Merge pull request #64 from timohl/master

Change required by migfra evacuate and fixed a compiler warning.

Author: timohl

include/fast-lib/message/migfra/task.hpp

@@ -249,6 +249,9 @@ struct Evacuate :
 	Optional<bool> rdma_migration;
 	Optional<std::string> pscom_hook_procs;
 	Optional<std::string> transport;
+
+	// Used internally by migration framework
+	Optional<std::string> vm_name;
 };
 
 /**

include/fast-lib/optional.hpp

@@ -90,6 +90,7 @@ Optional<T>::Optional(std::string tag, const T &rhs) :
 
 template<typename T>
 Optional<T>::Optional(const Optional<T> &rhs) :
+	Serializable(rhs),
 	tag(rhs.tag),
 	ptr(rhs.is_valid() ? new T(*rhs.ptr) : nullptr),
 	valid(rhs.valid)
@@ -98,6 +99,7 @@ Optional<T>::Optional(const Optional<T> &rhs) :
 
 template<typename T>
 Optional<T>::Optional(Optional<T> &&rhs) noexcept :
+	Serializable(rhs),
 	tag(std::move(rhs.tag)),
 	ptr(std::move(rhs.ptr)),
 	valid(rhs.valid)

src/message/migfra/task.cpp

@@ -457,7 +457,8 @@ Evacuate::Evacuate() :
 	migration_type("migration-type"),
 	rdma_migration("rdma-migration"),
 	pscom_hook_procs("pscom-hook-procs"),
-	transport("transport")
+	transport("transport"),
+	vm_name("vm-name")
 {
 }
 
@@ -470,7 +471,8 @@ Evacuate::Evacuate(std::vector<std::string> destinations, std::string mode, bool
 	migration_type("migration-type", std::move(migration_type)),
 	rdma_migration("rdma-migration", rdma_migration),
 	pscom_hook_procs("pscom-hook-procs", std::move(pscom_hook_procs)),
-	transport("transport")
+	transport("transport"),
+	vm_name("vm-name")
 {
 }
 
@@ -486,6 +488,7 @@ YAML::Node Evacuate::emit() const
 	merge_node(params, rdma_migration.emit());
 	merge_node(params, pscom_hook_procs.emit());
 	merge_node(params, transport.emit());
+	merge_node(node, vm_name.emit());
 	return node;
 }
 
@@ -502,6 +505,7 @@ void Evacuate::load(const YAML::Node &node)
 		pscom_hook_procs.load(node["parameter"]);
 		transport.load(node["parameter"]);
 	}
+	vm_name.load(node);
 }
 
 

test/optional_test.cpp

@@ -71,12 +71,46 @@ struct Task_tester :
 		fructose_assert(p.get().id == 1);
 		fructose_assert(p->id == 1);
 	}
+
+	void optional_copy(const std::string &test_name)
+	{
+		(void) test_name;
+		std::string name1_str = "bob";
+		std::string name2_str = "baumeister";
+		Optional<std::string> name1("name1", name1_str);
+		Optional<std::string> name2("name2", name2_str);
+		// Copy constructor
+		Optional<std::string> copy_constr(name1);
+		fructose_assert(name1.is_valid());
+		fructose_assert(copy_constr.is_valid());
+		fructose_assert_eq(name1.get(), name1_str);
+		fructose_assert_eq(copy_constr.get(), name1_str);
+		// Copy assignment
+		Optional<std::string> copy_assign("empty");
+		copy_assign = name2;
+		fructose_assert(name2.is_valid());
+		fructose_assert(copy_assign.is_valid());
+		fructose_assert_eq(name2.get(), name2_str);
+		fructose_assert_eq(copy_assign.get(), name2_str);
+		// Move constructor
+		Optional<std::string> move_constr(std::move(name1));
+		fructose_assert(!name1.is_valid());
+		fructose_assert(move_constr.is_valid());
+		fructose_assert_eq(move_constr.get(), name1_str);
+		// Move assignment
+		Optional<std::string> move_assign("empty_move");
+		move_assign = std::move(name2);
+		fructose_assert(!name2.is_valid());
+		fructose_assert(move_assign.is_valid());
+		fructose_assert_eq(move_assign.get(), name2_str);
+	}
 };
 
 int main(int argc, char **argv)
 {
 	Task_tester tests;
 	tests.add_test("optional-bool", &Task_tester::optional_bool);
 	tests.add_test("optional-struct", &Task_tester::optional_struct);
+	tests.add_test("optional-copy", &Task_tester::optional_copy);
 	return tests.run(argc, argv);
 }