aboutsummaryrefslogtreecommitdiffstats
path: root/ice_validator/app_tests/preload_tests/sample_heat
diff options
context:
space:
mode:
Diffstat (limited to 'ice_validator/app_tests/preload_tests/sample_heat')
-rw-r--r--ice_validator/app_tests/preload_tests/sample_heat/base.env11
-rw-r--r--ice_validator/app_tests/preload_tests/sample_heat/base.yaml4
-rw-r--r--ice_validator/app_tests/preload_tests/sample_heat/base_volume.yaml4
3 files changed, 7 insertions, 12 deletions
diff --git a/ice_validator/app_tests/preload_tests/sample_heat/base.env b/ice_validator/app_tests/preload_tests/sample_heat/base.env
index 3784ea0..e3ef442 100644
--- a/ice_validator/app_tests/preload_tests/sample_heat/base.env
+++ b/ice_validator/app_tests/preload_tests/sample_heat/base.env
@@ -1,15 +1,10 @@
parameters:
-
db_image_name: db_image
-
db_flavor_name: db_flavor
-
lb_image_name: lb_image
-
lb_flavor_name: lb_flavor
-
svc_image_name: svc_image
-
svc_flavor_name: svc_flavor
-
- svc_count: 3 \ No newline at end of file
+ svc_count: 3
+ mgmt_image_name: mgmt_image
+ mgmt_flavor_name: mgmt_flavor
diff --git a/ice_validator/app_tests/preload_tests/sample_heat/base.yaml b/ice_validator/app_tests/preload_tests/sample_heat/base.yaml
index 327d2ee..fdf34e0 100644
--- a/ice_validator/app_tests/preload_tests/sample_heat/base.yaml
+++ b/ice_validator/app_tests/preload_tests/sample_heat/base.yaml
@@ -270,13 +270,13 @@ resources:
type: OS::Cinder::VolumeAttachment
properties:
volume_id: { get_param: db_vol0_id }
- server: { get_resource: db_server_0 }
+ instance_uuid: { get_resource: db_server_0 }
db_volume_attachment_1:
type: OS::Cinder::VolumeAttachment
properties:
volume_id: { get_param: db_vol1_id }
- server: { get_resource: db_server_1 }
+ instance_uuid: { get_resource: db_server_1 }
mgmt_server_0:
type: OS::Nova::Server
diff --git a/ice_validator/app_tests/preload_tests/sample_heat/base_volume.yaml b/ice_validator/app_tests/preload_tests/sample_heat/base_volume.yaml
index 4d47766..e326357 100644
--- a/ice_validator/app_tests/preload_tests/sample_heat/base_volume.yaml
+++ b/ice_validator/app_tests/preload_tests/sample_heat/base_volume.yaml
@@ -26,7 +26,7 @@ resources:
params:
VNF_NAME: {get_param: vnf_name}
volume_type: "solidfire"
- volume_size: { get_param: volume_size }
+ size: { get_param: volume_size }
db_vol1:
type: OS::Cinder::Volume
@@ -37,7 +37,7 @@ resources:
params:
VNF_NAME: {get_param: vnf_name}
volume_type: "solidfire"
- volume_size: { get_param: volume_size }
+ size: { get_param: volume_size }
outputs:
db_vol0_id: