configure is ok

Author: earthmant

cloudify_vcd/decorators.py

@@ -77,7 +77,7 @@ def wrapper(*_, **kwargs):
                     resource_data.primary_ctx.instance.runtime_properties[
                         '__RETRY_BAD_REQUEST'] = True
                     resource_data.primary_ctx.instance.update()
-                raise OperationRetry(str(e))
+                    raise OperationRetry(str(e))
             else:
                 last_task = get_last_task(result)
 

cloudify_vcd/utils.py

@@ -389,7 +389,7 @@ def expose_props(operation_name, resource=None, new_props=None, _ctx=None):
 
 def get_last_task(task):
     try:
-        return task_to_dict(task.Tasks.Task)
+        return task_to_dict(task.Tasks.Task[0])
     except AttributeError:
         return task
 
@@ -426,12 +426,29 @@ def cannot_deploy(exc):
     return False
 
 
+def cannot_power_off(exc):
+    if 'Current state of vm: Powered off' in str(exc):
+        return True
+    elif 'RelationType.POWER_OFF' in str(exc):
+        return True
+    return False
+
+
+def task_on_failure(exc):
+    if 'Unable to perform this action. ' \
+       'Contact your cloud administrator' in str(exc):
+        return True
+    return False
+
+
 def check_if_task_successful(_resource, task):
     if task:
+        ctx.logger.info('Task: {task}'.format(task=task.items()))
         try:
             return _resource.task_successful(task)
         except VcdTaskException as e:
-            if cannot_deploy(e):
+            if cannot_deploy(e) or task_on_failure(e):
                 raise NonRecoverableError(str(e))
-            raise OperationRetry('Unhandled state validation error: {e}.'.format(e=str(e)))
+            raise OperationRetry(
+                'Unhandled state validation error: {e}.'.format(e=str(e)))
     return True

cloudify_vcd/vapp_tasks.py

@@ -1,13 +1,14 @@
-
 from pyvcloud.vcd.exceptions import (
     BadRequestException,
+    MissingLinkException,
     OperationNotSupportedException)
 
 from cloudify.exceptions import OperationRetry
 
 from .decorators import resource_operation
 from .network_tasks import get_network_type
 from .utils import (
+    cannot_power_off,
     find_rel_by_type,
     vcd_unresolved_vm,
     vcd_already_exists,
@@ -33,13 +34,12 @@ def create_vapp(_,
     if network and 'network' not in vapp_config:
         vapp_config['network'] = network
 
-    vapp = vapp_class(
+    return vapp_class(
         vapp_id,
         vapp_client,
         vapp_vdc,
         kwargs=vapp_config
-    )
-    return vapp, None
+    ), None
 
 
 @resource_operation
@@ -128,6 +128,26 @@ def create_vm(vm_external,
     return vm, last_task
 
 
+@resource_operation
+def configure_vm(_,
+                 vm_id,
+                 vm_client,
+                 vm_vdc,
+                 vm_config,
+                 vm_class,
+                 vm_ctx):
+    vapp_name = find_resource_id_from_relationship_by_type(
+        vm_ctx.instance, REL_VM_VAPP)
+    return vm_class(
+        vm_id,
+        vapp_name,
+        vm_client,
+        vdc_name=vm_vdc,
+        kwargs={},
+        vapp_kwargs=vm_config
+    ), None
+
+
 @resource_operation
 def start_vm(_,
              vm_id,
@@ -170,8 +190,8 @@ def stop_vm(_,
     )
     try:
         last_task = vm.power_off()
-    except OperationNotSupportedException as e:
-        if not vcd_unresolved_vm(e):
+    except (MissingLinkException, OperationNotSupportedException) as e:
+        if not vcd_unresolved_vm(e) and not cannot_power_off(e):
             raise
         last_task = None
     return vm, last_task
@@ -197,8 +217,8 @@ def delete_vm(_,
     )
     try:
         last_task = vm.undeploy()
-    except OperationNotSupportedException as e:
-        if not vcd_unresolved_vm(e):
+    except (MissingLinkException, OperationNotSupportedException) as e:
+        if not vcd_unresolved_vm(e) and not cannot_power_off(e):
             raise
         last_task = None
     if vm_ctx.instance.runtime_properties.get('__VM_CREATE_VAPP'):

plugin.yaml

@@ -377,6 +377,10 @@ node_types:
       cloudify.interfaces.lifecycle:
         create:
           implementation: vcd.cloudify_vcd.vapp_tasks.create_vm
+        configure:
+          implementation: vcd.cloudify_vcd.vapp_tasks.configure_vm
+        start:
+          implementation: vcd.cloudify_vcd.vapp_tasks.start_vm
         stop:
           implementation: vcd.cloudify_vcd.vapp_tasks.stop_vm
         delete:

test.yaml

@@ -84,7 +84,7 @@ node_templates:
       resource_config:
         description: test description
         fence_mode: natRouted
-        accept_all_eulas: True
+        accept_all_eulas: true
     relationships:
       - type: cloudify.relationships.vcloud.vapp_connected_to_network
         target: routed_network
@@ -176,34 +176,34 @@ node_templates:
 #      - type: cloudify.relationships.vcloud.network_connected_to_gateway
 #        target: gateway
 ##
-#  routed_network2:
-#    type: cloudify.nodes.vcloud.RoutedVDCNetwork
-#    properties:
-#      client_config: *client_config
-#      resource_id: { concat: [ 'routed-network2-', { get_input: resource_suffix } ] }
-#      resource_config:
-#        gateway_name: { get_property: [ gateway, resource_id ] }
-#        network_cidr: 192.170.2.1/24
-#        description: test routed network
-#        primary_dns_ip: 8.8.8.4
-#        secondary_dns_ip: 8.8.8.8
-#    relationships:
-#      - type: cloudify.relationships.vcloud.network_connected_to_gateway
-#        target: gateway
-#
+  routed_network2:
+    type: cloudify.nodes.vcloud.RoutedVDCNetwork
+    properties:
+      client_config: *client_config
+      resource_id: { concat: [ 'routed-network2-', { get_input: resource_suffix } ] }
+      resource_config:
+        gateway_name: { get_property: [ gateway, resource_id ] }
+        network_cidr: 192.170.2.1/24
+        description: test routed network
+        primary_dns_ip: 8.8.8.4
+        secondary_dns_ip: 8.8.8.8
+    relationships:
+      - type: cloudify.relationships.vcloud.network_connected_to_gateway
+        target: gateway
+
   routed_network:
     type: cloudify.nodes.vcloud.RoutedVDCNetwork
     properties:
       client_config: *client_config
       resource_id: { concat: [ 'routed-network-', { get_input: resource_suffix } ] }
       resource_config:
         gateway_name: { get_property: [ gateway, resource_id ] }
-        network_cidr: 192.170.1.1/24
+        network_cidr: 192.169.1.1/24
         description: test routed network
         primary_dns_ip: 8.8.8.4
         secondary_dns_ip: 8.8.8.8
-        ip_range_start: 192.170.1.2
-        ip_range_end: 192.170.1.254
+        ip_range_start: 192.169.1.2
+        ip_range_end: 192.169.1.254
     relationships:
       - type: cloudify.relationships.vcloud.network_connected_to_gateway
         target: gateway