CORD-1250 Update to new Service/Tenancy models
Change-Id: I2e5fa0dd7d62a6451a6726eeaba2c3aaf1b83bc9
diff --git a/xos/attic/volttenant_model.py b/xos/attic/volttenant_model.py
index bf15c30..54a6ec3 100644
--- a/xos/attic/volttenant_model.py
+++ b/xos/attic/volttenant_model.py
@@ -1,24 +1,32 @@
def __init__(self, *args, **kwargs):
volt_services = VOLTService.objects.all()
if volt_services:
- self._meta.get_field("provider_service").default = volt_services[0].id
+ self._meta.get_field("owner").default = volt_services[0].id
super(VOLTTenant, self).__init__(*args, **kwargs)
self.cached_vcpe = None
@property
def vcpe(self):
+ # TODO: hardcoded service dependency
from services.vsg.models import VSGTenant
- vcpe = self.get_newest_subscribed_tenant(VSGTenant)
- if not vcpe:
+
+ vsg = None
+ for link in self.subscribed_links:
+ # cast from base class to derived class
+ vsgs = VSGTenant.objects.filter(serviceinstance_ptr=link.provider_service_instance)
+ if vsgs:
+ vsg = vsgs[0]
+
+ if not vsg:
return None
# always return the same object when possible
- if (self.cached_vcpe) and (self.cached_vcpe.id == vcpe.id):
+ if (self.cached_vcpe) and (self.cached_vcpe.id == vsg.id):
return self.cached_vcpe
- vcpe.caller = self.creator
- self.cached_vcpe = vcpe
- return vcpe
+ vsg.caller = self.creator
+ self.cached_vcpe = vsg
+ return vsg
@vcpe.setter
def vcpe(self, value):
@@ -26,23 +34,14 @@
@property
def subscriber(self):
- if not self.subscriber_root:
- return None
- subs = CordSubscriberRoot.objects.filter(id=self.subscriber_root.id)
- if not subs:
- return None
- return subs[0]
+ for link in self.provided_links:
+ # cast from base class to derived class
+ roots = CordSubscriberRoot.objects.filter(serviceinstance_ptr=link.subscriber_service_instance)
+ if roots:
+ return roots[0]
+ return None
def save(self, *args, **kwargs):
- # VOLTTenant probably doesn't need a SSID anymore; that will be handled
- # by CORDSubscriberRoot...
- # self.validate_unique_service_specific_id()
-
- if (self.subscriber_root is not None):
- subs = self.subscriber_root.get_subscribed_tenants(VOLTTenant)
- if (subs) and (self not in subs):
- raise XOSDuplicateKey("Subscriber should only be linked to one vOLT")
-
if not self.creator:
if not getattr(self, "caller", None):
# caller must be set when creating a vCPE since it creates a slice
@@ -52,5 +51,3 @@
raise XOSProgrammingError("VOLTTenant's self.creator was not set")
super(VOLTTenant, self).save(*args, **kwargs)
-
-