added isntance_name to sliver page
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Thu, 2 May 2013 20:39:20 +0000 (16:39 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Thu, 2 May 2013 20:39:20 +0000 (16:39 -0400)
plstackapi/core/admin.py
plstackapi/core/serializers.py

index d43a500..a562911 100644 (file)
@@ -257,17 +257,19 @@ class NodeAdmin(admin.ModelAdmin):
 class SliverForm(forms.ModelForm):
     class Meta:
         ip = forms.CharField(widget=PlainTextWidget)
+        instance_name = forms.CharField(widget=PlainTextWidget)
         model = Sliver
         widgets = {
             'ip': PlainTextWidget(),
+            'instance_name': PlainTextWidget(),
         }
 
 class SliverAdmin(PlanetStackBaseAdmin):
     form = SliverForm
     fieldsets = [
-        ('Sliver', {'fields': ['ip', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']})
+        ('Sliver', {'fields': ['ip', 'instance_name', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']})
     ]
-    list_display = ['ip', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']
+    list_display = ['ip', 'instance_name', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']
 
     def save_model(self, request, obj, form, change):
         # update openstack connection to use this sliver's slice/tenant
index b4ffe68..a341508 100644 (file)
@@ -68,7 +68,6 @@ class SliceSerializer(serializers.HyperlinkedModelSerializer):
                   'router_id',
                   'site',
                   'slivers',
-                  'subnet',
                   'updated',
                   'created')