From 72a3642bd686271a88f50ebe76efabdd9a868617 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Sat, 24 Mar 2018 17:07:21 +0100
Subject: 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>
(cherry picked from commit a459dee88ba00d6f8283232ce2159594ae23d22a)
---
 .../test-two-chains-vnffgd2.yaml-queens            | 45 ----------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens

(limited to 'sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens')

diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens
deleted file mode 100644
index 4d0763aa..00000000
--- a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens
+++ /dev/null
@@ -1,45 +0,0 @@
----
-tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
-description: test-two-chains_SSH Test
-
-topology_template:
-  description: topology-template-test-two-chains
-  inputs:
-    net_src_port_id:
-      type: string
-
-  node_templates:
-    Forwarding_path1:
-      type: tosca.nodes.nfv.FP.TackerV2
-      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:
-          - forwarder: test-vnfd2
-            capability: CP1
-
-  groups:
-    VNFFG1:
-      type: tosca.groups.nfv.VNFFG
-      description: creates chain
-      properties:
-        vendor: tacker
-        version: 1.0
-        number_of_endpoints: 1
-        dependent_virtual_link: [VL1]
-        connection_point: [CP1]
-        constituent_vnfs: [test-vnfd2]
-      members: [Forwarding_path1]
-- 
cgit 1.2.3-korg