commit 43f2cc483cfe77950d75ea4aaafd7624314a2004
author Scott Baker <smbaker@gmail.com> Mon Aug 24 17:11:47 2015 -0700
committer Scott Baker <smbaker@gmail.com> Mon Aug 24 17:11:47 2015 -0700
tree 0cabac5d91e9131e5c9f01c6e646d28062807160
parent 286afba3046b4a523d4df68e278aa41d7c2c94c2

defer sync_network_slivers if network.net_id is not set

xos/openstack_observer/steps/sync_network_slivers.py

diff --git a/xos/openstack_observer/steps/sync_network_slivers.py b/xos/openstack_observer/steps/sync_network_slivers.py
index bbf3e8c..c46ca55 100644
--- a/xos/openstack_observer/steps/sync_network_slivers.py
+++ b/xos/openstack_observer/steps/sync_network_slivers.py
@@ -154,7 +154,10 @@
                 if cn.lazy_blocked:
                     cn.lazy_blocked=False
                     cn.save()
-                    logger.info("deferring networkSliver %s because controller was lazy-blocked" % networkSliver)
+                    logger.info("deferring networkSliver %s because controllerNetwork was lazy-blocked" % networkSliver)
+                    continue
+                if not cn.net_id:
+                    logger.info("deferring networkSliver %s because controllerNetwork does not have a port-id yet" % networkSliver)
                     continue
                 try:
                     # We need to use a client driver that specifies the tenant