Merge "Refactor tacker vnfd samples for consistency"

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

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: |

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: |

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
+        vendor: Tacker

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: |

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: |

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
 

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