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 9957e5a36..209777396 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.3.5-x86_64-disk" + "image": "cirros-0.4.0-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 8da93da79..eabed17ba 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.3.5-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.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" }, "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 42651e3a2..1515f3cd9 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.3.5-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.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" }, "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 7a245801c..5cc9662c3 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.3.5-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.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" }, "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 c436d7c7c..1ea70c802 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.3.5-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.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" }, "id": "0fb827e7-32b0-4e5b-b300-e1b1dce8a831", "name": "vnfd-sample-updated" 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 68fb5f3e4..eac1e9784 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.3.5-x86_64-disk"}}, + "properties": {"image": "cirros-0.4.0-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 7a25b6f65..456caf105 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.3.5-x86_64-disk --nic net-id=$network_id http_client +openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk --nic net-id=$network_id http_client echo "Creating HTTP server" -openstack server create --flavor m1.tiny --image cirros-0.3.5-x86_64-disk --nic net-id=$network_id http_server +openstack server create --flavor m1.tiny --image cirros-0.4.0-x86_64-disk --nic net-id=$network_id http_server sleep 15 diff --git a/devstack/lib/tacker b/devstack/lib/tacker index 788c5233b..aeacb6852 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -315,7 +315,7 @@ function openstack_image_create { function tacker_check_and_download_images { local image_url - image_url[0]='http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img' + image_url[0]='http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img' # Customized image of OpenWRT 15.05.1 that can fix the continuously respawning OpenWRT-based VNFs image_url[1]='https://anda.ssu.ac.kr/~openwrt/openwrt-x86-kvm_guest-combined-ext4.img.gz' diff --git a/doc/source/contributor/vnfd_template_description.rst b/doc/source/contributor/vnfd_template_description.rst index 273e7518b..e02593566 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova @@ -173,8 +173,8 @@ the VDU with that image. artifacts: VNFImage: type: tosca.artifacts.Deployment.Image.VM - file: http://download.cirros-cloud.net/0.3.5/ \ - cirros-0.3.5-x86_64-disk.img + file: http://download.cirros-cloud.net/0.4.0/ \ + cirros-0.4.0-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 5916d0d59..134d44a9d 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk** would now be replaced as: +instance_type: **cirros-0.4.0-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.3.5-x86_64-disk + image_name: cirros-0.4.0-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 78f629fc4..efc30fc9d 100644 --- a/doc/source/install/getting_started.rst +++ b/doc/source/install/getting_started.rst @@ -79,7 +79,7 @@ Onboarding sample VNF mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/doc/source/install/openstack_vim_installation.rst b/doc/source/install/openstack_vim_installation.rst index 1a5942cee..b5bf1e4aa 100644 --- a/doc/source/install/openstack_vim_installation.rst +++ b/doc/source/install/openstack_vim_installation.rst @@ -227,7 +227,7 @@ After installation, OpenStack administrator needs to: in OpenStack. * Upload related images. Tacker repo's sample TOSCA templates are - referring to cirros image named 'cirros-0.3.5-x86_64-disk', so + referring to cirros image named 'cirros-0.4.0-x86_64-disk', so this image should uploaded into OpenStack before Tacker uses it. In additions, following steps are needed: diff --git a/doc/source/reference/block_storage_usage_guide.rst b/doc/source/reference/block_storage_usage_guide.rst index 4fb56f824..f9749cf5d 100644 --- a/doc/source/reference/block_storage_usage_guide.rst +++ b/doc/source/reference/block_storage_usage_guide.rst @@ -84,7 +84,7 @@ With these additions, the new VNFD looks like below: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/doc/source/reference/mistral_workflows_usage_guide.rst b/doc/source/reference/mistral_workflows_usage_guide.rst index f4c1b832d..cc6d3f304 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 tacker 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.3.5-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.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: | @@ -288,7 +288,7 @@ Verify VNF details using tacker 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.3.5-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.4.0-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/user/alarm_monitoring_usage_guide.rst b/doc/source/user/alarm_monitoring_usage_guide.rst index 3325ecde2..bd3ad4fd6 100644 --- a/doc/source/user/alarm_monitoring_usage_guide.rst +++ b/doc/source/user/alarm_monitoring_usage_guide.rst @@ -74,7 +74,7 @@ in Tacker: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: SG1} @@ -98,7 +98,7 @@ in Tacker: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: SG1} diff --git a/doc/source/user/vnffg_usage_guide.rst b/doc/source/user/vnffg_usage_guide.rst index 7fd02adbb..8a15389f6 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.3.5-x86_64-disk \ + 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.3.5-x86_64-disk \ + openstack server create --flavor m1.tiny --image cirros-0.4.0-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 5ecb61b20..d974226b8 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.3.5-x86_64-disk --nic net-id=$net_id http_client - $ openstack server create --flavor m1.tiny --image cirros-0.3.5-x86_64-disk --nic net-id=$net_id http_server + $ 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 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.4.0-eb67919441885399.yaml b/releasenotes/notes/cirros-0.4.0-eb67919441885399.yaml new file mode 100644 index 000000000..a728d1f4e --- /dev/null +++ b/releasenotes/notes/cirros-0.4.0-eb67919441885399.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Change cirros image from 0.3.5 to 0.4.0. diff --git a/samples/mistral/workflows/input/create_vnfd.json b/samples/mistral/workflows/input/create_vnfd.json index a093d7343..be462d873 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.3.5-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.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" }, "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 7fb07a3d5..c720f3e35 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -60,7 +60,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 6743073d7..d7606c507 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -38,7 +38,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 ef9f0d24a..5ec56be96 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -53,7 +53,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 b3b209876..6110801e1 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -53,7 +53,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop 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 d9aba386c..ba2c5d7d8 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml index 0ce963462..3543950e9 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml index d612ce275..51e729a99 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: SG1} @@ -39,7 +39,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: SG1} diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-block-attach.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-block-attach.yaml index c4b080cb0..0619a1194 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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 fe2b77b03..89b71a034 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.3.5-x86_64-disk + image: cirros-0.4.0-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 368a9882a..ece0d3130 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml index 7fbb7f12b..7533b64bf 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.3.5-x86_64-disk + image: cirros-0.4.0-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 2be666bea..636defb4b 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.3.5/cirros-0.3.5-x86_64-disk.tar.gz + file: http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml index d5d4ef7bf..ff98c92af 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.3.5-x86_64-disk + image: cirros-0.4.0-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 bd7568b4c..e6a614532 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.3.5-x86_64-disk + image: cirros-0.4.0-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 f6d1354f9..bce4152a5 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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 952f18758..fa69369e1 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml index e04037a99..6b2dd2753 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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 401f3f516..17a5d4b7c 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.3.5-x86_64-disk + image: cirros-0.4.0-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 47153af1a..339330d47 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.3.5-x86_64-disk + image: cirros-0.4.0-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 90c76d1a7..cfee1b9c4 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.3.5-x86_64-disk + image: cirros-0.4.0-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 a388a1fc8..6ca78ee1e 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.3.5-x86_64-disk + image: cirros-0.4.0-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 a8600c28c..7b0f14e54 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml @@ -1,5 +1,5 @@ { - image_name: 'cirros-0.3.5-x86_64-disk', + image_name: 'cirros-0.4.0-x86_64-disk', 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 bb760a80d..10881f523 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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 0575cd855..b6658086d 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.3.5-x86_64-disk + image: cirros-0.4.0-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 0c82b4ad6..aefc2cd01 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.3.5-x86_64-disk + image: cirros-0.4.0-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 d13cca415..071341368 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.3.5-x86_64-disk + image: cirros-0.4.0-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 ace169f92..fad48ac15 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.3.5-x86_64-disk + image: cirros-0.4.0-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 87a3af756..153602600 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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 16922ff17..0c144f3ef 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.3.5-x86_64-disk + image: cirros-0.4.0-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 70594adb1..7d7de510e 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.3.5-x86_64-disk + image: cirros-0.4.0-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 3d8befecf..9c89f316e 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.3.5-x86_64-disk + image: cirros-0.4.0-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 3e62e4717..6be0d3455 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.3.5-x86_64-disk + image: cirros-0.4.0-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 5fc0b709c..560e2ed5a 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.3.5-x86_64-disk + image: cirros-0.4.0-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 49dc80899..f85968110 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml b/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml index 0ce963462..3543950e9 100644 --- a/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml +++ b/tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} diff --git a/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml b/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml index 72b1aa5de..c08307845 100644 --- a/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml +++ b/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: SG1} diff --git a/tacker/tests/etc/samples/sample-tosca-scale-all.yaml b/tacker/tests/etc/samples/sample-tosca-scale-all.yaml index a0e470ea0..f0f7bbfe9 100644 --- a/tacker/tests/etc/samples/sample-tosca-scale-all.yaml +++ b/tacker/tests/etc/samples/sample-tosca-scale-all.yaml @@ -17,7 +17,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml b/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml index a8600c28c..7b0f14e54 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnf-values.yaml @@ -1,5 +1,5 @@ { - image_name: 'cirros-0.3.5-x86_64-disk', + image_name: 'cirros-0.4.0-x86_64-disk', flavor: 'm1.tiny', zone: 'nova', network: 'net_mgmt', 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 951065bed..4b4a4e7fe 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk CB1: type: tosca.nodes.BlockStorageAttachment diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml index 95f10c2f3..685a0f12a 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml @@ -16,7 +16,7 @@ topology_template: disk_size: 1 GB mem_size: 512 MB properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 f3eb2bdb0..ca1c1c487 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-image.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-image.yaml @@ -19,7 +19,7 @@ topology_template: artifacts: VNFImage_image_func: type: tosca.artifacts.Deployment.Image.VM - file: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img + file: http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-large-template.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-large-template.yaml index e6d3c3a40..d80656ed6 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-large-template.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-large-template.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -70,7 +70,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml index 507bd64eb..18a554068 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml @@ -11,7 +11,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny config: | param0: key1 diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring.yaml index 097d0c4fc..24cecc567 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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 da419185d..d1da82a0b 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -52,7 +52,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop @@ -94,7 +94,7 @@ topology_template: VDU3: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 9e97d18af..f48243beb 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-no-monitor.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-no-monitor.yaml @@ -11,7 +11,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny config: | param0: key1 diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml index d2b893512..1e373d76d 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml @@ -14,7 +14,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 022e01100..5cd52a906 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd.yaml @@ -20,7 +20,7 @@ topology_template: type: tosca.nodes.nfv.VDU.Tacker properties: name: {get_input : vdu-name} - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 d117788e4..4fce1c048 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop CP1: diff --git a/tacker/tests/etc/samples/test-ns-vnfd1.yaml b/tacker/tests/etc/samples/test-ns-vnfd1.yaml index 25c730754..c04c5ce20 100644 --- a/tacker/tests/etc/samples/test-ns-vnfd1.yaml +++ b/tacker/tests/etc/samples/test-ns-vnfd1.yaml @@ -30,7 +30,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -60,7 +60,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 6743073d7..d7606c507 100644 --- a/tacker/tests/etc/samples/test-ns-vnfd2.yaml +++ b/tacker/tests/etc/samples/test-ns-vnfd2.yaml @@ -16,7 +16,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -38,7 +38,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 25c730754..c04c5ce20 100644 --- a/tacker/tests/etc/samples/test-nsd-vnfd1.yaml +++ b/tacker/tests/etc/samples/test-nsd-vnfd1.yaml @@ -30,7 +30,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -60,7 +60,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 6743073d7..d7606c507 100644 --- a/tacker/tests/etc/samples/test-nsd-vnfd2.yaml +++ b/tacker/tests/etc/samples/test-nsd-vnfd2.yaml @@ -16,7 +16,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop @@ -38,7 +38,7 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.5-x86_64-disk + image: cirros-0.4.0-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 3d8befecf..9c89f316e 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.3.5-x86_64-disk + image: cirros-0.4.0-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 3e62e4717..6be0d3455 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/tacker/tests/functional/nfvo/test_nfvo.py b/tacker/tests/functional/nfvo/test_nfvo.py index 7c3e64053..dd9f35fb0 100644 --- a/tacker/tests/functional/nfvo/test_nfvo.py +++ b/tacker/tests/functional/nfvo/test_nfvo.py @@ -235,7 +235,7 @@ class NsdTestCreate(base.BaseTackerTest): net_id = network['id'] networks = [{'net-id': net_id}] img = self.glanceclient().images.list( - name='cirros-0.3.5-x86_64-disk').next() + name='cirros-0.4.0-x86_64-disk').next() http_client = self.novaclient().servers.create(name='http_client', image=img['id'], flavor=1, 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 1ef6252bf..23e0e60bd 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny metadata: {metering.vnf: SG1} 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 f0dd37c0d..3f6828bbf 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.3.5-x86_64-disk + image: cirros-0.4.0-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 03a809c00..32d130876 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.3.5-x86_64-disk + image: cirros-0.4.0-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 3add0b4a9..be315cc2e 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.3.5-x86_64-disk + image: cirros-0.4.0-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 9f170cc52..f6c832f76 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk key_name: keyName metadata: {param0: key0, param1: key1} networks: 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 f51f4e467..f0a26d745 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.3.5-x86_64-disk + image: cirros-0.4.0-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 0c6eadde8..1a93739b3 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.3.5-x86_64-disk + image: cirros-0.4.0-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 7c5752f59..2be8fd8a2 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.3.5-x86_64-disk + image: cirros-0.4.0-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_monitoring_multi_vdu.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_monitoring_multi_vdu.yaml index 3a668b38e..7c9c3c003 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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_alarm_multi_actions.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_multi_actions.yaml index bdd3d64d6..9f2e31a3f 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} 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 0ce963462..3543950e9 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} 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 7b3508d15..0be3c3393 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: SG1} 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 8c55f2857..14f244f8f 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.3.5-x86_64-disk + image: cirros-0.4.0-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 734dc6e2b..c1b192a22 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} 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 a3ea6fdc0..dbecca75d 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.3.5-x86_64-disk + image: cirros-0.4.0-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 c4b080cb0..0619a1194 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-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 b6ef0ed81..e7302711d 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.3.5-x86_64-disk + image: cirros-0.4.0-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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop 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 7e9e8f256..b89b7b5cb 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.3.5-x86_64-disk + image: cirros-0.4.0-x86_64-disk mgmt_driver: noop availability_zone: nova flavor: m1.tiny diff --git a/tacker/tests/unit/vnfm/tosca/test_utils.py b/tacker/tests/unit/vnfm/tosca/test_utils.py index a1949943f..542325e17 100644 --- a/tacker/tests/unit/vnfm/tosca/test_utils.py +++ b/tacker/tests/unit/vnfm/tosca/test_utils.py @@ -253,7 +253,7 @@ class TestToscaUtils(testtools.TestCase): expected_dict = { 'volumes': { 'VB1': { - 'image': 'cirros-0.3.5-x86_64-disk', + 'image': 'cirros-0.4.0-x86_64-disk', 'size': '1' } },