From d34f48b771da208043a426794379f24d6db922e2 Mon Sep 17 00:00:00 2001 From: Bharath Thiruveedula Date: Thu, 16 Feb 2017 22:16:43 +0530 Subject: [PATCH] Modify glance image name to cirros-0.3.5-x86_64-disk Change-Id: I0a95ff408f7ac4d1d59d7d839e2ebd8cd3359c8b Closes-Bug: #1665220 (cherry picked from commit 6797945d5dbf9a4bdaea960adc9d67992abe2983) --- devstack/lib/tacker | 20 ++++++++++++++++--- devstack/plugin.sh | 2 ++ .../samples/sample-tosca-alarm-respawn.yaml | 2 +- .../etc/samples/sample-tosca-alarm-scale.yaml | 2 +- .../etc/samples/sample-tosca-scale-all.yaml | 2 +- .../etc/samples/sample-tosca-vnf-values.yaml | 2 +- .../etc/samples/sample-tosca-vnfd-flavor.yaml | 2 +- .../etc/samples/sample-tosca-vnfd-image.yaml | 4 ++-- .../sample-tosca-vnfd-large-template.yaml | 4 ++-- .../samples/sample-tosca-vnfd-monitor.yaml | 2 +- ...ample-tosca-vnfd-multi-vdu-monitoring.yaml | 6 +++--- .../samples/sample-tosca-vnfd-multi-vdu.yaml | 6 +++--- .../samples/sample-tosca-vnfd-no-monitor.yaml | 2 +- .../samples/sample-tosca-vnfd-static-ip.yaml | 2 +- .../tests/etc/samples/sample-tosca-vnfd.yaml | 2 +- tacker/tests/etc/samples/test-ns-vnfd1.yaml | 4 ++-- tacker/tests/etc/samples/test-ns-vnfd2.yaml | 4 ++-- tacker/tests/etc/samples/test-nsd-vnfd1.yaml | 4 ++-- tacker/tests/etc/samples/test-nsd-vnfd2.yaml | 4 ++-- .../data/hot_alarm_scale_custom.yaml | 2 +- .../hot_image_before_processed_image.yaml | 2 +- .../openstack/data/hot_openwrt.yaml | 2 +- .../openstack/data/hot_openwrt_ipparams.yaml | 2 +- .../openstack/data/hot_openwrt_params.yaml | 2 +- .../openstack/data/hot_scale_custom.yaml | 2 +- .../data/hot_tosca_alarm_metadata.yaml | 2 +- .../data/hot_tosca_alarm_respawn.yaml | 2 +- .../data/test_tosca_vnfd_alarm_respawn.yaml | 2 +- .../data/test_tosca_vnfd_alarm_scale.yaml | 2 +- .../openstack/data/tosca_alarm_metadata.yaml | 2 +- .../openstack/data/tosca_alarm_respawn.yaml | 2 +- .../openstack/data/tosca_alarm_scale.yaml | 2 +- .../openstack/data/tosca_scale.yaml | 2 +- 33 files changed, 60 insertions(+), 44 deletions(-) diff --git a/devstack/lib/tacker b/devstack/lib/tacker index 9bacf61dc..4458c4e53 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -317,12 +317,26 @@ function tacker_horizon_install { sudo cp $DEST/tacker-horizon/tacker_horizon/enabled/* $DEST/horizon/openstack_dashboard/enabled/ restart_apache_server } +function tacker_check_and_download_cirros { + local image_url image_fname + image_url=http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img + cirros_fname=`basename "$image_url"` + image_name=`glance image-list | grep "${cirros_fname%.*}" | awk '{print $4}'` + if [[ $image_name == "" ]]; then + if [[ ! -f $FILES/$image_fname || "$(stat -c "%s" $FILES/$image_fname)" = "0" ]]; then + { + wget --progress=dot:giga -c $image_url -O $FILES/$image_fname \ + && openstack_image_create $FILES/$image_fname ${cirros_fname%.*} + } + fi + fi +} -function openstack_image_create_openwrt { +function openstack_image_create { image=$1 disk_format=raw container_format=bare - image_name="OpenWRT" + image_name=$2 openstack --os-cloud=devstack-admin image create $image_name --public --container-format=$container_format --disk-format $disk_format < <(zcat --force "${image}") glance image-list | grep OpenWRT | awk {print$2} } @@ -336,7 +350,7 @@ function tacker_create_openwrt_image { if [[ ! -f $FILES/$image_fname || "$(stat -c "%s" $FILES/$image_fname)" = "0" ]]; then { wget --progress=dot:giga -c $image_url -O $FILES/$image_fname \ - && openstack_image_create_openwrt $FILES/$image_fname + && openstack_image_create $FILES/$image_fname OpenWRT }||{ rm -rf $FILES/$image_fname echo "WARNING: openwrt image create for $image_fname failed" diff --git a/devstack/plugin.sh b/devstack/plugin.sh index d6529b53e..7d94b5900 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -36,6 +36,8 @@ if is_service_enabled tacker; then tacker_create_initial_network echo_summary "Upload OpenWrt image" tacker_create_openwrt_image + echo_summary "Check existence of cirros==3.5" + tacker_check_and_download_cirros echo_summary "Registering default VIM" tacker_register_default_vim fi diff --git a/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml b/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml index 8933b0591..b65142825 100644 --- a/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml +++ b/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} diff --git a/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml b/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml index 96d007df5..19571940e 100644 --- a/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml +++ b/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: SG1} diff --git a/tacker/tests/etc/samples/sample-tosca-scale-all.yaml b/tacker/tests/etc/samples/sample-tosca-scale-all.yaml index 4749b03c1..fb4807fee 100644 --- a/tacker/tests/etc/samples/sample-tosca-scale-all.yaml +++ b/tacker/tests/etc/samples/sample-tosca-scale-all.yaml @@ -17,7 +17,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml b/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml index d3b621d96..a8600c28c 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml @@ -1,5 +1,5 @@ { - image_name: 'cirros-0.3.4-x86_64-uec', + image_name: 'cirros-0.3.5-x86_64-disk', flavor: 'm1.tiny', zone: 'nova', network: 'net_mgmt', diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml index 674b5e448..95f10c2f3 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml @@ -16,7 +16,7 @@ topology_template: disk_size: 1 GB mem_size: 512 MB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-image.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-image.yaml index 1f24f9b2f..f3eb2bdb0 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-image.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-image.yaml @@ -19,7 +19,7 @@ topology_template: artifacts: VNFImage_image_func: type: tosca.artifacts.Deployment.Image.VM - file: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz + file: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img CP1: type: tosca.nodes.nfv.CP.Tacker @@ -68,4 +68,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: net1 - vendor: Tacker \ No newline at end of file + vendor: Tacker diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-large-template.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-large-template.yaml index ad2bd7d0c..e6d3c3a40 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-large-template.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-large-template.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -70,7 +70,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml index 291ec529f..d6ab95d30 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml @@ -11,7 +11,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny config: | param0: key1 diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring.yaml index 21959432a..b06c3d3ff 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -53,7 +53,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop @@ -90,7 +90,7 @@ topology_template: VDU3: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu.yaml index 3d42ffa08..da419185d 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -52,7 +52,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop @@ -94,7 +94,7 @@ topology_template: VDU3: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-no-monitor.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-no-monitor.yaml index a99fd93f8..9e97d18af 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-no-monitor.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-no-monitor.yaml @@ -11,7 +11,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny config: | param0: key1 diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml index 3cb315fb7..3d470746e 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml @@ -14,7 +14,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd.yaml index a2b753fa3..022e01100 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd.yaml @@ -20,7 +20,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: {get_input : vdu-name} - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny key_name: userKey availability_zone: nova diff --git a/tacker/tests/etc/samples/test-ns-vnfd1.yaml b/tacker/tests/etc/samples/test-ns-vnfd1.yaml index f18e06262..25c730754 100644 --- a/tacker/tests/etc/samples/test-ns-vnfd1.yaml +++ b/tacker/tests/etc/samples/test-ns-vnfd1.yaml @@ -30,7 +30,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -60,7 +60,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/test-ns-vnfd2.yaml b/tacker/tests/etc/samples/test-ns-vnfd2.yaml index 99e22839d..6743073d7 100644 --- a/tacker/tests/etc/samples/test-ns-vnfd2.yaml +++ b/tacker/tests/etc/samples/test-ns-vnfd2.yaml @@ -16,7 +16,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -38,7 +38,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/test-nsd-vnfd1.yaml b/tacker/tests/etc/samples/test-nsd-vnfd1.yaml index f18e06262..25c730754 100644 --- a/tacker/tests/etc/samples/test-nsd-vnfd1.yaml +++ b/tacker/tests/etc/samples/test-nsd-vnfd1.yaml @@ -30,7 +30,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -60,7 +60,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/test-nsd-vnfd2.yaml b/tacker/tests/etc/samples/test-nsd-vnfd2.yaml index 99e22839d..6743073d7 100644 --- a/tacker/tests/etc/samples/test-nsd-vnfd2.yaml +++ b/tacker/tests/etc/samples/test-nsd-vnfd2.yaml @@ -16,7 +16,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -38,7 +38,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml index 7e974c04f..932a50fa7 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml @@ -16,7 +16,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk metadata: {metering.vnf: SG1} networks: - port: {get_resource: CP1} diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml index 47ab1d4cc..f0dd37c0d 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml @@ -6,4 +6,4 @@ resources: properties: config_drive: true flavor: m1.tiny - image: cirros-0.3.2-x86_64-uec + image: cirros-0.3.5-x86_64-disk diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt.yaml index 766915a0a..03a809c00 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt.yaml @@ -11,7 +11,7 @@ resources: availability_zone: nova config_drive: true flavor: m1.tiny - image: cirros-0.3.2-x86_64-uec + image: cirros-0.3.5-x86_64-disk metadata: {param0: key0, param1: key1} networks: - port: {get_resource: vdu1-net_mgmt-port} diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml index 7a76a4770..3add0b4a9 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml @@ -11,7 +11,7 @@ resources: availability_zone: nova config_drive: true flavor: m1.tiny - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk metadata: {param0: key0, param1: key1} networks: - port: {get_resource: vdu1-net_mgmt-port} diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_params.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_params.yaml index c5ade7824..9f170cc52 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_params.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_params.yaml @@ -11,7 +11,7 @@ resources: availability_zone: nova config_drive: true flavor: m1.tiny - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk key_name: keyName metadata: {param0: key0, param1: key1} networks: diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml index f135a83da..36aab41c7 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml @@ -16,7 +16,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk networks: - port: {get_resource: CP1} user_data_format: SOFTWARE_CONFIG diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml index 7efdd3184..dc16a0cef 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml @@ -14,7 +14,7 @@ resources: availability_zone: nova config_drive: false flavor: {get_resource: VDU1_flavor} - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk networks: - port: {get_resource: CP1} user_data_format: SOFTWARE_CONFIG diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml index e44d94c72..75845e190 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml @@ -14,7 +14,7 @@ resources: availability_zone: nova config_drive: false flavor: {get_resource: VDU1_flavor} - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk networks: - port: {get_resource: CP1} user_data_format: SOFTWARE_CONFIG diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml index 8933b0591..b65142825 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml index 3b4c672bc..15ef08b97 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: SG1} diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml index c47f04b43..f4e5f97f7 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml @@ -18,7 +18,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml index a207eaf82..271dc5da1 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_scale.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_scale.yaml index 08fa2b68c..cef87ee77 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_scale.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_scale.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova flavor: m1.tiny diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml index 08244edbc..6bb6e6594 100644 --- a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml +++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova flavor: m1.tiny