openstack
/
tacker
Code Issues Proposed changes

Update cirros to 0.4.0 

Change-Id: Ie4ff403f803a16ca53c91c7d10d71ec80fbe1a9b
This commit is contained in:
Nguyen Hai 2018-07-24 15:52:21 +09:00
parent a7ba6d02aa
commit f16ac7c79f
94 changed files with 132 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@
} }
}, },
"properties": { "properties": {
"image": "cirros-0.3.5-x86_64-disk" "image": "cirros-0.4.0-x86_64-disk"
} }
}, },
"CP1": { "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", "created_at": "2016-10-20 07:38:54.600003",
"updated_at": null, "updated_at": null,
"attributes": { "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", "id": "0fb827e7-32b0-4e5b-b300-e1b1dce8a831",
"name": "vnfd-sample" "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", "created_at": "2016-10-20 07:38:54",
"updated_at": null, "updated_at": null,
"attributes": { "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", "id": "0fb827e7-32b0-4e5b-b300-e1b1dce8a831",
"name": "vnfd-sample", "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", "created_at": "2016-10-20 07:38:54",
"updated_at": null, "updated_at": null,
"attributes": { "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", "id": "0fb827e7-32b0-4e5b-b300-e1b1dce8a831",
"name": "vnfd-sample", "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", "created_at": "2016-10-20 07:38:54",
"updated_at": "2016-10-20 07:41:27.392759", "updated_at": "2016-10-20 07:41:27.392759",
"attributes": { "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", "id": "0fb827e7-32b0-4e5b-b300-e1b1dce8a831",
"name": "vnfd-sample-updated" "name": "vnfd-sample-updated"

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

@ -42,7 +42,7 @@
"num_cpus": 1, "num_cpus": 1,
"mem_size": "512 MB", "mem_size": "512 MB",
"disk_size": "1 GB"}}}, "disk_size": "1 GB"}}},
"properties": {"image": "cirros-0.3.5-x86_64-disk"}}, "properties": {"image": "cirros-0.4.0-x86_64-disk"}},
"CP1": { "CP1": {
"type": "tosca.nodes.nfv.CP.Tacker", "type": "tosca.nodes.nfv.CP.Tacker",
"properties": { "properties": {

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

@ -22,9 +22,9 @@ if [ -z "$network_id" ]; then
fi fi
echo "Creating HTTP client" 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" 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 sleep 15

2
devstack/lib/tacker
View File

@ -315,7 +315,7 @@ function openstack_image_create {
function tacker_check_and_download_images { function tacker_check_and_download_images {
local image_url 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 # 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' image_url[1]='https://anda.ssu.ac.kr/~openwrt/openwrt-x86-kvm_guest-combined-ext4.img.gz'

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

@ -81,7 +81,7 @@ availability zone can be described as:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
capabilities: capabilities:
nfv_compute: nfv_compute:
@ -101,7 +101,7 @@ OpenStack specific **flavors** can also be used to describe VDU configuration.
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
@ -173,8 +173,8 @@ the VDU with that image.
artifacts: artifacts:
VNFImage: VNFImage:
type: tosca.artifacts.Deployment.Image.VM type: tosca.artifacts.Deployment.Image.VM
file: http://download.cirros-cloud.net/0.3.5/ \ file: http://download.cirros-cloud.net/0.4.0/ \
cirros-0.3.5-x86_64-disk.img cirros-0.4.0-x86_64-disk.img
VDU Capabilities VDU Capabilities
^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^

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

@ -39,7 +39,7 @@ Here is the sample template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop 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 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 provided at deploy time with { get_input: <param_name>}. 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 **image: {get_input: image_name}**. The **get_input** is a reserved
keyword in the template that indicates value will be supplied at deploy time 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 for the parameter instance_type. The **image_name** is the variable that will
@ -236,7 +236,7 @@ VNF deploy.
.. code-block:: yaml .. code-block:: yaml
image_name: cirros-0.3.5-x86_64-disk image_name: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
zone: nova zone: nova
network: net_mgmt network: net_mgmt

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

@ -79,7 +79,7 @@ Onboarding sample VNF
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

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

@ -227,7 +227,7 @@ After installation, OpenStack administrator needs to:
in OpenStack. in OpenStack.
* Upload related images. Tacker repo's sample TOSCA templates are * 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. this image should uploaded into OpenStack before Tacker uses it.
In additions, following steps are needed: In additions, following steps are needed:

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

@ -84,7 +84,7 @@ With these additions, the new VNFD looks like below:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

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

@ -201,7 +201,7 @@ Verify VNFD details using tacker CLI
| Field | Value | | 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- | | 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: | | | 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 | | | 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: | | | 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 | | 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 | | 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: | | | 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: | | | 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 | | | 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/user/alarm_monitoring_usage_guide.rst
View File

@ -74,7 +74,7 @@ in Tacker:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: SG1} metadata: {metering.vnf: SG1}
@ -98,7 +98,7 @@ in Tacker:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: SG1} metadata: {metering.vnf: 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}') 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 --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 --nic net-id=$net_id http_server
Creating the VNFFGD 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 .. code-block:: console
$ net_id=$(openstack network list | grep net0 | awk '{print $2}') $ 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.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 --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_server
To get information about neutron ports of **http_client** and **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 that are used for classifying traffics, user can use openstack commands to

4
releasenotes/notes/cirros-0.4.0-eb67919441885399.yaml Normal file
View File

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

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

@ -2,7 +2,7 @@
"body":{ "body":{
"vnfd":{ "vnfd":{
"attributes":{ "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" "name":"tacker-create-vnfd"
} }

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

@ -30,7 +30,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -60,7 +60,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -16,7 +16,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -38,7 +38,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -19,7 +19,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -53,7 +53,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -19,7 +19,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -53,7 +53,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: VDU1} metadata: {metering.vnf: VDU1}

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

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: VDU1} metadata: {metering.vnf: VDU1}

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

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: SG1} metadata: {metering.vnf: SG1}
@ -39,7 +39,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: SG1} metadata: {metering.vnf: SG1}

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

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |
@ -39,7 +39,7 @@ topology_template:
type: tosca.nodes.BlockStorage.Tacker type: tosca.nodes.BlockStorage.Tacker
properties: properties:
size: 1 GB size: 1 GB
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
CB1: CB1:
type: tosca.nodes.BlockStorageAttachment 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_allocation:
cpu_affinity: dedicated cpu_affinity: dedicated
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
CP1: CP1:
type: tosca.nodes.nfv.CP.Tacker 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 mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

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

@ -17,7 +17,7 @@ topology_template:
num_cpus: 2 num_cpus: 2
mem_page_size: large mem_page_size: large
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
CP1: CP1:
type: tosca.nodes.nfv.CP.Tacker type: tosca.nodes.nfv.CP.Tacker

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

@ -24,7 +24,7 @@ topology_template:
artifacts: artifacts:
VNFImage: VNFImage:
type: tosca.artifacts.Deployment.Image.VM 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: CP1:
type: tosca.nodes.nfv.CP.Tacker type: tosca.nodes.nfv.CP.Tacker

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

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
key_name: userKey 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 mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
key_name: userKey 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 mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |
@ -70,7 +70,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -124,7 +124,7 @@ topology_template:
VDU3: VDU3:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

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

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |
@ -60,7 +60,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -104,7 +104,7 @@ topology_template:
VDU3: VDU3:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -10,7 +10,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -10,7 +10,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -17,7 +17,7 @@ topology_template:
num_cpus: 2 num_cpus: 2
numa_node_count: 2 numa_node_count: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
CP1: CP1:
type: tosca.nodes.nfv.CP.Tacker 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] vcpus: [2,3,4,5]
mem_size: 3072 mem_size: 3072
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova

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

@ -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', flavor: 'm1.tiny',
zone: 'nova', zone: 'nova',
network: 'net_mgmt', network: 'net_mgmt',

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

@ -10,7 +10,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
flavor: m1.tiny flavor: m1.tiny
@ -30,7 +30,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
flavor: m1.tiny flavor: m1.tiny

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

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
key_name: userKey key_name: userKey

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

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
config: | config: |
param0: key1 param0: key1
param1: key2 param1: key2

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

@ -20,7 +20,7 @@ topology_template:
thread_count: 2 thread_count: 2
core_count: 2 core_count: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
CP1: CP1:
type: tosca.nodes.nfv.CP.Tacker 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 disk_size: 1 GB
properties: properties:
name: {get_input : vdu-name} name: {get_input : vdu-name}
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

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

@ -18,7 +18,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |
@ -51,7 +51,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | 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 mem_size: 512 MB
num_cpus: 1 num_cpus: 1
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
CP1: 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 mem_size: 512 MB
num_cpus: 1 num_cpus: 1
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
CP1: CP1:

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

@ -23,7 +23,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -16,7 +16,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

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

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

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

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

2
tacker/tests/etc/samples/sample-tosca-alarm-respawn.yaml
View File

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: VDU1} metadata: {metering.vnf: VDU1}

2
tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml
View File

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: SG1} metadata: {metering.vnf: SG1}

2
tacker/tests/etc/samples/sample-tosca-scale-all.yaml
View File

@ -17,7 +17,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova

2
tacker/tests/etc/samples/sample-tosca-vnf-values.yaml
View File

@ -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', flavor: 'm1.tiny',
zone: 'nova', zone: 'nova',
network: 'net_mgmt', network: 'net_mgmt',

4
tacker/tests/etc/samples/sample-tosca-vnfd-block-storage.yaml
View File

@ -17,7 +17,7 @@ topology_template:
disk_size: 1 GB disk_size: 1 GB
properties: properties:
name: test-vdu-block-storage name: test-vdu-block-storage
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |
@ -41,7 +41,7 @@ topology_template:
type: tosca.nodes.BlockStorage.Tacker type: tosca.nodes.BlockStorage.Tacker
properties: properties:
size: 1 GB size: 1 GB
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
CB1: CB1:
type: tosca.nodes.BlockStorageAttachment type: tosca.nodes.BlockStorageAttachment

2
tacker/tests/etc/samples/sample-tosca-vnfd-flavor.yaml
View File

@ -16,7 +16,7 @@ topology_template:
disk_size: 1 GB disk_size: 1 GB
mem_size: 512 MB mem_size: 512 MB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

2
tacker/tests/etc/samples/sample-tosca-vnfd-image.yaml
View File

@ -19,7 +19,7 @@ topology_template:
artifacts: artifacts:
VNFImage_image_func: VNFImage_image_func:
type: tosca.artifacts.Deployment.Image.VM 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: CP1:
type: tosca.nodes.nfv.CP.Tacker type: tosca.nodes.nfv.CP.Tacker

4
tacker/tests/etc/samples/sample-tosca-vnfd-large-template.yaml
View File

@ -10,7 +10,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -70,7 +70,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

2
tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml
View File

@ -11,7 +11,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
config: | config: |
param0: key1 param0: key1

6
tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu-monitoring.yaml
View File

@ -10,7 +10,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -62,7 +62,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -108,7 +108,7 @@ topology_template:
VDU3: VDU3:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

6
tacker/tests/etc/samples/sample-tosca-vnfd-multi-vdu.yaml
View File

@ -10,7 +10,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -52,7 +52,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -94,7 +94,7 @@ topology_template:
VDU3: VDU3:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

2
tacker/tests/etc/samples/sample-tosca-vnfd-no-monitor.yaml
View File

@ -11,7 +11,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
config: | config: |
param0: key1 param0: key1

2
tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml
View File

@ -14,7 +14,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

2
tacker/tests/etc/samples/sample-tosca-vnfd.yaml
View File

@ -20,7 +20,7 @@ topology_template:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
name: {get_input : vdu-name} name: {get_input : vdu-name}
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
key_name: userKey key_name: userKey
availability_zone: nova availability_zone: nova

2
tacker/tests/etc/samples/sample_tosca_assign_floatingip_to_vdu.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 1 num_cpus: 1
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
CP1: CP1:

4
tacker/tests/etc/samples/test-ns-vnfd1.yaml
View File

@ -30,7 +30,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -60,7 +60,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

4
tacker/tests/etc/samples/test-ns-vnfd2.yaml
View File

@ -16,7 +16,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -38,7 +38,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

4
tacker/tests/etc/samples/test-nsd-vnfd1.yaml
View File

@ -30,7 +30,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -60,7 +60,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

4
tacker/tests/etc/samples/test-nsd-vnfd2.yaml
View File

@ -16,7 +16,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -38,7 +38,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

2
tacker/tests/etc/samples/tosca-ns-vnffg-vnfd1-sample.yaml
View File

@ -23,7 +23,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

2
tacker/tests/etc/samples/tosca-ns-vnffg-vnfd2-sample.yaml
View File

@ -16,7 +16,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

2
tacker/tests/functional/nfvo/test_nfvo.py
View File

@ -235,7 +235,7 @@ class NsdTestCreate(base.BaseTackerTest):
net_id = network['id'] net_id = network['id']
networks = [{'net-id': net_id}] networks = [{'net-id': net_id}]
img = self.glanceclient().images.list( 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', http_client = self.novaclient().servers.create(name='http_client',
image=img['id'], image=img['id'],
flavor=1, flavor=1,

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml
View File

@ -12,7 +12,7 @@ resources:
config_drive: false config_drive: false
networks: networks:
- port: { get_resource: CP1 } - port: { get_resource: CP1 }
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
metadata: {metering.vnf: SG1} metadata: {metering.vnf: SG1}
VL1: VL1:

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml
View File

@ -6,4 +6,4 @@ resources:
properties: properties:
config_drive: true config_drive: true
flavor: m1.tiny flavor: m1.tiny
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt.yaml
View File

@ -11,7 +11,7 @@ resources:
availability_zone: nova availability_zone: nova
config_drive: true config_drive: true
flavor: m1.tiny flavor: m1.tiny
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
metadata: {param0: key0, param1: key1} metadata: {param0: key0, param1: key1}
networks: networks:
- port: {get_resource: vdu1-net_mgmt-port} - port: {get_resource: vdu1-net_mgmt-port}

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml
View File

@ -11,7 +11,7 @@ resources:
availability_zone: nova availability_zone: nova
config_drive: true config_drive: true
flavor: m1.tiny flavor: m1.tiny
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
metadata: {param0: key0, param1: key1} metadata: {param0: key0, param1: key1}
networks: networks:
- port: {get_resource: vdu1-net_mgmt-port} - port: {get_resource: vdu1-net_mgmt-port}

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_params.yaml
View File

@ -11,7 +11,7 @@ resources:
availability_zone: nova availability_zone: nova
config_drive: true config_drive: true
flavor: m1.tiny flavor: m1.tiny
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
key_name: keyName key_name: keyName
metadata: {param0: key0, param1: key1} metadata: {param0: key0, param1: key1}
networks: networks:

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_scale_custom.yaml
View File

@ -12,7 +12,7 @@ resources:
config_drive: false config_drive: false
networks: networks:
- port: { get_resource: CP1 } - port: { get_resource: CP1 }
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
VL1: VL1:
type: OS::Neutron::Net type: OS::Neutron::Net

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml
View File

@ -14,7 +14,7 @@ resources:
availability_zone: nova availability_zone: nova
config_drive: false config_drive: false
flavor: {get_resource: VDU1_flavor} flavor: {get_resource: VDU1_flavor}
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
networks: networks:
- port: {get_resource: CP1} - port: {get_resource: CP1}
user_data_format: SOFTWARE_CONFIG user_data_format: SOFTWARE_CONFIG

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml
View File

@ -14,7 +14,7 @@ resources:
availability_zone: nova availability_zone: nova
config_drive: false config_drive: false
flavor: {get_resource: VDU1_flavor} flavor: {get_resource: VDU1_flavor}
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
networks: networks:
- port: {get_resource: CP1} - port: {get_resource: CP1}
user_data_format: SOFTWARE_CONFIG user_data_format: SOFTWARE_CONFIG

4
tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_monitoring_multi_vdu.yaml
View File

@ -17,7 +17,7 @@ resources:
availability_zone: nova availability_zone: nova
config_drive: false config_drive: false
flavor: m1.tiny flavor: m1.tiny
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
networks: networks:
- port: {get_resource: CP1} - port: {get_resource: CP1}
user_data_format: SOFTWARE_CONFIG user_data_format: SOFTWARE_CONFIG
@ -32,7 +32,7 @@ resources:
availability_zone: nova availability_zone: nova
config_drive: false config_drive: false
flavor: m1.tiny flavor: m1.tiny
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
networks: networks:
- port: {get_resource: CP2} - port: {get_resource: CP2}
user_data_format: SOFTWARE_CONFIG user_data_format: SOFTWARE_CONFIG

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_multi_actions.yaml
View File

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: VDU1} metadata: {metering.vnf: VDU1}

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml
View File

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: VDU1} metadata: {metering.vnf: VDU1}

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml
View File

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: SG1} metadata: {metering.vnf: SG1}

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml
View File

