SEBA-497 delayering, Makefile, and tox for fabric-crossconnect-synchronizer
Change-Id: Ibcf8fd06b9ad94d3f198887c18be7adfa4d5a954
diff --git a/xos/synchronizer/event_steps/__init__.py b/xos/synchronizer/event_steps/__init__.py
new file mode 100644
index 0000000..19d1424
--- /dev/null
+++ b/xos/synchronizer/event_steps/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/xos/synchronizer/event_steps/kubernetes_event.py b/xos/synchronizer/event_steps/kubernetes_event.py
index b3aae1a..4452636 100644
--- a/xos/synchronizer/event_steps/kubernetes_event.py
+++ b/xos/synchronizer/event_steps/kubernetes_event.py
@@ -15,8 +15,6 @@
import json
-import os
-import sys
from xossynchronizer.event_steps.eventstep import EventStep
from xossynchronizer.modelaccessor import FabricCrossconnectService, FabricCrossconnectServiceInstance, Service
from xosconfig import Config
@@ -24,6 +22,7 @@
log = create_logger(Config().get('logging'))
+
class KubernetesPodDetailsEventStep(EventStep):
topics = ["xos.kubernetes.pod-details"]
technology = "kafka"
@@ -63,6 +62,11 @@
for service_instance in service.service_instances.all():
log.info("Dirtying FabricCrossconnectServiceInstance", service_instance=service_instance)
- service_instance.backend_code=0
- service_instance.backend_status="resynchronize due to kubernetes event"
- service_instance.save(update_fields=["updated", "backend_code", "backend_status"], always_update_timestamp=True)
+ service_instance.backend_code = 0
+ service_instance.backend_status = "resynchronize due to kubernetes event"
+ service_instance.save(
+ update_fields=[
+ "updated",
+ "backend_code",
+ "backend_status"],
+ always_update_timestamp=True)
diff --git a/xos/synchronizer/event_steps/test_kubernetes_event.py b/xos/synchronizer/event_steps/test_kubernetes_event.py
index 1d45ce5..2de7157 100644
--- a/xos/synchronizer/event_steps/test_kubernetes_event.py
+++ b/xos/synchronizer/event_steps/test_kubernetes_event.py
@@ -14,13 +14,13 @@
import unittest
import json
-import functools
-from mock import patch, call, Mock, PropertyMock
-import requests_mock
+from mock import patch, call, Mock
-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__)))
+
class TestKubernetesEvent(unittest.TestCase):
@@ -42,7 +42,7 @@
import xossynchronizer.modelaccessor
import mock_modelaccessor
- reload(mock_modelaccessor) # in case nose2 loaded it in a previous test
+ 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
@@ -60,10 +60,10 @@
self.onos = ONOSService(name="myonos",
id=1111,
- rest_hostname = "onos-url",
- rest_port = "8181",
- rest_username = "karaf",
- rest_password = "karaf",
+ rest_hostname="onos-url",
+ rest_port="8181",
+ rest_username="karaf",
+ rest_password="karaf",
backend_code=1,
backend_status="succeeded")
@@ -92,8 +92,8 @@
def test_process_event(self):
with patch.object(FabricCrossconnectService.objects, "get_items") as fcservice_objects, \
- patch.object(Service.objects, "get_items") as service_objects, \
- patch.object(FabricCrossconnectServiceInstance, "save", autospec=True) as fcsi_save:
+ patch.object(Service.objects, "get_items") as service_objects, \
+ patch.object(FabricCrossconnectServiceInstance, "save", autospec=True) as fcsi_save:
fcservice_objects.return_value = [self.fcservice]
service_objects.return_value = [self.onos, self.fcservice]
@@ -112,14 +112,14 @@
self.assertEqual(self.fcsi2.backend_status, "resynchronize due to kubernetes event")
fcsi_save.assert_has_calls([call(self.fcsi1, update_fields=["updated", "backend_code", "backend_status"],
- always_update_timestamp=True),
- call(self.fcsi2, update_fields=["updated", "backend_code", "backend_status"],
- always_update_timestamp=True)])
+ always_update_timestamp=True),
+ call(self.fcsi2, update_fields=["updated", "backend_code", "backend_status"],
+ always_update_timestamp=True)])
def test_process_event_unknownstatus(self):
with patch.object(FabricCrossconnectService.objects, "get_items") as fcservice_objects, \
- patch.object(Service.objects, "get_items") as service_objects, \
- patch.object(FabricCrossconnectServiceInstance, "save") as fcsi_save:
+ patch.object(Service.objects, "get_items") as service_objects, \
+ patch.object(FabricCrossconnectServiceInstance, "save") as fcsi_save:
fcservice_objects.return_value = [self.fcservice]
service_objects.return_value = [self.onos, self.fcservice]
@@ -141,8 +141,8 @@
def test_process_event_unknownservice(self):
with patch.object(FabricCrossconnectService.objects, "get_items") as fcservice_objects, \
- patch.object(Service.objects, "get_items") as service_objects, \
- patch.object(FabricCrossconnectServiceInstance, "save") as fcsi_save:
+ patch.object(Service.objects, "get_items") as service_objects, \
+ patch.object(FabricCrossconnectServiceInstance, "save") as fcsi_save:
fcservice_objects.return_value = [self.fcservice]
service_objects.return_value = [self.onos, self.fcservice]
@@ -164,8 +164,8 @@
def test_process_event_nolabels(self):
with patch.object(FabricCrossconnectService.objects, "get_items") as fcservice_objects, \
- patch.object(Service.objects, "get_items") as service_objects, \
- patch.object(FabricCrossconnectServiceInstance, "save") as fcsi_save:
+ patch.object(Service.objects, "get_items") as service_objects, \
+ patch.object(FabricCrossconnectServiceInstance, "save") as fcsi_save:
fcservice_objects.return_value = [self.fcservice]
service_objects.return_value = [self.onos, self.fcservice]
@@ -184,8 +184,6 @@
fcsi_save.assert_not_called()
+
if __name__ == '__main__':
unittest.main()
-
-
-