Merge pull request #438 from cloudify-cosmo/RD-3455-aws-elb-feature-d…

…emo-fails-to-delete-classic-elb-listener Rd 3455 aws elb feature demo fails to delete classic elb listener
cloudify-cosmo · Mar 8, 2022 · acb8ba3 · acb8ba3
2 parents c6be0e9 + c08b45a
commit acb8ba3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cloudify_aws/ec2/resources/image.py b/cloudify_aws/ec2/resources/image.py
@@ -80,7 +80,7 @@ def status(self):
                 raise e
         if not props:
             return None
-        return props['State']
+        return props.get('State')
 
     def create(self, params):
         """

diff --git a/cloudify_aws/elb/resources/classic/listener.py b/cloudify_aws/elb/resources/classic/listener.py
@@ -123,5 +123,5 @@ def delete(ctx, iface, resource_config, **_):
         lb = ctx.instance.runtime_properties[LB_NAME]
 
     for listener in params.get(LISTENERS, []):
-        ports = listener.get(LB_PORT)
+        ports = [listener.get(LB_PORT)]
         iface.delete({LB_NAME: lb, LB_PORTS: ports})
diff --git a/cloudify_aws/elb/resources/classic/load_balancer.py b/cloudify_aws/elb/resources/classic/load_balancer.py
@@ -68,7 +68,7 @@ def status(self):
         props = self.properties
         if not props:
             return None
-        return props['State']['Code']
+        return props.get('State', {}).get('Code')
 
     def create(self, params):
         """

diff --git a/examples/elb-feature-demo/blueprint.yaml b/examples/elb-feature-demo/blueprint.yaml
@@ -13,12 +13,12 @@ inputs:
   availability_zone1:
     type: string
     description: The availability zone in the AWS Region.
-    default: { concat: [ { get_input: aws_region_name }, 'a' ] }
+    default: { concat: [ { get_input: aws_region_name }, 'c' ] }
 
   availability_zone2:
     type: string
     description: The availability zone in the AWS Region.
-    default: { concat: [ { get_input: aws_region_name }, 'b' ] }
+    default: { concat: [ { get_input: aws_region_name }, 'd' ] }
 
 dsl_definitions:
 
@@ -66,7 +66,7 @@ node_templates:
         target: classic_elb
     interfaces:
       cloudify.interfaces.lifecycle:
-        configure:
+        create:
           implementation: aws.cloudify_aws.ec2.resources.instances.create
           inputs:
             resource_config:
@@ -98,7 +98,7 @@ node_templates:
         target: classic_elb
     interfaces:
       cloudify.interfaces.lifecycle:
-        configure:
+        create:
           implementation: aws.cloudify_aws.ec2.resources.instances.create
           inputs:
             resource_config: