rename NetworkBoundSliver to NetworkSliver

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index bfd9421..54533e0 100644 (file)
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -52,7 +52,7 @@ class NetworkLookerUpper:
 \r
     def __call__(self, obj):\r
         if obj is not None:\r
-            for nbs in obj.networkboundsliver_set.all():\r
+            for nbs in obj.networksliver_set.all():\r
                 if (nbs.network.name == self.network_name):\r
                     return nbs.ip\r
         return ""
@@ -78,7 +78,7 @@ class SliverInline(PlStackTabularInline):
         # network names to the list of readonly fields.
 
         for sliver in obj.slivers.all():
-            for nbs in sliver.networkboundsliver_set.all():
+            for nbs in sliver.networksliver_set.all():
                 if nbs.ip is not None:
                     network_name = nbs.network.name
                     if network_name not in [str(x) for x in readonly_fields]:
@@ -88,6 +88,7 @@ class SliverInline(PlStackTabularInline):
 
     def get_fieldsets(self, request, obj=None):
         form = self.get_formset(request, obj).form
+        # fields = the read/write files + the read-only fields
         fields = self.fields
         for fieldName in self.get_readonly_fields(request,obj):
             if not fieldName in fields:
@@ -316,21 +317,21 @@ class SitePrivilegeAdmin(PlanetStackBaseAdmin):
             qs = qs.filter(site__in=sites)
         return qs
 
-class NetworkBoundSliverInline(PlStackTabularInline):
-    model = NetworkBoundSliver
+class NetworkSliverInline(PlStackTabularInline):
+    model = NetworkSliver
     extra = 0
     fields = ('network', 'ip')
 
     def get_queryset(self, request):
-        return NetworkBoundSliver.objects.all()
+        return NetworkSliver.objects.all()
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
-        return super(NetworkBoundSliverInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
+        return super(NetworkSliverInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
 
 class SliceAdmin(PlanetStackBaseAdmin):
     fields = ['name', 'site', 'serviceClass', 'description', 'slice_url']
     list_display = ('name', 'site','serviceClass', 'slice_url')
-    inlines = [SliverInline, SliceMembershipInline, TagInline, SliceTagInline] #, NetworkBoundSliverInline]
+    inlines = [SliverInline, SliceMembershipInline, TagInline, SliceTagInline] #, NetworkSliverInline]
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == 'site':
@@ -759,17 +760,17 @@ class NetworkParameterInline(generic.GenericTabularInline):
     model = NetworkParameter
     extra = 1
 
-class NetworkBoundSliversInline(admin.TabularInline):
+class NetworkSliversInline(admin.TabularInline):
     exclude = ['enacted']
-    model = NetworkBoundSliver # Network.boundSlivers.through
+    model = NetworkSliver # Network.boundSlivers.through
     extra = 0
 
 class NetworkAdmin(admin.ModelAdmin):
     exclude = ['enacted']
     list_display = ("name", "subnet", "ports", "labels")
-    inlines = [NetworkParameterInline, NetworkBoundSliversInline, RouterInline]
+    inlines = [NetworkParameterInline, NetworkSliversInline, RouterInline]
 
-class NetworkBoundSliverAdmin(admin.ModelAdmin):
+class NetworkSliverAdmin(admin.ModelAdmin):
     exclude = ['enacted']
     list_display = ("network", "sliver", "ip")
 
@@ -811,7 +812,7 @@ admin.site.register(TagType, TagTypeAdmin)
 admin.site.register(Network, NetworkAdmin)
 admin.site.register(Router, RouterAdmin)
 admin.site.register(NetworkParameterType, NetworkParameterTypeAdmin)
-admin.site.register(NetworkBoundSliver, NetworkBoundSliverAdmin)
+admin.site.register(NetworkSliver, NetworkSliverAdmin)
 admin.site.register(NetworkTemplate, NetworkTemplateAdmin)
 
 if showAll:

diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 627e346..16ae2ca 100644 (file)
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -16,4 +16,4 @@ from .slicetag import SliceTag
 from .sliver import Sliver
 from .reservation import ReservedResource
 from .reservation import Reservation
-from .network import Network, NetworkParameterType, NetworkParameter, NetworkBoundSliver, NetworkTemplate, Router
+from .network import Network, NetworkParameterType, NetworkParameter, NetworkSliver, NetworkTemplate, Router

diff --git a/planetstack/core/models/network.py b/planetstack/core/models/network.py
index a15b222..c55bae6 100644 (file)
--- a/planetstack/core/models/network.py
+++ b/planetstack/core/models/network.py
@@ -25,11 +25,11 @@ class Network(PlCoreBase):
 
     guaranteedBandwidth = models.IntegerField(default=0)
     permittedSlices = models.ManyToManyField(Slice, blank=True, related_name="permittedNetworks")
-    boundSlivers = models.ManyToManyField(Sliver, blank=True, related_name="boundNetworks", through="NetworkBoundSliver")
+    boundSlivers = models.ManyToManyField(Sliver, blank=True, related_name="boundNetworks", through="NetworkSliver")
 
     def __unicode__(self):  return u'%s' % (self.name)
 
-class NetworkBoundSliver(PlCoreBase):
+class NetworkSliver(PlCoreBase):
     network = models.ForeignKey(Network)
     sliver = models.ForeignKey(Sliver)
     ip = models.GenericIPAddressField(help_text="Sliver ip address", blank=True, null=True)