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:
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))
+ return parent_queryset.filter(Q(controller__backend_type=backend_type))
else:
return parent_queryset
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
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
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))
+ return parent_queryset.filter(Q(controller__backend_type=backend_type))
else:
return parent_queryset
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
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)
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")\r
- 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")
+ #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")\r
+ #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
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='deploymentprivileges')
deployment = models.ForeignKey('Deployment', related_name='deploymentprivileges')
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 ControllerRole(PlCoreBase):
+ #objects = ControllerLinkManager()
+ #deleted_objects = ControllerLinkDeletionManager()
+
+ ROLE_CHOICES = (('admin','Admin'),)
+ role = models.CharField(choices=ROLE_CHOICES, unique=True, max_length=30)
+
+ def __unicode__(self): return u'%s' % (self.role)
+
+class Controller(PlCoreBase):
-class SiteDeployments(PlCoreBase):
- objects = DeploymentLinkManager()
- deleted_objects = DeploymentLinkDeletionManager()
+ objects = ControllerManager()
+ deleted_objects = ControllerDeletionManager()
+
+ name = models.CharField(max_length=200, unique=True, help_text="Name of the Controller")
+ version = models.CharField(max_length=200, help_text="Controller version")
+ backend_type = models.CharField(max_length=200, null=True, blank=True, help_text="Type of compute controller, e.g. EC2, OpenStack, or OpenStack 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')
- tenant_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone tenant id")
-
- #class Meta:
- # db_table = 'core_site_deployments'
- # #auto_created = Site
+ 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")