observer now supports remote openstack deployments
diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 6926d90..7c10fc8 100644
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -8,10 +8,10 @@
from .role import Role
#from .deployment import Deployment
from .site import Site,Deployment, DeploymentRole, DeploymentPrivilege, SiteDeployments
-from .user import User
+from .user import User, UserDeployments
from .serviceclass import ServiceClass
-from .slice import Slice
-from .site import SitePrivilege
+from .slice import Slice, SliceDeployments
+from .site import SitePrivilege, SiteDeployments
from .image import Image
from .node import Node
from .serviceresource import ServiceResource
diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py
index edd9373..4256e75 100644
--- a/planetstack/core/models/site.py
+++ b/planetstack/core/models/site.py
@@ -21,8 +21,8 @@
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('Deployment', blank=True, related_name='sites')
- #deployments = models.ManyToManyField('Deployment', through='SiteDeployments', blank=True)
+ #deployments = models.ManyToManyField('Deployment', blank=True, related_name='sites')
+ deployments = models.ManyToManyField('Deployment', through='SiteDeployments', blank=True)
tags = generic.GenericRelation(Tag)
def __unicode__(self): return u'%s' % (self.name)
@@ -88,6 +88,9 @@
def __unicode__(self): return u'%s' % (self.name)
+ @staticmethod
+ def select_by_user(user):
+ return Deployment.objects.all()
class DeploymentRole(PlCoreBase):
@@ -127,6 +130,11 @@
class SiteDeployments(PlCoreBase):
site = models.ForeignKey(Site)
deployment = models.ForeignKey(Deployment)
+ 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'
diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py
index c39d09b..15d317f 100644
--- a/planetstack/core/models/slice.py
+++ b/planetstack/core/models/slice.py
@@ -9,6 +9,7 @@
from core.models import Tag
from django.contrib.contenttypes import generic
from core.models import Service
+from core.models import Deployment
# Create your models here.
@@ -87,3 +88,22 @@
sp_ids = [sp.id for sp in SlicePrivilege.objects.filter(user=user)]
qs = SlicePrivilege.objects.filter(id__in=sp_ids)
return qs
+
+class SliceDeployments(PlCoreBase):
+ slice = models.ForeignKey(Slice)
+ deployment = models.ForeignKey(Deployment)
+ tenant_id = models.CharField(max_length=200, help_text="Keystone tenant id")
+ network_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum network")
+ router_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum router id")
+ subnet_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum subnet id")
+
+ def __unicode__(self): return u'%s %s %s' % (self.slice, self.deployment)
+
+ @staticmethod
+ def select_by_user(user):
+ if user.is_admin:
+ qs = SliceDeployments.objects.all()
+ else:
+ slices = Slice.select_by_user(user)
+ qs = SliceDeployments.objects.filter(slice__in=slices)
+ return qs
diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py
index 29ae0d4..ce46cac 100644
--- a/planetstack/core/models/sliver.py
+++ b/planetstack/core/models/sliver.py
@@ -52,6 +52,6 @@
if user.is_admin:
qs = Sliver.objects.all()
else:
- slice_ids = [s.id for s in Slice.select_by_user(user)]
- qs = Sliver.objects.filter(id__in=slice_ids)
+ slices = Slice.select_by_user(user)
+ qs = Sliver.objects.filter(slice__in=slices)
return qs
diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py
index 1afb5fc..62e5b91 100644
--- a/planetstack/core/models/user.py
+++ b/planetstack/core/models/user.py
@@ -4,6 +4,7 @@
from django.db import models
from django.db.models import F, Q
from core.models import PlCoreBase,Site
+from core.models.deployment import Deployment
from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
from timezones.fields import TimeZoneField
@@ -149,4 +150,19 @@
return qs
-
+
+class UserDeployments(PlCoreBase):
+ user = models.ForeignKey(User)
+ deployment = models.ForeignKey(Deployment)
+ kuser_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone user id")
+
+ def __unicode__(self): return u'%s %s %s' % (self.user, self.deployment.name)
+
+ @staticmethod
+ def select_by_user(user):
+ if user.is_admin:
+ qs = UserDeployments.objects.all()
+ else:
+ users = Users.select_by_user(user)
+ qs = Usereployments.objects.filter(user__in=slices)
+ return qs