Adapt SFC testcases according to new Tacker API.

- Update vnfd tosca templates

JIRA: SFC-102

Change-Id: I712b64e45c317582e0cb54e42364605f537aeee3
Signed-off-by: Taseer Ahmed <taseer94@gmail.com>

5 files changed, 249 insertions, 127 deletions

diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml
index 79a625fa..de8eecbe 100644
--- a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml
+++ b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml
@@ -1,31 +1,55 @@
-template_name: test-vnfd1
+tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 description: firewall1-example
+metadata:
+  template_name: test-vnfd1
 
-service_properties:
-  Id: firewall1-vnfd
-  vendor: tacker
-  version: 1
-  type:
-      - firewall1
-vdus:
-  vdu1:
-    id: vdu1
-    vm_image: sfc_nsh_danube
-    instance_type: custom
-    service_type: firewall1
+topology_template:
+  inputs:
+    zone:
+      type: string
+  node_templates:
+    VDU1:
+      type: tosca.nodes.nfv.VDU.Tacker
+      capabilities:
+        nfv_compute:
+          properties:
+            num_cpus: 1
+            mem_size: 2 GB
+            disk_size: 10 GB
+      properties:
+        image: sfc_nsh_danube
+        availability_zone: { get_input: zone }
+        mgmt_driver: noop
+        config: |
+          param0: key1
+          param1: key2
+        service_type: firewall
+        monitoring_policy:
+          name: ping
+          parameters:
+            monitorying_delay: 10
+            count: 3
+            interval: 2
+            timeout: 2
+            action:
+              failure: respawn
+            retry: 5
+            port: 22
 
-    network_interfaces:
-      management:
-        network: example-net
+    CP1:
+      type: tosca.nodes.nfv.CP.Tacker
+      properties:
         management: true
+        order: 0
+        anti_spoofing_protection: false
+      requirements:
+        - virtualLink:
+          node: VL1
+        - virtualBinding:
+          node: VDU1
 
-    placement_policy:
-      availability_zone: { get_input: zone }
-
-    auto-scaling: noop
-    monitoring_policy: noop
-    failure_policy: respawn
-
-    config:
-      param0: key0
-      param1: key1
+    VL1:
+      type: tosca.nodes.nfv.VL
+      properties:
+        network_name: example-net
+        vendor: Tacker
\ No newline at end of file
diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml
index 64f799e4..3058d337 100644
--- a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml
+++ b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml
@@ -1,31 +1,56 @@
-template_name: test-vnfd2
+tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 description: firewall2-example
+metadata:
+  template_name: test-vnfd2
 
-service_properties:
-  Id: firewall2-vnfd
-  vendor: tacker
-  version: 1
-  type:
-      - firewall2
-vdus:
-  vdu1:
-    id: vdu1
-    vm_image: sfc_nsh_danube
-    instance_type: custom
-    service_type: firewall2
 
-    network_interfaces:
-      management:
-        network: example-net
-        management: true
-
-    placement_policy:
-      availability_zone: { get_input: zone }
+topology_template:
+  inputs:
+    zone:
+      type: string
+  node_templates:
+    VDU1:
+      type: tosca.nodes.nfv.VDU.Tacker
+      capabilities:
+        nfv_compute:
+          properties:
+            num_cpus: 1
+            mem_size: 2 GB
+            disk_size: 10 GB
+      properties:
+        image: sfc_nsh_danube
+        availability_zone: { get_input: zone }
+        mgmt_driver: noop
+        config: |
+          param0: key0
+          param1: key1
+        service_type: firewall
+        monitoring_policy:
+          name: ping
+          parameters:
+            monitoring_delay: 10
+            count: 3
+            interval: 2
+            timeout: 2
+            action:
+              failure: respawn
+            retry: 5
+            port: 22
 
-    auto-scaling: noop
-    monitoring_policy: noop
-    failure_policy: respawn
+    CP1:
+      type: tosca.nodes.nfv.CP.Tacker
+      properties:
+        management: true
+        order: 0
+        anti_spoofing_protection: false
+      requirements:
+        - virtualLink:
+            node: VL1
+        - virtualBinding:
+            node: VDU1
 
-    config:
-      param0: key0
-      param1: key1
+    VL1:
+      type: tosca.nodes.nfv.VL
+      properties:
+        network_name: example-net
+        vendor: Tacker
\ No newline at end of file
diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml
index e8e0626b..998bc511 100644
--- a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml
+++ b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml
@@ -1,33 +1,55 @@
-template_name: test-vnfd1
+tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 description: firewall1-example
+metadata:
+  template_name: test-vnfd1
 
-service_properties:
-  Id: firewall1-vnfd
-  vendor: tacker
-  version: 1
-  type:
-      - firewall1
-vdus:
-  vdu1:
-    id: vdu1
-    vm_image: sfc_nsh_danube
-    instance_type: custom
-    service_type: firewall1
+topology_template:
+  inputs:
+    zone:
+      type: string
+  node_templates:
+    VDU1:
+      type: tosca.nodes.nfv.VDU.Tacker
+      capabilities:
+        nfv_compute:
+          properties:
+            num_cpus: 1
+            mem_size: 2 GB
+            disk_size: 10 GB
+      properties:
+        image: sfc_nsh_danube
+        availability_zone: { get_input: zone}
+        mgmt_driver: noop
+        config: |
+          param0: key1
+          param1: key2
+        service_type: firewall
+        monitoring_policy:
+          name: ping
+          parameters:
+            monitoring_delay: 10
+            count: 3
+            interval: 2
+            timeout: 2
+            action:
+              failure: respawn
+            retry: 5
+            port: 22
 
