CORD-1008 port vtn synchronizer to new_base
Change-Id: Ib3883dd978dd6ff09cb83380f98c57203bdae346
diff --git a/xos/synchronizer/steps/sync_vtn_service.py b/xos/synchronizer/steps/sync_vtn_service.py
index 3b775f1..44e29d7 100644
--- a/xos/synchronizer/steps/sync_vtn_service.py
+++ b/xos/synchronizer/steps/sync_vtn_service.py
@@ -3,20 +3,13 @@
import socket
import sys
import base64
-from django.db.models import F, Q
from xos.config import Config
-from synchronizers.base.syncstep import SyncStep
-from core.models import Service, Network, Port
-from core.models.service import COARSE_KIND
from services.vtn.vtnnetport import VTNNetwork, VTNPort
-from services.vtn.models import VTNService
+from synchronizers.new_base.syncstep import SyncStep
+from synchronizers.new_base.modelaccessor import *
from xos.logger import Logger, logging
from requests.auth import HTTPBasicAuth
-# hpclibrary will be in steps/..
-parentdir = os.path.join(os.path.dirname(__file__),"..")
-sys.path.insert(0,parentdir)
-
logger = Logger(level=logging.INFO)
# XXX should save and load this
@@ -33,9 +26,7 @@
SyncStep.__init__(self, **args)
def get_vtn_onos_service(self):
- from services.onos.models import ONOSService
-
- vtn_service = ONOSService.get_service_objects().filter(name="ONOS_CORD") # XXX fixme - harcoded
+ vtn_service = ONOSService.objects.filter(name="ONOS_CORD") # XXX fixme - harcoded
if not vtn_service:
raise "No VTN Onos Service"