Move ovs under netvirt

JIRA: NETVIRT-1232
Change-Id: Ibc9f5460a42bca1005402b196d3c16c03f53677f
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/resources/tools/odltools/odltools/csit/robotfiles.py b/resources/tools/odltools/odltools/csit/robotfiles.py
index 10422ce4e81eccbb1985eab451985e10247cca8d..d8eeb9e9dc71c6d1c8011411a513b7bb1a012450 100644 (file)
--- a/resources/tools/odltools/odltools/csit/robotfiles.py
+++ b/resources/tools/odltools/odltools/csit/robotfiles.py
@@ -5,7 +5,7 @@ from subprocess import Popen
 import os
 import re
 
-from odltools.ovs import flows
+from odltools.netvirt import ovs_flows
 
 logger = logging.getLogger("csit.robotfiles")
 
@@ -255,7 +255,7 @@ class RobotFiles:
                 logger.info("Processing: %s", filename)
                 filename = filename + ".f.txt"
                 dump_flows = node[RobotFiles.DUMP_FLOWS]
-                fls = flows.Flows(dump_flows)
+                fls = ovs_flows.Flows(dump_flows)
                 fls.write_fdata(filename)
 
     def fix_command_names(self, cmd):

diff --git a/resources/tools/odltools/odltools/csit/tests/test_robotfiles.py b/resources/tools/odltools/odltools/csit/tests/test_robotfiles.py
index 216f5c56f801465932a4adffbea771fe570e1f59..4d3ff05a425851478038a32abb509bb465894601 100644 (file)
--- a/resources/tools/odltools/odltools/csit/tests/test_robotfiles.py
+++ b/resources/tools/odltools/odltools/csit/tests/test_robotfiles.py
@@ -11,7 +11,7 @@ from odltools.csit.robotfiles import RobotFiles
 
 class TestRobotFiles(unittest.TestCase):
     DATAPATH = "/tmp/output_02_l3.xml.gz"
-    OUTPATH = "/tmp/robotjob2"
+    OUTPATH = "/tmp/robotjob"
 
     def setUp(self):
         logg.Logger()

diff --git a/resources/tools/odltools/odltools/ovs/__init__.py b/resources/tools/odltools/odltools/netvirt/flow.py
similarity index 100%
rename from resources/tools/odltools/odltools/ovs/__init__.py
rename to resources/tools/odltools/odltools/netvirt/flow.py

diff --git a/resources/tools/odltools/odltools/ovs/flows.py b/resources/tools/odltools/odltools/netvirt/ovs_flows.py
similarity index 99%
rename from resources/tools/odltools/odltools/ovs/flows.py
rename to resources/tools/odltools/odltools/netvirt/ovs_flows.py
index 7c07ee414d516636bdf70b2b768dd371914f2451..5cb8bda88e8e6d9116bd14d683eacc9f5e71c078 100644 (file)
--- a/resources/tools/odltools/odltools/ovs/flows.py
+++ b/resources/tools/odltools/odltools/netvirt/ovs_flows.py
@@ -2,10 +2,10 @@ import logging
 from pprint import pformat
 
 import re
-
-import request
 import tables
 
+from odltools.netvirt import request
+
 logger = logging.getLogger("ovs.flows")
 
 

diff --git a/resources/tools/odltools/odltools/ovs/request.py b/resources/tools/odltools/odltools/netvirt/request.py
similarity index 100%
rename from resources/tools/odltools/odltools/ovs/request.py
rename to resources/tools/odltools/odltools/netvirt/request.py

diff --git a/resources/tools/odltools/odltools/ovs/tables.py b/resources/tools/odltools/odltools/netvirt/tables.py
similarity index 100%
rename from resources/tools/odltools/odltools/ovs/tables.py
rename to resources/tools/odltools/odltools/netvirt/tables.py

diff --git a/resources/tools/odltools/odltools/ovs/tests/test_flows.py b/resources/tools/odltools/odltools/netvirt/tests/test_ovs_flows.py
similarity index 79%
rename from resources/tools/odltools/odltools/ovs/tests/test_flows.py
rename to resources/tools/odltools/odltools/netvirt/tests/test_ovs_flows.py
index 556ff00c3398271d050d2bcc2ce6e99e06478b38..1787539c2384e55ff18306a6ec89390c910f4a00 100644 (file)
--- a/resources/tools/odltools/odltools/ovs/tests/test_flows.py
+++ b/resources/tools/odltools/odltools/netvirt/tests/test_ovs_flows.py
@@ -1,17 +1,17 @@
-import os
 import unittest
 
