Renamed ImageDeployments->ImageDeployment
diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index b26194a..cd0e5dd 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -455,8 +455,8 @@
fields = ['backend_status_icon', 'network']
readonly_fields = ('backend_status_icon', )
-class ImageDeploymentsInline(PlStackTabularInline):
- model = ImageDeployments
+class ImageDeploymentInline(PlStackTabularInline):
+ model = ImageDeployment
extra = 0
verbose_name = "Image Deployments"
verbose_name_plural = "Image Deployments"
@@ -561,7 +561,7 @@
# a better way...
self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments_set.all(), SiteDeployment, "deployment", "site")
- self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments_set.all(), ImageDeployments, "deployment", "image")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments_set.all(), ImageDeployment, "deployment", "image")
self.save_m2m()
@@ -580,7 +580,7 @@
model = Deployment
fieldList = ['backend_status_text', 'name', 'availability_zone', 'sites', 'images', 'flavors', 'accessControl']
fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})]
- inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentsInline]
+ inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentInline]
list_display = ['backend_status_icon', 'name']
list_display_links = ('backend_status_icon', 'name', )
readonly_fields = ('backend_status_text', )
@@ -892,7 +892,7 @@
suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'))
- inlines = [SliverInline, ImageDeploymentsInline]
+ inlines = [SliverInline, ImageDeploymentInline]
user_readonly_fields = ['name', 'disk_format', 'container_format']
diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index b1175f1..821939e 100644
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -13,7 +13,7 @@
from .slice import Slice, SliceDeployment
from .site import SitePrivilege, SiteDeployment
from .userdeployments import UserDeployment
-from .image import Image, ImageDeployments
+from .image import Image, ImageDeployment
from .node import Node
from .serviceresource import ServiceResource
from .slice import SliceRole
diff --git a/planetstack/core/models/image.py b/planetstack/core/models/image.py
index fdeb2cc..1bca1b9 100644
--- a/planetstack/core/models/image.py
+++ b/planetstack/core/models/image.py
@@ -14,7 +14,7 @@
def __unicode__(self): return u'%s' % (self.name)
-class ImageDeployments(PlCoreBase):
+class ImageDeployment(PlCoreBase):
objects = DeploymentLinkManager()
deleted_objects = DeploymentLinkDeletionManager()
image = models.ForeignKey(Image,related_name='imagedeployments')