Use different config files depending on version

We can read the openstack version from the env variables and then use
a different config. The reason we use this is because openstack API
changed from Pike to Queens and Pike is the official version for
OPNFV Fraser release

Change-Id: I8a94e71224d2ba0aa75a6438f3d7b03929acbbef
Signed-off-by: Manuel Buil <mbuil@suse.com>

8 files changed, 49 insertions, 49 deletions

diff --git a/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml-queens b/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd-pike.yaml
index 28b78ead..3f10e6b8 100644
--- a/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml-queens
+++ b/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd-pike.yaml
@@ -18,8 +18,8 @@ topology_template:
           type: ACL
           criteria:
             - network_src_port_id: {get_input: net_src_port_id}
-              destination_port_range: 80-80
-              ip_proto: 6
+            - destination_port_range: 80-80
+            - ip_proto: 6
         path:
           - forwarder: test-vnfd1
             capability: CP1
diff --git a/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml b/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml
index 3f10e6b8..28b78ead 100644
--- a/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml
+++ b/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml
@@ -18,8 +18,8 @@ topology_template:
           type: ACL
           criteria:
             - network_src_port_id: {get_input: net_src_port_id}
-            - destination_port_range: 80-80
-            - ip_proto: 6
+              destination_port_range: 80-80
+              ip_proto: 6
         path:
           - forwarder: test-vnfd1
             capability: CP1
diff --git a/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml-queens b/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd-pike.yaml
index 544d6e8e..27c7d545 100644
--- a/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml-queens
+++ b/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd-pike.yaml
@@ -18,8 +18,8 @@ topology_template:
           type: ACL
           criteria:
             - network_src_port_id: {get_input: net_src_port_id}
-              destination_port_range: 80-80
-              ip_proto: 6
+            - destination_port_range: 80-80
+            - ip_proto: 6
         path:
           - forwarder: test-vnfd1
             capability: CP1
diff --git a/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml b/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml
index 27c7d545..544d6e8e 100644
--- a/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml
+++ b/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml
@@ -18,8 +18,8 @@ topology_template:
           type: ACL
           criteria:
             - network_src_port_id: {get_input: net_src_port_id}
-            - destination_port_range: 80-80
-            - ip_proto: 6
+              destination_port_range: 80-80
+              ip_proto: 6
         path:
           - forwarder: test-vnfd1
             capability: CP1
diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml-queens b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1-pike.yaml
index 6123fb50..f0615e4e 100644
--- a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml-queens
+++ b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1-pike.yaml
@@ -1,33 +1,26 @@
 ---
 tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
-description: test-two-chains_HTTP Test
+description: test-case2_HTTP Test
 
 topology_template:
-  description: topology-template-test-two-chains
+  description: topology-template-test2
   inputs:
     net_src_port_id:
       type: string
 
   node_templates:
     Forwarding_path1:
-      type: tosca.nodes.nfv.FP.TackerV2
+      type: tosca.nodes.nfv.FP.Tacker
       description: creates path
       properties:
         id: 1
         policy:
           type: ACL
           criteria:
-            - name: get_ssh
-              classifier:
-                network_src_port_id: {get_input: net_src_port_id}
-                destination_port_range: 22-22
-                ip_proto: 6
-            - name: get_http
-              classifier:
-                network_src_port_id: {get_input: net_src_port_id}
-                destination_port_range: 80-80
-                ip_proto: 6
-         path:
+            - network_src_port_id: {get_input: net_src_port_id}
+            - destination_port_range: 22-80
+            - ip_proto: 6
+        path:
           - forwarder: test-vnfd1
             capability: CP1
 
diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml
index f0615e4e..ceee363b 100644
--- a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml
+++ b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml
@@ -1,25 +1,32 @@
 ---
 tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
-description: test-case2_HTTP Test
+description: test-two-chains_HTTP Test
 
 topology_template:
-  description: topology-template-test2
+  description: topology-template-test-two-chains
   inputs:
     net_src_port_id:
       type: string
 
   node_templates:
     Forwarding_path1:
-      type: tosca.nodes.nfv.FP.Tacker
+      type: tosca.nodes.nfv.FP.TackerV2
       description: creates path
       properties:
         id: 1
         policy:
           type: ACL
           criteria:
-            - network_src_port_id: {get_input: net_src_port_id}
-            - destination_port_range: 22-80
-            - ip_proto: 6
+            - name: get_ssh
+              classifier:
+                network_src_port_id: {get_input: net_src_port_id}
+                destination_port_range: 22-22
+                ip_proto: 6
+            - name: get_http
+              classifier:
+                network_src_port_id: {get_input: net_src_port_id}
+                destination_port_range: 80-80
+                ip_proto: 6
         path:
           - forwarder: test-vnfd1
             capability: CP1
diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2-pike.yaml
index 4d0763aa..ec18c9d6 100644
--- a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens
+++ b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2-pike.yaml
@@ -1,33 +1,27 @@
 ---
 tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
-description: test-two-chains_SSH Test
+description: test-case2_SSH Test
 
 topology_template:
-  description: topology-template-test-two-chains
+  description: topology-template-test2
   inputs:
     net_src_port_id:
       type: string
 
+
   node_templates:
     Forwarding_path1:
-      type: tosca.nodes.nfv.FP.TackerV2
+      type: tosca.nodes.nfv.FP.Tacker
       description: creates path
       properties:
         id: 2
         policy:
           type: ACL
           criteria:
-            - name: get_ssh
-              classifier:
-                network_src_port_id: {get_input: net_src_port_id}
-                destination_port_range: 22-22
-                ip_proto: 6
-            - name: get_http
-              classifier:
-                network_src_port_id: {get_input: net_src_port_id}
-                destination_port_range: 80-80
-                ip_proto: 6
-         path:
+            - network_src_port_id: {get_input: net_src_port_id}
+            - destination_port_range: 22-80
+            - ip_proto: 6
+        path:
           - forwarder: test-vnfd2
             capability: CP1
 
diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml
index ec18c9d6..15739cc7 100644
--- a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml
+++ b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml
@@ -1,26 +1,32 @@
 ---
 tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
-description: test-case2_SSH Test
+description: test-two-chains_SSH Test
 
 topology_template:
-  description: topology-template-test2
+  description: topology-template-test-two-chains
   inputs:
     net_src_port_id:
       type: string
 
-
   node_templates:
     Forwarding_path1:
-      type: tosca.nodes.nfv.FP.Tacker
+      type: tosca.nodes.nfv.FP.TackerV2
       description: creates path
       properties:
         id: 2
         policy:
           type: ACL
           criteria:
-            - network_src_port_id: {get_input: net_src_port_id}
-            - destination_port_range: 22-80
-            - ip_proto: 6
+            - name: get_ssh
+              classifier:
+                network_src_port_id: {get_input: net_src_port_id}
+                destination_port_range: 22-22
+                ip_proto: 6
+            - name: get_http
+              classifier:
+                network_src_port_id: {get_input: net_src_port_id}
+                destination_port_range: 80-80
+                ip_proto: 6
         path:
           - forwarder: test-vnfd2
             capability: CP1