openstack
/
tacker
Code Issues Proposed changes

move the left cirros 3.4 into 3.5 disk image 

Change-Id: Iac12c44e9bc83d96b81d642a9eaa044415759914
Closes-Bug: #1671982
This commit is contained in:
yong sheng gong 2017-03-22 19:56:13 +08:00 committed by gong yong sheng
parent d185a03707
commit 8166b1a8a5
13 changed files with 24 additions and 24 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.4-x86_64-uec" "image": "cirros-0.3.5-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.4-x86_64-uec}\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.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"
}, },
"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.4-x86_64-uec}\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.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"
}, },
"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.4-x86_64-uec}\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.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"
}, },
"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.4-x86_64-uec}\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.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"
}, },
"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.4-x86_64-uec"}}, "properties": {"image": "cirros-0.3.5-x86_64-disk"}},
"CP1": { "CP1": {
"type": "tosca.nodes.nfv.CP.Tacker", "type": "tosca.nodes.nfv.CP.Tacker",
"properties": { "properties": {

4
doc/source/devref/alarm_monitoring_usage_guide.rst
View File

@ -73,7 +73,7 @@ alarming monitoring and scaling was also supported by Alarm monitor in Tacker:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.4-x86_64-uec image: cirros-0.3.5-x86_64-disk
mgmt_driver: noop mgmt_driver: noop
availability_zone: nova availability_zone: nova
metadata: {metering.vnf: SG1} metadata: {metering.vnf: SG1}
@ -97,7 +97,7 @@ alarming monitoring and scaling was also supported by Alarm monitor in Tacker:
mem_size: 512 MB mem_size: 512 MB
num_cpus: 2 num_cpus: 2
properties: properties:
image: cirros-0.3.4-x86_64-uec image: cirros-0.3.5-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/devref/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.4-x86_64-uec\n | | | 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: | | | 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.4-x86_64-uec\n networks:\n - port:\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 |
| | 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 |

8
doc/source/devref/nsd_usage_guide.rst
View File

@ -120,7 +120,7 @@ VNF1 sample template for nsd named vnfd1.yaml:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.4-x86_64-uec image: cirros-0.3.5-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -139,7 +139,7 @@ VNF1 sample template for nsd named vnfd1.yaml:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.4-x86_64-uec image: cirros-0.3.5-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -196,7 +196,7 @@ VNF2 sample template for nsd named vnfd2.yaml:
VDU1: VDU1:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.4-x86_64-uec image: cirros-0.3.5-x86_64-disk
flavor: m1.tiny flavor: m1.tiny
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
@ -216,7 +216,7 @@ VNF2 sample template for nsd named vnfd2.yaml:
VDU2: VDU2:
type: tosca.nodes.nfv.VDU.Tacker type: tosca.nodes.nfv.VDU.Tacker
properties: properties:
image: cirros-0.3.4-x86_64-uec image: cirros-0.3.5-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop

8
doc/source/devref/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.4-x86_64-uec image: cirros-0.3.5-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.4-x86_64-uec image: cirros-0.3.5-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.4/ \ file: http://download.cirros-cloud.net/0.3.5/ \
cirros-0.3.4-x86_64-uec.tar.gz cirros-0.3.5-x86_64-disk.img
VDU Capabilities VDU Capabilities
^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^

6
doc/source/devref/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.4-x86_64-uec image: cirros-0.3.5-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.4-x86_64-uec** would now be replaced as: instance_type: **cirros-0.3.5-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.4-x86_64-uec image_name: cirros-0.3.5-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

@ -43,7 +43,7 @@ i). Create a sample-vnfd.yaml file with the following content:
mem_size: 512 MB mem_size: 512 MB
disk_size: 1 GB disk_size: 1 GB
properties: properties:
image: cirros-0.3.4-x86_64-uec image: cirros-0.3.5-x86_64-disk
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop
config: | config: |

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.4-x86_64-uec image: cirros-0.3.5-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.4-x86_64-uec image: cirros-0.3.5-x86_64-disk
flavor: m1.medium flavor: m1.medium
availability_zone: nova availability_zone: nova
mgmt_driver: noop mgmt_driver: noop