From 210edb3b5d08e820a48bf2b8ecdb336e05804277 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Thu, 28 Sep 2017 12:04:02 +0200
Subject: Sort config.yml correctly and correct vnfd names

JIRA: SFC-116

It is confusing that our test-1 is in the second position of config.yaml
and that it uses test2-vnfd instead of test-vnfd

Change-Id: Iffd22f295630bce0ce854d4876c1478c56690cfa
Signed-off-by: Manuel Buil <mbuil@suse.com>
---
 sfc/tests/functest/config.yaml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/sfc/tests/functest/config.yaml b/sfc/tests/functest/config.yaml
index 2200c2d6..2957c596 100644
--- a/sfc/tests/functest/config.yaml
+++ b/sfc/tests/functest/config.yaml
@@ -23,11 +23,12 @@ defaults:
   vnfd-dir: "vnfd-templates"
   vnfd-default-params-file: "test-vnfd-default-params.yaml"
 
+
 testcases:
-  sfc_two_chains_SSH_and_HTTP:
-    enabled: false
-    order: 1
-    description: "ODL-SFC tests"
+  sfc_one_chain_two_service_functions:
+    enabled: true
+    order: 0
+    description: "ODL-SFC Testing SFs when they are located on the same chain"
     net_name: example-net
     subnet_name: example-subnet
     router_name: example-router
@@ -36,13 +37,12 @@ testcases:
     secgroup_descr: "Example Security group"
     test_vnfd_red: "test-vnfd1.yaml"
     test_vnfd_blue: "test-vnfd2.yaml"
-    test_vnffgd_red: "test2-vnffgd1.yaml"
-    test_vnffgd_blue: "test2-vnffgd2.yaml"
+    test_vnffgd_red: "test-vnffgd.yaml"
 
-  sfc_one_chain_two_service_functions:
-    enabled: true
-    order: 0
-    description: "ODL-SFC Testing SFs when they are located on the same chain"
+  sfc_two_chains_SSH_and_HTTP:
+    enabled: false
+    order: 1
+    description: "ODL-SFC tests with two chains and one SF per chain"
     net_name: example-net
     subnet_name: example-subnet
     router_name: example-router
@@ -51,7 +51,8 @@ testcases:
     secgroup_descr: "Example Security group"
     test_vnfd_red: "test2-vnfd1.yaml"
     test_vnfd_blue: "test2-vnfd2.yaml"
-    test_vnffgd_red: "test-vnffgd.yaml"
+    test_vnffgd_red: "test2-vnffgd1.yaml"
+    test_vnffgd_blue: "test2-vnffgd2.yaml"
 
   sfc_symmetric_chain:
     enabled: false
-- 
cgit 1.2.3-korg