minor improvements to cloud service

wrench-project · Oct 17, 2017 · 6fbf070 · 6fbf070
1 parent d6d089c
commit 6fbf070
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 22 deletions.
diff --git a/examples/simple-wms/scheduler/CloudScheduler.cpp b/examples/simple-wms/scheduler/CloudScheduler.cpp
@@ -79,11 +79,9 @@ namespace wrench {
           try {
             std::string pm_host = choosePMHostname();
             std::string vm_host = "vm" + std::to_string(VM_ID++) + "_" + pm_host;
-            std::string vm_hostname = cs->createVM(pm_host, vm_host,
-                                                   ((StandardJob *) (job))->getMinimumRequiredNumCores());
 
-            if (not vm_hostname.empty()) {
-              this->vm_list[pm_host].push_back(vm_hostname);
+            if (cs->createVM(pm_host, vm_host, ((StandardJob *) (job))->getMinimumRequiredNumCores())) {
+              this->vm_list[pm_host].push_back(vm_host);
             }
 
           } catch (WorkflowExecutionException &e) {
@@ -98,7 +96,7 @@ namespace wrench {
     }
 
     /**
-     * Select a physical host (PM) with the least number of VMs.
+     * @brief Select a physical host (PM) with the least number of VMs.
      *
      * @return a physical hostname
      */

diff --git a/include/wrench/services/compute/cloud/CloudService.h b/include/wrench/services/compute/cloud/CloudService.h
@@ -54,10 +54,10 @@ namespace wrench {
         /** \cond DEVELOPER    */
         /***********************/
 
-        std::string createVM(const std::string &pm_hostname,
-                             const std::string &vm_hostname,
-                             unsigned long num_cores,
-                             std::map<std::string, std::string> plist = {});
+        bool createVM(const std::string &pm_hostname,
+                      const std::string &vm_hostname,
+                      unsigned long num_cores,
+                      std::map<std::string, std::string> plist = {});
 
         // Running jobs
         void submitStandardJob(StandardJob *job, std::map<std::string, std::string> &service_specific_args) override;

diff --git a/src/wrench/services/compute/cloud/CloudService.cpp b/src/wrench/services/compute/cloud/CloudService.cpp
@@ -66,10 +66,10 @@ namespace wrench {
      *
      * @throw WorkflowExecutionException
      */
-    std::string CloudService::createVM(const std::string &pm_hostname,
-                                       const std::string &vm_hostname,
-                                       unsigned long num_cores,
-                                       std::map<std::string, std::string> plist) {
+    bool CloudService::createVM(const std::string &pm_hostname,
+                                const std::string &vm_hostname,
+                                unsigned long num_cores,
+                                std::map<std::string, std::string> plist) {
 
       if (this->state == Service::DOWN) {
         throw WorkflowExecutionException(new ServiceIsDown(this));
@@ -99,7 +99,7 @@ namespace wrench {
       }
 
       if (auto *msg = dynamic_cast<CloudServiceCreateVMAnswerMessage *>(message.get())) {
-        return msg->vm_hostname;
+        return msg->success;
       } else {
         throw std::runtime_error("CloudService::createVM(): Unexpected [" + msg->getName() + "] message");
       }
@@ -340,13 +340,14 @@ namespace wrench {
           S4U_Mailbox::dputMessage(
                   answer_mailbox,
                   new CloudServiceCreateVMAnswerMessage(
-                          vm_hostname,
+                          true,
                           this->getPropertyValueAsDouble(CloudServiceProperty::CREATE_VM_ANSWER_MESSAGE_PAYLOAD)));
         } else {
           S4U_Mailbox::dputMessage(
                   answer_mailbox,
                   new CloudServiceCreateVMAnswerMessage(
-                          "", this->getPropertyValueAsDouble(CloudServiceProperty::CREATE_VM_ANSWER_MESSAGE_PAYLOAD)));
+                          false,
+                          this->getPropertyValueAsDouble(CloudServiceProperty::CREATE_VM_ANSWER_MESSAGE_PAYLOAD)));
         }
       } catch (std::shared_ptr<NetworkError> &cause) {
         return;

diff --git a/src/wrench/services/compute/cloud/CloudServiceMessage.cpp b/src/wrench/services/compute/cloud/CloudServiceMessage.cpp
@@ -62,7 +62,7 @@ namespace wrench {
      * @param vm_hostname: the new VM hostname
      * @param payload: the message size in bytes
      */
-    CloudServiceCreateVMAnswerMessage::CloudServiceCreateVMAnswerMessage(
-            const std::string &vm_hostname, double payload) :
-            CloudServiceMessage("CREATE_VM_ANSWER", payload), vm_hostname(vm_hostname) {}
+    CloudServiceCreateVMAnswerMessage::CloudServiceCreateVMAnswerMessage(bool success, double payload) :
+            CloudServiceMessage("CREATE_VM_ANSWER", payload), success(success) {}
+
 }
diff --git a/src/wrench/services/compute/cloud/CloudServiceMessage.h b/src/wrench/services/compute/cloud/CloudServiceMessage.h
@@ -57,11 +57,11 @@ namespace wrench {
      */
     class CloudServiceCreateVMAnswerMessage : public CloudServiceMessage {
     public:
-        CloudServiceCreateVMAnswerMessage(const std::string &vm_hostname, double payload);
+        CloudServiceCreateVMAnswerMessage(bool success, double payload);
 
-        std::string vm_hostname;
+        bool success;
     };
-
+    
     /***********************/
     /** \endcond           */
     /***********************/