Protect vs TypeErrors when cleaning stacks

[functest.git] / functest / opnfv_tests / vnf / ims / cloudify_ims.yaml

diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
index 280e0a6..869281a 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
@@ -1,35 +1,23 @@
-tenant_images:
-    ubuntu_14.04: /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img
-    cloudify_manager_4.0: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2
+---
 orchestrator:
     name: cloudify
     version: '4.0'
-    requirements:
-        flavor:
-          name: m1.medium
-          ram_min: 4096
-        os_image: 'cloudify_manager_4.0'
 vnf:
     name: clearwater
-    version: '107'
+    version: '129'
     descriptor:
-        file_name: openstack-blueprint.yaml
+        file_name: /src/cloudify_vims/openstack-blueprint.yaml
         name: clearwater-opnfv
-        url: https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/archive/master.zip
-        version: '122'
-    requirements:
-        flavor:
-          name: m1.small
-          ram_min: 2048
+        version: '129'
     inputs:
         image_id: 'ubuntu_14.04'
-        flavor_id: 'm1.small'
+        flavor_id: 'cloudify.small'
         agent_user: ubuntu
         key_pair_name: cloudify_ims_kp
         private_key_path: '/etc/cloudify/cloudify_ims.pem'
         external_network_name: ''
         public_domain: clearwater.opnfv
-        release: repo122
+        release: repo129
         bono_cluster_size: 1
         sprout_cluster_size: 1
         vellum_cluster_size: 1
@@ -37,4 +25,4 @@ vnf:
         homer_cluster_size: 1
 vnf_test_suite:
     name: clearwater-live-test
-    version: "1.0"
+    version: '1.0'