SEBA-497 delayering, Makefile, and tox for fabric-synchronizer
Change-Id: I916f4b632019dddceae5a6f024a0b1c64d8188d8
diff --git a/xos/synchronizer/steps/test_sync_fabric_switch.py b/xos/synchronizer/steps/test_sync_fabric_switch.py
index 2184a6d..b749b94 100644
--- a/xos/synchronizer/steps/test_sync_fabric_switch.py
+++ b/xos/synchronizer/steps/test_sync_fabric_switch.py
@@ -12,24 +12,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+#from __future__ import absolute_import
+
+import imp
import unittest
-
import functools
-from mock import patch, call, Mock, PropertyMock
+from mock import patch, Mock
import requests_mock
-import multistructlog
-from multistructlog import create_logger
-import os, sys
+import os
+import sys
-test_path=os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+test_path = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+
def match_json(desired, req):
- if desired!=req.json():
+ if desired != req.json():
raise Exception("Got request %s, but body is not matching" % req.url)
return False
return True
+
class TestSyncFabricSwitch(unittest.TestCase):
def setUp(self):
@@ -49,8 +52,8 @@
import xossynchronizer.modelaccessor
import mock_modelaccessor
- reload(mock_modelaccessor) # in case nose2 loaded it in a previous test
- reload(xossynchronizer.modelaccessor) # in case nose2 loaded it in a previous test
+ imp.reload(mock_modelaccessor) # in case nose2 loaded it in a previous test
+ imp.reload(xossynchronizer.modelaccessor) # in case nose2 loaded it in a previous test
from xossynchronizer.modelaccessor import model_accessor
self.model_accessor = model_accessor
@@ -61,11 +64,9 @@
for (k, v) in model_accessor.all_model_classes.items():
globals()[k] = v
-
self.sync_step = SyncFabricSwitch
self.sync_step.log = Mock()
-
# mock onos-fabric
onos_fabric = Mock()
onos_fabric.name = "onos-fabric"
@@ -105,17 +106,17 @@
"devices": {
self.o.ofId: {
"basic": {
- "name": self.o.name,
- "driver": self.o.driver
- },
- "segmentrouting" : {
- "name" : self.o.name,
- "ipv4NodeSid" : self.o.ipv4NodeSid,
- "ipv4Loopback" : self.o.ipv4Loopback,
- "routerMac" : self.o.routerMac,
- "isEdgeRouter" : self.o.isEdgeRouter,
- "adjacencySids" : []
- }
+ "name": self.o.name,
+ "driver": self.o.driver
+ },
+ "segmentrouting": {
+ "name": self.o.name,
+ "ipv4NodeSid": self.o.ipv4NodeSid,
+ "ipv4Loopback": self.o.ipv4Loopback,
+ "routerMac": self.o.routerMac,
+ "isEdgeRouter": self.o.isEdgeRouter,
+ "adjacencySids": []
+ }
}
}
}
@@ -134,7 +135,7 @@
@requests_mock.Mocker()
def test_delete_switch(self, m):
m.delete("http://onos-fabric:8181/onos/v1/network/configuration/devices/of:1234",
- status_code=204)
+ status_code=204)
self.o.ofId = "of:1234"
@@ -145,5 +146,6 @@
self.assertTrue(m.called)
+
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()