Delete alt images before removing the account

[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 74b9e95..869281a 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
@@ -1,39 +1,28 @@
-tenant_images:
-    ubuntu_14.04: http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
-    centos_7: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1510.qcow2
-cloudify:
-    blueprint:
-        url: https://github.com/boucherv-orange/cloudify-manager-blueprints.git
-        branch: '3.3.1-build'
-    requirements:
-        ram_min: 4096
-        os_image: centos_7
-    inputs:
-      keystone_username: ""
-      keystone_password: ""
-      keystone_tenant_name: ""
-      keystone_url: ""
-      manager_public_key_name: 'manager-kp'
-      agent_public_key_name: 'agent-kp'
-      image_id: ""
-      flavor_id: "3"
-      external_network_name: ""
-      ssh_user: centos
-      agents_user: ubuntu
-clearwater:
-    blueprint:
-        file_name: openstack-blueprint.yaml
+---
+orchestrator:
+    name: cloudify
+    version: '4.0'
+vnf:
+    name: clearwater
+    version: '129'
+    descriptor:
+        file_name: /src/cloudify_vims/openstack-blueprint.yaml
         name: clearwater-opnfv
-        destination_folder: opnfv-cloudify-clearwater
-        url: https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git
-        branch: stable
-    deployment_name: clearwater-opnfv
-    requirements:
-        ram_min: 2048
-        os_image: ubuntu_14.04
+        version: '129'
     inputs:
-        image_id: ''
-        flavor_id: ''
+        image_id: 'ubuntu_14.04'
+        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: repo129
+        bono_cluster_size: 1
+        sprout_cluster_size: 1
+        vellum_cluster_size: 1
+        dime_cluster_size: 1
+        homer_cluster_size: 1
+vnf_test_suite:
+    name: clearwater-live-test
+    version: '1.0'