Update cirros to 0.4.0
Change-Id: Ie4ff403f803a16ca53c91c7d10d71ec80fbe1a9b
This commit is contained in:
parent
a7ba6d02aa
commit
f16ac7c79f
@ -29,7 +29,7 @@
|
||||
}
|
||||
},
|
||||
"properties": {
|
||||
"image": "cirros-0.3.5-x86_64-disk"
|
||||
"image": "cirros-0.4.0-x86_64-disk"
|
||||
}
|
||||
},
|
||||
"CP1": {
|
||||
|
@ -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"
|
||||
|
@ -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",
|
||||
|
@ -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",
|
||||
|
@ -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"
|
||||
|
@ -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": {
|
||||
|
@ -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
|
||||
|
||||
|
@ -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'
|
||||
|
||||
|
@ -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
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
@ -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: <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
|
||||
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
|
||||
|
@ -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: |
|
||||
|
@ -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:
|
||||
|
@ -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: |
|
||||
|
@ -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 |
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
4
releasenotes/notes/cirros-0.4.0-eb67919441885399.yaml
Normal file
4
releasenotes/notes/cirros-0.4.0-eb67919441885399.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
Change cirros image from 0.3.5 to 0.4.0.
|
@ -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"
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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: |
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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: |
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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',
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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: |
|
||||
|
@ -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: |
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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: |
|
||||
|
@ -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: |
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
|
||||
|
@ -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',
|
||||
|
@ -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
|
||||
|
@ -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: |
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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: |
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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'
|
||||
}
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user