Merge pull request #63 from timohl/master

Fixed Task_container to support Evacuate. Fixed some indention.

Author: timohl

include/fast-lib/log.hpp

@@ -6,7 +6,7 @@ namespace fast {
 		class Dev_null
 		{
 		};
-	       	extern Dev_null dev_null;
+		extern Dev_null dev_null;
 		template<typename T> Dev_null & operator<<(Dev_null &dest, T)
 		{
 			return dest;

include/fast-lib/message/agent/mmbwmon/reply.hpp

@@ -37,7 +37,7 @@ struct reply : public fast::Serializable
 	void load(const YAML::Node &node) override;
 
 	std::vector<size_t> cores;
-    double result;
+	double result;
 };
 
 }

include/fast-lib/message/agent/mmbwmon/restart.hpp

@@ -34,7 +34,7 @@ struct restart : public fast::Serializable
 	YAML::Node emit() const override;
 	void load(const YAML::Node &node) override;
 
-    std::string cgroup;
+	std::string cgroup;
 };
 
 }

include/fast-lib/message/agent/mmbwmon/stop.hpp

@@ -35,7 +35,7 @@ struct stop : public fast::Serializable
 	YAML::Node emit() const override;
 	void load(const YAML::Node &node) override;
 
-    std::string cgroup;
+	std::string cgroup;
 };
 
 }

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

@@ -241,9 +241,9 @@ struct Evacuate :
 	YAML::Node emit() const override;
 	void load(const YAML::Node &node) override;
 
-    std::vector<std::string> destinations;
-    Optional<std::string> mode;
-    Optional<bool> overbooking;
+	std::vector<std::string> destinations;
+	Optional<std::string> mode;
+	Optional<bool> overbooking;
 	Optional<unsigned int> retry_counter;
 	Optional<std::string> migration_type;
 	Optional<bool> rdma_migration;

src/message/agent/mmbwmon/reply.cpp

@@ -20,7 +20,7 @@ YAML::Node reply::emit() const
 void reply::load(const YAML::Node &node)
 {
 	fast::load(cores, node["cores"]);
-    fast::load(result, node["result"]);
+	fast::load(result, node["result"]);
 }
 
 }

src/message/migfra/pci_id.cpp

@@ -18,9 +18,9 @@ namespace migfra {
 // Converts integer type numbers to string in hex format.
 static std::string to_hex_string(unsigned int integer, int digits, bool show_base = true)
 {
-        std::stringstream ss;
-        ss << (show_base ? "0x" : "") << std::hex << std::setfill('0') << std::setw(digits) << +integer;
-        return ss.str();
+	std::stringstream ss;
+	ss << (show_base ? "0x" : "") << std::hex << std::setfill('0') << std::setw(digits) << +integer;
+	return ss.str();
 }
 
 

src/message/migfra/task.cpp

@@ -70,11 +70,11 @@ Task_container::Task_container(std::vector<std::shared_ptr<Task>> tasks, bool co
 
 std::string Task_container::type(bool enable_result_format) const
 {
-	std::array<std::string, 7> types;
+	std::array<std::string, 8> types;
 	if (enable_result_format)
-		types = {{"vm started", "vm stopped", "vm migrated", "vm repinned", "vm suspended", "vm resumed", "quit"}};
+		types = {{"vm started", "vm stopped", "vm migrated", "node evacuated" "vm repinned", "vm suspended", "vm resumed", "quit"}};
 	else
-		types = {{"start vm", "stop vm", "migrate vm", "repin vm", "suspend vm", "resume vm", "quit"}};
+		types = {{"start vm", "stop vm", "migrate vm", "evacuate node", "repin vm", "suspend vm", "resume vm", "quit"}};
 	if (tasks.empty())
 		throw std::runtime_error("No subtasks available to get type.");
 	else if (std::dynamic_pointer_cast<Start>(tasks.front()))
@@ -83,14 +83,16 @@ std::string Task_container::type(bool enable_result_format) const
 		return types[1];
 	else if (std::dynamic_pointer_cast<Migrate>(tasks.front()))
 		return types[2];
-	else if (std::dynamic_pointer_cast<Repin>(tasks.front()))
+	else if (std::dynamic_pointer_cast<Evacuate>(tasks.front()))
 		return types[3];
-	else if (std::dynamic_pointer_cast<Suspend>(tasks.front()))
+	else if (std::dynamic_pointer_cast<Repin>(tasks.front()))
 		return types[4];
-	else if (std::dynamic_pointer_cast<Resume>(tasks.front()))
+	else if (std::dynamic_pointer_cast<Suspend>(tasks.front()))
 		return types[5];
-	else if (std::dynamic_pointer_cast<Quit>(tasks.front()))
+	else if (std::dynamic_pointer_cast<Resume>(tasks.front()))
 		return types[6];
+	else if (std::dynamic_pointer_cast<Quit>(tasks.front()))
+		return types[7];
 	else
 		throw std::runtime_error("Unknown type of Task.");
 
@@ -104,6 +106,8 @@ YAML::Node Task_container::emit() const
 	node["task"] = type_str;
 	if (type_str == "migrate vm") {
 		merge_node(node, tasks.front()->emit());
+	} else if (type_str == "evacuate node") {
+		merge_node(node, tasks.front()->emit());
 	} else if (type_str == "repin vm") {
 		merge_node(node, tasks.front()->emit());
 	} else if (type_str == "start vm") {
@@ -143,6 +147,13 @@ static std::vector<std::shared_ptr<Task>> load_migrate_task(const YAML::Node &no
 	return std::vector<std::shared_ptr<Task>>(1, migrate_task);
 }
 
+static std::vector<std::shared_ptr<Task>> load_evacuate_task(const YAML::Node &node)
+{
+	std::shared_ptr<Evacuate> evacuate_task;
+	fast::load(evacuate_task, node);
+	return std::vector<std::shared_ptr<Task>>(1, evacuate_task);
+}
+
 static std::vector<std::shared_ptr<Task>> load_repin_task(const YAML::Node &node)
 {
 	std::shared_ptr<Repin> repin_task;
@@ -185,6 +196,8 @@ void Task_container::load(const YAML::Node &node)
 		tasks = load_stop_task(node);
 	} else if (type == "migrate vm") {
 		tasks = load_migrate_task(node);
+	} else if (type == "evacuate node") {
+		tasks = load_evacuate_task(node);
 	} else if (type == "repin vm") {
 		tasks = load_repin_task(node);
 	} else if (type == "suspend vm") {