commit 382366d103e0c9fd5898550572fac86fb770cfba
author Scott Baker <smbaker@gmail.com> Mon Feb 04 10:58:43 2019 -0800
committer Scott Baker <smbaker@gmail.com> Mon Feb 04 14:19:52 2019 -0800
tree ecbf7b401eefe38e030a525668c55e76a1e1f9af
parent 964e9121534ce084e44891415b97b67550fbbec8

SEBA-405 Update fabric synchronizer to use synchronizer library

Change-Id: I101dce9008bac14bbce95a3f61ace7059b92a4b4

xos/synchronizer/steps/sync_fabric_switch.py

diff --git a/xos/synchronizer/steps/sync_fabric_switch.py b/xos/synchronizer/steps/sync_fabric_switch.py
index 7f5aa17..31c5575 100644
--- a/xos/synchronizer/steps/sync_fabric_switch.py
+++ b/xos/synchronizer/steps/sync_fabric_switch.py
@@ -15,8 +15,8 @@
 
 import requests
 from requests.auth import HTTPBasicAuth
-from synchronizers.new_base.syncstep import SyncStep, model_accessor
-from synchronizers.new_base.modelaccessor import FabricService, Switch
+from xossynchronizer.steps.syncstep import SyncStep
+from xossynchronizer.modelaccessor import FabricService, Switch, model_accessor
 
 from xosconfig import Config
 from multistructlog import create_logger
@@ -51,7 +51,7 @@
           }
         }
 
-        onos = Helpers.get_onos_fabric_service()
+        onos = Helpers.get_onos_fabric_service(model_accessor=self.model_accessor)
 
         url = 'http://%s:%s/onos/v1/network/configuration/' % (onos.rest_hostname, onos.rest_port)
         r = requests.post(url, json=data, auth=HTTPBasicAuth(onos.rest_username, onos.rest_password))
@@ -67,7 +67,7 @@
 
     def delete_record(self, model):
         log.info("Removing switch %s from onos-fabric" % model.name)
-        onos = Helpers.get_onos_fabric_service()
+        onos = Helpers.get_onos_fabric_service(model_accessor=self.model_accessor)
         url = 'http://%s:%s/onos/v1/network/configuration/devices/%s' % (
         onos.rest_hostname, onos.rest_port, model.ofId)