openstack/tacker
Code Issues Proposed changes

Update version of cirros image to 0.5.2

Browse Source 
We've been using old cirros-0.4.0 for long time, and don't need to fix
the version of cirros to 0.4.0. This patch is update to the latest
0.5.2.

Most of the changes in this patch is replacing `image`, `hash` and
`version` in TOSCA definition files. The rest of them are:

* Replace images. First one is only an actual image, and rest of them
  are empty text files which is a trick for reducing total size in
  tacker repo. So, text files are not replaced, but renamed simply.
  * tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.5.2-x86_64-disk.img
  * samples/vnf_packages/Files/images/cirros-0.5.2-x86_64-disk.img
  * 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
  * tacker/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/images/cirros-0.5.2-x86_64-disk.img

* Update functional tests verifying images. A refactor of defining
  package size is included.

* Update devstack script, and helper scripts under `contrib` dir.

* Update API references and documents describing usage of the image.

Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>

Implements: blueprint update-cirros-052
Change-Id: I081b791dc986ab10f4845784b3e19dbb626e3cac
This commit is contained in:
Yasufumi Ogawa 2021-06-30 02:23:48 +00:00 committed by Hiromu Asahina
parent ab08a39618
commit ddf28104a3
213 changed files with 482 additions and 471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api-ref/source/v1/samples/vnf_packages/vnf-packages-list-response.json
View File

@ -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"

8
api-ref/source/v1/samples/vnf_packages/vnf-packages-show-response.json
View File

@ -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"

2
api-ref/source/v1/samples/vnfds/vnfds-create-request.json
View File

@ -29,7 +29,7 @@
}
},
"properties": {
"image": "cirros-0.4.0-x86_64-disk"
"image": "cirros-0.5.2-x86_64-disk"
}
},
"CP1": {

2
api-ref/source/v1/samples/vnfds/vnfds-create-response.json
View File

@ -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"

2
api-ref/source/v1/samples/vnfds/vnfds-list-response.json
View File

@ -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",

2
api-ref/source/v1/samples/vnfds/vnfds-show-response.json
View File

@ -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",

2
api-ref/source/v1/samples/vnfds/vnfds-update-response.json
View File

@ -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"

2
api-ref/source/v1/samples/vnflcm/fail-vnf-instance-response.json
View File

@ -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"

2
api-ref/source/v1/samples/vnfs/vnfs-inline-create-request.json
View File

@ -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": {

4
contrib/tacker-config/ns-config.sh
View File

@ -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

4
contrib/tacker-config/vnffg-config.sh
View File

@ -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

2
devstack/lib/tacker
View File

@ -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"

40
doc/source/cli/cli-legacy-vnf.rst
View File

@ -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 |
+--------------------------------------+-------------------------------------------------------+--------+--------------------------+--------------------------+---------+

6
doc/source/cli/cli-legacy-vnfd.rst
View File

@ -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" |

2
doc/source/cli/cli-legacy-vnffg.rst
View File

@ -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: |

8
doc/source/contributor/vnfd_template_description.rst
View File

@ -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
^^^^^^^^^^^^^^^^

6
doc/source/contributor/vnfd_template_parameterization.rst
View File

@ -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: <param_name>}. 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

2
doc/source/install/getting_started.rst
View File

@ -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: |

2
doc/source/reference/block_storage_usage_guide.rst
View File

@ -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: |

2
doc/source/reference/maintenance_usage_guide.rst
View File

@ -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:

4
doc/source/reference/mistral_workflows_usage_guide.rst
View File

@ -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 |

4
doc/source/reference/reservation_policy_usage_guide.rst
View File

@ -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 }

2
doc/source/user/alarm_monitoring_usage_guide.rst
View File

@ -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}

4
doc/source/user/vnffg_usage_guide.rst
View File

@ -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

4
doc/source/user/vnffg_usage_guide_advanced.rst
View File

@ -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

4
releasenotes/notes/cirros-0.5.2-51990bfb9ec72fc9.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Update cirros image from 0.4.0 to 0.5.2.

2
samples/mistral/workflows/input/create_vnfd.json
View File

@ -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"
}

4
samples/tosca-templates/nsd/sample-tosca-vnfd1.yaml
View File

@ -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

4
samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml
View File

@ -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

4
samples/tosca-templates/nsd/sample2-tosca-vnfd1.yaml
View File

@ -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

4
samples/tosca-templates/nsd/sample2-tosca-vnfd2.yaml
View File

@ -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

