commit cdbb71e91332aee5891810285bf747e05aafa1c7
author Scott Baker <smbaker@gmail.com> Wed Oct 26 15:50:03 2016 -0700
committer Scott Baker <scottb@onlab.us> Wed Oct 26 16:47:51 2016 -0700
tree 2d6300959ba7f85736287e59e363ef16f5520fb2
parent 144062a9adc1f6cf926a030101d197624e2f2e63

drop support for V1 VTN API

Change-Id: I87e91785edc7890aeda6c078a80c6c05ab6af66b

xos/synchronizer/steps/sync_port_addresses.py

diff --git a/xos/synchronizer/steps/sync_port_addresses.py b/xos/synchronizer/steps/sync_port_addresses.py
index 37d8dc6..b3a7837 100644
--- a/xos/synchronizer/steps/sync_port_addresses.py
+++ b/xos/synchronizer/steps/sync_port_addresses.py
@@ -39,6 +39,8 @@
         if vtn_service.vtnAPIVersion >= 2:
             logger.info("skipping SyncPortAddresses due to VTN API Version")
             return
+        else:
+            raise Exception("VTN API Version 1 is no longer supported by VTN Synchronizer")
 
         # build up a dictionary of port-->[wan_addrs] mappings
         port_addrs = {}

xos/synchronizer/steps/sync_vtn_service.py

diff --git a/xos/synchronizer/steps/sync_vtn_service.py b/xos/synchronizer/steps/sync_vtn_service.py
index 112fc5a..97f0db6 100644
--- a/xos/synchronizer/steps/sync_vtn_service.py
+++ b/xos/synchronizer/steps/sync_vtn_service.py
@@ -221,6 +221,7 @@
         else:
             # default to legacy
             logger.info("Using Old API")
-            self.sync_legacy_vtn_api()
+            raise Exception("VTN API Version 1 is no longer supported by VTN Synchronizer")
+            #self.sync_legacy_vtn_api()
 
 

xos/synchronizer/vtn-synchronizer.py

diff --git a/xos/synchronizer/vtn-synchronizer.py b/xos/synchronizer/vtn-synchronizer.py
index 3c99763..e162e18 100755
--- a/xos/synchronizer/vtn-synchronizer.py
+++ b/xos/synchronizer/vtn-synchronizer.py
@@ -9,11 +9,13 @@
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
 
-import synchronizers.base.event_loop
-if hasattr(synchronizers.base.event_loop, "set_driver"):
-    # VTN synchronizer needs the OpenStack driver
-    from openstack_xos.driver import OpenStackDriver
-    synchronizers.base.event_loop.set_driver(OpenStackDriver())
+# Legacy code to support VTN API version 1.
+
+# import synchronizers.base.event_loop
+# if hasattr(synchronizers.base.event_loop, "set_driver"):
+#    # VTN synchronizer needs the OpenStack driver
+#    from openstack_xos.driver import OpenStackDriver
+#    synchronizers.base.event_loop.set_driver(OpenStackDriver())
 
 mod = importlib.import_module("synchronizers.base.xos-synchronizer")
 mod.main()