diff --git a/api-ref/source/v1/samples/vnf_packages/vnf-packages-list-response.json b/api-ref/source/v1/samples/vnf_packages/vnf-packages-list-response.json index efad74888..37bd9c0ba 100644 --- a/api-ref/source/v1/samples/vnf_packages/vnf-packages-list-response.json +++ b/api-ref/source/v1/samples/vnf_packages/vnf-packages-list-response.json @@ -15,11 +15,11 @@ "size":2, "name":"VrtualStorage", "checksum":{ - "hash":"b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d", + "hash":"932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464", "algorithm":"sha-256" }, "minDisk":2, - "version":"0.4.0", + "version":"0.5.2", "provider":"provider", "minRam":8192, "containerFormat":"bare" @@ -34,11 +34,11 @@ "size":1, "name":"Software of VDU1", "checksum":{ - "hash":"b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d", + "hash":"932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464", "algorithm":"sha-256" }, "minDisk":1, - "version":"0.4.0", + "version":"0.5.2", "provider":"provider", "minRam":0, "containerFormat":"bare" diff --git a/api-ref/source/v1/samples/vnf_packages/vnf-packages-show-response.json b/api-ref/source/v1/samples/vnf_packages/vnf-packages-show-response.json index 72f1737a5..ea5bbacf9 100644 --- a/api-ref/source/v1/samples/vnf_packages/vnf-packages-show-response.json +++ b/api-ref/source/v1/samples/vnf_packages/vnf-packages-show-response.json @@ -13,11 +13,11 @@ "size":2000000000, // unit for 'size` is always in Bytes "name":"VrtualStorage", "checksum":{ - "hash":"b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d", + "hash":"932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464", "algorithm":"sha-256" }, "minDisk":2000000000, // unit for 'minDisk' is always in Bytes - "version":"0.4.0", + "version":"0.5.2", "provider":"provider", "minRam":8192000000, // unit for 'minRam' is always in Bytes "containerFormat":"bare" @@ -32,11 +32,11 @@ "size":1000000000, "name":"Software of VDU1", "checksum":{ - "hash":"b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d", + "hash":"932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464", "algorithm":"sha-256" }, "minDisk":1000000000, - "version":"0.4.0", + "version":"0.5.2", "provider":"provider", "minRam":0, "containerFormat":"bare" diff --git a/api-ref/source/v1/samples/vnfds/vnfds-create-request.json b/api-ref/source/v1/samples/vnfds/vnfds-create-request.json index 209777396..59e5fbf06 100644 --- a/api-ref/source/v1/samples/vnfds/vnfds-create-request.json +++ b/api-ref/source/v1/samples/vnfds/vnfds-create-request.json @@ -29,7 +29,7 @@ } }, "properties": { - "image": "cirros-0.4.0-x86_64-disk" + "image": "cirros-0.5.2-x86_64-disk" } }, "CP1": { diff --git a/api-ref/source/v1/samples/vnfds/vnfds-create-response.json b/api-ref/source/v1/samples/vnfds/vnfds-create-response.json index eabed17ba..79da908b0 100644 --- a/api-ref/source/v1/samples/vnfds/vnfds-create-response.json +++ b/api-ref/source/v1/samples/vnfds/vnfds-create-response.json @@ -11,7 +11,7 @@ "created_at": "2016-10-20 07:38:54.600003", "updated_at": null, "attributes": { - "vnfd": "description: Demo example\nmetadata: {template_name: sample-tosca-vnfd}\ntopology_template:\n node_templates:\n CP1:\n properties: {anti_spoofing_protection: false, management: true, order: 0}\n requirements:\n - virtualLink: {node: VL1}\n - virtualBinding: {node: VDU1}\n type: tosca.nodes.nfv.CP.Tacker\n VDU1:\n capabilities:\n nfv_compute:\n properties: {disk_size: 1 GB, mem_size: 512 MB, num_cpus: 1}\n properties: {image: cirros-0.4.0-x86_64-disk}\n type: tosca.nodes.nfv.VDU.Tacker\n VL1:\n properties: {network_name: net_mgmt, vendor: Tacker}\n type: tosca.nodes.nfv.VL\ntosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n" + "vnfd": "description: Demo example\nmetadata: {template_name: sample-tosca-vnfd}\ntopology_template:\n node_templates:\n CP1:\n properties: {anti_spoofing_protection: false, management: true, order: 0}\n requirements:\n - virtualLink: {node: VL1}\n - virtualBinding: {node: VDU1}\n type: tosca.nodes.nfv.CP.Tacker\n VDU1:\n capabilities:\n nfv_compute:\n properties: {disk_size: 1 GB, mem_size: 512 MB, num_cpus: 1}\n properties: {image: cirros-0.5.2-x86_64-disk}\n type: tosca.nodes.nfv.VDU.Tacker\n VL1:\n properties: {network_name: net_mgmt, vendor: Tacker}\n type: tosca.nodes.nfv.VL\ntosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n" }, "id": "0fb827e7-32b0-4e5b-b300-e1b1dce8a831", "name": "vnfd-sample" diff --git a/api-ref/source/v1/samples/vnfds/vnfds-list-response.json b/api-ref/source/v1/samples/vnfds/vnfds-list-response.json index 1515f3cd9..a23737fcb 100644 --- a/api-ref/source/v1/samples/vnfds/vnfds-list-response.json +++ b/api-ref/source/v1/samples/vnfds/vnfds-list-response.json @@ -12,7 +12,7 @@ "created_at": "2016-10-20 07:38:54", "updated_at": null, "attributes": { - "vnfd": "description: Demo example\nmetadata: {template_name: sample-tosca-vnfd}\ntopology_template:\n node_templates:\n CP1:\n properties: {anti_spoofing_protection: false, management: true, order: 0}\n requirements:\n - virtualLink: {node: VL1}\n - virtualBinding: {node: VDU1}\n type: tosca.nodes.nfv.CP.Tacker\n VDU1:\n capabilities:\n nfv_compute:\n properties: {disk_size: 1 GB, mem_size: 512 MB, num_cpus: 1}\n properties: {image: cirros-0.4.0-x86_64-disk}\n type: tosca.nodes.nfv.VDU.Tacker\n VL1:\n properties: {network_name: net_mgmt, vendor: Tacker}\n type: tosca.nodes.nfv.VL\ntosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n" + "vnfd": "description: Demo example\nmetadata: {template_name: sample-tosca-vnfd}\ntopology_template:\n node_templates:\n CP1:\n properties: {anti_spoofing_protection: false, management: true, order: 0}\n requirements:\n - virtualLink: {node: VL1}\n - virtualBinding: {node: VDU1}\n type: tosca.nodes.nfv.CP.Tacker\n VDU1:\n capabilities:\n nfv_compute:\n properties: {disk_size: 1 GB, mem_size: 512 MB, num_cpus: 1}\n properties: {image: cirros-0.5.2-x86_64-disk}\n type: tosca.nodes.nfv.VDU.Tacker\n VL1:\n properties: {network_name: net_mgmt, vendor: Tacker}\n type: tosca.nodes.nfv.VL\ntosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n" }, "id": "0fb827e7-32b0-4e5b-b300-e1b1dce8a831", "name": "vnfd-sample", diff --git a/api-ref/source/v1/samples/vnfds/vnfds-show-response.json b/api-ref/source/v1/samples/vnfds/vnfds-show-response.json index 5cc9662c3..39d7772b7 100644 --- a/api-ref/source/v1/samples/vnfds/vnfds-show-response.json +++ b/api-ref/source/v1/samples/vnfds/vnfds-show-response.json @@ -11,7 +11,7 @@ "created_at": "2016-10-20 07:38:54", "updated_at": null, "attributes": { - "vnfd": "description: Demo example\nmetadata: {template_name: sample-tosca-vnfd}\ntopology_template:\n node_templates:\n CP1:\n properties: {anti_spoofing_protection: false, management: true, order: 0}\n requirements:\n - virtualLink: {node: VL1}\n - virtualBinding: {node: VDU1}\n type: tosca.nodes.nfv.CP.Tacker\n VDU1:\n capabilities:\n nfv_compute:\n properties: {disk_size: 1 GB, mem_size: 512 MB, num_cpus: 1}\n properties: {image: cirros-0.4.0-x86_64-disk}\n type: tosca.nodes.nfv.VDU.Tacker\n VL1:\n properties: {network_name: net_mgmt, vendor: Tacker}\n type: tosca.nodes.nfv.VL\ntosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n" + "vnfd": "description: Demo example\nmetadata: {template_name: sample-tosca-vnfd}\ntopology_template:\n node_templates:\n CP1:\n properties: {anti_spoofing_protection: false, management: true, order: 0}\n requirements:\n - virtualLink: {node: VL1}\n - virtualBinding: {node: VDU1}\n type: tosca.nodes.nfv.CP.Tacker\n VDU1:\n capabilities:\n nfv_compute:\n properties: {disk_size: 1 GB, mem_size: 512 MB, num_cpus: 1}\n properties: {image: cirros-0.5.2-x86_64-disk}\n type: tosca.nodes.nfv.VDU.Tacker\n VL1:\n properties: {network_name: net_mgmt, vendor: Tacker}\n type: tosca.nodes.nfv.VL\ntosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n" }, "id": "0fb827e7-32b0-4e5b-b300-e1b1dce8a831", "name": "vnfd-sample", diff --git a/api-ref/source/v1/samples/vnfds/vnfds-update-response.json b/api-ref/source/v1/samples/vnfds/vnfds-update-response.json index 1ea70c802..a5e018382 100644 --- a/api-ref/source/v1/samples/vnfds/vnfds-update-response.json +++ b/api-ref/source/v1/samples/vnfds/vnfds-update-response.json @@ -11,7 +11,7 @@ "created_at": "2016-10-20 07:38:54", "updated_at": "2016-10-20 07:41:27.392759", "attributes": { - "vnfd": "description: Demo example\nmetadata: {template_name: sample-tosca-vnfd}\ntopology_template:\n node_templates:\n CP1:\n properties: {anti_spoofing_protection: false, management: true, order: 0}\n requirements:\n - virtualLink: {node: VL1}\n - virtualBinding: {node: VDU1}\n type: tosca.nodes.nfv.CP.Tacker\n VDU1:\n capabilities:\n nfv_compute:\n properties: {disk_size: 1 GB, mem_size: 512 MB, num_cpus: 1}\n properties: {image: cirros-0.4.0-x86_64-disk}\n type: tosca.nodes.nfv.VDU.Tacker\n VL1:\n properties: {network_name: net_mgmt, vendor: Tacker}\n type: tosca.nodes.nfv.VL\ntosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n" + "vnfd": "description: Demo example\nmetadata: {template_name: sample-tosca-vnfd}\ntopology_template:\n node_templates:\n CP1:\n properties: {anti_spoofing_protection: false, management: true, order: 0}\n requirements:\n - virtualLink: {node: VL1}\n - virtualBinding: {node: VDU1}\n type: tosca.nodes.nfv.CP.Tacker\n VDU1:\n capabilities:\n nfv_compute:\n properties: {disk_size: 1 GB, mem_size: 512 MB, num_cpus: 1}\n properties: {image: cirros-0.5.2-x86_64-disk}\n type: tosca.nodes.nfv.VDU.Tacker\n VL1:\n properties: {network_name: net_mgmt, vendor: Tacker}\n type: tosca.nodes.nfv.VL\ntosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n" }, "id": "0fb827e7-32b0-4e5b-b300-e1b1dce8a831", "name": "vnfd-sample-updated" diff --git a/api-ref/source/v1/samples/vnflcm/fail-vnf-instance-response.json b/api-ref/source/v1/samples/vnflcm/fail-vnf-instance-response.json index a2764d8e6..6678fcc27 100644 --- a/api-ref/source/v1/samples/vnflcm/fail-vnf-instance-response.json +++ b/api-ref/source/v1/samples/vnflcm/fail-vnf-instance-response.json @@ -7,7 +7,7 @@ "startTime":"2021-01-22 13:41:03+00:00", "isAutomaticInvocation":false, "operationState":"FAILED", - "operationParams":"{\"flavourId\": \"default\", \"instantiationLevelId\": \"n-msc-min\", \"additionalParams\": {\"lcm-operation-user-data\": \"./UserData/lcm_user_data.py\", \"lcm-operation-user-data-class\": \"SampleUserData\", \"sbc_name\": \"sbc\", \"slb_name\": \"slb\", \"image\": \"cirros-0.4.0-x86_64-disk\"}}", + "operationParams":"{\"flavourId\": \"default\", \"instantiationLevelId\": \"n-msc-min\", \"additionalParams\": {\"lcm-operation-user-data\": \"./UserData/lcm_user_data.py\", \"lcm-operation-user-data-class\": \"SampleUserData\", \"sbc_name\": \"sbc\", \"slb_name\": \"slb\", \"image\": \"cirros-0.5.2-x86_64-disk\"}}", "error":{ "status":500, "detail":"MANUAL ERROR" diff --git a/api-ref/source/v1/samples/vnfs/vnfs-inline-create-request.json b/api-ref/source/v1/samples/vnfs/vnfs-inline-create-request.json index eac1e9784..3a6708e3d 100644 --- a/api-ref/source/v1/samples/vnfs/vnfs-inline-create-request.json +++ b/api-ref/source/v1/samples/vnfs/vnfs-inline-create-request.json @@ -42,7 +42,7 @@ "num_cpus": 1, "mem_size": "512 MB", "disk_size": "1 GB"}}}, - "properties": {"image": "cirros-0.4.0-x86_64-disk"}}, + "properties": {"image": "cirros-0.5.2-x86_64-disk"}}, "CP1": { "type": "tosca.nodes.nfv.CP.Tacker", "properties": { diff --git a/contrib/tacker-config/ns-config.sh b/contrib/tacker-config/ns-config.sh index 10eb72d0b..33be00214 100755 --- a/contrib/tacker-config/ns-config.sh +++ b/contrib/tacker-config/ns-config.sh @@ -22,9 +22,9 @@ if [ -z "$network_id" ]; then fi echo "Creating HTTP client" -openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk --nic net-id=$network_id http_client +openstack server create --flavor m1.tiny --image cirros-0.5.2-x86_64-disk --nic net-id=$network_id http_client echo "Creating HTTP server" -openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk --nic net-id=$network_id http_server +openstack server create --flavor m1.tiny --image cirros-0.5.2-x86_64-disk --nic net-id=$network_id http_server sleep 15 diff --git a/contrib/tacker-config/vnffg-config.sh b/contrib/tacker-config/vnffg-config.sh index 679f8ef43..0c521e9ff 100755 --- a/contrib/tacker-config/vnffg-config.sh +++ b/contrib/tacker-config/vnffg-config.sh @@ -22,9 +22,9 @@ if [ -z "$network_id" ]; then fi echo "Creating HTTP client" -openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk --nic net-id=$network_id http_client +openstack server create --flavor m1.tiny --image cirros-0.5.2-x86_64-disk --nic net-id=$network_id http_client echo "Creating HTTP server" -openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk --nic net-id=$network_id http_server +openstack server create --flavor m1.tiny --image cirros-0.5.2-x86_64-disk --nic net-id=$network_id http_server sleep 15 diff --git a/devstack/lib/tacker b/devstack/lib/tacker index 38f4dc1ab..fe8f9cd2a 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -359,7 +359,7 @@ function openstack_image_create { function tacker_check_and_download_images { local image_url - image_url[0]="http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" + image_url[0]="http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" # Customized image of OpenWRT 15.05.1 that can fix the continuously # respawning OpenWRT-based VNFs. image_url[1]="$TACKER_DIR/samples/images/openwrt-x86-kvm_guest-combined-ext4.img.gz" diff --git a/doc/source/cli/cli-legacy-vnf.rst b/doc/source/cli/cli-legacy-vnf.rst index 45ec58e3f..a3f7d2b5f 100644 --- a/doc/source/cli/cli-legacy-vnf.rst +++ b/doc/source/cli/cli-legacy-vnf.rst @@ -94,7 +94,7 @@ Result: | | "properties": { | | | "availability_zone": "nova", | | | "flavor": "m1.tiny", | - | | "image": "cirros-0.4.0-x86_64-disk", | + | | "image": "cirros-0.5.2-x86_64-disk", | | | "mgmt_driver": "noop" | | | }, | | | "type": "tosca.nodes.nfv.VDU.Tacker" | @@ -103,7 +103,7 @@ Result: | | "properties": { | | | "availability_zone": "nova", | | | "flavor": "m1.tiny", | - | | "image": "cirros-0.4.0-x86_64-disk", | + | | "image": "cirros-0.5.2-x86_64-disk", | | | "mgmt_driver": "noop" | | | }, | | | "type": "tosca.nodes.nfv.VDU.Tacker" | @@ -183,7 +183,7 @@ Result: | | flavor: m1.tiny | | | user_data_format: SOFTWARE_CONFIG | | | availability_zone: nova | - | | image: cirros-0.4.0-x86_64-disk | + | | image: cirros-0.5.2-x86_64-disk | | | config_drive: false | | | networks: | | | - port: | @@ -194,7 +194,7 @@ Result: | | flavor: m1.tiny | | | user_data_format: SOFTWARE_CONFIG | | | availability_zone: nova | - | | image: cirros-0.4.0-x86_64-disk | + | | image: cirros-0.5.2-x86_64-disk | | | config_drive: false | | | networks: | | | - port: | @@ -403,7 +403,7 @@ Result: | | flavor: m1.tiny | | | user_data_format: SOFTWARE_CONFIG | | | availability_zone: nova | - | | image: cirros-0.4.0-x86_64-disk | + | | image: cirros-0.5.2-x86_64-disk | | | config_drive: false | | | networks: | | | - port: | @@ -414,7 +414,7 @@ Result: | | flavor: m1.tiny | | | user_data_format: SOFTWARE_CONFIG | | | availability_zone: nova | - | | image: cirros-0.4.0-x86_64-disk | + | | image: cirros-0.5.2-x86_64-disk | | | config_drive: false | | | networks: | | | - port: | @@ -601,7 +601,7 @@ Result (Updating): | | flavor: m1.tiny | | | user_data_format: SOFTWARE_CONFIG | | | availability_zone: nova | - | | image: cirros-0.4.0-x86_64-disk | + | | image: cirros-0.5.2-x86_64-disk | | | config_drive: false | | | networks: | | | - port: | @@ -612,7 +612,7 @@ Result (Updating): | | flavor: m1.tiny | | | user_data_format: SOFTWARE_CONFIG | | | availability_zone: nova | - | | image: cirros-0.4.0-x86_64-disk | + | | image: cirros-0.5.2-x86_64-disk | | | config_drive: false | | | networks: | | | - port: | @@ -713,7 +713,7 @@ Result (Updated): | | flavor: m1.tiny | | | user_data_format: SOFTWARE_CONFIG | | | availability_zone: nova | - | | image: cirros-0.4.0-x86_64-disk | + | | image: cirros-0.5.2-x86_64-disk | | | config_drive: false | | | networks: | | | - port: | @@ -724,7 +724,7 @@ Result (Updated): | | flavor: m1.tiny | | | user_data_format: SOFTWARE_CONFIG | | | availability_zone: nova | - | | image: cirros-0.4.0-x86_64-disk | + | | image: cirros-0.5.2-x86_64-disk | | | config_drive: false | | | networks: | | | - port: | @@ -848,12 +848,12 @@ Check the VMs scaled out: +--------------------------------------+-------------------------------------------------------+--------+--------------------------+--------------------------+---------+ | ID | Name | Status | Networks | Image | Flavor | +--------------------------------------+-------------------------------------------------------+--------+--------------------------+--------------------------+---------+ - | dfb04024-666c-4b82-94eb-12766851cfb7 | vn-6okzhe-k6n2umsyoizd-ex2uwxma2tlt-VDU2-ljontrce3bd7 | ACTIVE | net_mgmt=192.168.120.8 | cirros-0.4.0-x86_64-disk | m1.tiny | - | e48999e8-5f65-43e4-b8a5-e81e358e2e21 | vn-6okzhe-k6n2umsyoizd-ex2uwxma2tlt-VDU1-3dcglaxrwyzl | ACTIVE | net_mgmt=192.168.120.82 | cirros-0.4.0-x86_64-disk | m1.tiny | - | 0abc3f38-647e-4b47-8376-06d2e56c4217 | vn-6okzhe-edilzqp2htvv-ibfssgztffjf-VDU2-43gjj46b2nrr | ACTIVE | net_mgmt=192.168.120.41 | cirros-0.4.0-x86_64-disk | m1.tiny | - | 43840dde-1ec3-4da6-aeab-afca96299a9f | vn-6okzhe-qf4qc4l6qk7o-tukln5mwcokq-VDU2-zd7nq3smgjdr | ACTIVE | net_mgmt=192.168.120.250 | cirros-0.4.0-x86_64-disk | m1.tiny | - | 84c78850-8a06-41ab-98a7-371224125beb | vn-6okzhe-edilzqp2htvv-ibfssgztffjf-VDU1-qvv2vv37f65t | ACTIVE | net_mgmt=192.168.120.92 | cirros-0.4.0-x86_64-disk | m1.tiny | - | 9318b9fe-d655-4088-9910-b5f7481ed059 | vn-6okzhe-qf4qc4l6qk7o-tukln5mwcokq-VDU1-omaexvftqjee | ACTIVE | net_mgmt=192.168.120.69 | cirros-0.4.0-x86_64-disk | m1.tiny | + | dfb04024-666c-4b82-94eb-12766851cfb7 | vn-6okzhe-k6n2umsyoizd-ex2uwxma2tlt-VDU2-ljontrce3bd7 | ACTIVE | net_mgmt=192.168.120.8 | cirros-0.5.2-x86_64-disk | m1.tiny | + | e48999e8-5f65-43e4-b8a5-e81e358e2e21 | vn-6okzhe-k6n2umsyoizd-ex2uwxma2tlt-VDU1-3dcglaxrwyzl | ACTIVE | net_mgmt=192.168.120.82 | cirros-0.5.2-x86_64-disk | m1.tiny | + | 0abc3f38-647e-4b47-8376-06d2e56c4217 | vn-6okzhe-edilzqp2htvv-ibfssgztffjf-VDU2-43gjj46b2nrr | ACTIVE | net_mgmt=192.168.120.41 | cirros-0.5.2-x86_64-disk | m1.tiny | + | 43840dde-1ec3-4da6-aeab-afca96299a9f | vn-6okzhe-qf4qc4l6qk7o-tukln5mwcokq-VDU2-zd7nq3smgjdr | ACTIVE | net_mgmt=192.168.120.250 | cirros-0.5.2-x86_64-disk | m1.tiny | + | 84c78850-8a06-41ab-98a7-371224125beb | vn-6okzhe-edilzqp2htvv-ibfssgztffjf-VDU1-qvv2vv37f65t | ACTIVE | net_mgmt=192.168.120.92 | cirros-0.5.2-x86_64-disk | m1.tiny | + | 9318b9fe-d655-4088-9910-b5f7481ed059 | vn-6okzhe-qf4qc4l6qk7o-tukln5mwcokq-VDU1-omaexvftqjee | ACTIVE | net_mgmt=192.168.120.69 | cirros-0.5.2-x86_64-disk | m1.tiny | +--------------------------------------+-------------------------------------------------------+--------+--------------------------+--------------------------+---------+ @@ -873,10 +873,10 @@ Check the VMs scaled in: +--------------------------------------+-------------------------------------------------------+--------+--------------------------+--------------------------+---------+ | ID | Name | Status | Networks | Image | Flavor | +--------------------------------------+-------------------------------------------------------+--------+--------------------------+--------------------------+---------+ - | dfb04024-666c-4b82-94eb-12766851cfb7 | vn-6okzhe-k6n2umsyoizd-ex2uwxma2tlt-VDU2-ljontrce3bd7 | ACTIVE | net_mgmt=192.168.120.8 | cirros-0.4.0-x86_64-disk | m1.tiny | - | e48999e8-5f65-43e4-b8a5-e81e358e2e21 | vn-6okzhe-k6n2umsyoizd-ex2uwxma2tlt-VDU1-3dcglaxrwyzl | ACTIVE | net_mgmt=192.168.120.82 | cirros-0.4.0-x86_64-disk | m1.tiny | - | 43840dde-1ec3-4da6-aeab-afca96299a9f | vn-6okzhe-qf4qc4l6qk7o-tukln5mwcokq-VDU2-zd7nq3smgjdr | ACTIVE | net_mgmt=192.168.120.250 | cirros-0.4.0-x86_64-disk | m1.tiny | - | 9318b9fe-d655-4088-9910-b5f7481ed059 | vn-6okzhe-qf4qc4l6qk7o-tukln5mwcokq-VDU1-omaexvftqjee | ACTIVE | net_mgmt=192.168.120.69 | cirros-0.4.0-x86_64-disk | m1.tiny | + | dfb04024-666c-4b82-94eb-12766851cfb7 | vn-6okzhe-k6n2umsyoizd-ex2uwxma2tlt-VDU2-ljontrce3bd7 | ACTIVE | net_mgmt=192.168.120.8 | cirros-0.5.2-x86_64-disk | m1.tiny | + | e48999e8-5f65-43e4-b8a5-e81e358e2e21 | vn-6okzhe-k6n2umsyoizd-ex2uwxma2tlt-VDU1-3dcglaxrwyzl | ACTIVE | net_mgmt=192.168.120.82 | cirros-0.5.2-x86_64-disk | m1.tiny | + | 43840dde-1ec3-4da6-aeab-afca96299a9f | vn-6okzhe-qf4qc4l6qk7o-tukln5mwcokq-VDU2-zd7nq3smgjdr | ACTIVE | net_mgmt=192.168.120.250 | cirros-0.5.2-x86_64-disk | m1.tiny | + | 9318b9fe-d655-4088-9910-b5f7481ed059 | vn-6okzhe-qf4qc4l6qk7o-tukln5mwcokq-VDU1-omaexvftqjee | ACTIVE | net_mgmt=192.168.120.69 | cirros-0.5.2-x86_64-disk | m1.tiny | +--------------------------------------+-------------------------------------------------------+--------+--------------------------+--------------------------+---------+ diff --git a/doc/source/cli/cli-legacy-vnfd.rst b/doc/source/cli/cli-legacy-vnfd.rst index 73fd7d62c..2b97589d3 100644 --- a/doc/source/cli/cli-legacy-vnfd.rst +++ b/doc/source/cli/cli-legacy-vnfd.rst @@ -121,7 +121,7 @@ Result: | | "properties": { | | | "availability_zone": "nova", | | | "config": "param0: key1\nparam1: key2\n", | - | | "image": "cirros-0.4.0-x86_64-disk", | + | | "image": "cirros-0.5.2-x86_64-disk", | | | "mgmt_driver": "noop" | | | }, | | | "type": "tosca.nodes.nfv.VDU.Tacker" | @@ -327,7 +327,7 @@ Result: | | "properties": { | | | "availability_zone": "nova", | | | "config": "param0: key1\nparam1: key2\n", | - | | "image": "cirros-0.4.0-x86_64-disk", | + | | "image": "cirros-0.5.2-x86_64-disk", | | | "mgmt_driver": "noop" | | | }, | | | "type": "tosca.nodes.nfv.VDU.Tacker" | @@ -483,7 +483,7 @@ Result: | | "properties": { | | | "availability_zone": "nova", | | | "config": "param0: key1\nparam1: key2\n", | - | | "image": "cirros-0.4.0-x86_64-disk", | + | | "image": "cirros-0.5.2-x86_64-disk", | | | "mgmt_driver": "noop" | | | }, | | | "type": "tosca.nodes.nfv.VDU.Tacker" | diff --git a/doc/source/cli/cli-legacy-vnffg.rst b/doc/source/cli/cli-legacy-vnffg.rst index 26897ba1b..5ac5e11d5 100644 --- a/doc/source/cli/cli-legacy-vnffg.rst +++ b/doc/source/cli/cli-legacy-vnffg.rst @@ -409,7 +409,7 @@ following template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/doc/source/contributor/vnfd_template_description.rst b/doc/source/contributor/vnfd_template_description.rst index d23dbf49c..74ca37425 100644 --- a/doc/source/contributor/vnfd_template_description.rst +++ b/doc/source/contributor/vnfd_template_description.rst @@ -81,7 +81,7 @@ availability zone can be described as: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova capabilities: nfv_compute: @@ -101,7 +101,7 @@ OpenStack specific **flavors** can also be used to describe VDU configuration. VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova @@ -190,8 +190,8 @@ the VDU with that image. artifacts: VNFImage: type: tosca.artifacts.Deployment.Image.VM - file: http://download.cirros-cloud.net/0.4.0/ \ - cirros-0.4.0-x86_64-disk.img + file: http://download.cirros-cloud.net/0.5.2/ \ + cirros-0.5.2-x86_64-disk.img VDU Capabilities ^^^^^^^^^^^^^^^^ diff --git a/doc/source/contributor/vnfd_template_parameterization.rst b/doc/source/contributor/vnfd_template_parameterization.rst index 607415d35..eae30e815 100644 --- a/doc/source/contributor/vnfd_template_parameterization.rst +++ b/doc/source/contributor/vnfd_template_parameterization.rst @@ -39,7 +39,7 @@ Here is the sample template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -110,7 +110,7 @@ want to be able to supply different values for the parameters The next step is to substitute the identified parameter values that will be provided at deploy time with { get_input: }. For example, the -instance_type: **cirros-0.4.0-x86_64-disk** would now be replaced as: +instance_type: **cirros-0.5.2-x86_64-disk** would now be replaced as: **image: {get_input: image_name}**. The **get_input** is a reserved keyword in the template that indicates value will be supplied at deploy time for the parameter instance_type. The **image_name** is the variable that will @@ -236,7 +236,7 @@ VNF deploy. .. code-block:: yaml - image_name: cirros-0.4.0-x86_64-disk + image_name: cirros-0.5.2-x86_64-disk flavor: m1.tiny zone: nova network: net_mgmt diff --git a/doc/source/install/getting_started.rst b/doc/source/install/getting_started.rst index 8b24570bc..f7a7ebdf9 100644 --- a/doc/source/install/getting_started.rst +++ b/doc/source/install/getting_started.rst @@ -82,7 +82,7 @@ Onboarding Sample VNF mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/doc/source/reference/block_storage_usage_guide.rst b/doc/source/reference/block_storage_usage_guide.rst index a67c35fa3..4177142d5 100644 --- a/doc/source/reference/block_storage_usage_guide.rst +++ b/doc/source/reference/block_storage_usage_guide.rst @@ -103,7 +103,7 @@ With these additions, the new VNFD looks like below: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/doc/source/reference/maintenance_usage_guide.rst b/doc/source/reference/maintenance_usage_guide.rst index 926a194d4..afdc21396 100644 --- a/doc/source/reference/maintenance_usage_guide.rst +++ b/doc/source/reference/maintenance_usage_guide.rst @@ -129,7 +129,7 @@ modification later. This is not works yet. It will be updated. type: tosca.nodes.nfv.VDU.Tacker properties: maintenance: True - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk capabilities: nfv_compute: properties: diff --git a/doc/source/reference/mistral_workflows_usage_guide.rst b/doc/source/reference/mistral_workflows_usage_guide.rst index 3139cff01..6e86093f5 100644 --- a/doc/source/reference/mistral_workflows_usage_guide.rst +++ b/doc/source/reference/mistral_workflows_usage_guide.rst @@ -201,7 +201,7 @@ Verify VNFD details using OpenStackClient CLI | Field | Value | +---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | attributes | {"vnfd": "tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n\ndescription: Demo example\n\nmetadata:\n template_name: sample-tosca- | - | | vnfd\n\ntopology_template:\n node_templates:\n VDU1:\n type: tosca.nodes.nfv.VDU.Tacker\n properties:\n image: cirros-0.4.0-x86_64-disk\n | + | | vnfd\n\ntopology_template:\n node_templates:\n VDU1:\n type: tosca.nodes.nfv.VDU.Tacker\n properties:\n image: cirros-0.5.2-x86_64-disk\n | | | flavor: m1.tiny\n availability_zone: nova\n mgmt_driver: noop\n config: |\n param0: key1\n param1: key2\n\n CP1:\n type: | | | tosca.nodes.nfv.CP.Tacker\n properties:\n management: true\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n | | | node: VL1\n - virtualBinding:\n node: VDU1\n\n CP2:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n anti_spoofing_protection: | @@ -288,7 +288,7 @@ Verify VNF details using OpenStackClient CLI | Field | Value | +----------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | attributes | {"heat_template": "heat_template_version: 2013-05-23\ndescription: 'Demo example\n\n '\nparameters: {}\nresources:\n VDU1:\n type: OS::Nova::Server\n | - | | properties:\n availability_zone: nova\n config_drive: false\n flavor: m1.tiny\n image: cirros-0.4.0-x86_64-disk\n networks:\n - port:\n | + | | properties:\n availability_zone: nova\n config_drive: false\n flavor: m1.tiny\n image: cirros-0.5.2-x86_64-disk\n networks:\n - port:\n | | | get_resource: CP1\n - port:\n get_resource: CP2\n - port:\n get_resource: CP3\n user_data_format: SOFTWARE_CONFIG\n CP1:\n type: | | | OS::Neutron::Port\n properties:\n network: net_mgmt\n port_security_enabled: false\n CP2:\n type: OS::Neutron::Port\n properties:\n network: | | | net0\n port_security_enabled: false\n CP3:\n type: OS::Neutron::Port\n properties:\n network: net1\n port_security_enabled: false\noutputs:\n | diff --git a/doc/source/reference/reservation_policy_usage_guide.rst b/doc/source/reference/reservation_policy_usage_guide.rst index 1511a07a0..f946e07ad 100644 --- a/doc/source/reference/reservation_policy_usage_guide.rst +++ b/doc/source/reference/reservation_policy_usage_guide.rst @@ -280,7 +280,7 @@ Ref: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: { get_input: flavor } reservation_metadata: resource_type: { get_input: resource_type } @@ -458,7 +458,7 @@ Add lease_id and reservation id in the parameter file. VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk reservation_metadata: resource_type: { get_input: resource_type } id: { get_input: reservation_id } diff --git a/doc/source/user/alarm_monitoring_usage_guide.rst b/doc/source/user/alarm_monitoring_usage_guide.rst index b4efe1556..cdd95f60a 100644 --- a/doc/source/user/alarm_monitoring_usage_guide.rst +++ b/doc/source/user/alarm_monitoring_usage_guide.rst @@ -76,7 +76,7 @@ in Tacker: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: SG1} diff --git a/doc/source/user/vnffg_usage_guide.rst b/doc/source/user/vnffg_usage_guide.rst index b3fa16f04..359b81dae 100644 --- a/doc/source/user/vnffg_usage_guide.rst +++ b/doc/source/user/vnffg_usage_guide.rst @@ -53,10 +53,10 @@ Firstly, HTTP client and HTTP server must be launched. net_id=$(openstack network list | grep net0 | awk '{print $2}') - openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk \ + openstack server create --flavor m1.tiny --image cirros-0.5.2-x86_64-disk \ --nic net-id=$net_id http_client - openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk \ + openstack server create --flavor m1.tiny --image cirros-0.5.2-x86_64-disk \ --nic net-id=$net_id http_server Creating the VNFFGD diff --git a/doc/source/user/vnffg_usage_guide_advanced.rst b/doc/source/user/vnffg_usage_guide_advanced.rst index 54f546fdf..768c90deb 100644 --- a/doc/source/user/vnffg_usage_guide_advanced.rst +++ b/doc/source/user/vnffg_usage_guide_advanced.rst @@ -122,8 +122,8 @@ and **http_server**. The example uses **net0** to create VNFFG on that network. .. code-block:: console $ net_id=$(openstack network list | grep net0 | awk '{print $2}') - $ openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk --nic net-id=$net_id http_client - $ openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk --nic net-id=$net_id http_server + $ openstack server create --flavor m1.tiny --image cirros-0.5.2-x86_64-disk --nic net-id=$net_id http_client + $ openstack server create --flavor m1.tiny --image cirros-0.5.2-x86_64-disk --nic net-id=$net_id http_server To get information about neutron ports of **http_client** and **http_server** that are used for classifying traffics, user can use openstack commands to diff --git a/releasenotes/notes/cirros-0.5.2-51990bfb9ec72fc9.yaml b/releasenotes/notes/cirros-0.5.2-51990bfb9ec72fc9.yaml new file mode 100644 index 000000000..51745de55 --- /dev/null +++ b/releasenotes/notes/cirros-0.5.2-51990bfb9ec72fc9.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Update cirros image from 0.4.0 to 0.5.2. diff --git a/samples/mistral/workflows/input/create_vnfd.json b/samples/mistral/workflows/input/create_vnfd.json index be462d873..26625ffbd 100644 --- a/samples/mistral/workflows/input/create_vnfd.json +++ b/samples/mistral/workflows/input/create_vnfd.json @@ -2,7 +2,7 @@ "body":{ "vnfd":{ "attributes":{ - "vnfd":"tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n\ndescription: Demo example\n\nmetadata:\n template_name: sample-tosca-vnfd\n\ntopology_template:\n node_templates:\n VDU1:\n type: tosca.nodes.nfv.VDU.Tacker\n properties:\n image: cirros-0.4.0-x86_64-disk\n flavor: m1.tiny\n availability_zone: nova\n mgmt_driver: noop\n config: |\n param0: key1\n param1: key2\n\n CP1:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n management: true\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL1\n - virtualBinding:\n node: VDU1\n\n CP2:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL2\n - virtualBinding:\n node: VDU1\n\n CP3:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL3\n - virtualBinding:\n node: VDU1\n\n VL1:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net_mgmt\n vendor: Tacker\n\n VL2:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net0\n vendor: Tacker\n\n VL3:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net1\n vendor: Tacker\n" + "vnfd":"tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n\ndescription: Demo example\n\nmetadata:\n template_name: sample-tosca-vnfd\n\ntopology_template:\n node_templates:\n VDU1:\n type: tosca.nodes.nfv.VDU.Tacker\n properties:\n image: cirros-0.5.2-x86_64-disk\n flavor: m1.tiny\n availability_zone: nova\n mgmt_driver: noop\n config: |\n param0: key1\n param1: key2\n\n CP1:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n management: true\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL1\n - virtualBinding:\n node: VDU1\n\n CP2:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL2\n - virtualBinding:\n node: VDU1\n\n CP3:\n type: tosca.nodes.nfv.CP.Tacker\n properties:\n anti_spoofing_protection: false\n requirements:\n - virtualLink:\n node: VL3\n - virtualBinding:\n node: VDU1\n\n VL1:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net_mgmt\n vendor: Tacker\n\n VL2:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net0\n vendor: Tacker\n\n VL3:\n type: tosca.nodes.nfv.VL\n properties:\n network_name: net1\n vendor: Tacker\n" }, "name":"tacker-create-vnfd" } diff --git a/samples/tosca-templates/nsd/sample-tosca-vnfd1.yaml b/samples/tosca-templates/nsd/sample-tosca-vnfd1.yaml index c720f3e35..e6b036a8b 100644 --- a/samples/tosca-templates/nsd/sample-tosca-vnfd1.yaml +++ b/samples/tosca-templates/nsd/sample-tosca-vnfd1.yaml @@ -30,7 +30,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml b/samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml index d7606c507..f75115cbb 100644 --- a/samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml +++ b/samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml @@ -16,7 +16,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/nsd/sample2-tosca-vnfd1.yaml b/samples/tosca-templates/nsd/sample2-tosca-vnfd1.yaml index 5ec56be96..7c453d706 100644 --- a/samples/tosca-templates/nsd/sample2-tosca-vnfd1.yaml +++ b/samples/tosca-templates/nsd/sample2-tosca-vnfd1.yaml @@ -19,7 +19,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/nsd/sample2-tosca-vnfd2.yaml b/samples/tosca-templates/nsd/sample2-tosca-vnfd2.yaml index 6110801e1..594b85c54 100644 --- a/samples/tosca-templates/nsd/sample2-tosca-vnfd2.yaml +++ b/samples/tosca-templates/nsd/sample2-tosca-vnfd2.yaml @@ -19,7 +19,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-placement-policy-anti-affinity.yaml b/samples/tosca-templates/vnfd/tosca-placement-policy-anti-affinity.yaml index ed1e6daa2..7d8ca8235 100644 --- a/samples/tosca-templates/vnfd/tosca-placement-policy-anti-affinity.yaml +++ b/samples/tosca-templates/vnfd/tosca-placement-policy-anti-affinity.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova @@ -39,7 +39,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-multi-actions.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-multi-actions.yaml index 5996dde41..1c015444b 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-multi-actions.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-multi-actions.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: VDU1} diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml index f74ca221c..2f67e86b3 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: VDU1} diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml index a7ba4133d..d77387940 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: SG1} diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-block-attach.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-block-attach.yaml index 0619a1194..00c3c1db7 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-block-attach.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-block-attach.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | @@ -39,7 +39,7 @@ topology_template: type: tosca.nodes.BlockStorage.Tacker properties: size: 1 GB - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk CB1: type: tosca.nodes.BlockStorageAttachment diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml index 89b71a034..775dec9d5 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml @@ -18,7 +18,7 @@ topology_template: cpu_allocation: cpu_affinity: dedicated properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml index ece0d3130..548a5c0c2 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-host-reservation.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-host-reservation.yaml index e0ef1929f..ae0bb8ae5 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-host-reservation.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-host-reservation.yaml @@ -23,7 +23,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny reservation_metadata: resource_type: { get_input: resource_type } diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml index 7533b64bf..a6765fa7a 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml @@ -17,7 +17,7 @@ topology_template: num_cpus: 2 mem_page_size: large properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml index 636defb4b..432f6cab8 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml @@ -24,7 +24,7 @@ topology_template: artifacts: VNFImage: type: tosca.artifacts.Deployment.Image.VM - file: http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img + file: http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-instance-reservation.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-instance-reservation.yaml index 1c0797415..85cd1e477 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-instance-reservation.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-instance-reservation.yaml @@ -27,7 +27,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: { get_input: flavor } reservation_metadata: resource_type: { get_input: resource_type } diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml index ff98c92af..113b4ef4d 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop key_name: userKey diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml index e6a614532..973d09c97 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop key_name: userKey diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-monitor-multi-vdu.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-monitor-multi-vdu.yaml index bce4152a5..02c959d63 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-monitor-multi-vdu.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-monitor-multi-vdu.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | @@ -70,7 +70,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop @@ -124,7 +124,7 @@ topology_template: VDU3: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml index fa69369e1..b6be423f5 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-monitoring-vdu-autoheal.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-monitoring-vdu-autoheal.yaml index eeac65e42..29b86d260 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-monitoring-vdu-autoheal.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-monitoring-vdu-autoheal.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 1 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml index 6b2dd2753..ed2dd5af4 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | @@ -60,7 +60,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop @@ -104,7 +104,7 @@ topology_template: VDU3: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-network.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-network.yaml index 17a5d4b7c..0bfe77568 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-network.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-network.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml index 339330d47..82bb7d757 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml index cfee1b9c4..f55fe3ab7 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml @@ -17,7 +17,7 @@ topology_template: num_cpus: 2 numa_node_count: 2 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml index 6ca78ee1e..cf4e6e3b1 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml @@ -25,7 +25,7 @@ topology_template: vcpus: [2,3,4,5] mem_size: 3072 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml index 32c074790..42675d2cc 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml @@ -1,6 +1,6 @@ { - image_name: 'cirros-0.4.0-x86_64-disk', - image_source: 'http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img', + image_name: 'cirros-0.5.2-x86_64-disk', + image_source: 'http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img', flavor: 'm1.tiny', zone: 'nova', network: 'net_mgmt', diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml index c749d9efa..cd7b8f841 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova flavor: m1.tiny @@ -30,7 +30,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova flavor: m1.tiny diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml index b6658086d..05d5b1a3c 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop key_name: userKey diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml index aefc2cd01..33c041e54 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk config: | param0: key1 param1: key2 diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml index 071341368..607561ea4 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml @@ -20,7 +20,7 @@ topology_template: thread_count: 2 core_count: 2 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml index fad48ac15..c040c762e 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml @@ -26,7 +26,7 @@ topology_template: disk_size: 1 GB properties: name: {get_input : vdu-name} - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-vip.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-vip.yaml index 153602600..b931251a9 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-vip.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-vip.yaml @@ -18,7 +18,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | @@ -51,7 +51,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_ip_address.yaml b/samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_ip_address.yaml index 0c144f3ef..2e7a8ffd1 100644 --- a/samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_ip_address.yaml +++ b/samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_ip_address.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB num_cpus: 1 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop CP1: diff --git a/samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_network.yaml b/samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_network.yaml index 7d7de510e..d32425821 100644 --- a/samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_network.yaml +++ b/samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_network.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB num_cpus: 1 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop CP1: diff --git a/samples/tosca-templates/vnffg-nsd/tosca-vnfd1-sample.yaml b/samples/tosca-templates/vnffg-nsd/tosca-vnfd1-sample.yaml index 9c89f316e..80d3b748a 100644 --- a/samples/tosca-templates/vnffg-nsd/tosca-vnfd1-sample.yaml +++ b/samples/tosca-templates/vnffg-nsd/tosca-vnfd1-sample.yaml @@ -23,7 +23,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnffg-nsd/tosca-vnfd2-sample.yaml b/samples/tosca-templates/vnffg-nsd/tosca-vnfd2-sample.yaml index 6be0d3455..a0dd69717 100644 --- a/samples/tosca-templates/vnffg-nsd/tosca-vnfd2-sample.yaml +++ b/samples/tosca-templates/vnffg-nsd/tosca-vnfd2-sample.yaml @@ -16,7 +16,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml b/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml index 81007bb85..0f16981e0 100644 --- a/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml +++ b/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml b/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml index bbddd30b3..c01ecc933 100644 --- a/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml +++ b/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/vnf_packages/Definitions/helloworld3_df_simple.yaml b/samples/vnf_packages/Definitions/helloworld3_df_simple.yaml index b4b4a3df1..68c48a765 100644 --- a/samples/vnf_packages/Definitions/helloworld3_df_simple.yaml +++ b/samples/vnf_packages/Definitions/helloworld3_df_simple.yaml @@ -88,10 +88,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -100,7 +100,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -141,10 +141,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VirtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -153,7 +153,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/samples/vnf_packages/Files/images/cirros-0.4.0-x86_64-disk.img b/samples/vnf_packages/Files/images/cirros-0.4.0-x86_64-disk.img deleted file mode 120000 index 5f6aa4b0e..000000000 --- a/samples/vnf_packages/Files/images/cirros-0.4.0-x86_64-disk.img +++ /dev/null @@ -1 +0,0 @@ -../../../../tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.4.0-x86_64-disk.img \ No newline at end of file diff --git a/samples/vnf_packages/Files/images/cirros-0.5.2-x86_64-disk.img b/samples/vnf_packages/Files/images/cirros-0.5.2-x86_64-disk.img new file mode 120000 index 000000000..8c579fce9 --- /dev/null +++ b/samples/vnf_packages/Files/images/cirros-0.5.2-x86_64-disk.img @@ -0,0 +1 @@ +../../../../tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.5.2-x86_64-disk.img \ No newline at end of file diff --git a/samples/vnf_packages/TOSCA-Metadata/TOSCA.meta b/samples/vnf_packages/TOSCA-Metadata/TOSCA.meta index e748aaa26..63e87a642 100644 --- a/samples/vnf_packages/TOSCA-Metadata/TOSCA.meta +++ b/samples/vnf_packages/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Dummy User CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.4.0-x86_64-disk.img b/tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.5.2-x86_64-disk.img similarity index 55% rename from tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.4.0-x86_64-disk.img rename to tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.5.2-x86_64-disk.img index 2e39ad87c..7d95efc2b 100644 Binary files a/tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.4.0-x86_64-disk.img and b/tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.5.2-x86_64-disk.img differ diff --git a/tacker/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_df_simple.yaml index df269aa14..be5a0babf 100644 --- a/tacker/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_df_simple.yaml @@ -82,10 +82,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1000 MB @@ -94,7 +94,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -135,10 +135,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2000 MB @@ -147,7 +147,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/Definitions/helloworld3_df_simple.yaml index f8356b576..8d0d5079d 100644 --- a/tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/Definitions/helloworld3_df_simple.yaml @@ -18,20 +18,20 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB size: 1 GB artifacts: - sw_image1: ../Files/images/cirros-0.4.0-x86_64-disk.img + sw_image1: ../Files/images/cirros-0.5.2-x86_64-disk.img sw_image2: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: diff --git a/tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/TOSCA-Metadata/TOSCA.meta index a5993440a..e87443dc3 100644 --- a/tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Hiroyuki JO CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_df_simple.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/Definitions/helloworld3_df_simple.yaml index 5f0353a01..eed8fdd35 100644 --- a/tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/Definitions/helloworld3_df_simple.yaml @@ -18,7 +18,7 @@ topology_template: max_number_of_instances: 1 artifacts: - sw_image: ../Files/images/cirros-0.4.0-x86_64-disk.img + sw_image: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: diff --git a/tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/TOSCA-Metadata/TOSCA.meta index a5993440a..e87443dc3 100644 --- a/tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Hiroyuki JO CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_df_simple.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_df_simple.yaml index ddbd7aad8..78d6ac537 100644 --- a/tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_df_simple.yaml @@ -62,17 +62,17 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB size: 1 GB artifacts: - sw_image: ../Files/images/cirros-0.4.0-x86_64-disk.img + sw_image: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: diff --git a/tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/TOSCA-Metadata/TOSCA.meta index 432a1b476..7af0b80d7 100644 --- a/tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Hiroyuki JO CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_df_simple.yaml index 903add83e..bef501739 100644 --- a/tacker/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_df_simple.yaml @@ -90,11 +90,11 @@ topology_template: min_number_of_instances: 2 max_number_of_instances: 2 sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB @@ -123,11 +123,11 @@ topology_template: size_of_storage: 1 GB rdma_enabled: true sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB diff --git a/tacker/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_df_simple.yaml index 120044934..3429e6ed2 100644 --- a/tacker/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_df_simple.yaml @@ -90,11 +90,11 @@ topology_template: min_number_of_instances: 2 max_number_of_instances: 2 sw_image_data: - name: cirros-0.4.0-x86_64-disk2 - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk2 + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB @@ -123,11 +123,11 @@ topology_template: size_of_storage: 1 GB rdma_enabled: true sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB diff --git a/tacker/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_df_simple.yaml index b46852223..f108b7f46 100644 --- a/tacker/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_df_simple.yaml @@ -90,11 +90,11 @@ topology_template: min_number_of_instances: 2 max_number_of_instances: 2 sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB @@ -123,11 +123,11 @@ topology_template: size_of_storage: 1 GB rdma_enabled: true sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB diff --git a/tacker/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_df_simple.yaml index b46852223..f108b7f46 100644 --- a/tacker/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_df_simple.yaml @@ -90,11 +90,11 @@ topology_template: min_number_of_instances: 2 max_number_of_instances: 2 sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB @@ -123,11 +123,11 @@ topology_template: size_of_storage: 1 GB rdma_enabled: true sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB diff --git a/tacker/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_df_simple.yaml index a076c36d5..7a97fed54 100644 --- a/tacker/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_df_simple.yaml @@ -90,11 +90,11 @@ topology_template: min_number_of_instances: 1 max_number_of_instances: 1 sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB @@ -123,11 +123,11 @@ topology_template: size_of_storage: 1 GB rdma_enabled: true sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB diff --git a/tacker/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_df_simple.yaml index 1ed638e22..51316e6fb 100644 --- a/tacker/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_df_simple.yaml @@ -64,11 +64,11 @@ topology_template: min_number_of_instances: 1 max_number_of_instances: 3 sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB @@ -99,11 +99,11 @@ topology_template: min_number_of_instances: 1 max_number_of_instances: 1 sw_image_data: - name: cirros-0.4.0-x86_64-disk - version: '0.4.0' + name: cirros-0.5.2-x86_64-disk + version: '0.5.2' checksum: algorithm: sha-256 - hash: a8dd75ecffd4cdd96072d60c2237b448e0c8b2bc94d57f10fdbc8c481d9005b8 + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 0 GB diff --git a/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_df_simple.yaml index abc175541..5a2634add 100644 --- a/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_df_simple.yaml @@ -76,10 +76,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -88,7 +88,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -129,10 +129,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -141,7 +141,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver2/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver2/Definitions/helloworld3_df_simple.yaml index 4f8c176da..a0654604b 100644 --- a/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver2/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver2/Definitions/helloworld3_df_simple.yaml @@ -76,10 +76,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -88,7 +88,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -129,10 +129,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -141,7 +141,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver3/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver3/Definitions/helloworld3_df_simple.yaml index abc175541..5a2634add 100644 --- a/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver3/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver3/Definitions/helloworld3_df_simple.yaml @@ -76,10 +76,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -88,7 +88,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -129,10 +129,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -141,7 +141,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/TOSCA-Metadata/TOSCA.meta index 68192a9cf..f1e8cb14a 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/TOSCA-Metadata/TOSCA.meta @@ -3,7 +3,7 @@ Created-by: dummy_user CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image Name: Scripts/install.sh diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf index 843027cdc..02cb15525 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf @@ -1,6 +1,6 @@ -Source: Files/images/cirros-0.4.0-x86_64-disk.img +Source: Files/images/cirros-0.5.2-x86_64-disk.img Algorithm: SHA-512 -Hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 +Hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 Source: Scripts/install.sh Algorithm: SHA-256 @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false/manifest.mf b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false/manifest.mf index 843027cdc..02cb15525 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false/manifest.mf +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false/manifest.mf @@ -1,6 +1,6 @@ -Source: Files/images/cirros-0.4.0-x86_64-disk.img +Source: Files/images/cirros-0.5.2-x86_64-disk.img Algorithm: SHA-512 -Hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 +Hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 Source: Scripts/install.sh Algorithm: SHA-256 @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false_hash/manifest.mf b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false_hash/manifest.mf index 843027cdc..02cb15525 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false_hash/manifest.mf +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false_hash/manifest.mf @@ -1,6 +1,6 @@ -Source: Files/images/cirros-0.4.0-x86_64-disk.img +Source: Files/images/cirros-0.5.2-x86_64-disk.img Algorithm: SHA-512 -Hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 +Hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 Source: Scripts/install.sh Algorithm: SHA-256 @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml index d3c12d531..055a13c7e 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml @@ -1093,10 +1093,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -1105,7 +1105,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -1146,10 +1146,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GiB @@ -1158,7 +1158,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.mf b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.mf index 843027cdc..02cb15525 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.mf +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.mf @@ -1,6 +1,6 @@ -Source: Files/images/cirros-0.4.0-x86_64-disk.img +Source: Files/images/cirros-0.5.2-x86_64-disk.img Algorithm: SHA-512 -Hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 +Hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 Source: Scripts/install.sh Algorithm: SHA-256 @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml index d3c12d531..055a13c7e 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml @@ -1093,10 +1093,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -1105,7 +1105,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -1146,10 +1146,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GiB @@ -1158,7 +1158,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_meta_in_manifest/manifest.mf b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_meta_in_manifest/manifest.mf index 843027cdc..02cb15525 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_meta_in_manifest/manifest.mf +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_meta_in_manifest/manifest.mf @@ -1,6 +1,6 @@ -Source: Files/images/cirros-0.4.0-x86_64-disk.img +Source: Files/images/cirros-0.5.2-x86_64-disk.img Algorithm: SHA-512 -Hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 +Hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 Source: Scripts/install.sh Algorithm: SHA-256 @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_df_simple.yaml index bd793e8fb..75ead366f 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_df_simple.yaml @@ -64,17 +64,17 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB size: 1 GB artifacts: - sw_image: ../Files/images/cirros-0.4.0-x86_64-disk.img + sw_image: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -115,17 +115,17 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GB min_ram: 8192 MB size: 2 GB artifacts: - sw_image: ../Files/images/cirros-0.4.0-x86_64-disk.img + sw_image: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/TOSCA-Metadata/TOSCA.meta index a5993440a..e87443dc3 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Hiroyuki JO CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_df_simple.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml b/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml index af0c1df96..a59f6a9aa 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml @@ -1105,10 +1105,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -1117,7 +1117,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -1158,10 +1158,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GiB @@ -1170,7 +1170,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_df_simple.yaml index 26280e99a..709e4723a 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_df_simple.yaml @@ -82,10 +82,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1000 MB @@ -94,7 +94,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -135,10 +135,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2000 MB @@ -147,7 +147,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/TOSCA-Metadata/TOSCA.meta index bf3c08627..b9ddb7d4c 100644 --- a/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Tacker CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_with_missing_sw_image_data_in_main_template/Definitions/main_tosca.yaml b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_with_missing_sw_image_data_in_main_template/Definitions/main_tosca.yaml index 4da083d96..0b3a0fb75 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_with_missing_sw_image_data_in_main_template/Definitions/main_tosca.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_with_missing_sw_image_data_in_main_template/Definitions/main_tosca.yaml @@ -61,7 +61,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: diff --git a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_with_multiple_sw_image_data/Definitions/tosca_with_vdus.yaml b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_with_multiple_sw_image_data/Definitions/tosca_with_vdus.yaml index 6ef26abf3..dbd648ea1 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_with_multiple_sw_image_data/Definitions/tosca_with_vdus.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_with_multiple_sw_image_data/Definitions/tosca_with_vdus.yaml @@ -59,10 +59,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -71,10 +71,10 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img sw_image1: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: diff --git a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_policies/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_policies/Definitions/helloworld3_df_simple.yaml index db8fb2670..4835d7286 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_policies/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_policies/Definitions/helloworld3_df_simple.yaml @@ -62,10 +62,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -73,7 +73,7 @@ topology_template: artifacts: sw_image: - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img type: tosca.artifacts.nfv.SwImage capabilities: diff --git a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_sw_image_data/Definitions/tosca_with_vdus.yaml b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_sw_image_data/Definitions/tosca_with_vdus.yaml index 4da083d96..0b3a0fb75 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_sw_image_data/Definitions/tosca_with_vdus.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_sw_image_data/Definitions/tosca_with_vdus.yaml @@ -61,7 +61,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: diff --git a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_vnfd_info/Definitions/tosca_with_vdus.yaml b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_vnfd_info/Definitions/tosca_with_vdus.yaml index 31e56659b..3416c6f9d 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_vnfd_info/Definitions/tosca_with_vdus.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_without_vnfd_info/Definitions/tosca_with_vdus.yaml @@ -46,10 +46,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -58,7 +58,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -99,10 +99,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -111,7 +111,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/Files/images/cirros-0.4.0-x86_64-disk.img b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/Files/images/cirros-0.5.2-x86_64-disk.img similarity index 100% rename from tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/Files/images/cirros-0.4.0-x86_64-disk.img rename to tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/Files/images/cirros-0.5.2-x86_64-disk.img diff --git a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml index 03d40823b..41bc8e133 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml @@ -1073,10 +1073,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -1085,7 +1085,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -1126,10 +1126,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GiB @@ -1138,7 +1138,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/test_csar_utils_common/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/test_csar_utils_common/TOSCA-Metadata/TOSCA.meta index c16298d5c..25c94a0ab 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/test_csar_utils_common/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/test_csar_utils_common/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Hiroyuki JO CSAR-Version: 1.1 Entry-Definitions: Definitions/main_tosca.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/Definitions/helloworld3_df_simple.yaml index 2547c3ac8..0acc85ac0 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/Definitions/helloworld3_df_simple.yaml @@ -85,10 +85,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VirtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -97,7 +97,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/TOSCA-Metadata/TOSCA.meta index d5e5012cc..9b6b11ad9 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/TOSCA-Metadata/TOSCA.meta @@ -3,7 +3,7 @@ Created-by: dummy_user CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image Name: Scripts/vnflcm_noop.py diff --git a/tacker/tests/etc/samples/etsi/nfv/user_data_common/Definitions/sample_lcm_with_user_data_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/user_data_common/Definitions/sample_lcm_with_user_data_df_simple.yaml index 2bb57cff4..3ce24c3eb 100644 --- a/tacker/tests/etc/samples/etsi/nfv/user_data_common/Definitions/sample_lcm_with_user_data_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/user_data_common/Definitions/sample_lcm_with_user_data_df_simple.yaml @@ -63,10 +63,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -74,7 +74,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_basehot_invalid/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_basehot_invalid/TOSCA-Metadata/TOSCA.meta index 38af40834..aed982826 100644 --- a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_basehot_invalid/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_basehot_invalid/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Dummy User CSAR-Version: 1.1 Entry-Definitions: Definitions/sample_lcm_with_user_data_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_normal/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_normal/TOSCA-Metadata/TOSCA.meta index 38af40834..aed982826 100644 --- a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_normal/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_normal/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Dummy User CSAR-Version: 1.1 Entry-Definitions: Definitions/sample_lcm_with_user_data_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_invalid_hot_param/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_invalid_hot_param/TOSCA-Metadata/TOSCA.meta index 38af40834..aed982826 100644 --- a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_invalid_hot_param/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_invalid_hot_param/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Dummy User CSAR-Version: 1.1 Entry-Definitions: Definitions/sample_lcm_with_user_data_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_invalid_script/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_invalid_script/TOSCA-Metadata/TOSCA.meta index 38af40834..aed982826 100644 --- a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_invalid_script/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_invalid_script/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Dummy User CSAR-Version: 1.1 Entry-Definitions: Definitions/sample_lcm_with_user_data_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_none/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_none/TOSCA-Metadata/TOSCA.meta index 38af40834..aed982826 100644 --- a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_none/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_none/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Dummy User CSAR-Version: 1.1 Entry-Definitions: Definitions/sample_lcm_with_user_data_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_timeout/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_timeout/TOSCA-Metadata/TOSCA.meta index 38af40834..aed982826 100644 --- a/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_timeout/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_timeout/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Dummy User CSAR-Version: 1.1 Entry-Definitions: Definitions/sample_lcm_with_user_data_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/vnflcm1/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/vnflcm1/Definitions/helloworld3_df_simple.yaml index 98205f9fd..953992c56 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnflcm1/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/vnflcm1/Definitions/helloworld3_df_simple.yaml @@ -81,10 +81,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VirtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -93,7 +93,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/vnflcm1/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/vnflcm1/TOSCA-Metadata/TOSCA.meta index 432a1b476..7af0b80d7 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnflcm1/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/vnflcm1/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Hiroyuki JO CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/vnflcm2/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/vnflcm2/Definitions/helloworld3_df_simple.yaml index 5671183c6..36fcbe2f0 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnflcm2/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/vnflcm2/Definitions/helloworld3_df_simple.yaml @@ -62,10 +62,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -74,7 +74,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: diff --git a/tacker/tests/etc/samples/etsi/nfv/vnflcm2/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/vnflcm2/TOSCA-Metadata/TOSCA.meta index 432a1b476..7af0b80d7 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnflcm2/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/vnflcm2/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Hiroyuki JO CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/vnflcm3/Definitions/helloworld3simple.vnfd.tosca.yaml b/tacker/tests/etc/samples/etsi/nfv/vnflcm3/Definitions/helloworld3simple.vnfd.tosca.yaml index 5ec9a044c..4c9680d87 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnflcm3/Definitions/helloworld3simple.vnfd.tosca.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/vnflcm3/Definitions/helloworld3simple.vnfd.tosca.yaml @@ -62,10 +62,10 @@ topology_template: max_number_of_instances: 3 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -73,7 +73,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/etc/samples/etsi/nfv/vnflcm3/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/vnflcm3/TOSCA-Metadata/TOSCA.meta index b1a41323c..4725c80be 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnflcm3/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/vnflcm3/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Hiroyuki JO CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3.vnfd.tosca.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/vnflcm4/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/vnflcm4/Definitions/helloworld3_df_simple.yaml index 216172e8a..584059c5a 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnflcm4/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/vnflcm4/Definitions/helloworld3_df_simple.yaml @@ -70,10 +70,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -82,7 +82,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -123,10 +123,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -135,7 +135,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/vnflcm4/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/vnflcm4/TOSCA-Metadata/TOSCA.meta index 432a1b476..7af0b80d7 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnflcm4/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/vnflcm4/TOSCA-Metadata/TOSCA.meta @@ -3,5 +3,5 @@ Created-by: Hiroyuki JO CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm1/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm1/TOSCA-Metadata/TOSCA.meta index 68192a9cf..f1e8cb14a 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm1/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm1/TOSCA-Metadata/TOSCA.meta @@ -3,7 +3,7 @@ Created-by: dummy_user CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image Name: Scripts/install.sh diff --git a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/Definitions/helloworld3_df_simple.yaml b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/Definitions/helloworld3_df_simple.yaml index 9b209994e..b1a7219a5 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/Definitions/helloworld3_df_simple.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/Definitions/helloworld3_df_simple.yaml @@ -82,10 +82,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Demo software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 9a318acd9d049bbd6a8c662b18be95414b3b1f2e3d27e38e59bf99347193ac2831220aa54296ee35aee8f53c399000f095c8eca7eb611c5b2c83eeb7c30834a8 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 4 GB @@ -94,7 +94,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -135,10 +135,10 @@ topology_template: rdma_enabled: true sw_image_data: name: DemoVirtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 9a318acd9d049bbd6a8c662b18be95414b3b1f2e3d27e38e59bf99347193ac2831220aa54296ee35aee8f53c399000f095c8eca7eb611c5b2c83eeb7c30834a8 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 8 GB @@ -147,7 +147,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/TOSCA-Metadata/TOSCA.meta index 2f68cb152..2a1c900e1 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/TOSCA-Metadata/TOSCA.meta @@ -4,5 +4,5 @@ CSAR-Version: 1.1 Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml ETSI-Entry-Manifest: manifest.mf -Name: Files/images/cirros-0.4.0-x86_64-disk.img +Name: Files/images/cirros-0.5.2-x86_64-disk.img Content-type: application/x-iso9066-image diff --git a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/manifest.mf b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/manifest.mf index de6385b72..02cb15525 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/manifest.mf +++ b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm2/manifest.mf @@ -1,6 +1,6 @@ -Source: Files/images/cirros-0.4.0-x86_64-disk.img +Source: Files/images/cirros-0.5.2-x86_64-disk.img Algorithm: SHA-512 -Hash: 9a318acd9d049bbd6a8c662b18be95414b3b1f2e3d27e38e59bf99347193ac2831220aa54296ee35aee8f53c399000f095c8eca7eb611c5b2c83eeb7c30834a8 +Hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 Source: Scripts/install.sh Algorithm: SHA-256 @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 diff --git a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.mf b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.mf index de6385b72..02cb15525 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.mf +++ b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.mf @@ -1,6 +1,6 @@ -Source: Files/images/cirros-0.4.0-x86_64-disk.img +Source: Files/images/cirros-0.5.2-x86_64-disk.img Algorithm: SHA-512 -Hash: 9a318acd9d049bbd6a8c662b18be95414b3b1f2e3d27e38e59bf99347193ac2831220aa54296ee35aee8f53c399000f095c8eca7eb611c5b2c83eeb7c30834a8 +Hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 Source: Scripts/install.sh Algorithm: SHA-256 @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 diff --git a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml index d3c12d531..055a13c7e 100644 --- a/tacker/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml @@ -1093,10 +1093,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -1105,7 +1105,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -1146,10 +1146,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VrtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 2 GiB @@ -1158,7 +1158,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml b/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml index 1a8b07e08..36859e9fe 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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: VDU1} diff --git a/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml b/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml index 513d243fb..468da5e74 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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: SG1} diff --git a/tacker/tests/etc/samples/sample-tosca-scale-all.yaml b/tacker/tests/etc/samples/sample-tosca-scale-all.yaml index 86551de0c..941468a23 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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/tacker/tests/etc/samples/sample-tosca-vnf-artifacts-image-values.yaml b/tacker/tests/etc/samples/sample-tosca-vnf-artifacts-image-values.yaml index 4c7ebaeb8..f57d0dcc6 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnf-artifacts-image-values.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnf-artifacts-image-values.yaml @@ -1,5 +1,5 @@ { - image_source: 'http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img', + image_source: 'http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img', flavor: 'm1.tiny', zone: 'nova', network: 'net_mgmt', diff --git a/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml b/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml index 7b0f14e54..b24c67b94 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.4.0-x86_64-disk', + image_name: 'cirros-0.5.2-x86_64-disk', flavor: 'm1.tiny', zone: 'nova', network: 'net_mgmt', diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-anti-affinity-multi-vdu.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-anti-affinity-multi-vdu.yaml index 475b5d5d2..b809fef5f 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-anti-affinity-multi-vdu.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-anti-affinity-multi-vdu.yaml @@ -11,7 +11,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: anti-affinity-vdu-insufficient-comp-nodes - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -54,7 +54,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: anti-affinity-vdu-insufficient-comp-nodes - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop @@ -97,7 +97,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: anti-affinity-vdu-insufficient-comp-nodes - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-block-storage.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-block-storage.yaml index 4b4a4e7fe..729e64665 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-block-storage.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-block-storage.yaml @@ -17,7 +17,7 @@ topology_template: disk_size: 1 GB properties: name: test-vdu-block-storage - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | @@ -41,7 +41,7 @@ topology_template: type: tosca.nodes.BlockStorage.Tacker properties: size: 1 GB - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk CB1: type: tosca.nodes.BlockStorageAttachment diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-existing-block-storage.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-existing-block-storage.yaml index e6e2533ae..e371fc83b 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-existing-block-storage.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-existing-block-storage.yaml @@ -22,7 +22,7 @@ topology_template: disk_size: 1 GB properties: name: test-vdu-block-storage - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml index 685a0f12a..812ff685a 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.4.0-x86_64-disk + image: cirros-0.5.2-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 ca1c1c487..e1c83abb6 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.4.0/cirros-0.4.0-x86_64-disk.img + file: http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-instance-reservation.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-instance-reservation.yaml index a35e4c264..d50ae0a9d 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-instance-reservation.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-instance-reservation.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: { get_input: flavor } reservation_metadata: resource_type: {get_input: resource_type} 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 d80656ed6..2d25493d2 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.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-maintenance.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-maintenance.yaml index 043185785..0c9ef9047 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-maintenance.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-maintenance.yaml @@ -16,7 +16,7 @@ topology_template: num_cpus: 2 properties: availability_zone: nova - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk maintenance: true mgmt_driver: noop type: tosca.nodes.nfv.VDU.Tacker diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml index 18a554068..affa52584 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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny config: | param0: key1 diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring-vdu-autoheal.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring-vdu-autoheal.yaml index 39a57a7d1..a1832cad3 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring-vdu-autoheal.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring-vdu-autoheal.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 1 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova mgmt_driver: noop @@ -49,7 +49,7 @@ topology_template: mem_size: 512 MB num_cpus: 1 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova mgmt_driver: noop 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 24cecc567..b53ad9ae4 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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -62,7 +62,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -108,7 +108,7 @@ topology_template: VDU3: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-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 d1da82a0b..cd8d4cc6c 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.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-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 f48243beb..dad85b1ca 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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny config: | param0: key1 diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-affinity.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-affinity.yaml index e85f60ec9..b333aff0c 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-affinity.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-affinity.yaml @@ -11,7 +11,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: affinity-vdu - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -54,7 +54,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: affinity-vdu - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-anti-affinity.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-anti-affinity.yaml index 43a3d763b..2016887bc 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-anti-affinity.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-anti-affinity.yaml @@ -11,7 +11,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: anti-affinity-vdu-multi-comp-nodes - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -54,7 +54,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: anti-affinity-vdu-multi-comp-nodes - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-invalid.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-invalid.yaml index b47189795..504ece5a6 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-invalid.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-placement-policy-invalid.yaml @@ -11,7 +11,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: invalid-placement-policy-vdu - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -54,7 +54,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: invalid-placement-policy-vdu - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop @@ -97,7 +97,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: invalid-placement-policy-vdu - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-single-vdu-monitoring-vdu-autoheal.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-single-vdu-monitoring-vdu-autoheal.yaml index eeac65e42..29b86d260 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-single-vdu-monitoring-vdu-autoheal.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-single-vdu-monitoring-vdu-autoheal.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 1 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova mgmt_driver: noop 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 1e373d76d..e105b065e 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.4.0-x86_64-disk + image: cirros-0.5.2-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 5cd52a906..bfac29868 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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny key_name: userKey availability_zone: nova diff --git a/tacker/tests/etc/samples/sample_tosca_assign_floatingip_to_vdu.yaml b/tacker/tests/etc/samples/sample_tosca_assign_floatingip_to_vdu.yaml index 4fce1c048..4c90e3356 100644 --- a/tacker/tests/etc/samples/sample_tosca_assign_floatingip_to_vdu.yaml +++ b/tacker/tests/etc/samples/sample_tosca_assign_floatingip_to_vdu.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB num_cpus: 1 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop CP1: diff --git a/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/sample_vnfd_df_complex_int.yaml b/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/sample_vnfd_df_complex_int.yaml index b510019e1..9a87c516c 100755 --- a/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/sample_vnfd_df_complex_int.yaml +++ b/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/sample_vnfd_df_complex_int.yaml @@ -88,10 +88,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -100,7 +100,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -141,10 +141,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VirtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -153,7 +153,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/sample_vnfd_df_simple_int.yaml b/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/sample_vnfd_df_simple_int.yaml index 9622a790f..1d707f21e 100755 --- a/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/sample_vnfd_df_simple_int.yaml +++ b/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/sample_vnfd_df_simple_int.yaml @@ -88,10 +88,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 1 GB @@ -100,7 +100,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: @@ -141,10 +141,10 @@ topology_template: rdma_enabled: true sw_image_data: name: VirtualStorage - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-512 - hash: 6513f21e44aa3da349f248188a44bc304a3653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5186106570c17a9e58b64dd39390617cd5a350f78 + hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 container_format: bare disk_format: qcow2 min_disk: 2 GB @@ -153,7 +153,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img CP1: type: tosca.nodes.nfv.VduCp diff --git a/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/images/cirros-0.4.0-x86_64-disk.img b/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/images/cirros-0.5.2-x86_64-disk.img similarity index 100% rename from tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/images/cirros-0.4.0-x86_64-disk.img rename to tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/images/cirros-0.5.2-x86_64-disk.img diff --git a/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf b/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf index 9a1d0c4be..dbfea8176 100755 --- a/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf +++ b/tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf @@ -1,6 +1,6 @@ Source: Files/images/cirros.img Algorithm: SHA-512 -Hash: 9a318acd9d049bbd6a8c662b18be95414b3b1f2e3d27e38e59bf99347193ac2831220aa54296ee35aee8f53c399000f095c8eca7eb611c5b2c83eeb7c30834a8 +Hash: 6b813aa46bb90b4da216a4d19376593fa3f4fc7e617f03a92b7fe11e9a3981cbe8f0959dbebe36225e5f53dc4492341a4863cac4ed1ee0909f3fc78ef9c3e869 Source: Scripts/install.sh Algorithm: SHA-256 @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 diff --git a/tacker/tests/etc/samples/test-ns-vnfd1.yaml b/tacker/tests/etc/samples/test-ns-vnfd1.yaml index c04c5ce20..777ef576d 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.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-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 d7606c507..f75115cbb 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.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-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 c04c5ce20..777ef576d 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.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-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 d7606c507..f75115cbb 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.4.0-x86_64-disk + image: cirros-0.5.2-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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/tosca-ns-vnffg-vnfd1-sample.yaml b/tacker/tests/etc/samples/tosca-ns-vnffg-vnfd1-sample.yaml index 9c89f316e..80d3b748a 100644 --- a/tacker/tests/etc/samples/tosca-ns-vnffg-vnfd1-sample.yaml +++ b/tacker/tests/etc/samples/tosca-ns-vnffg-vnfd1-sample.yaml @@ -23,7 +23,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/tosca-ns-vnffg-vnfd2-sample.yaml b/tacker/tests/etc/samples/tosca-ns-vnffg-vnfd2-sample.yaml index 6be0d3455..a0dd69717 100644 --- a/tacker/tests/etc/samples/tosca-ns-vnffg-vnfd2-sample.yaml +++ b/tacker/tests/etc/samples/tosca-ns-vnffg-vnfd2-sample.yaml @@ -16,7 +16,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/vnfd_lcm_user_data.yaml b/tacker/tests/etc/samples/vnfd_lcm_user_data.yaml index 6052dbb12..b2410250c 100644 --- a/tacker/tests/etc/samples/vnfd_lcm_user_data.yaml +++ b/tacker/tests/etc/samples/vnfd_lcm_user_data.yaml @@ -63,7 +63,7 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 hash: cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e @@ -74,7 +74,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: ../Files/images/cirros-0.4.0-x86_64-disk.img + file: ../Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/functional/sol/vnflcm/base.py b/tacker/tests/functional/sol/vnflcm/base.py index 9c9555a0a..8d9621fd1 100644 --- a/tacker/tests/functional/sol/vnflcm/base.py +++ b/tacker/tests/functional/sol/vnflcm/base.py @@ -307,7 +307,7 @@ class BaseVnfLcmTest(base.BaseTackerTest): gateway="22.22.2.1")) @classmethod - def _list_glance_image(cls, filter_name='cirros-0.4.0-x86_64-disk'): + def _list_glance_image(cls, filter_name='cirros-0.5.2-x86_64-disk'): try: images = cls.glance_client.images.list() except Exception: diff --git a/tacker/tests/functional/sol/vnflcm/fake_vnfpkgm.py b/tacker/tests/functional/sol/vnflcm/fake_vnfpkgm.py index 1f124ce3b..9ba2efe7d 100644 --- a/tacker/tests/functional/sol/vnflcm/fake_vnfpkgm.py +++ b/tacker/tests/functional/sol/vnflcm/fake_vnfpkgm.py @@ -51,9 +51,9 @@ class VnfPackage: "softwareImages": [ { "id": "sw_image", - "name": "cirros-0.4.0-x86_64-disk", + "name": "cirros-0.5.2-x86_64-disk", "provider": "Company", - "version": "0.4.0", + "version": "0.5.2", "checksum": { "algorithm": "SHA-512", "hash": sw_image_hash @@ -67,13 +67,13 @@ class VnfPackage: "userMetadata": { "key": "value" }, - "imagePath": "Files/images/cirros-0.4.0-x86_64-disk.img" + "imagePath": "Files/images/cirros-0.5.2-x86_64-disk.img" } ], "additionalArtifacts": [ { "artifactPath": - "Files/images/cirros-0.4.0-x86_64-disk.img", + "Files/images/cirros-0.5.2-x86_64-disk.img", "checksum": { "algorithm": "SHA-512", "hash": add_artifact_hash diff --git a/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py b/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py index 6d805dc20..9bd5e7d69 100644 --- a/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py +++ b/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py @@ -37,9 +37,15 @@ class VnfPackageTest(base.BaseTackerTest): VNF_PACKAGE_DELETE_TIMEOUT = 120 VNF_PACKAGE_UPLOAD_TIMEOUT = 300 + # The size of CSAR zip file used while verifying downloaded package. + # NOTE: It should be updated if some contents of packages under + # `tacker/tests/etc/samples` dir. + SIZE_CSAR_ZIP = 16389096 + def setUp(self): super(VnfPackageTest, self).setUp() self.base_url = "/vnfpkgm/v1/vnf_packages" + # Here we create and upload vnf package. Also get 'show' api response # as reference data for attribute filter tests self.package_id1 = self._create_and_upload_vnf("vnfpkgm1") @@ -437,7 +443,8 @@ class VnfPackageTest(base.BaseTackerTest): id=self.package_id1, base_path=self.base_url), "GET", body={}, headers={}) self.assertEqual(200, response[0].status_code) - self.assertEqual('12804584', response[0].headers['Content-Length']) + self.assertEqual( + str(self.SIZE_CSAR_ZIP), response[0].headers['Content-Length']) def test_fetch_vnf_package_content_combined_download(self): """Combine two partial downloads using 'Range' requests for csar zip""" @@ -458,7 +465,7 @@ class VnfPackageTest(base.BaseTackerTest): zipf.writestr(file_path, data) # Partial download 2 - range_ = 'bytes=11-12804584' + range_ = 'bytes=11-{}'.format(self.SIZE_CSAR_ZIP) headers = {'Range': range_} response_2 = self.http_client.do_request( '{base_path}/{id}/package_content'.format( @@ -471,7 +478,7 @@ class VnfPackageTest(base.BaseTackerTest): size_2 = int(response_2[0].headers['Content-Length']) total_size = size_1 + size_2 self.assertEqual(True, zipfile.is_zipfile(zip_file_path)) - self.assertEqual(12804584, total_size) + self.assertEqual(self.SIZE_CSAR_ZIP, total_size) zip_file_path.close() def test_fetch_vnf_package_artifacts(self): diff --git a/tacker/tests/functional/sol_separated_nfvo/vnflcm/fake_vnfpkgm.py b/tacker/tests/functional/sol_separated_nfvo/vnflcm/fake_vnfpkgm.py index 6f94a8516..7cde7871e 100644 --- a/tacker/tests/functional/sol_separated_nfvo/vnflcm/fake_vnfpkgm.py +++ b/tacker/tests/functional/sol_separated_nfvo/vnflcm/fake_vnfpkgm.py @@ -51,9 +51,9 @@ class VnfPackage: "softwareImages": [ { "id": "sw_image", - "name": "cirros-0.4.0-x86_64-disk", + "name": "cirros-0.5.2-x86_64-disk", "provider": "Company", - "version": "0.4.0", + "version": "0.5.2", "checksum": { "algorithm": "SHA-512", "hash": sw_image_hash @@ -67,13 +67,13 @@ class VnfPackage: "userMetadata": { "key": "value" }, - "imagePath": "Files/images/cirros-0.4.0-x86_64-disk.img" + "imagePath": "Files/images/cirros-0.5.2-x86_64-disk.img" } ], "additionalArtifacts": [ { "artifactPath": - "Files/images/cirros-0.4.0-x86_64-disk.img", + "Files/images/cirros-0.5.2-x86_64-disk.img", "checksum": { "algorithm": "SHA-512", "hash": add_artifact_hash diff --git a/tacker/tests/unit/vnflcm/fakes.py b/tacker/tests/unit/vnflcm/fakes.py index 6ba84e435..24b07c0e8 100644 --- a/tacker/tests/unit/vnflcm/fakes.py +++ b/tacker/tests/unit/vnflcm/fakes.py @@ -1118,7 +1118,7 @@ def vnf_dict(): ' size_of_storage: 1 GB\n' + \ ' rdma_enabled: true\n sw_image_data:\n' + \ ' name: VirtualStorage\n' + \ - ' version: \'0.4.0\'\n checksum:\n' + \ + ' version: \'0.5.2\'\n checksum:\n' + \ ' algorithm: sha-512\n' + \ ' hash: 6513f21e44aa3da349f248188a44bc304a3' + \ '653a04122d8fb4535423c8e1d14cd6a153f735bb0982e2161b5b5' + \ diff --git a/tacker/tests/unit/vnflcm/test_utils.py b/tacker/tests/unit/vnflcm/test_utils.py index 1626ae81f..b0f729646 100644 --- a/tacker/tests/unit/vnflcm/test_utils.py +++ b/tacker/tests/unit/vnflcm/test_utils.py @@ -28,12 +28,12 @@ from tacker.vnflcm import utils as vnflcm_utils class VnfLcmUtilsTestCase(base.TestCase): @ddt.data( - {'image_path': 'cirros-0.4.0-x86_64-disk.img', - 'extracted_path': 'cirros-0.4.0-x86_64-disk.img'}, - {'image_path': '../ImageFiles/image/cirros-0.4.0-x86_64-disk.img', - 'extracted_path': 'ImageFiles/image/cirros-0.4.0-x86_64-disk.img'}, - {'image_path': '../../Files/image/cirros-0.4.0-x86_64-disk.img', - 'extracted_path': 'Files/image/cirros-0.4.0-x86_64-disk.img'} + {'image_path': 'cirros-0.5.2-x86_64-disk.img', + 'extracted_path': 'cirros-0.5.2-x86_64-disk.img'}, + {'image_path': '../ImageFiles/image/cirros-0.5.2-x86_64-disk.img', + 'extracted_path': 'ImageFiles/image/cirros-0.5.2-x86_64-disk.img'}, + {'image_path': '../../Files/image/cirros-0.5.2-x86_64-disk.img', + 'extracted_path': 'Files/image/cirros-0.5.2-x86_64-disk.img'} ) @ddt.unpack def test_create_grant_request_with_software_image_path(self, image_path, diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca.yaml index 494c05ebf..85f5430b5 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca.yaml @@ -20,10 +20,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -31,7 +31,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_translator_error.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_translator_error.yaml index 45bf5bef6..8b65955ff 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_translator_error.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_translator_error.yaml @@ -20,10 +20,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -31,7 +31,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_params_error.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_params_error.yaml index 93d00e73a..7248264a0 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_params_error.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_params_error.yaml @@ -102,10 +102,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -113,7 +113,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_scaling.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_scaling.yaml index d657378e7..4416ca946 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_scaling.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_scaling.yaml @@ -20,10 +20,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -31,7 +31,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_scaling_invalid_inst_req.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_scaling_invalid_inst_req.yaml index b4442a8b0..09d6a70f3 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_scaling_invalid_inst_req.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_scaling_invalid_inst_req.yaml @@ -20,10 +20,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -31,7 +31,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_substitution_mappings_error.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_substitution_mappings_error.yaml index 93d00e73a..7248264a0 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_substitution_mappings_error.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_with_substitution_mappings_error.yaml @@ -102,10 +102,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -113,7 +113,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_vnfd.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_vnfd.yaml index 4f6bc7905..e22609fd9 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_vnfd.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_vnfd.yaml @@ -20,10 +20,10 @@ topology_template: max_number_of_instances: 1 sw_image_data: name: Software of VDU1 - version: '0.4.0' + version: '0.5.2' checksum: algorithm: sha-256 - hash: b9c3036539fd7a5f87a1bf38eb05fdde8b556a1a7e664dbeda90ed3cd74b4f9d + hash: 932fcae93574e242dc3d772d5235061747dfe537668443a1f0567d893614b464 container_format: bare disk_format: qcow2 min_disk: 1 GiB @@ -31,7 +31,7 @@ topology_template: artifacts: sw_image: type: tosca.artifacts.nfv.SwImage - file: Files/images/cirros-0.4.0-x86_64-disk.img + file: Files/images/cirros-0.5.2-x86_64-disk.img capabilities: virtual_compute: properties: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml index ce5301be9..09126ce1a 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml @@ -12,7 +12,7 @@ resources: config_drive: false networks: - port: { get_resource: CP1 } - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny metadata: {metering.server_group: SG1-2e3261d9-14} VL1: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml index 3f6828bbf..9839fa092 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt.yaml index 32d130876..c71d61908 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt.yaml @@ -11,7 +11,7 @@ resources: availability_zone: nova config_drive: true flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk metadata: {param0: key0, param1: key1} networks: - port: {get_resource: vdu1-net_mgmt-port} diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml index be315cc2e..f17788c44 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk metadata: {param0: key0, param1: key1} networks: - port: {get_resource: vdu1-net_mgmt-port} diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_params.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_params.yaml index f6c832f76..332822686 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_params.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk key_name: keyName metadata: {param0: key0, param1: key1} networks: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_affinity.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_affinity.yaml index 8e5ca112a..a8d71febe 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_affinity.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_affinity.yaml @@ -17,7 +17,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP1} scheduler_hints: @@ -29,7 +29,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP2} scheduler_hints: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_anti_affinity.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_anti_affinity.yaml index a78d12e74..36431355c 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_anti_affinity.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_anti_affinity.yaml @@ -17,7 +17,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP1} scheduler_hints: @@ -29,7 +29,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP2} scheduler_hints: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_default_affinity.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_default_affinity.yaml index 8e5ca112a..a8d71febe 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_default_affinity.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_default_affinity.yaml @@ -17,7 +17,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP1} scheduler_hints: @@ -29,7 +29,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP2} scheduler_hints: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_soft_anti_affinity.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_soft_anti_affinity.yaml index ee4e1a902..310b4c782 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_soft_anti_affinity.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_placement_policy_soft_anti_affinity.yaml @@ -17,7 +17,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP1} scheduler_hints: @@ -29,7 +29,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP2} scheduler_hints: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_scale_custom.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_scale_custom.yaml index 8cd8df739..31636cb95 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_scale_custom.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_scale_custom.yaml @@ -12,7 +12,7 @@ resources: config_drive: false networks: - port: { get_resource: CP1 } - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny VL1: type: OS::Neutron::Net diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml index fac1956d1..d069f4db9 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP1} user_data_format: SOFTWARE_CONFIG diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml index 2dc7d1d2a..241341c8a 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP1} user_data_format: SOFTWARE_CONFIG diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_artifacts_image_vnfd_params.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_artifacts_image_vnfd_params.yaml index 86c5e0378..2fd4faab4 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_artifacts_image_vnfd_params.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_artifacts_image_vnfd_params.yaml @@ -7,7 +7,7 @@ outputs: value: {get_attr: [CP1, fixed_ips, 0, ip_address]} parameters: image_source: - default: http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img + default: http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img description: Image source for the server type: string resources: diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_monitoring_multi_vdu.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_monitoring_multi_vdu.yaml index 7c9c3c003..351b7431a 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_monitoring_multi_vdu.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_monitoring_multi_vdu.yaml @@ -17,7 +17,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP1} user_data_format: SOFTWARE_CONFIG @@ -32,7 +32,7 @@ resources: availability_zone: nova config_drive: false flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk networks: - port: {get_resource: CP2} user_data_format: SOFTWARE_CONFIG diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test-tosca-vnfd-existing-block-storage.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test-tosca-vnfd-existing-block-storage.yaml index e6e2533ae..e371fc83b 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test-tosca-vnfd-existing-block-storage.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test-tosca-vnfd-existing-block-storage.yaml @@ -22,7 +22,7 @@ topology_template: disk_size: 1 GB properties: name: test-vdu-block-storage - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca-vnfd-instance-reservation.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca-vnfd-instance-reservation.yaml index 9f817dc51..137ad1d70 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca-vnfd-instance-reservation.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca-vnfd-instance-reservation.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: 'cde27e47-1c88-4bb7-a64e-8d7c69014e4f' reservation_metadata: resource_type: 'virtual_instance' diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_multi_actions.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_multi_actions.yaml index 380bbd01b..bb243bb8b 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_multi_actions.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_multi_actions.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: VDU1-2e3261d9-1} diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml index 0ce083c33..7c3cef168 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: VDU1-2e3261d9-1} diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml index 2f02635c7..24aae263f 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: SG1-2e3261d9-14} diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml index c7459793d..7aaf1621b 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml index 1a4fefeea..88ee59fe2 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.server_group: VDU1-2e3261d9-1} diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml index 96dcb2b74..da9628ec8 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml +++ b/tacker/tests/unit/vnfm/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.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova flavor: m1.tiny diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_block_storage.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_block_storage.yaml index 0619a1194..00c3c1db7 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_block_storage.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_block_storage.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk availability_zone: nova mgmt_driver: noop config: | @@ -39,7 +39,7 @@ topology_template: type: tosca.nodes.BlockStorage.Tacker properties: size: 1 GB - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk CB1: type: tosca.nodes.BlockStorageAttachment diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_monitoring_multi_vdu.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_monitoring_multi_vdu.yaml index e7302711d..32c005ac5 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_monitoring_multi_vdu.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_monitoring_multi_vdu.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -40,7 +40,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_affinity.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_affinity.yaml index a8ff548bf..e94ab1b91 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_affinity.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_affinity.yaml @@ -10,7 +10,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova @@ -29,7 +29,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_anti_affinity.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_anti_affinity.yaml index dbe85aaa3..38604185d 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_anti_affinity.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_anti_affinity.yaml @@ -10,7 +10,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova @@ -29,7 +29,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_default_affinity.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_default_affinity.yaml index eab6a0e3a..5ce100795 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_default_affinity.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_default_affinity.yaml @@ -10,7 +10,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova @@ -29,7 +29,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_soft_anti_affinity.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_soft_anti_affinity.yaml index 124859c70..ac9ffbe64 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_soft_anti_affinity.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_placement_policy_soft_anti_affinity.yaml @@ -10,7 +10,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova @@ -29,7 +29,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: flavor: m1.tiny - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml index e8318fd2f..ba150ca25 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.4.0-x86_64-disk + image: cirros-0.5.2-x86_64-disk mgmt_driver: noop availability_zone: nova flavor: m1.tiny diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/fixture_data/fixture_data_utils.py b/tacker/tests/unit/vnfm/infra_drivers/openstack/fixture_data/fixture_data_utils.py index d80413aff..7e523a022 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/fixture_data/fixture_data_utils.py +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/fixture_data/fixture_data_utils.py @@ -313,8 +313,8 @@ def get_vnf_instantiated_info(flavour_id='simple', def get_vnf_software_image_object(image_path=None): - image_path = image_path or ("http://download.cirros-cloud.net/0.4.0/" - "cirros-0.4.0-x86_64-disk.img") + image_path = image_path or ("http://download.cirros-cloud.net/0.5.2/" + "cirros-0.5.2-x86_64-disk.img") vnf_software_image = objects.VnfSoftwareImage( name='test-image', image_path=image_path, min_disk=10, min_ram=4, disk_format="qcow2", @@ -500,10 +500,10 @@ def get_original_stack_param(): 'VDU1': {'flavor': 'm1.tiny', 'image': 'None'}, 'VirtualStorage': { 'flavor': 'None', - 'image': 'cirros-0.4.0-x86_64-disk'}, + 'image': 'cirros-0.5.2-x86_64-disk'}, 'VDU2': { 'flavor': 'm1.tiny', - 'image': 'cirros-0.4.0-x86_64-disk'}}, + 'image': 'cirros-0.5.2-x86_64-disk'}}, 'CP': { 'VDU1_CP1': { 'network': 'nw-resource-id-1', @@ -528,10 +528,10 @@ def get_expect_stack_param(): 'VDU1': {'flavor': 'm1.tiny', 'image': 'None'}, 'VirtualStorage': { 'flavor': 'None', - 'image': 'cirros-0.4.0-x86_64-disk'}, + 'image': 'cirros-0.5.2-x86_64-disk'}, 'VDU2': { 'flavor': 'm1.tiny', - 'image': 'cirros-0.4.0-x86_64-disk'}}, + 'image': 'cirros-0.5.2-x86_64-disk'}}, 'CP': { 'VDU1_CP1': { 'network': 'nw-resource-id-1', diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py b/tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py index 78ec79c42..8f2853bd0 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py @@ -48,7 +48,7 @@ vnf_dict = { 'properties': { 'user_data_format': 'SOFTWARE_CONFIG', 'availability_zone': 'nova', - 'image': 'cirros-0.4.0-x86_64-disk', + 'image': 'cirros-0.5.2-x86_64-disk', 'config_drive': False, 'flavor': {'get_resource': 'VDU1_flavor'}, 'networks': [{'port': {'get_resource': 'CP1'}}] @@ -528,7 +528,7 @@ class TestOpenStack(base.TestCase): def test_tosca_artifacts_image_params(self): input_params = 'image_source: ' \ 'http://download.cirros-cloud.net/' \ - '0.4.0/cirros-0.4.0-x86_64-disk.img' + '0.5.2/cirros-0.5.2-x86_64-disk.img' self._test_assert_equal_for_tosca_templates( 'tosca_artifacts_image_vnfd_params.yaml', 'hot_tosca_artifacts_image_vnfd_params.yaml', diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/test_vdu.py b/tacker/tests/unit/vnfm/infra_drivers/openstack/test_vdu.py index 23aaba18f..5044f4a18 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/test_vdu.py +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/test_vdu.py @@ -42,7 +42,7 @@ vnf_dict = { 'properties': { 'user_data_format': 'SOFTWARE_CONFIG', 'availability_zone': 'nova', - 'image': 'cirros-0.4.0-x86_64-disk', + 'image': 'cirros-0.5.2-x86_64-disk', 'config_drive': False, 'flavor': {'get_resource': 'VDU1_flavor'}, 'networks': [{'port': {'get_resource': 'CP1'}}] diff --git a/tacker/tests/unit/vnfm/test_plugin.py b/tacker/tests/unit/vnfm/test_plugin.py index 2eb9a5a35..d25d1a00c 100644 --- a/tacker/tests/unit/vnfm/test_plugin.py +++ b/tacker/tests/unit/vnfm/test_plugin.py @@ -499,7 +499,7 @@ class TestVNFMPlugin(db_base.SqlTestCase): self._insert_dummy_vnf_template() vnf_obj = utils.get_dummy_vnf_obj() vnf_obj['vnf']['attributes'] = {'param_values': - {'image_name': 'cirros-0.4.0-x86_64-disk', 'flavor': 'm1.tiny'}} + {'image_name': 'cirros-0.5.2-x86_64-disk', 'flavor': 'm1.tiny'}} result = self.vnfm_plugin.create_vnf(self.context, vnf_obj) self.assertIsNotNone(result) self.assertEqual(vnf_obj['vnf']['attributes']['param_values'], diff --git a/tacker/tests/unit/vnfm/tosca/test_utils.py b/tacker/tests/unit/vnfm/tosca/test_utils.py index 723ee44fd..eda8a522c 100644 --- a/tacker/tests/unit/vnfm/tosca/test_utils.py +++ b/tacker/tests/unit/vnfm/tosca/test_utils.py @@ -285,7 +285,7 @@ class TestToscaUtils(testtools.TestCase): expected_dict = { 'volumes': { 'VB1': { - 'image': 'cirros-0.4.0-x86_64-disk', + 'image': 'cirros-0.5.2-x86_64-disk', 'size': '1' } },