diff --git a/samples/mistral/workflows/input/create_vnfd.json b/samples/mistral/workflows/input/create_vnfd.json index 7a86cf4f0..a093d7343 100644 --- a/samples/mistral/workflows/input/create_vnfd.json +++ b/samples/mistral/workflows/input/create_vnfd.json @@ -2,7 +2,7 @@ "body":{ "vnfd":{ "attributes":{ - "vnfd":"tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0\n\ndescription: Demo example\n\nmetadata:\n template_name: sample-tosca-vnfd\n\ntopology_template:\n node_templates:\n VDU1:\n type: tosca.nodes.nfv.VDU.Tacker\n properties:\n image: cirros-0.3.4-x86_64-uec\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.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" }, "name":"tacker-create-vnfd" } diff --git a/samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml b/samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml index 99e22839d..6743073d7 100644 --- a/samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml +++ b/samples/tosca-templates/nsd/sample-tosca-vnfd2.yaml @@ -16,7 +16,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-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.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.medium availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml index 8933b0591..b65142825 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-respawn.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: VDU1} diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml index 1eb25d116..585180463 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml @@ -15,7 +15,7 @@ topology_template: mem_size: 512 MB num_cpus: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-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.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova metadata: {metering.vnf: SG1} diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml index db4b96f5d..fe2b77b03 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml @@ -18,7 +18,7 @@ topology_template: cpu_allocation: cpu_affinity: dedicated properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml index 81ef89980..368a9882a 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml index a392c8ced..7fbb7f12b 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml @@ -17,7 +17,7 @@ topology_template: num_cpus: 2 mem_page_size: large properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml index d7e7ac3eb..2be666bea 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml @@ -24,7 +24,7 @@ topology_template: artifacts: VNFImage: type: tosca.artifacts.Deployment.Image.VM - file: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz + file: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.tar.gz CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml index 0be3c75b6..d5d4ef7bf 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop key_name: userKey diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml index e1c239833..bd7568b4c 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-mac-ip.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop key_name: userKey diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml index 0b283c115..952f18758 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml index 5e1eb6c23..e04037a99 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-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.4-x86_64-uec + image: cirros-0.3.5-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.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-network.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-network.yaml index ba7522a8e..401f3f516 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-network.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-network.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml index b509fe618..47153af1a 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk flavor: m1.tiny availability_zone: nova mgmt_driver: noop diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml index e21fad114..90c76d1a7 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml @@ -17,7 +17,7 @@ topology_template: num_cpus: 2 numa_node_count: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml index db3480d17..a388a1fc8 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml @@ -25,7 +25,7 @@ topology_template: vcpus: [2,3,4,5] mem_size: 3072 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml index d3b621d96..a8600c28c 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-param-values.yaml @@ -1,5 +1,5 @@ { - image_name: 'cirros-0.3.4-x86_64-uec', + image_name: 'cirros-0.3.5-x86_64-disk', flavor: 'm1.tiny', zone: 'nova', network: 'net_mgmt', diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml index c4890e3bc..ff5957234 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml @@ -10,7 +10,7 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-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.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk mgmt_driver: noop availability_zone: nova flavor: m1.tiny diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml index 76e8db5e5..0575cd855 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-secgroups.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop key_name: userKey diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml index c280bc036..004742a89 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk config: | param0: key1 param1: key2 diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml index 9f5668632..d13cca415 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml @@ -20,7 +20,7 @@ topology_template: thread_count: 2 core_count: 2 properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk CP1: type: tosca.nodes.nfv.CP.Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml index 062a0dde5..ace169f92 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-vdu-name.yaml @@ -26,7 +26,7 @@ topology_template: disk_size: 1 GB properties: name: {get_input : vdu-name} - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml b/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml index c59dd3843..a0c0d2060 100644 --- a/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml +++ b/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd1.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml b/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml index f9d52e812..821fb7087 100644 --- a/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml +++ b/samples/tosca-templates/vnffgd/tosca-vnffg-vnfd2.yaml @@ -16,7 +16,7 @@ topology_template: mem_size: 512 MB disk_size: 1 GB properties: - image: cirros-0.3.4-x86_64-uec + image: cirros-0.3.5-x86_64-disk availability_zone: nova mgmt_driver: noop config: |