Merge pull request #46 from timohl/master

Added pscom-hook-procs option to swap-with option in migrate task.

Author: timohl

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

@@ -149,6 +149,22 @@ struct Stop :
 	Optional<bool> undefine;
 };
 
+/**
+ * \brief Used for the swap-with option of the migrate task.
+ */
+struct Swap_with :
+	public fast::Serializable
+{
+	Swap_with();
+
+	YAML::Node emit() const override;
+	void load(const YAML::Node &node) override;
+
+	std::string vm_name;
+	Optional<std::string> pscom_hook_procs;
+};
+
+
 /**
  * \brief Task to migrate a virtual machine.
  */
@@ -190,7 +206,7 @@ struct Migrate :
 	Optional<bool> rdma_migration;
 	Optional<std::string> pscom_hook_procs;
 	Optional<std::string> transport;
-	Optional<std::string> swap_with;
+	Optional<Swap_with> swap_with;
 	Optional<std::vector<std::vector<unsigned int>>> vcpu_map;
 };
 
@@ -271,6 +287,7 @@ YAML_CONVERT_IMPL(fast::msg::migfra::Task)
 YAML_CONVERT_IMPL(fast::msg::migfra::Task_container)
 YAML_CONVERT_IMPL(fast::msg::migfra::Start)
 YAML_CONVERT_IMPL(fast::msg::migfra::Stop)
+YAML_CONVERT_IMPL(fast::msg::migfra::Swap_with)
 YAML_CONVERT_IMPL(fast::msg::migfra::Migrate)
 YAML_CONVERT_IMPL(fast::msg::migfra::Repin)
 YAML_CONVERT_IMPL(fast::msg::migfra::Suspend)

src/message/migfra/task.cpp

@@ -17,6 +17,10 @@ namespace fast {
 namespace msg {
 namespace migfra {
 
+//
+// Task implementation
+//
+
 Task::Task() :
 	concurrent_execution("concurrent-execution"),
 	time_measurement("time-measurement"),
@@ -47,6 +51,10 @@ void Task::load(const YAML::Node &node)
 	driver.load(node);
 }
 
+//
+// Task_container implementation
+//
+
 Task_container::Task_container() :
 	concurrent_execution("concurrent-execution"),
 	id("id")
@@ -192,6 +200,10 @@ void Task_container::load(const YAML::Node &node)
 	id.load(node);
 }
 
+//
+// Start implementation
+//
+
 Start::Start() :
 	vm_name("vm-name"),
 	vcpus("vcpus"),
@@ -252,6 +264,10 @@ void Start::load(const YAML::Node &node)
 	transient.load(node);
 }
 
+//
+// Stop implementation
+//
+
 Stop::Stop() :
 	force("force"),
 	undefine("undefine")
@@ -283,6 +299,33 @@ void Stop::load(const YAML::Node &node)
 	undefine.load(node);
 }
 
+//
+// Swap_with implementation
+//
+
+Swap_with::Swap_with() :
+	pscom_hook_procs("pscom-hook-procs")
+{
+}
+
+YAML::Node Swap_with::emit() const
+{
+	YAML::Node node;
+	node["vm-name"] = vm_name;
+	merge_node(node, pscom_hook_procs.emit());
+	return node;
+}
+
+void Swap_with::load(const YAML::Node &node)
+{
+	fast::load(vm_name, node["vm-name"]);
+	pscom_hook_procs.load(node);
+}
+
+//
+// Migrate implementation
+//
+
 Migrate::Migrate() :
 	migration_type("migration-type"),
 	rdma_migration("rdma-migration"),
@@ -351,6 +394,10 @@ void Migrate::load(const YAML::Node &node)
 	}
 }
 
+//
+// Repin implementation
+//
+
 Repin::Repin()
 {
 }
@@ -378,6 +425,10 @@ void Repin::load(const YAML::Node &node)
 	fast::load(vcpu_map, node["vcpu-map"]);
 }
 
+//
+// Suspend implementation
+//
+
 Suspend::Suspend()
 {
 }
@@ -401,6 +452,10 @@ void Suspend::load(const YAML::Node &node)
 	fast::load(vm_name, node["vm-name"]);
 }
 
+//
+// Resume implementation
+//
+
 Resume::Resume()
 {
 }