+import os
+
 from odltools import logg
-from odltools.ovs import flows
-from odltools.ovs import request
+from odltools.netvirt import request, ovs_flows
 
 
 class TestFlows(unittest.TestCase):
     def setUp(self):
         logg.Logger()
-        self.filename = "./resources/flow_dumps.3.txt"
+        self.filename = "../../tests/resources/flow_dumps.3.txt"
         self.data = request.read_file(self.filename)
-        self.flows = flows.Flows(self.data)
+        self.flows = ovs_flows.Flows(self.data)
 
     def test_process_data(self):
         print "pretty_print:\n{}".format(self.flows.pretty_print(self.flows.pdata))

diff --git a/resources/tools/odltools/odltools/ovs/tests/test_request.py b/resources/tools/odltools/odltools/netvirt/tests/test_request.py
similarity index 85%
rename from resources/tools/odltools/odltools/ovs/tests/test_request.py
rename to resources/tools/odltools/odltools/netvirt/tests/test_request.py
index 89b0810273ee88bf92f347c8060be36f77dfc6e9..41b336cec821ad79d67fdf8005204492efd22db9 100644 (file)
--- a/resources/tools/odltools/odltools/ovs/tests/test_request.py
+++ b/resources/tools/odltools/odltools/netvirt/tests/test_request.py
@@ -1,15 +1,16 @@
 import logging
-import os
 import unittest
 
+import os
+
 from odltools import logg
-from odltools.ovs import request
+from odltools.netvirt import request
 
 
 class TestRequest(unittest.TestCase):
     def setUp(self):
         logg.Logger(logging.DEBUG, logging.DEBUG)
-        self.filename = "./resources/flow_dumps.1.txt"
+        self.filename = "../../tests/resources/flow_dumps.1.txt"
         self.outpath = "/tmp/flow_dumps.1.out.txt"
 
     def test_read_file(self):

diff --git a/resources/tools/odltools/odltools/ovs/tests/test_tables.py b/resources/tools/odltools/odltools/netvirt/tests/test_tables.py
similarity index 88%
rename from resources/tools/odltools/odltools/ovs/tests/test_tables.py
rename to resources/tools/odltools/odltools/netvirt/tests/test_tables.py
index 7132ead75d834b0ccbe16ae8f14d6e6c4aee3a28..5d852b0cc9d11b3a441a420df978cdfa14b2a5ec 100644 (file)
--- a/resources/tools/odltools/odltools/ovs/tests/test_tables.py
+++ b/resources/tools/odltools/odltools/netvirt/tests/test_tables.py
@@ -1,7 +1,7 @@
 import unittest
 
 from odltools import logg
-from odltools.ovs import tables
+from odltools.netvirt import tables
 
 
 class TestTables(unittest.TestCase):

diff --git a/resources/tools/odltools/odltools/ovs/tests/__init__.py b/resources/tools/odltools/odltools/ovs/tests/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/resources/tools/odltools/odltools/ovs/tests/resources/flow_dumps.1.txt b/resources/tools/odltools/odltools/tests/resources/flow_dumps.1.txt
similarity index 100%
rename from resources/tools/odltools/odltools/ovs/tests/resources/flow_dumps.1.txt
rename to resources/tools/odltools/odltools/tests/resources/flow_dumps.1.txt

diff --git a/resources/tools/odltools/odltools/ovs/tests/resources/flow_dumps.2.txt b/resources/tools/odltools/odltools/tests/resources/flow_dumps.2.txt
similarity index 100%
rename from resources/tools/odltools/odltools/ovs/tests/resources/flow_dumps.2.txt
rename to resources/tools/odltools/odltools/tests/resources/flow_dumps.2.txt

diff --git a/resources/tools/odltools/odltools/ovs/tests/resources/flow_dumps.3.txt b/resources/tools/odltools/odltools/tests/resources/flow_dumps.3.txt
similarity index 100%
rename from resources/tools/odltools/odltools/ovs/tests/resources/flow_dumps.3.txt
rename to resources/tools/odltools/odltools/tests/resources/flow_dumps.3.txt