CORD-1010 refactor openstack synchronizer to use new_base
Change-Id: I4eb4e5131275faf69e1da05efc81a3d8d0d12296
diff --git a/xos/synchronizer/xos-synchronizer.py b/xos/synchronizer/xos-synchronizer.py
index c2d9e43..6cd8e7a 100644
--- a/xos/synchronizer/xos-synchronizer.py
+++ b/xos/synchronizer/xos-synchronizer.py
@@ -6,21 +6,20 @@
sys.path.append('/opt/xos')
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
-from synchronizers.base.backend import Backend
-from synchronizers.base.event_loop import set_driver
from xos.config import Config, DEFAULT_CONFIG_FN
-from core.models import Instance,NetworkTemplate
from xos.logger import Logger, logging, logger
-from django.db import ProgrammingError
import time
-try:
- from django import setup as django_setup # django 1.7
-except:
- django_setup = False
+from synchronizers.new_base.modelaccessor import *
+from synchronizers.new_base.backend import Backend
+from synchronizers.new_base.event_loop import set_driver
config = Config()
+logger = Logger(level=logging.INFO)
+
+# TODO: These two lines are the only difference between this file and
+# new_base/xos-synchronizer.py. Reconcile these.
# set the driver.
from synchronizers.openstack.driver import OpenStackDriver
set_driver(OpenStackDriver())
@@ -64,9 +63,6 @@
if args.daemon: daemon()
- if django_setup: # 1.7
- django_setup()
-
models_active = False
wait = False
while not models_active: