SEBA-405 Update fabric synchronizer to use synchronizer library
Change-Id: I101dce9008bac14bbce95a3f61ace7059b92a4b4
diff --git a/xos/synchronizer/event_steps/kubernetes_event.py b/xos/synchronizer/event_steps/kubernetes_event.py
index 03c17df..507da0d 100644
--- a/xos/synchronizer/event_steps/kubernetes_event.py
+++ b/xos/synchronizer/event_steps/kubernetes_event.py
@@ -17,9 +17,9 @@
import json
import os
import sys
-from synchronizers.new_base.eventstep import EventStep
-from synchronizers.new_base.modelaccessor import model_accessor
-from synchronizers.new_base.modelaccessor import FabricService, Switch, Service
+from xossynchronizer.event_steps.eventstep import EventStep
+from xossynchronizer.modelaccessor import model_accessor
+from xossynchronizer.modelaccessor import FabricService, Switch, Service
from xosconfig import Config
from multistructlog import create_logger
diff --git a/xos/synchronizer/event_steps/test_kubernetes_event.py b/xos/synchronizer/event_steps/test_kubernetes_event.py
index 22b0c95..ae2915d 100644
--- a/xos/synchronizer/event_steps/test_kubernetes_event.py
+++ b/xos/synchronizer/event_steps/test_kubernetes_event.py
@@ -20,27 +20,7 @@
import os, sys
-# Hack to load synchronizer framework
test_path=os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
-xos_dir=os.path.join(test_path, "../../..")
-if not os.path.exists(os.path.join(test_path, "new_base")):
- xos_dir=os.path.join(test_path, "../../../../../../orchestration/xos/xos")
- services_dir = os.path.join(xos_dir, "../../xos_services")
-sys.path.append(xos_dir)
-sys.path.append(os.path.join(xos_dir, 'synchronizers', 'new_base'))
-# END Hack to load synchronizer framework
-
-# generate model from xproto
-def get_models_fn(service_name, xproto_name):
- name = os.path.join(service_name, "xos", xproto_name)
- if os.path.exists(os.path.join(services_dir, name)):
- return name
- else:
- name = os.path.join(service_name, "xos", "synchronizer", "models", xproto_name)
- if os.path.exists(os.path.join(services_dir, name)):
- return name
- raise Exception("Unable to find service=%s xproto=%s" % (service_name, xproto_name))
-# END generate model from xproto
class TestKubernetesEvent(unittest.TestCase):
@@ -48,8 +28,6 @@
global DeferredException
self.sys_path_save = sys.path
- sys.path.append(xos_dir)
- sys.path.append(os.path.join(xos_dir, 'synchronizers', 'new_base'))
# Setting up the config module
from xosconfig import Config
@@ -58,18 +36,19 @@
Config.init(config, "synchronizer-config-schema.yaml")
# END Setting up the config module
- from synchronizers.new_base.mock_modelaccessor_build import build_mock_modelaccessor
- build_mock_modelaccessor(xos_dir, services_dir, [
- get_models_fn("fabric", "fabric.xproto"),
- get_models_fn("onos-service", "onos.xproto"),
- ])
- import synchronizers.new_base.mock_modelaccessor
- reload(synchronizers.new_base.mock_modelaccessor) # in case nose2 loaded it in a previous test
- import synchronizers.new_base.modelaccessor
- reload(synchronizers.new_base.modelaccessor) # in case nose2 loaded it in a previous test
- from kubernetes_event import model_accessor
- from mock_modelaccessor import MockObjectList
+ from xossynchronizer.mock_modelaccessor_build import mock_modelaccessor_config
+ mock_modelaccessor_config(test_path, [("fabric", "fabric.xproto"),
+ ("onos-service", "onos.xproto")])
+ 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
+
+ from xossynchronizer.modelaccessor import model_accessor
+ self.model_accessor = model_accessor
+
+ from mock_modelaccessor import MockObjectList
from kubernetes_event import KubernetesPodDetailsEventStep
# import all class names to globals
@@ -129,7 +108,7 @@
event = Mock()
event.value = json.dumps(event_dict)
- step = self.event_step(log=self.log)
+ step = self.event_step(model_accessor=self.model_accessor, log=self.log)
step.process_event(event)
self.assertEqual(self.switch.backend_code, 0)
@@ -164,7 +143,7 @@
event = Mock()
event.value = json.dumps(event_dict)
- step = self.event_step(log=self.log)
+ step = self.event_step(model_accessor=self.model_accessor, log=self.log)
step.process_event(event)
self.assertEqual(self.switch.backend_code, 1)
@@ -195,7 +174,7 @@
event = Mock()
event.value = json.dumps(event_dict)
- step = self.event_step(log=self.log)
+ step = self.event_step(model_accessor=self.model_accessor, log=self.log)
step.process_event(event)
self.assertEqual(self.switch.backend_code, 1)
@@ -225,7 +204,7 @@
event = Mock()
event.value = json.dumps(event_dict)
- step = self.event_step(log=self.log)
+ step = self.event_step(model_accessor=self.model_accessor, log=self.log)
step.process_event(event)
self.assertEqual(self.switch.backend_code, 1)