SEBA-497 delayering, Makefile, and tox for fabric-synchronizer
Change-Id: I916f4b632019dddceae5a6f024a0b1c64d8188d8
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 507da0d..9f02171 100644
--- a/xos/synchronizer/event_steps/kubernetes_event.py
+++ b/xos/synchronizer/event_steps/kubernetes_event.py
@@ -13,10 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import
import json
-import os
-import sys
from xossynchronizer.event_steps.eventstep import EventStep
from xossynchronizer.modelaccessor import model_accessor
from xossynchronizer.modelaccessor import FabricService, Switch, Service
@@ -25,6 +24,7 @@
log = create_logger(Config().get('logging'))
+
class KubernetesPodDetailsEventStep(EventStep):
topics = ["xos.kubernetes.pod-details"]
technology = "kafka"
@@ -63,12 +63,17 @@
for switch in Switch.objects.all():
log.info("Dirtying Switch", switch=switch)
- switch.backend_code=0
- switch.backend_status="resynchronize due to kubernetes event"
+ switch.backend_code = 0
+ switch.backend_status = "resynchronize due to kubernetes event"
switch.save(update_fields=["updated", "backend_code", "backend_status"], always_update_timestamp=True)
for port in switch.ports.all():
log.info("Dirtying SwitchPort", port=port)
- port.backend_code=0
- port.backend_status="resynchronize due to kubernetes event"
- port.save(update_fields=["updated", "backend_code", "backend_status"], always_update_timestamp=True)
+ port.backend_code = 0
+ port.backend_status = "resynchronize due to kubernetes event"
+ port.save(
+ update_fields=[
+ "updated",
+ "backend_code",
+ "backend_status"],
+ always_update_timestamp=True)
diff --git a/xos/synchronizer/event_steps/onos_event.py b/xos/synchronizer/event_steps/onos_event.py
index 8458516..27199f2 100644
--- a/xos/synchronizer/event_steps/onos_event.py
+++ b/xos/synchronizer/event_steps/onos_event.py
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import
import json
from xossynchronizer.event_steps.eventstep import EventStep
diff --git a/xos/synchronizer/event_steps/test_kubernetes_event.py b/xos/synchronizer/event_steps/test_kubernetes_event.py
index ae2915d..a69c608 100644
--- a/xos/synchronizer/event_steps/test_kubernetes_event.py
+++ b/xos/synchronizer/event_steps/test_kubernetes_event.py
@@ -12,15 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+#from __future__ import absolute_import
+
+import imp
import unittest
import json
-import functools
-from mock import patch, call, Mock, PropertyMock
-import requests_mock
+from mock import patch, call, Mock
+import os
+import sys
-import os, 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,8 +45,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
@@ -59,18 +62,18 @@
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")
self.fabric_service = FabricService(name="fabric",
- id=1112,
- backend_code=1,
- backend_status="succeeded",
- provider_services=[self.onos])
+ id=1112,
+ backend_code=1,
+ backend_status="succeeded",
+ provider_services=[self.onos])
self.switch = Switch(name="switch1",
backend_code=1,
@@ -115,7 +118,7 @@
self.assertEqual(self.switch.backend_status, "resynchronize due to kubernetes event")
switch_save.assert_called_with(self.switch, update_fields=["updated", "backend_code", "backend_status"],
- always_update_timestamp=True)
+ always_update_timestamp=True)
self.assertEqual(self.port1.backend_code, 0)
self.assertEqual(self.port1.backend_status, "resynchronize due to kubernetes event")
@@ -123,10 +126,22 @@
self.assertEqual(self.port2.backend_code, 0)
self.assertEqual(self.port2.backend_status, "resynchronize due to kubernetes event")
- switchport_save.assert_has_calls([call(self.port1, update_fields=["updated", "backend_code", "backend_status"],
- always_update_timestamp=True),
- call(self.port2, update_fields=["updated", "backend_code", "backend_status"],
- always_update_timestamp=True)])
+ switchport_save.assert_has_calls(
+ [
+ call(
+ self.port1,
+ update_fields=[
+ "updated",
+ "backend_code",
+ "backend_status"],
+ always_update_timestamp=True),
+ call(
+ self.port2,
+ update_fields=[
+ "updated",
+ "backend_code",
+ "backend_status"],
+ always_update_timestamp=True)])
def test_process_event_unknownstatus(self):
with patch.object(FabricService.objects, "get_items") as fabric_service_objects, \
@@ -220,8 +235,6 @@
switchport_save.assert_not_called()
+
if __name__ == '__main__':
unittest.main()
-
-
-
diff --git a/xos/synchronizer/event_steps/test_onos_event.py b/xos/synchronizer/event_steps/test_onos_event.py
index 2174577..61b0185 100644
--- a/xos/synchronizer/event_steps/test_onos_event.py
+++ b/xos/synchronizer/event_steps/test_onos_event.py
@@ -12,6 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+#from __future__ import absolute_import
+
+import imp
import unittest
import json
from mock import patch, Mock
@@ -42,8 +45,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
@@ -92,7 +95,7 @@
def test_process_event_enable(self):
with patch.object(Switch.objects, "get_items") as switch_objects, \
- patch.object(SwitchPort.objects, "get_items") as switchport_objects:
+ patch.object(SwitchPort.objects, "get_items") as switchport_objects:
switch_objects.return_value = [self.switch]
switchport_objects.return_value = [self.port1, self.port2]
@@ -109,7 +112,7 @@
def test_process_event_disable(self):
with patch.object(Switch.objects, "get_items") as switch_objects, \
- patch.object(SwitchPort.objects, "get_items") as switchport_objects:
+ patch.object(SwitchPort.objects, "get_items") as switchport_objects:
switch_objects.return_value = [self.switch]
switchport_objects.return_value = [self.port1, self.port2]
@@ -126,7 +129,7 @@
def test_process_event_no_switch(self):
with patch.object(Switch.objects, "get_items") as switch_objects, \
- patch.object(SwitchPort.objects, "get_items") as switchport_objects:
+ patch.object(SwitchPort.objects, "get_items") as switchport_objects:
switch_objects.return_value = [self.switch]
switchport_objects.return_value = [self.port1, self.port2]
@@ -145,7 +148,7 @@
def test_process_event_no_port(self):
with patch.object(Switch.objects, "get_items") as switch_objects, \
- patch.object(SwitchPort.objects, "get_items") as switchport_objects:
+ patch.object(SwitchPort.objects, "get_items") as switchport_objects:
switch_objects.return_value = [self.switch]
switchport_objects.return_value = [self.port1, self.port2]