CORD-2964 Implement new openstack models and steps
Change-Id: I32ac438e799f563b721e19ad7ebc8a033796c88e
diff --git a/xos/synchronizer/model_policies/model_policy_Slice.py b/xos/synchronizer/model_policies/model_policy_Slice.py
index 87a5ef4..a48f5a2 100644
--- a/xos/synchronizer/model_policies/model_policy_Slice.py
+++ b/xos/synchronizer/model_policies/model_policy_Slice.py
@@ -24,6 +24,11 @@
return self.handle_update(slice)
def handle_update(self, slice):
+ # Ignore new-style slices as we don't want to run all the old policies
+ if (slice.trust_domain != None):
+ self.logger.info("This is a new-style openstack slice, which this policy shall ignore")
+ return
+
support_nat_net = False # Assume we're using VTN rather than nat-net
# slice = Slice.get(slice_id)
@@ -109,10 +114,12 @@
# TODO: This feels redundant with the reaper
def handle_delete(self, slice):
- public_nets = []
- private_net = None
- networks = Network.objects.filter(owner_id=slice.id)
+ # Ignore new-style slices as we don't want to run all the old policies
+ if (slice.trust_domain != None):
+ self.logger.info("This is a new-style openstack slice, which this policy shall ignore")
+ return
+ networks = Network.objects.filter(owner_id=slice.id)
for n in networks:
n.delete()