add deploy false and delete vm improvements

Author: EarthmanT

cloudify_vcd/legacy/compute/tasks.py

@@ -16,7 +16,7 @@
 
 from cloudify.exceptions import OperationRetry
 
-from vcd_plugin_sdk.resources.vapp import VCloudVM
+from vcd_plugin_sdk.resources.vapp import VCloudVM, VCloudvApp
 from cloudify_common_sdk.utils import (
     get_ctx_instance,
     skip_creative_or_destructive_operation as skip)
@@ -72,6 +72,45 @@ def configure_server(vm_client, ctx, **_):
     #              legacy=True)
 
 
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def power_off_vapp(vm_client, ctx, **_):
+    return vapp_tasks._power_off_vapp(
+        vapp_ext=False,
+        vapp_id=vm_client.name,
+        vapp_client=vm_client.vapp_object.connection,
+        vm_vdc=vm_client.vdc_name,
+        vapp_config=vm_client.kwargs,
+        vapp_class=VCloudvApp,
+        __=ctx)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def stop_vapp(vm_client, ctx, **_):
+    return vapp_tasks._stop_vapp(
+        vapp_ext=False,
+        vapp_id=vm_client.name,
+        vapp_client=vm_client.vapp_object.connection,
+        vm_vdc=vm_client.vdc_name,
+        vapp_config=vm_client.kwargs,
+        vapp_class=VCloudvApp,
+        __=ctx)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def delete_vapp(vm_client, ctx, **_):
+    return vapp_tasks._delete_vapp(
+        vapp_ext=False,
+        vapp_id=vm_client.name,
+        vapp_client=vm_client.vapp_object.connection,
+        vm_vdc=vm_client.vdc_name,
+        vapp_config=vm_client.kwargs,
+        vapp_class=VCloudvApp,
+        __=ctx)
+
+
 @decorators.with_vcd_client()
 @decorators.with_vm_resource()
 def start_server(vm_client, ctx, **_):

cloudify_vcd/legacy/utils.py

@@ -400,6 +400,8 @@ def convert_vm_config(config):
         del config['name']
     if 'power_on' not in config:
         config['power_on'] = False
+    if 'deploy' not in config:
+        config['deploy'] = False
     if 'hardware' in config:
         if 'memory' in config['hardware']:
             config['memory'] = config['hardware']['memory']

cloudify_vcd/vapp_tasks.py

@@ -77,14 +77,18 @@ def _create_vapp(_=None,
 
 
 @resource_operation
-def stop_vapp(vapp_ext=None,
-              vapp_id=None,
-              vapp_client=None,
-              vapp_vdc=None,
-              vapp_config=None,
-              vapp_class=None,
-              __=None,
-              **___):
+def stop_vapp(*args, **kwargs):
+    return _stop_vapp(*args, *kwargs)
+
+
+def _stop_vapp(vapp_ext=None,
+               vapp_id=None,
+               vapp_client=None,
+               vapp_vdc=None,
+               vapp_config=None,
+               vapp_class=None,
+               __=None,
+               **___):
     """
     Perform undeploy operation on a vApp.
 
@@ -111,14 +115,18 @@ def stop_vapp(vapp_ext=None,
 
 
 @resource_operation
-def power_off_vapp(vapp_ext=None,
-                   vapp_id=None,
-                   vapp_client=None,
-                   vapp_vdc=None,
-                   vapp_config=None,
-                   vapp_class=None,
-                   __=None,
-                   **___):
+def power_off_vapp(*args, **kwargs):
+    return _power_off_vapp(*args, **kwargs)
+
+
+def _power_off_vapp(vapp_ext=None,
+                    vapp_id=None,
+                    vapp_client=None,
+                    vapp_vdc=None,
+                    vapp_config=None,
+                    vapp_class=None,
+                    __=None,
+                    **___):
     """
     Execute power off on the vApp before deletion.
     :param vapp_ext:
@@ -151,14 +159,18 @@ def power_off_vapp(vapp_ext=None,
 
 
 @resource_operation
-def delete_vapp(vapp_ext=None,
-                vapp_id=None,
-                vapp_client=None,
-                vapp_vdc=None,
-                vapp_config=None,
-                vapp_class=None,
-                __=None,
-                **___):
+def delete_vapp(*args, **kwargs):
+    return _delete_vapp(*args, **kwargs)
+
+
+def _delete_vapp(vapp_ext=None,
+                 vapp_id=None,
+                 vapp_client=None,
+                 vapp_vdc=None,
+                 vapp_config=None,
+                 vapp_class=None,
+                 __=None,
+                 **___):
     """
     Delete a vApp.
 

vcloud_server_plugin/server.py

@@ -14,14 +14,17 @@
 
 from cloudify.decorators import operation
 from cloudify_vcd.legacy.compute.tasks import (
-    create_server,
     # configure_server,
+    postconfigure_nic,
+    preconfigure_nic,
+    power_off_vapp,
+    delete_server,
+    create_server,
     start_server,
     stop_server,
-    delete_server,
-    preconfigure_nic,
-    postconfigure_nic,
-    unlink_nic
+    delete_vapp,
+    unlink_nic,
+    stop_vapp,
 )
 
 
@@ -64,12 +67,15 @@ def start(*args, **kwargs):
 @operation(resumable=True)
 def stop(*args, **kwargs):
     stop_server(*args, **kwargs)
+    unlink_nic(*args, **kwargs)
+    stop_vapp(*args, **kwargs)
+    power_off_vapp(*args, **kwargs)
 
 
 @operation(resumable=True)
 def delete(*args, **kwargs):
-    unlink_nic(*args, **kwargs)
     delete_server(*args, **kwargs)
+    delete_vapp(*args, **kwargs)
 
 
 @operation(resumable=True)