Skip to content

Added regex option in stop task to stop all matching domains. #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 1, 2017
Merged

Added regex option in stop task to stop all matching domains. #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad85e85
Added regex option in stop task to stop all matching domains.
timohl Feb 1, 2017
f860614
Changed CMakeLists.txt to version 0.3.2
timohl Feb 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ set(FASTLIB "fastlib")
# Define version number
set(FASTLIB_VERSION_MAJOR "0")
set(FASTLIB_VERSION_MINOR "3")
set(FASTLIB_VERSION_PATCH "1")
set(FASTLIB_VERSION_PATCH "2")
set(FASTLIB_VERSION "${FASTLIB_VERSION_MAJOR}.${FASTLIB_VERSION_MINOR}.${FASTLIB_VERSION_PATCH}")

# Check compiler version
Expand Down
3 changes: 2 additions & 1 deletion include/fast-lib/message/migfra/task.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ struct Stop :
YAML::Node emit() const override;
void load(const YAML::Node &node) override;

std::string vm_name;
Optional<std::string> vm_name;
Optional<std::string> regex;
Optional<bool> force;
Optional<bool> undefine;
};
Expand Down
11 changes: 8 additions & 3 deletions src/message/migfra/task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,17 @@ void Start::load(const YAML::Node &node)
//

Stop::Stop() :
vm_name("vm-name"),
regex("regex"),
force("force"),
undefine("undefine")
{
}

Stop::Stop(std::string vm_name, bool force, bool undefine, bool concurrent_execution) :
Task::Task(concurrent_execution),
vm_name(std::move(vm_name)),
vm_name("vm-name", std::move(vm_name)),
regex("regex"),
force("force", force),
undefine("undefine", undefine)
{
Expand All @@ -285,7 +288,8 @@ Stop::Stop(std::string vm_name, bool force, bool undefine, bool concurrent_execu
YAML::Node Stop::emit() const
{
YAML::Node node = Task::emit();
node["vm-name"] = vm_name;
merge_node(node, vm_name.emit());
merge_node(node, regex.emit());
merge_node(node, force.emit());
merge_node(node, undefine.emit());
return node;
Expand All @@ -294,7 +298,8 @@ YAML::Node Stop::emit() const
void Stop::load(const YAML::Node &node)
{
Task::load(node);
fast::load(vm_name, node["vm-name"]);
vm_name.load(node);
regex.load(node);
force.load(node);
undefine.load(node);
}
Expand Down
8 changes: 4 additions & 4 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ include_directories(SYSTEM "${FRUCTOSE_INCLUDE_DIR}")
########

set(FASTLIB_COMMUNICATION_TEST "fastlib_communication_test")
set(FASTLIB_TASK_TEST "fastlib_task_test")
set(FASTLIB_OPTIONAL_TEST "fastlib_optional_test")
set(FASTLIB_TASK_TEST "fastlib_task_test")

# Include directories
include_directories(SYSTEM "${EXTERNAL_INCLUDES}")

### Build and installation targets
# Add executable
add_executable(${FASTLIB_COMMUNICATION_TEST} ${CMAKE_CURRENT_SOURCE_DIR}/communication.cpp)
add_executable(${FASTLIB_TASK_TEST} ${CMAKE_CURRENT_SOURCE_DIR}/task_test.cpp)
add_executable(${FASTLIB_OPTIONAL_TEST} ${CMAKE_CURRENT_SOURCE_DIR}/optional_test.cpp)
add_executable(${FASTLIB_TASK_TEST} ${CMAKE_CURRENT_SOURCE_DIR}/task_test.cpp)

# Link libraries
target_link_libraries(${FASTLIB_COMMUNICATION_TEST} ${FASTLIB} -lpthread)
target_link_libraries(${FASTLIB_TASK_TEST} ${FASTLIB} -lpthread)
target_link_libraries(${FASTLIB_OPTIONAL_TEST} ${FASTLIB} -lpthread)
target_link_libraries(${FASTLIB_TASK_TEST} ${FASTLIB} -lpthread)

# Add test
add_test(communication ${FASTLIB_COMMUNICATION_TEST})
add_test(task ${FASTLIB_TASK_TEST})
add_test(optional ${FASTLIB_OPTIONAL_TEST})
add_test(task ${FASTLIB_TASK_TEST})
55 changes: 29 additions & 26 deletions test/task_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ struct Task_tester :
auto buf = task1.to_string();
std::cout << "Serialized string: " << buf << std::endl;
task2.from_string(buf);
fructose_assert(task2.concurrent_execution.is_valid());
fructose_assert(task2.time_measurement.is_valid());
fructose_assert(task2.concurrent_execution);
fructose_assert(task2.time_measurement);
fructose_assert(task2.concurrent_execution == task1.concurrent_execution);
fructose_assert(task2.time_measurement == task1.time_measurement);
}
Expand All @@ -32,8 +32,8 @@ struct Task_tester :
auto buf = task1.to_string();
std::cout << "Serialized string: " << buf << std::endl;
task2.from_string(buf);
fructose_assert(!task2.concurrent_execution.is_valid());
fructose_assert(!task2.time_measurement.is_valid());
fructose_assert(!task2.concurrent_execution);
fructose_assert(!task2.time_measurement);
}
void start1(const std::string &test_name)
{
Expand All @@ -44,24 +44,24 @@ struct Task_tester :
start1.memory = 8 * 1024 * 1024;
start1.pci_ids.emplace_back(0x15b3, 0x1004); // lookup emplace_back params
start1.ivshmem = fast::msg::migfra::Device_ivshmem();
start1.ivshmem.get().id = "test";
start1.ivshmem.get().size = "512M";
start1.ivshmem->id = "test";
start1.ivshmem->size = "512M";

Start start2;
auto buf = start1.to_string();
std::cout << "Serialized string: " << buf << std::endl;
start2.from_string(buf);
fructose_assert(start2.vm_name.is_valid());
fructose_assert(start2.vcpus.is_valid());
fructose_assert(start2.memory.is_valid());
fructose_assert(start2.ivshmem.is_valid());
fructose_assert(start2.vm_name);
fructose_assert(start2.vcpus);
fructose_assert(start2.memory);
fructose_assert(start2.ivshmem);
fructose_assert_eq(start2.pci_ids.size(), 1);
fructose_assert(!start2.xml.is_valid());
fructose_assert(!start2.xml);
fructose_assert(start2.vm_name == start1.vm_name);
fructose_assert(start2.vcpus == start1.vcpus);
fructose_assert(start2.memory == start1.memory);
fructose_assert(start2.ivshmem.get().id == start1.ivshmem.get().id);
fructose_assert(start2.ivshmem.get().size == start1.ivshmem.get().size);
fructose_assert(start2.ivshmem->id == start1.ivshmem->id);
fructose_assert(start2.ivshmem->size == start1.ivshmem->size);
fructose_assert_eq(start2.pci_ids[0], start1.pci_ids[0]);
}

Expand All @@ -75,11 +75,11 @@ struct Task_tester :
auto buf = start1.to_string();
std::cout << "Serialized string: " << buf << std::endl;
start2.from_string(buf);
fructose_assert(!start2.vm_name.is_valid());
fructose_assert(!start2.vcpus.is_valid());
fructose_assert(!start2.memory.is_valid());
fructose_assert(!start2.vm_name);
fructose_assert(!start2.vcpus);
fructose_assert(!start2.memory);
fructose_assert_eq(start2.pci_ids.size(), 0);
fructose_assert(start2.xml.is_valid());
fructose_assert(start2.xml);
fructose_assert(start2.xml == start1.xml);
}

