commit 855a9df0e5cc4d557fd4353f19d3d52605885eb6
author Scott Baker <smbaker@gmail.com> Fri Sep 09 09:23:50 2016 -0700
committer Scott Baker <smbaker@gmail.com> Fri Sep 09 11:13:25 2016 -0700
tree ba333100c3ba58f214cc7447f12733a58c72656c
parent ce142a873f528ab794e4c1c6336d42375a10ff56

check VTN API version in sync_port_addresses

Change-Id: Ib829b037e0cbb7695ab2c7a8dc3a3463ef584540

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 02e8df6..0ff7d67 100644
--- a/xos/synchronizer/steps/sync_port_addresses.py
+++ b/xos/synchronizer/steps/sync_port_addresses.py
@@ -11,6 +11,7 @@
 from services.vsg.models import VSGTenant
 from xos.logger import Logger, logging
 from requests.auth import HTTPBasicAuth
+from services.vtn.models import VTNService
 
 # hpclibrary will be in steps/..
 parentdir = os.path.join(os.path.dirname(__file__),"..")
@@ -32,6 +33,14 @@
     def call(self, **args):
         global glo_saved_vtn_maps
 
+        vtn_service = VTNService.get_service_objects().all()
+        if not vtn_service:
+            raise Exception("SyncPortAddresses: No VTN Service")
+        vtn_service = vtn_service[0]
+        if vtn_service.vtnAPIVersion >= 2:
+            logger.info("skipping SyncPortAddresses due to VTN API Version")
+            return
+
         logger.info("sync'ing vsg tenant to port addresses")
 
         # build up a dictionary of port-->[wan_addrs] mappings

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 a4016e5..7bdee17 100644
--- a/xos/synchronizer/steps/sync_vtn_service.py
+++ b/xos/synchronizer/steps/sync_vtn_service.py
@@ -205,7 +205,7 @@
 
         vtn_service = vtn_service[0]
 
-        if vtn_service.vtnAPIVersion==2:
+        if vtn_service.vtnAPIVersion>=2:
             # version 2 means use new API
             logger.info("Using New API")
             self.sync_service_networks()