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
class SitePrivilege(PlCoreBase):
- user = models.ForeignKey('User', related_name='site_privileges')
- site = models.ForeignKey('Site', related_name='site_privileges')
- role = models.ForeignKey('SiteRole')
+ user = models.ForeignKey('User', related_name='siteprivileges')
+ site = models.ForeignKey('Site', related_name='siteprivileges')
+ role = models.ForeignKey('SiteRole',related_name='siteprivileges')
def __unicode__(self): return u'%s %s %s' % (self.site, self.user, self.role)
admin_tenant = models.CharField(max_length=200, null=True, blank=True, help_text="Name of the tenant the admin user belongs to")\r
auth_url = models.CharField(max_length=200, null=True, blank=True, help_text="Auth url for the deployment")
backend_type = models.CharField(max_length=200, null=True, blank=True, help_text="Type of deployment, e.g. EC2, OpenStack, or OpenStack version")
+ availability_zone = models.CharField(max_length=200, null=True, blank=True, help_text="OpenStack availability zone")
# smbaker: the default of 'allow all' is intended for evolutions of existing
# deployments. When new deployments are created via the GUI, they are
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()
objects = DeploymentLinkManager()
deleted_objects = DeploymentLinkDeletionManager()
- user = models.ForeignKey('User', related_name='deployment_privileges')
- deployment = models.ForeignKey('Deployment', related_name='deployment_privileges')
- role = models.ForeignKey('DeploymentRole')
+ user = models.ForeignKey('User', related_name='deploymentprivileges')
+ deployment = models.ForeignKey('Deployment', related_name='deploymentprivileges')
+ role = models.ForeignKey('DeploymentRole',related_name='deploymentprivileges')
def __unicode__(self): return u'%s %s %s' % (self.deployment, self.user, self.role)
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