git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added in geoposition for Sites, including google map display. Redid fixtures to...
[plstackapi.git]
/
planetstack
/
core
/
models
/
site.py
diff --git
a/planetstack/core/models/site.py
b/planetstack/core/models/site.py
index
ebf2ab9
..
8a6d7c4
100644
(file)
--- a/
planetstack/core/models/site.py
+++ b/
planetstack/core/models/site.py
@@
-1,35
+1,29
@@
import os
from django.db import models
from core.models import PlCoreBase
import os
from django.db import models
from core.models import PlCoreBase
-from core.models import DeploymentNetwork
-
+from core.models import Deployment
+from core.models import Tag
+from django.contrib.contenttypes import generic
+from geoposition.fields import GeopositionField
class Site(PlCoreBase):
class Site(PlCoreBase):
- tenant_id = models.CharField(max_length=200, help_text="Keystone tenant id")
+ tenant_id = models.CharField(
null=True, blank=True,
max_length=200, help_text="Keystone tenant id")
name = models.CharField(max_length=200, help_text="Name for this Site")
site_url = models.URLField(null=True, blank=True, max_length=512, help_text="Site's Home URL Page")
enabled = models.BooleanField(default=True, help_text="Status for this Site")
name = models.CharField(max_length=200, help_text="Name for this Site")
site_url = models.URLField(null=True, blank=True, max_length=512, help_text="Site's Home URL Page")
enabled = models.BooleanField(default=True, help_text="Status for this Site")
+ location = GeopositionField()
longitude = models.FloatField(null=True, blank=True)
latitude = models.FloatField(null=True, blank=True)
login_base = models.CharField(max_length=50, unique=True, help_text="Prefix for Slices associated with this Site")
is_public = models.BooleanField(default=True, help_text="Indicates the visibility of this site to other members")
abbreviated_name = models.CharField(max_length=80)
longitude = models.FloatField(null=True, blank=True)
latitude = models.FloatField(null=True, blank=True)
login_base = models.CharField(max_length=50, unique=True, help_text="Prefix for Slices associated with this Site")
is_public = models.BooleanField(default=True, help_text="Indicates the visibility of this site to other members")
abbreviated_name = models.CharField(max_length=80)
- deployments = models.ManyToManyField(DeploymentNetwork, blank=True, related_name='sites')
+ deployments = models.ManyToManyField(Deployment, blank=True, related_name='sites')
+ tags = generic.GenericRelation(Tag)
def __unicode__(self): return u'%s' % (self.name)
def __unicode__(self): return u'%s' % (self.name)
- def save(self, *args, **kwds):
- self.os_manager.save_site(self)
- super(Site, self).save(*args, **kwds)
-
-
- def delete(self, *args, **kwds):
- self.os_manager.delete_site(self)
- super(Site, self).delete(*args, **kwds)
-
-
class SitePrivilege(PlCoreBase):
user = models.ForeignKey('User', related_name='site_privileges')
class SitePrivilege(PlCoreBase):
user = models.ForeignKey('User', related_name='site_privileges')
@@
-39,11
+33,9
@@
class SitePrivilege(PlCoreBase):
def __unicode__(self): return u'%s %s %s' % (self.site, self.user, self.role)
def save(self, *args, **kwds):
def __unicode__(self): return u'%s %s %s' % (self.site, self.user, self.role)
def save(self, *args, **kwds):
- self.os_manager.driver.add_user_role(self.user.kuser_id, self.site.tenant_id, self.role.role_type)
super(SitePrivilege, self).save(*args, **kwds)
def delete(self, *args, **kwds):
super(SitePrivilege, self).save(*args, **kwds)
def delete(self, *args, **kwds):
- self.os_manager.driver.delete_user_role(self.user.kuser_id, self.site.tenant_id, self.role.role_type)
super(SitePrivilege, self).delete(*args, **kwds)
super(SitePrivilege, self).delete(*args, **kwds)