@ -18,7 +18,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml
View File

@ -15,7 +15,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: VDU1} metadata: {metering.vnf: VDU1}

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml
View File

@ -10,7 +10,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
flavor: m1.tiny flavor: m1.tiny

4
tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_block_storage.yaml
View File

@ -16,7 +16,7 @@ topology_template:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |
@ -39,7 +39,7 @@ topology_template:
type: tosca.nodes.BlockStorage.Tacker type: tosca.nodes.BlockStorage.Tacker
properties: properties:
size: 1 GB size: 1 GB
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
CB1: CB1:
type: tosca.nodes.BlockStorageAttachment type: tosca.nodes.BlockStorageAttachment

4
tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_monitoring_multi_vdu.yaml
View File

@ -10,7 +10,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -40,7 +40,7 @@ topology_template:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

2
tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml
View File

@ -10,7 +10,7 @@ topology_template:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.5-x86_64-disk image: cirros-0.4.0-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
flavor: m1.tiny flavor: m1.tiny

2
tacker/tests/unit/vnfm/tosca/test_utils.py
View File

@ -253,7 +253,7 @@ class TestToscaUtils(testtools.TestCase):
expected_dict = { expected_dict = {
'volumes': { 'volumes': {
'VB1': { 'VB1': {
'image': 'cirros-0.3.5-x86_64-disk', 'image': 'cirros-0.4.0-x86_64-disk',
'size': '1' 'size': '1'
} }
}, },