Changing NSF test to openflowplugin folder

Change-Id: I8e651e171d063b65be3a51af348c67b862f444ea
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/test/csit/suites/controller/AD_SAL_Apps_OF10/010__host_tracker.txt b/test/csit/suites/openflowplugin/AD_SAL_Apps_OF10/010__host_tracker.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_Apps_OF10/010__host_tracker.txt
rename to test/csit/suites/openflowplugin/AD_SAL_Apps_OF10/010__host_tracker.txt

diff --git a/test/csit/suites/controller/AD_SAL_Apps_OF10/020__static_route.txt b/test/csit/suites/openflowplugin/AD_SAL_Apps_OF10/020__static_route.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_Apps_OF10/020__static_route.txt
rename to test/csit/suites/openflowplugin/AD_SAL_Apps_OF10/020__static_route.txt

diff --git a/test/csit/suites/controller/AD_SAL_Apps_OF10/030__subnet_gateway.txt b/test/csit/suites/openflowplugin/AD_SAL_Apps_OF10/030__subnet_gateway.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_Apps_OF10/030__subnet_gateway.txt
rename to test/csit/suites/openflowplugin/AD_SAL_Apps_OF10/030__subnet_gateway.txt

diff --git a/test/csit/suites/controller/AD_SAL_Apps_OF10/__init__.txt b/test/csit/suites/openflowplugin/AD_SAL_Apps_OF10/__init__.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_Apps_OF10/__init__.txt
rename to test/csit/suites/openflowplugin/AD_SAL_Apps_OF10/__init__.txt

diff --git a/test/csit/suites/controller/AD_SAL_Apps_OF13/010__host_tracker.txt b/test/csit/suites/openflowplugin/AD_SAL_Apps_OF13/010__host_tracker.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_Apps_OF13/010__host_tracker.txt
rename to test/csit/suites/openflowplugin/AD_SAL_Apps_OF13/010__host_tracker.txt

diff --git a/test/csit/suites/controller/AD_SAL_Apps_OF13/020__static_route.txt b/test/csit/suites/openflowplugin/AD_SAL_Apps_OF13/020__static_route.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_Apps_OF13/020__static_route.txt
rename to test/csit/suites/openflowplugin/AD_SAL_Apps_OF13/020__static_route.txt

diff --git a/test/csit/suites/controller/AD_SAL_Apps_OF13/030__subnet_gateway.txt b/test/csit/suites/openflowplugin/AD_SAL_Apps_OF13/030__subnet_gateway.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_Apps_OF13/030__subnet_gateway.txt
rename to test/csit/suites/openflowplugin/AD_SAL_Apps_OF13/030__subnet_gateway.txt

diff --git a/test/csit/suites/controller/AD_SAL_Apps_OF13/__init__.txt b/test/csit/suites/openflowplugin/AD_SAL_Apps_OF13/__init__.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_Apps_OF13/__init__.txt
rename to test/csit/suites/openflowplugin/AD_SAL_Apps_OF13/__init__.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF10/010__switch_manager.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF10/010__switch_manager.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF10/020__topology_manager.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF10/020__topology_manager.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF10/030__statistics_manager.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF10/030__statistics_manager.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF10/040__flow_programmer.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF10/040__flow_programmer.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF10/__init__.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF10/__init__.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF13/010__switch_manager.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF13/010__switch_manager.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF13/020__topology_manager.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF13/020__topology_manager.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF13/030__statistics_manager.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF13/030__statistics_manager.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF13/040__flow_programmer.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF13/040__flow_programmer.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.txt

diff --git a/test/csit/suites/controller/AD_SAL_NSF_OF13/__init__.txt b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.txt
similarity index 100%
rename from test/csit/suites/controller/AD_SAL_NSF_OF13/__init__.txt
rename to test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF10/010__restconf_inventory.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF10/010__restconf_inventory.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF10/020__restconf_topology.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF10/020__restconf_topology.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF10/030__switch_manager.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF10/030__switch_manager.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF10/040__statistics_manager.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF10/040__statistics_manager.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF10/050__topology_manager.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF10/050__topology_manager.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF10/__init__.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF10/__init__.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF13/010__restconf_inventory.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF13/010__restconf_inventory.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF13/020__restconf_topology.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF13/020__restconf_topology.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF13/030__switch_manager.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF13/030__switch_manager.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF13/040__statistics_manager.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF13/040__statistics_manager.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF13/050__topology_manager.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF13/050__topology_manager.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.txt

diff --git a/test/csit/suites/controller/Inventory_Scalability_OF13/__init__.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.txt
similarity index 100%
rename from test/csit/suites/controller/Inventory_Scalability_OF13/__init__.txt
rename to test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF10/010__restconf_inventory.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF10/010__restconf_inventory.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF10/020__restconf_topology.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF10/020__restconf_topology.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF10/030__restconf_statistics.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF10/030__restconf_statistics.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF10/040__restconf_frm.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF10/040__restconf_frm.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF10/__init__.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF10/__init__.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF13/010__restconf_inventory.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF13/010__restconf_inventory.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF13/020__restconf_topology.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF13/020__restconf_topology.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF13/030__restconf_statistics.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF13/030__restconf_statistics.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF13/040__restconf_frm.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF13/040__restconf_frm.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.txt

diff --git a/test/csit/suites/controller/MD_SAL_NSF_OF13/__init__.txt b/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.txt
similarity index 100%
rename from test/csit/suites/controller/MD_SAL_NSF_OF13/__init__.txt
rename to test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.txt

diff --git a/test/csit/testplans/controller-nsf.txt b/test/csit/testplans/controller-nsf.txt
deleted file mode 100644 (file)
index 3390082..0000000
--- a/test/csit/testplans/controller-nsf.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Place the suites in run order:
-integration/test/csit/suites/controller/MD_SAL_NSF_OF10
-integration/test/csit/suites/controller/AD_SAL_NSF_OF10
-integration/test/csit/suites/controller/Inventory_Scalability_OF10
-integration/test/csit/suites/controller/MD_SAL_NSF_OF13
-integration/test/csit/suites/controller/AD_SAL_NSF_OF13
-integration/test/csit/suites/controller/Inventory_Scalability_OF13
-

diff --git a/test/csit/testplans/openflowplugin-flow-services.txt b/test/csit/testplans/openflowplugin-flow-services.txt
index 49e7208b1f653e317b983d6b4655d47f2eac147b..a8afdb34df692c1e29aec7ee1f3c60b38315b5aa 100644 (file)
--- a/test/csit/testplans/openflowplugin-flow-services.txt
+++ b/test/csit/testplans/openflowplugin-flow-services.txt
@@ -1,4 +1,10 @@
 # Place the suites in run order:
+integration/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10
+integration/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10
+integration/test/csit/suites/openflowplugin/Inventory_Scalability_OF10
+integration/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13
+integration/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13
 integration/test/csit/suites/openflowplugin/Flows_OF13
 integration/test/csit/suites/openflowplugin/Flows_Stats_OF13
 integration/test/csit/suites/openflowplugin/Groups_Meters_OF13
+integration/test/csit/suites/openflowplugin/Inventory_Scalability_OF13