removing plural from model names. some cleanup
diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 3a63602..79c6611 100644
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -5,13 +5,13 @@
from .service import ServiceAttribute
from .tag import Tag
from .role import Role
-from .site import Site, Deployment, DeploymentRole, DeploymentPrivilege, Controller, ControllerRole, ControllerPrivilege, SiteDeployments
+from .site import Site, Deployment, DeploymentRole, DeploymentPrivilege, Controller, ControllerRole, ControllerPrivilege, ControllerSite, SiteDeployment
from .dashboard import DashboardView, ControllerDashboardView
from .user import User, UserDashboardView
from .serviceclass import ServiceClass
from .site import ControllerManager, ControllerDeletionManager, ControllerLinkManager,ControllerLinkDeletionManager
-from .slice import Slice, ControllerSlices
-from .controllerusers import ControllerUsers
+from .slice import Slice, ControllerSlice
+from .controlleruser import ControllerUser
from .image import Image, ImageDeployments, ControllerImages
from .node import Node
from .serviceresource import ServiceResource
@@ -26,6 +26,6 @@
from .sliver import Sliver
from .reservation import ReservedResource
from .reservation import Reservation
-from .network import Network, NetworkParameterType, NetworkParameter, NetworkSliver, NetworkTemplate, Router, NetworkSlice, ControllerNetworks
+from .network import Network, NetworkParameterType, NetworkParameter, NetworkSliver, NetworkTemplate, Router, NetworkSlice, ControllerNetwork
from .billing import Account, Invoice, Charge, UsableObject, Payment
diff --git a/planetstack/core/models/controllerusers.py b/planetstack/core/models/controlleruser.py
similarity index 84%
rename from planetstack/core/models/controllerusers.py
rename to planetstack/core/models/controlleruser.py
index 5a3568a..d0fda11 100644
--- a/planetstack/core/models/controllerusers.py
+++ b/planetstack/core/models/controlleruser.py
@@ -6,7 +6,7 @@
from core.models import PlCoreBase,User,Controller
from core.models import Controller,ControllerLinkManager,ControllerLinkDeletionManager
-class ControllerUsers(PlCoreBase):
+class ControllerUser(PlCoreBase):
objects = ControllerLinkManager()
deleted_objects = ControllerLinkDeletionManager()
@@ -19,8 +19,8 @@
@staticmethod
def select_by_user(user):
if user.is_admin:
- qs = ControllerUsers.objects.all()
+ qs = ControllerUser.objects.all()
else:
users = Users.select_by_user(user)
- qs = ControllerUsers.objects.filter(user__in=users)
+ qs = ControllerUser.objects.filter(user__in=users)
return qs
diff --git a/planetstack/core/models/network.py b/planetstack/core/models/network.py
index 554bbf5..cfaffc3 100644
--- a/planetstack/core/models/network.py
+++ b/planetstack/core/models/network.py
@@ -143,7 +143,7 @@
qs = Network.objects.filter(owner__in=slices)
return qs
-class ControllerNetworks(PlCoreBase):
+class ControllerNetwork(PlCoreBase):
objects = ControllerLinkManager()
deleted_objects = ControllerLinkDeletionManager()
diff --git a/planetstack/core/models/node.py b/planetstack/core/models/node.py
index 2ff503e..0884ec1 100644
--- a/planetstack/core/models/node.py
+++ b/planetstack/core/models/node.py
@@ -1,7 +1,7 @@
import os
from django.db import models
from core.models import PlCoreBase
-from core.models import SiteDeployments
+from core.models import SiteDeployment
from core.models import Tag
from django.contrib.contenttypes import generic
@@ -9,7 +9,7 @@
class Node(PlCoreBase):
name = models.CharField(max_length=200, unique=True, help_text="Name of the Node")
- site_deployment = models.ForeignKey(SiteDeployments, related_name='nodes')
+ site_deployment = models.ForeignKey(SiteDeployment, related_name='nodes')
tags = generic.GenericRelation(Tag)
def __unicode__(self): return u'%s' % (self.name)
diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py
index 69863eb..6b1f3df 100644
--- a/planetstack/core/models/site.py
+++ b/planetstack/core/models/site.py
@@ -105,7 +105,7 @@
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)
@@ -308,14 +308,19 @@
def __unicode__(self): return u'%s %s %s' % (self.name, self.backend_type, self.version)
-class SiteDeployments(PlCoreBase):
+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')
+ site = models.ForeignKey(Site,related_name='sitedeployment')
+ deployment = models.ForeignKey(Deployment,related_name='sitedeployment')
+ controller = models.ForeignKey(Controller, null=True, blank=True, related_name='sitedeployment')
availability_zone = models.CharField(max_length=200, null=True, blank=True, help_text="OpenStack availability zone")
- tenant_id = models.CharField(null=True, blank=True, max_length=200, db_index=True, help_text="Keystone tenant id")
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")
diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py
index 52a5dd6..e182388 100644
--- a/planetstack/core/models/slice.py
+++ b/planetstack/core/models/slice.py
@@ -94,7 +94,7 @@
nets = Network.objects.filter(slices=self)
nets.delete()
# delete slice controllers
- slice_controllers = ControllerSlices.objects.filter(slice=self)
+ slice_controllers = ControllerSlice.objects.filter(slice=self)
slice_controllers.delete()
# delete slice privilege
slice_privileges = SlicePrivilege.objects.filter(slice=self)
@@ -129,7 +129,7 @@
qs = SlicePrivilege.objects.filter(id__in=sp_ids)
return qs
-class ControllerSlices(PlCoreBase):
+class ControllerSlice(PlCoreBase):
objects = ControllerLinkManager()
deleted_objects = ControllerLinkDeletionManager()
@@ -142,10 +142,10 @@
@staticmethod
def select_by_user(user):
if user.is_admin:
- qs = ControllerSlices.objects.all()
+ qs = ControllerSlice.objects.all()
else:
slices = Slice.select_by_user(user)
- qs = ControllerSlices.objects.filter(slice__in=slices)
+ qs = ControllerSlice.objects.filter(slice__in=slices)
return qs
def get_cpu_stats(self):