Expand All @@ -95,8 +95,8 @@ struct Task_tester :
auto buf = stop1.to_string();
std::cout << "Serialized string: " << buf << std::endl;
stop2.from_string(buf);
fructose_assert(stop2.force.is_valid());
fructose_assert(stop2.undefine.is_valid());
fructose_assert(stop2.force);
fructose_assert(stop2.undefine);
fructose_assert_eq(stop2.vm_name, stop1.vm_name);
fructose_assert(stop2.force == stop1.force);
fructose_assert(stop2.undefine == stop1.undefine);
Expand All @@ -106,14 +106,17 @@ struct Task_tester :
{
(void) test_name;
Stop stop1;
stop1.vm_name = "vm1";
stop1.regex = "vm\\d";

Stop stop2;
auto buf = stop1.to_string();
std::cout << "Serialized string: " << buf << std::endl;
stop2.from_string(buf);
fructose_assert(!stop2.force.is_valid());
fructose_assert_eq(stop2.vm_name, stop1.vm_name);
fructose_assert(!stop2.force);
fructose_assert(!stop2.undefine);
fructose_assert(!stop2.vm_name);
fructose_assert(stop2.regex);
fructose_assert_eq(stop2.regex, stop1.regex);
}

void migrate(const std::string &test_name)
Expand All @@ -131,10 +134,10 @@ struct Task_tester :
auto buf = mig1.to_string();
std::cout << "Serialized string: " << buf << std::endl;
mig2.from_string(buf);
fructose_assert(mig2.migration_type.is_valid());
fructose_assert(mig2.rdma_migration.is_valid());
fructose_assert(mig2.pscom_hook_procs.is_valid());
fructose_assert(mig2.vcpu_map.is_valid());
fructose_assert(mig2.migration_type);
fructose_assert(mig2.rdma_migration);
fructose_assert(mig2.pscom_hook_procs);
fructose_assert(mig2.vcpu_map);
fructose_assert_eq(mig2.vm_name, mig1.vm_name);
fructose_assert_eq(mig2.dest_hostname, mig1.dest_hostname);
fructose_assert(mig2.migration_type == mig1.migration_type);
Expand Down