Merge branch 'develop' into feature/alex_59_app_orchestration

Author: alexazarh

common/utilites/command_result.py

@@ -0,0 +1,14 @@
+from re import search
+
+COMMAND_RESULT_PREFIX = "command_json_result="
+COMMAND_RESULT_POSTFIX = "=command_json_result_end"
+
+def get_result_from_command_output(output):
+
+    match = search(COMMAND_RESULT_PREFIX + '(?P<result>.*)' + COMMAND_RESULT_POSTFIX, output)
+    if not match:
+        return output
+    return match.group('result')
+
+def set_command_result(output):
+    print COMMAND_RESULT_PREFIX + str(output) + COMMAND_RESULT_POSTFIX

common/vcenter/vmomi_service.py

@@ -406,13 +406,12 @@ def destroy_vm(self, vm):
         :param vm: virutal machine pyvmomi object
         """
 
-        logger.info(
-                ("The current powerState is: {0}. Attempting to power off {1}".format(vm.runtime.powerState, vm.name)))
+        if vm.runtime.powerState == 'poweredOn':
+            logger.info(("The current powerState is: {0}. Attempting to power off {1}"
+                         .format(vm.runtime.powerState, vm.name)))
+            task = vm.PowerOffVM_Task()
+            self.wait_for_task(task)
 
-        task = vm.PowerOffVM_Task()
-        self.wait_for_task(task)
-
-        logger.info(("{0}".format(task.info.state)))
         logger.info(("Destroying VM {0}".format(vm.name)))
 
         task = vm.Destroy_Task()

common/wrappers/command_wrapper.py

@@ -1,5 +1,5 @@
 DISCONNCTING_VCENERT = 'disconnecting from vcenter: {0}'
-COMMAND_ERROR = 'error has occurred while executing command: {0} error: {1}'
+COMMAND_ERROR = 'error has occurred while executing command: {0}'
 DEBUG_COMMAND_RESULT = 'finished executing with the result: {0}'
 FINISHED_EXECUTING_COMMAND = 'finished executing command: {0}'
 DEBUG_COMMAND_PARAMS = 'command params: {0}'
@@ -66,7 +66,8 @@ def execute_command_with_connection(self, connection_details, command, *args):
 
             return results
         except Exception as e:
-            logger.error(COMMAND_ERROR.format(command_name, e))
+            logger.error(COMMAND_ERROR.format(command_name))
+            logger.exception(e)
             raise
         finally:
             if si:

deployed_app_service/__main__.py

@@ -0,0 +1,10 @@
+from common.model_factory import ResourceModelParser
+from deployed_app_service.proxy.deployed_app_proxy import DeployedAppService
+
+
+def main():
+    DeployedAppService(ResourceModelParser())\
+        .connect()
+
+if __name__ == "__main__":
+    main()

deployed_app_service/connect.py

@@ -0,0 +1,10 @@
+from common.model_factory import ResourceModelParser
+from deployed_app_service.proxy.deployed_app_proxy import DeployedAppService
+
+
+def main():
+    DeployedAppService(ResourceModelParser())\
+        .destroy_vm()
+
+if __name__ == "__main__":
+    main()