Merge remote-tracking branch 'origin/develop' into feature/borismod_40_save_vnic

Conflicts:
	common/utilites/command_result.py
	deployed_app_service/connect.py

Author: borismod

common/logger/__init__.py

@@ -69,7 +69,7 @@ def get_logging_config(level_console="DEBUG", level_file=None, logfile=None):
                 }
     return logger
 
-print os.environ.get("LOG_LEVEL") or "DEBUG"
+# print os.environ.get("LOG_LEVEL") or "DEBUG"
 initial_log_level = os.environ.get("LOG_LEVEL") or "DEBUG"
 logging.config.dictConfig(get_logging_config(initial_log_level))
 

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()

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()

deployed_app_service/connect/__init__.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())\
+        .power_off()
+
+if __name__ == "__main__":
+    main()