From 66afcda73821729bbdb7daf6776d69ce56651ccf Mon Sep 17 00:00:00 2001 From: Sridhar Ramaswamy Date: Sat, 16 Jul 2016 00:04:28 +0000 Subject: [PATCH] Refactor tacker vnfd samples for consistency First, rename the filenames to be consistent. Second, use descriptive nfv_compute properties to describe the VDU instead of resorting to use nova flavor name. The power of TOSCA VNFD template is in describing the properties of a VNF purely using TOSCA constructs *without* using openstack specific attributes. Change-Id: I8584dc083b62d30f1463a4739eb8dd7c98957c26 --- ...lavor.yaml => tosca-vnfd-hello-world.yaml} | 41 +++++++++++++++++-- .../vnfd/tosca-vnfd-http-monitor.yaml | 7 +++- .../vnfd/tosca-vnfd-image.yaml | 7 +++- .../vnfd/tosca-vnfd-keyname.yaml | 9 +++- .../vnfd/tosca-vnfd-monitor.yaml | 7 +++- .../vnfd/tosca-vnfd-multi-vdu.yaml | 7 +++- ..._vnfd.yaml => tosca-vnfd-nova-flavor.yaml} | 0 ...nwrt_vnfd.yaml => tosca-vnfd-openwrt.yaml} | 11 +++-- ...userdata.yaml => tosca-vnfd-userdata.yaml} | 23 +++++------ 9 files changed, 87 insertions(+), 25 deletions(-) rename samples/tosca-templates/vnfd/{tosca-vnfd-flavor.yaml => tosca-vnfd-hello-world.yaml} (51%) rename samples/tosca-templates/vnfd/{tosca_hello_world_vnfd.yaml => tosca-vnfd-nova-flavor.yaml} (100%) rename samples/tosca-templates/vnfd/{tosca_openwrt_vnfd.yaml => tosca-vnfd-openwrt.yaml} (88%) rename samples/tosca-templates/vnfd/{tosca_openwrt_userdata.yaml => tosca-vnfd-userdata.yaml} (71%) diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-flavor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml similarity index 51% rename from samples/tosca-templates/vnfd/tosca-vnfd-flavor.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml index bd0a84cc3..886451578 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-flavor.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml @@ -12,13 +12,16 @@ topology_template: capabilities: nfv_compute: properties: - disk_size: 1 GB + num_cpus: 1 mem_size: 512 MB - num_cpus: 2 + disk_size: 1 GB properties: image: cirros-0.3.4-x86_64-uec - mgmt_driver: noop availability_zone: nova + mgmt_driver: noop + config: | + param0: key1 + param1: key2 CP1: type: tosca.nodes.nfv.CP.Tacker @@ -31,7 +34,39 @@ topology_template: - virtualBinding: node: VDU1 + CP2: + type: tosca.nodes.nfv.CP.Tacker + properties: + anti_spoofing_protection: false + requirements: + - virtualLink: + node: VL2 + - virtualBinding: + node: VDU1 + + CP3: + type: tosca.nodes.nfv.CP.Tacker + properties: + anti_spoofing_protection: false + requirements: + - virtualLink: + node: VL3 + - virtualBinding: + node: VDU1 + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: net_mgmt + vendor: Tacker + + VL2: + type: tosca.nodes.nfv.VL + properties: + network_name: net0 + vendor: Tacker + + VL3: type: tosca.nodes.nfv.VL properties: network_name: net1 diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-http-monitor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-http-monitor.yaml index 89a92c961..73fe64cd3 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-http-monitor.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-http-monitor.yaml @@ -9,9 +9,14 @@ topology_template: node_templates: VDU1: type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 2 GB + disk_size: 20 GB properties: image: ubuntu - flavor: m1.small availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml index 202701a1e..a54230375 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml @@ -9,8 +9,13 @@ topology_template: node_templates: VDU1: type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 512 MB + disk_size: 1 GB properties: - flavor: m1.tiny availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml index 640b727c6..054562be3 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml @@ -9,9 +9,14 @@ topology_template: node_templates: VDU1: type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 512 MB + disk_size: 1 GB properties: image: cirros-0.3.4-x86_64-uec - flavor: m1.tiny availability_zone: nova mgmt_driver: noop key_name: userKey @@ -34,4 +39,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: net1 - vendor: Tacker \ No newline at end of file + vendor: Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml index 22808ca57..5c18c8a62 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml @@ -9,9 +9,14 @@ topology_template: node_templates: VDU1: type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 512 MB + disk_size: 1 GB properties: image: cirros-0.3.4-x86_64-uec - flavor: m1.tiny 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 6e86730f1..7c2561efe 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml @@ -9,9 +9,14 @@ topology_template: node_templates: VDU1: type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 512 MB + disk_size: 1 GB properties: image: cirros-0.3.4-x86_64-uec - flavor: m1.tiny availability_zone: nova mgmt_driver: noop config: | diff --git a/samples/tosca-templates/vnfd/tosca_hello_world_vnfd.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml similarity index 100% rename from samples/tosca-templates/vnfd/tosca_hello_world_vnfd.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml diff --git a/samples/tosca-templates/vnfd/tosca_openwrt_vnfd.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-openwrt.yaml similarity index 88% rename from samples/tosca-templates/vnfd/tosca_openwrt_vnfd.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-openwrt.yaml index 74b4924f2..ba4da0e32 100644 --- a/samples/tosca-templates/vnfd/tosca_openwrt_vnfd.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-openwrt.yaml @@ -10,9 +10,14 @@ topology_template: VDU1: type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 512 MB + disk_size: 1 GB properties: image: OpenWRT - flavor: m1.tiny config: | param0: key1 param1: key2 @@ -65,12 +70,12 @@ topology_template: VL2: type: tosca.nodes.nfv.VL properties: - network_name: pkt_in + network_name: net0 vendor: Tacker VL3: type: tosca.nodes.nfv.VL properties: - network_name: pkt_out + network_name: net1 vendor: Tacker diff --git a/samples/tosca-templates/vnfd/tosca_openwrt_userdata.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml similarity index 71% rename from samples/tosca-templates/vnfd/tosca_openwrt_userdata.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml index 58293ff7e..39d3adaa1 100644 --- a/samples/tosca-templates/vnfd/tosca_openwrt_userdata.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml @@ -1,29 +1,26 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: OpenWRT with services +description: Demo with user-data metadata: - template_name: OpenWRT + template_name: sample-vnfd-userdata topology_template: node_templates: - VDU1: type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 512 MB + disk_size: 1 GB properties: - image: OpenWRT - flavor: m1.tiny + image: cirros-0.3.4-x86_64-uec config: | param0: key1 param1: key2 - mgmt_driver: openwrt - monitoring_policy: - name: ping - actions: - failure: respawn - parameters: - count: 3 - interval: 10 + mgmt_driver: noop user_data_format: RAW user_data: | #!/bin/sh