commit e7b55e4cfc8b5fac791072aca159f1b63d9bd17a
author Scott Baker <smbaker@gmail.com> Mon Apr 01 17:18:03 2019 -0700
committer Scott Baker <smbaker@gmail.com> Tue Apr 02 08:52:44 2019 -0700
tree 65fdb7cf10d4d808811548dbd335b7dd45aef243
parent 7beff9386a8f56b6987d7cbd169a5effbbc47835

SEBA-497 delayering, Makefile, and tox for fabric-crossconnect-synchronizer

Change-Id: Ibcf8fd06b9ad94d3f198887c18be7adfa4d5a954

xos/synchronizer/event_steps/test_kubernetes_event.py

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()
-
-
-