SEBA-405 Update VOLT Service to use synchronizer library
Change-Id: I8292e0e7d1b7c76b1e53d9bd944abf95d9b38333
diff --git a/xos/synchronizer/event_steps/test_kubernetes_event.py b/xos/synchronizer/event_steps/test_kubernetes_event.py
index 32d8e1f..0b45e88 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,29 +28,24 @@
global DeferredException
self.sys_path_save = sys.path
- sys.path.append(xos_dir)
- sys.path.append(os.path.join(xos_dir, 'synchronizers', 'new_base'))
config = os.path.join(test_path, "../test_config.yaml")
from xosconfig import Config
Config.clear()
Config.init(config, 'synchronizer-config-schema.yaml')
- from synchronizers.new_base.mock_modelaccessor_build import build_mock_modelaccessor
- build_mock_modelaccessor(xos_dir, services_dir, [
- get_models_fn("olt-service", "volt.xproto"),
- get_models_fn("vsg", "vsg.xproto"),
- get_models_fn("../profiles/rcord", "rcord.xproto"),
- get_models_fn("onos-service", "onos.xproto"),
- ])
+ from xossynchronizer.mock_modelaccessor_build import mock_modelaccessor_config
+ mock_modelaccessor_config(test_path, [("olt-service", "volt.xproto"),
+ ("vsg", "vsg.xproto"),
+ ("../profiles/rcord", "rcord.xproto"),
+ ("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 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
- import synchronizers.new_base.modelaccessor
- reload(synchronizers.new_base.modelaccessor) # in case nose2 loaded it in a previous test
-
- from synchronizers.new_base.modelaccessor import model_accessor
+ from xossynchronizer.modelaccessor import model_accessor
from mock_modelaccessor import MockObjectList
from kubernetes_event import KubernetesPodDetailsEventStep
@@ -79,6 +54,7 @@
for (k, v) in model_accessor.all_model_classes.items():
globals()[k] = v
+ self.model_accessor = model_accessor
self.event_step = KubernetesPodDetailsEventStep
self.onos = ONOSService(name="myonos",
@@ -125,7 +101,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.fcsi1.backend_code, 0)
@@ -151,7 +127,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.fcsi1.backend_code, 1)
@@ -174,7 +150,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.fcsi1.backend_code, 1)
@@ -196,7 +172,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.fcsi1.backend_code, 1)