X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fmodels%2Fsite.py;h=cc2ad0314871a8450e1572a090b5d8dc4da1fc19;hb=fe290f49559b1e19b9251b83877862f70679bf86;hp=160b426f8d1a783eaa31739a7da03107f5fb2a11;hpb=f38f3b0d04decd094983aab02c795c392d47138c;p=plstackapi.git diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py index 160b426..cc2ad03 100644 --- a/planetstack/core/models/site.py +++ b/planetstack/core/models/site.py @@ -10,9 +10,9 @@ from planetstack.config import Config config = Config() -class DeploymentLinkDeletionManager(PlCoreBaseDeletionManager): +class ControllerLinkDeletionManager(PlCoreBaseDeletionManager): def get_queryset(self): - parent=super(DeploymentLinkDeletionManager, self) + parent=super(ControllerLinkDeletionManager, self) try: backend_type = config.observer_backend_type except AttributeError: @@ -20,7 +20,7 @@ class DeploymentLinkDeletionManager(PlCoreBaseDeletionManager): 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(controller__backend_type=backend_type)) else: return parent_queryset @@ -29,9 +29,9 @@ class DeploymentLinkDeletionManager(PlCoreBaseDeletionManager): return self.get_queryset() -class DeploymentDeletionManager(PlCoreBaseDeletionManager): +class ControllerDeletionManager(PlCoreBaseDeletionManager): def get_queryset(self): - parent=super(DeploymentDeletionManager, self) + parent=super(ControllerDeletionManager, self) try: backend_type = config.observer_backend_type @@ -41,7 +41,7 @@ class DeploymentDeletionManager(PlCoreBaseDeletionManager): 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 @@ -49,9 +49,9 @@ class DeploymentDeletionManager(PlCoreBaseDeletionManager): def get_query_set(self): return self.get_queryset() -class DeploymentLinkManager(PlCoreBaseManager): +class ControllerLinkManager(PlCoreBaseManager): def get_queryset(self): - parent=super(DeploymentLinkManager, self) + parent=super(ControllerLinkManager, self) try: backend_type = config.observer_backend_type @@ -61,7 +61,7 @@ class DeploymentLinkManager(PlCoreBaseManager): 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(controller__backend_type=backend_type)) else: return parent_queryset @@ -70,9 +70,9 @@ class DeploymentLinkManager(PlCoreBaseManager): return self.get_queryset() -class DeploymentManager(PlCoreBaseManager): +class ControllerManager(PlCoreBaseManager): def get_queryset(self): - parent=super(DeploymentManager, self) + parent=super(ControllerManager, self) try: backend_type = config.observer_backend_type @@ -82,7 +82,7 @@ class DeploymentManager(PlCoreBaseManager): 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 @@ -105,7 +105,7 @@ class Site(PlCoreBase): 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) @@ -141,9 +141,9 @@ class SiteRole(PlCoreBase): 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) @@ -166,15 +166,15 @@ class SitePrivilege(PlCoreBase): return qs class Deployment(PlCoreBase): - objects = DeploymentManager() - deleted_objects = DeploymentDeletionManager() + #objects = Controllermanager() + #deleted_objects = DeploymentDeletionManager() name = models.CharField(max_length=200, unique=True, help_text="Name of the Deployment") - admin_user = models.CharField(max_length=200, null=True, blank=True, help_text="Username of an admin user at this deployment") - admin_password = models.CharField(max_length=200, null=True, blank=True, help_text="Password of theadmin user at this deployment") - admin_tenant = models.CharField(max_length=200, null=True, blank=True, help_text="Name of the tenant the admin user belongs to") - 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") + #admin_user = models.CharField(max_length=200, null=True, blank=True, help_text="Username of an admin user at this deployment") + #admin_password = models.CharField(max_length=200, null=True, blank=True, help_text="Password of theadmin user at this deployment") + #admin_tenant = models.CharField(max_length=200, null=True, blank=True, help_text="Name of the tenant the admin user belongs to") + #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 @@ -193,7 +193,7 @@ class Deployment(PlCoreBase): 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) @@ -216,26 +216,21 @@ class Deployment(PlCoreBase): 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() - ROLE_CHOICES = (('admin','Admin'),) role = models.CharField(choices=ROLE_CHOICES, unique=True, max_length=30) def __unicode__(self): return u'%s' % (self.role) class DeploymentPrivilege(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) @@ -257,21 +252,52 @@ class DeploymentPrivilege(PlCoreBase): else: dpriv_ids = [dp.id for dp in DeploymentPrivilege.objects.filter(user=user)] qs = DeploymentPrivilege.objects.filter(id__in=dpriv_ids) - return qs + return qs -class SiteDeployments(PlCoreBase): - objects = DeploymentLinkManager() - deleted_objects = DeploymentLinkDeletionManager() +class ControllerRole(PlCoreBase): + #objects = ControllerLinkManager() + #deleted_objects = ControllerLinkDeletionManager() - site = models.ForeignKey(Site) - deployment = models.ForeignKey(Deployment) - tenant_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone tenant id") + ROLE_CHOICES = (('admin','Admin'),) + role = models.CharField(choices=ROLE_CHOICES, unique=True, max_length=30) - @staticmethod - def select_by_user(user): - return SiteDeployments.objects.all() + def __unicode__(self): return u'%s' % (self.role) - #class Meta: - # db_table = 'core_site_deployments' - # #auto_created = Site +class Controller(PlCoreBase): + + objects = ControllerManager() + deleted_objects = ControllerDeletionManager() + + name = models.CharField(max_length=200, unique=True, help_text="Name of the Controller") + backend_type = models.CharField(max_length=200, help_text="Type of compute controller, e.g. EC2, OpenStack, or OpenStack version") + version = models.CharField(max_length=200, help_text="Controller version") + auth_url = models.CharField(max_length=200, null=True, blank=True, help_text="Auth url for the compute controller") + admin_user = models.CharField(max_length=200, null=True, blank=True, help_text="Username of an admin user at this controller") + admin_password = models.CharField(max_length=200, null=True, blank=True, help_text="Password of theadmin user at this controller") + admin_tenant = models.CharField(max_length=200, null=True, blank=True, help_text="Name of the tenant the admin user belongs to") + + def __unicode__(self): return u'%s %s %s' % (self.name, self.backend_type, self.version) + + def can_update(self, user): + if user.is_readonly: + return False + if user.is_admin: + return True + return False + +class SiteDeployment(PlCoreBase): + objects = ControllerLinkManager() + deleted_objects = ControllerLinkDeletionManager() + + site = models.ForeignKey(Site,related_name='sitedeployments') + deployment = models.ForeignKey(Deployment,related_name='sitedeployments') + controller = models.ForeignKey(Controller, null=True, blank=True, related_name='sitedeployments') + availability_zone = models.CharField(max_length=200, null=True, blank=True, help_text="OpenStack availability zone") + def __unicode__(self): return u'%s %s' % (self.deployment, self.site) + +class ControllerSite(PlCoreBase): + + site = models.ForeignKey(Site,related_name='controllersite') + controller = models.ForeignKey(Controller, null=True, blank=True, related_name='controllersite') + tenant_id = models.CharField(null=True, blank=True, max_length=200, db_index=True, help_text="Keystone tenant id")