4
samples/tosca-templates/vnfd/tosca-placement-policy-anti-affinity.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-alarm-multi-actions.yaml
View File

@ -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}

2
samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml
View File

@ -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}

2
samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml
View File

@ -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}

4
samples/tosca-templates/vnfd/tosca-vnfd-block-attach.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml
View File

@ -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: |

2
samples/tosca-templates/vnfd/tosca-vnfd-host-reservation.yaml
View File

@ -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 }

2
samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-image.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-instance-reservation.yaml
View File

@ -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 }

2
samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml
View File

@ -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

6
samples/tosca-templates/vnfd/tosca-vnfd-monitor-multi-vdu.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml
View File

@ -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: |

2
samples/tosca-templates/vnfd/tosca-vnfd-monitoring-vdu-autoheal.yaml
View File

@ -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

6
samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-network.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml
View File

@ -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

4
samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml
View File

@ -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',

4
samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml
View File

@ -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

2
samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml
View File

@ -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: |

4
samples/tosca-templates/vnfd/tosca-vnfd-vip.yaml
View File

@ -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: |

2
samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_ip_address.yaml
View File

@ -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:

2
samples/tosca-templates/vnfd/tosca_vnfd_assign_fip_to_vdu_floating_network.yaml
View File

@ -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:

2
samples/tosca-templates/vnffg-nsd/tosca-vnfd1-sample.yaml
View File

@ -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

2
samples/tosca-templates/vnffg-nsd/tosca-vnfd2-sample.yaml
View File

@ -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

2
samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml
View File

@ -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: |

2
samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml
View File

@ -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: |

12
samples/vnf_packages/Definitions/helloworld3_df_simple.yaml
View File

@ -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

1
samples/vnf_packages/Files/images/cirros-0.4.0-x86_64-disk.img
View File

@ -1 +0,0 @@
../../../../tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.4.0-x86_64-disk.img

1
samples/vnf_packages/Files/images/cirros-0.5.2-x86_64-disk.img Symbolic link
View File

@ -0,0 +1 @@
../../../../tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.5.2-x86_64-disk.img

2
samples/vnf_packages/TOSCA-Metadata/TOSCA.meta
View File

@ -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

BIN
tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.4.0-x86_64-disk.img → tacker/tests/etc/samples/etsi/nfv/common/Files/images/cirros-0.5.2-x86_64-disk.img
View File

Binary file not shown.

12
tacker/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_df_simple.yaml
View File

@ -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

8
tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/Definitions/helloworld3_df_simple.yaml
View File

@ -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:

2
tacker/tests/etc/samples/etsi/nfv/csar_multiple_sw_image_data_with_short_notation/TOSCA-Metadata/TOSCA.meta
View File

@ -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

2
tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/Definitions/helloworld3_df_simple.yaml
View File

@ -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:

2
tacker/tests/etc/samples/etsi/nfv/csar_short_notation_for_artifacts_without_sw_image_data/TOSCA-Metadata/TOSCA.meta
View File

@ -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

6
tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_df_simple.yaml
View File

@ -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:

2
tacker/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/TOSCA-Metadata/TOSCA.meta
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_df_simple.yaml
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_df_simple.yaml
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_df_simple.yaml
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_df_simple.yaml
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_df_simple.yaml
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_df_simple.yaml
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_df_simple.yaml
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver2/Definitions/helloworld3_df_simple.yaml
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/refactor_mgmt_driver3/Definitions/helloworld3_df_simple.yaml
View File

@ -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

2
tacker/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/TOSCA-Metadata/TOSCA.meta
View File

@ -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

6
tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf
View File

@ -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
Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2

6
tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false/manifest.mf
View File

@ -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
Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2

6
tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false_hash/manifest.mf
View File

@ -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
Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2

12
tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml
View File

@ -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

6
tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.mf
View File

@ -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
Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2

12
tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml
View File

@ -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

6
tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_meta_in_manifest/manifest.mf
View File

@ -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
Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2

12
tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_df_simple.yaml
View File

@ -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

2
tacker/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/TOSCA-Metadata/TOSCA.meta
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml
View File

@ -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

12
tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_df_simple.yaml
View File

@ -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

2
tacker/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/TOSCA-Metadata/TOSCA.meta
View File

@ -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

2
tacker/tests/etc/samples/etsi/nfv/test_csar_utils_data/csar_with_missing_sw_image_data_in_main_template/Definitions/main_tosca.yaml
View File

@ -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:

Some files were not shown because too many files have changed in this diff Show More