From: Luis Gomez Date: Mon, 1 Dec 2014 01:37:54 +0000 (+0000) Subject: Merge "GIT Reorganization - Create VTN suites" X-Git-Tag: release/helium-sr1.1~5 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ac5d22c55125b460db1cdba0818831a5e4ecb1e0;hp=372b2a82a128e507fd75ad57674e238aee7bbca1;p=integration%2Ftest.git Merge "GIT Reorganization - Create VTN suites" --- diff --git a/test/csit/suites/vtn/VTN_OF10/020__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF10/020__vtn_coordinator.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF10/020__vtn_coordinator.txt rename to test/csit/suites/vtn/VTN_C_OF10/020__vtn_coordinator.txt diff --git a/test/csit/suites/vtn/VTN_OF10/030__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF10/030__vtn_coordinator.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF10/030__vtn_coordinator.txt rename to test/csit/suites/vtn/VTN_C_OF10/030__vtn_coordinator.txt diff --git a/test/csit/suites/vtn/VTN_OF10/040__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF10/040__vtn_coordinator.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF10/040__vtn_coordinator.txt rename to test/csit/suites/vtn/VTN_C_OF10/040__vtn_coordinator.txt diff --git a/test/csit/suites/vtn/VTN_OF10/__init__.txt b/test/csit/suites/vtn/VTN_C_OF10/__init__.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF10/__init__.txt rename to test/csit/suites/vtn/VTN_C_OF10/__init__.txt diff --git a/test/csit/suites/vtn/VTN_OF13/020__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF13/020__vtn_coordinator.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF13/020__vtn_coordinator.txt rename to test/csit/suites/vtn/VTN_C_OF13/020__vtn_coordinator.txt diff --git a/test/csit/suites/vtn/VTN_OF13/030__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF13/030__vtn_coordinator.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF13/030__vtn_coordinator.txt rename to test/csit/suites/vtn/VTN_C_OF13/030__vtn_coordinator.txt diff --git a/test/csit/suites/vtn/VTN_OF13/040__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF13/040__vtn_coordinator.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF13/040__vtn_coordinator.txt rename to test/csit/suites/vtn/VTN_C_OF13/040__vtn_coordinator.txt diff --git a/test/csit/suites/vtn/VTN_OF13/__init__.txt b/test/csit/suites/vtn/VTN_C_OF13/__init__.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF13/__init__.txt rename to test/csit/suites/vtn/VTN_C_OF13/__init__.txt diff --git a/test/csit/suites/vtn/VTN_OF10/010__vtn_manager.txt b/test/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF10/010__vtn_manager.txt rename to test/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager.txt diff --git a/test/csit/suites/vtn/VTN_Mgr_OF10/__init__.txt b/test/csit/suites/vtn/VTN_Mgr_OF10/__init__.txt new file mode 100644 index 0000000000..8a8c1943c6 --- /dev/null +++ b/test/csit/suites/vtn/VTN_Mgr_OF10/__init__.txt @@ -0,0 +1,11 @@ +*** Settings *** +Documentation Test suite for AD-SAL NSF +Suite Setup Start Suite +Suite Teardown Stop Suite +Library SSHLibrary +Resource ../../../libraries/Utils.txt + +*** Variables *** +${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 + +** Keywords *** diff --git a/test/csit/suites/vtn/VTN_OF13/010__vtn_manager.txt b/test/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager.txt similarity index 100% rename from test/csit/suites/vtn/VTN_OF13/010__vtn_manager.txt rename to test/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager.txt diff --git a/test/csit/suites/vtn/VTN_Mgr_OF13/__init__.txt b/test/csit/suites/vtn/VTN_Mgr_OF13/__init__.txt new file mode 100644 index 0000000000..36c2d66210 --- /dev/null +++ b/test/csit/suites/vtn/VTN_Mgr_OF13/__init__.txt @@ -0,0 +1,11 @@ +*** Settings *** +Documentation Test suite for AD-SAL NSF mininet OF13 +Suite Setup Start Suite +Suite Teardown Stop Suite +Library SSHLibrary +Resource ../../../libraries/Utils.txt + +*** Variables *** +${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13 + +** Keywords ***