commit 18e01e35cfc3b1b44fbb6214553f02df705e869d
author Sapan Bhatia <sapanb@cs.princeton.edu> Tue Nov 11 21:43:31 2014 -0500
committer Sapan Bhatia <sapanb@cs.princeton.edu> Tue Nov 11 21:43:31 2014 -0500
tree 9b2d038160cbab18a8cdce91bc52002b02bb12b6
parent 3d872e574d5faf42fb95a92b7e46413c08dbe1ac

Renamed SliceDeployments --> SliceDeployment

planetstack/core/admin.py

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 1ef4106..b26194a 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -748,8 +748,8 @@
             raise forms.ValidationError('slice name must begin with %s' % site.login_base)
         return cleaned_data
 
-class SliceDeploymentsInline(PlStackTabularInline):
-    model = SliceDeployments
+class SliceDeploymentInline(PlStackTabularInline):
+    model = SliceDeployment
     extra = 0
     verbose_name = "Slice Deployment"
     verbose_name_plural = "Slice Deployments"
@@ -765,7 +765,7 @@
     list_display = ('backend_status_icon', 'name', 'site','serviceClass', 'slice_url', 'max_slivers')
     list_display_links = ('backend_status_icon', 'name', )
     inlines = [SlicePrivilegeInline,SliverInline, TagInline, ReservationInline,SliceNetworkInline]
-    admin_inlines = [SliceDeploymentsInline]
+    admin_inlines = [SliceDeploymentInline]
 
     user_readonly_fields = fieldList
 

planetstack/core/models/__init__.py

diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 2070e16..b1175f1 100644
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -5,14 +5,14 @@
 from .service import ServiceAttribute
 from .tag import Tag
 from .role import Role
-from .site import Site,Deployment, DeploymentRole, DeploymentPrivilege, SiteDeployments
+from .site import Site,Deployment, DeploymentRole, DeploymentPrivilege, SiteDeployment
 from .dashboard import DashboardView
 from .user import User, UserDashboardView
 from .serviceclass import ServiceClass
 from .site import DeploymentLinkManager,DeploymentLinkDeletionManager
-from .slice import Slice, SliceDeployments
-from .site import SitePrivilege, SiteDeployments
-from .userdeployments import UserDeployments
+from .slice import Slice, SliceDeployment
+from .site import SitePrivilege, SiteDeployment
+from .userdeployments import UserDeployment
 from .image import Image, ImageDeployments
 from .node import Node
 from .serviceresource import ServiceResource

planetstack/core/models/slice.py

diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py
index ed10caf..e1fad4c 100644
--- a/planetstack/core/models/slice.py
+++ b/planetstack/core/models/slice.py
@@ -120,7 +120,7 @@
             qs = SlicePrivilege.objects.filter(id__in=sp_ids)
         return qs
 
-class SliceDeployments(PlCoreBase):
+class SliceDeployment(PlCoreBase):
     objects = DeploymentLinkManager()
     deleted_objects = DeploymentLinkDeletionManager()
 
@@ -136,8 +136,8 @@
     @staticmethod
     def select_by_user(user):
         if user.is_admin:
-            qs = SliceDeployments.objects.all()
+            qs = SliceDeployment.objects.all()
         else:
             slices = Slice.select_by_user(user)
-            qs = SliceDeployments.objects.filter(slice__in=slices)
+            qs = SliceDeployment.objects.filter(slice__in=slices)
         return qs