delete networks bug

Author: earthmant

cloudify_vcd/utils.py

@@ -397,6 +397,8 @@ def get_last_task(task):
 def vcd_busy_exception(exc):
     if 'is busy, cannot proceed with the operation' in str(exc):
         return True
+    elif 'cannot be deleted, because it is in use' in str(exc):
+        return True
     return False
 
 

test.yaml

@@ -136,29 +136,29 @@ node_templates:
 #      - type: cloudify.relationships.depends_on
 #        target: routed_network2
 #
-#  firewall_rules:
-#    type: cloudify.nodes.vcloud.FirewallRules
-#    properties:
-#      client_config: *client_config
-#      resource_id: firewall_rules
-#      resource_config:
-#        test_rule1:
-#          source_values:
-#            - 'VLAN-102:gatewayinterface'
-#            - { concat: [ { get_property: [ routed_network, resource_id ] }, ':network']}
-#            - '192.170.1.0:ip'
-#          destination_values:
-#            - 'VLAN-102:gatewayinterface'
-#            - { concat: [ { get_property: [ routed_network2, resource_id ] }, ':network']}
-#            - '192.170.1.0:ip'
-#          services: [{'tcp': {'any': 'any'}}]
-#    relationships:
-#      - type: cloudify.relationships.vcloud.firewall_rules_contained_in_gateway
-#        target: gateway
-#      - type: cloudify.relationships.depends_on
-#        target: routed_network
-#      - type: cloudify.relationships.depends_on
-#        target: routed_network2
+  firewall_rules:
+    type: cloudify.nodes.vcloud.FirewallRules
+    properties:
+      client_config: *client_config
+      resource_id: firewall_rules
+      resource_config:
+        test_rule1:
+          source_values:
+            - 'VLAN-102:gatewayinterface'
+            - { concat: [ { get_property: [ routed_network, resource_id ] }, ':network']}
+            - '192.170.1.0:ip'
+          destination_values:
+            - 'VLAN-102:gatewayinterface'
+            - { concat: [ { get_property: [ routed_network2, resource_id ] }, ':network']}
+            - '192.170.1.0:ip'
+          services: [{'tcp': {'any': 'any'}}]
+    relationships:
+      - type: cloudify.relationships.vcloud.firewall_rules_contained_in_gateway
+        target: gateway
+      - type: cloudify.relationships.depends_on
+        target: routed_network
+      - type: cloudify.relationships.depends_on
+        target: routed_network2
 
 #  isolated_network:
 #    type: cloudify.nodes.vcloud.IsolatedVDCNetwork