parent_queryset = parent.get_queryset() if hasattr(parent, "get_queryset") else parent.get_query_set()
if (backend_type):
- return parent_queryset.filter(Q(deployment__backend_type=backend_type)|Q(backend_type=None))
+ return parent_queryset.filter(Q(deployment__backend_type=backend_type))
else:
return parent_queryset
parent_queryset = parent.get_queryset() if hasattr(parent, "get_queryset") else parent.get_query_set()
if backend_type:
- return parent_queryset.filter(Q(backend_type=backend_type)|Q(backend_type=None))
+ return parent_queryset.filter(Q(backend_type=backend_type))
else:
return parent_queryset
parent_queryset = parent.get_queryset() if hasattr(parent, "get_queryset") else parent.get_query_set()
if backend_type:
- return parent_queryset.filter(Q(deployment__backend_type=backend_type)|Q(backend_type=None))
+ return parent_queryset.filter(Q(deployment__backend_type=backend_type))
else:
return parent_queryset
parent_queryset = parent.get_queryset() if hasattr(parent, "get_queryset") else parent.get_query_set()
if backend_type:
- return parent_queryset.filter(Q(backend_type=backend_type)|Q(backend_type=None))
+ return parent_queryset.filter(Q(backend_type=backend_type))
else:
return parent_queryset
abbreviated_name = models.CharField(max_length=80)
#deployments = models.ManyToManyField('Deployment', blank=True, related_name='sites')
- deployments = models.ManyToManyField('Deployment', through='SiteDeployments', blank=True, help_text="Select which sites are allowed to host nodes in this deployment", related_name='sites')
+ deployments = models.ManyToManyField('Deployment', through='SiteDeployment', blank=True, help_text="Select which sites are allowed to host nodes in this deployment", related_name='sites')
tags = generic.GenericRelation(Tag)
def __unicode__(self): return u'%s' % (self.name)
if slice:
potential_users.append(slice.creator)
- for priv in slice.slice_privileges.all():
+ for priv in slice.sliceprivileges.all():
if priv.user not in potential_users:
potential_users.append(priv.user)
def __unicode__(self): return u'%s' % (self.name)
- @staticmethod
- def select_by_user(user):
- return Deployment.objects.all()
-
class DeploymentRole(PlCoreBase):
#objects = DeploymentLinkManager()
#deleted_objects = DeploymentLinkDeletionManager()
qs = DeploymentPrivilege.objects.filter(id__in=dpriv_ids)
return qs
-class SiteDeployments(PlCoreBase):
+class SiteDeployment(PlCoreBase):
objects = DeploymentLinkManager()
deleted_objects = DeploymentLinkDeletionManager()
- site = models.ForeignKey(Site)
- deployment = models.ForeignKey(Deployment)
+ site = models.ForeignKey(Site,related_name='sitedeployments')
+ deployment = models.ForeignKey(Deployment,related_name='sitedeployments')
tenant_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone tenant id")
- @staticmethod
- def select_by_user(user):
- return SiteDeployments.objects.all()
-
#class Meta:
# db_table = 'core_site_deployments'
# #auto_created = Site