-    network_interfaces:
-      management:
-        network: example-net
+    CP1:
+      type: tosca.nodes.nfv.CP.Tacker
+      properties:
         management: true
+        order: 0
+        anti_spoofing_protection: false
+      requirements:
+        - virtualLink:
+            node: VL1
+        - virtualBinding:
+            node: VDU1
 
-    placement_policy:
-      # TODO: This availability zone is changed by the test case on the fly.
-      # See JIRA SFC-73 for more info
-      availability_zone: { get_input: zone }
-
-    auto-scaling: noop
-    monitoring_policy: noop
-    failure_policy: respawn
-
-    config:
-      param0: key0
-      param1: key1
+    VL1:
+      type: tosca.nodes.nfv.VL
+      properties:
+        network_name: example-net
+        vendor: Tacker
\ No newline at end of file
diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml
index 93a38acb..239e1aca 100644
--- a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml
+++ b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml
@@ -1,33 +1,55 @@
-template_name: test-vnfd2
+tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 description: firewall2-example
+metadata:
+  template_name: test-vnfd2
 
-service_properties:
-  Id: firewall2-vnfd
-  vendor: tacker
-  version: 1
-  type:
-      - firewall2
-vdus:
-  vdu1:
-    id: vdu1
-    vm_image: sfc_nsh_danube
-    instance_type: custom
-    service_type: firewall2
+topology_template:
+  inputs:
+    zone:
+      type: string
+  node_templates:
+    VDU1:
+      type: tosca.nodes.nfv.VDU.Tacker
+      capabilities:
+        nfv_compute:
+          properties:
+            num_cpus: 1
+            mem_size: 2 GB
+            disk_size: 10 GB
+      properties:
+        image: sfc_nsh_danube
+        availability_zone: { get_input: zone }
+        mgmt_driver: noop
+        config: |
+          param0: key1
+          param1: key2
+        service_type: firewall
+        monitoring_policy:
+          name: ping
+          parameters:
+            monitoring_delay: 10
+            count: 3
+            interval: 2
+            timeout: 2
+            action:
+              failure: respawn
+            retry: 5
+            port: 22
 
-    network_interfaces:
-      management:
-        network: example-net
+    CP1:
+      type: tosca.nodes.nfv.CP.Tacker
+      properties:
         management: true
+        order: 0
+        anti_spoofing_protection: false
+      requirements:
+        - virtualLink:
+            node: VL1
+        - virtualBinding:
+            node: VDU1
 
-    placement_policy:
-      # TODO: This availability zone is changed by the test case on the fly.
-      # See JIRA SFC-73 for more info
-      availability_zone: { get_input: zone }
-
-    auto-scaling: noop
-    monitoring_policy: noop
-    failure_policy: respawn
-
-    config:
-      param0: key0
-      param1: key1
+    VL1:
+      type: tosca.nodes.nfv.VL
+      properties:
+        network_name: example-net
+        vendor: Tacker
\ No newline at end of file
diff --git a/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml
index 92e616bd..adc92f23 100644
--- a/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml
+++ b/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml
@@ -1,23 +1,52 @@
-template_name: test-vnfd1
-description: firewall1-example
+tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
+description: firewall3-example
+metadata:
+  template_name: test-vnfd1
 
-service_properties:
-  Id: firewall1-vnfd
-  vendor: tacker
-  version: 1
-  type:
-      - firewall1
-vdus:
-  vdu1:
-    id: vdu1
-    vm_image: sfc_nsh_danube
-    instance_type: custom
-    service_type: firewall1
+topology_template:
+  inputs:
+    zone:
+      type: string
+  node_templates:
+    VDU1:
+      type: tosca.nodes.nfv.VDU.Tacker
+      capabilities:
+        nfv_compute:
+          properties:
+            num_cpus: 1
+            mem_size: 2 GB
+            disk_size: 10 GB
+      properties:
+        image: sfc_nsh_danube
+        availability_zone: { get_input: zone}
+        mgmt_driver: noop
+        service_type: firewall
+        monitoring_policy:
+          name: ping
+          parameters:
+            monitoring_delay: 10
+            count: 3
+            interval: 2
+            timeout: 2
+            action:
+              failure: respawn
+            retry: 5
+            port: 22
 
-    network_interfaces:
-      management:
-        network: example-net
+    CP1:
+      type: tosca.nodes.nfv.CP.Tacker
+      properties:
         management: true
+        order: 0
+        anti_spoofing_protection: false
+      requirements:
+        - virtualLink:
+            node: VL1
+        - virtualBinding:
+            node: VDU1
 
-    placement_policy:
-      availability_zone: { get_input: zone }
+    VL1:
+      type: tosca.nodes.nfv.VL
+      properties:
+        network_name: example-net
+        vendor: Tacker
\ No newline at end of file