From: Siobhan Tully <stully@verivue.com>
Date: Thu, 2 May 2013 10:02:36 +0000 (-0400)
Subject: Merged with Tony's changes -- added numberCores to SliverAdmins
X-Git-Tag: 1.0~73
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d1cd5dfcc6df38e882a0d518d10b3856ffd432f9;p=plstackapi.git

Merged with Tony's changes -- added numberCores to SliverAdmins
---

d1cd5dfcc6df38e882a0d518d10b3856ffd432f9
diff --cc plstackapi/core/admin.py
index 3a40bca,904b566..4bb9a98
--- a/plstackapi/core/admin.py
+++ b/plstackapi/core/admin.py
@@@ -31,7 -32,7 +32,7 @@@ class ReadonlyTabularInline(admin.Tabul
  
  class SliverInline(admin.TabularInline):
      model = Sliver
-     fields = ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork']
 -    fields = ['ip', 'name', 'slice', 'image', 'key', 'node', 'deploymentNetwork']
++    fields = ['ip', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']
      extra = 0
  
  class SiteInline(admin.TabularInline):
@@@ -160,10 -196,21 +196,21 @@@ class KeyAdmin(OSModelAdmin)
          
  
  class SliceAdmin(OSModelAdmin):
 -    fields = ['name', 'site', 'instantiation', 'description', 'slice_url']
 -    list_display = ('name', 'site','slice_url', 'instantiation')
 +    fields = ['name', 'site', 'serviceClass', 'instantiation', 'description', 'slice_url']
 +    list_display = ('name', 'site','serviceClass', 'slice_url', 'instantiation')
      inlines = [SliverInline]
  
+     def get_formsets(self, request, obj=None):
+         for inline in self.get_inline_instances(request, obj):
+             # hide MyInline in the add view
+             if obj is None:
+                 continue
+             # give inline object access to driver and caller
+             client = OpenStackClient(tenant=obj.name, **request.session.get('auth', {}))
+             inline.model.driver = OpenStackDriver(client=client)
+             inline.model.caller = request.user
+             yield inline.get_formset(request, obj)
+ 
      def get_queryset(self, request):
          qs = super(SliceAdmin, self).get_queryset(request)
          if request.user.is_superuser:
@@@ -228,9 -275,9 +275,9 @@@ class SliverForm(forms.ModelForm)
  class SliverAdmin(PlanetStackBaseAdmin):
      form = SliverForm
      fieldsets = [
-         ('Sliver', {'fields': ['ip', 'name', 'slice', 'numberCores', 'flavor', 'image', 'key', 'node', 'deploymentNetwork']})
 -        ('Sliver', {'fields': ['ip', 'name', 'slice', 'image', 'key', 'node', 'deploymentNetwork']})
++        ('Sliver', {'fields': ['ip', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']})
      ]
-     list_display = ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork']
 -    list_display = ['ip', 'name', 'slice', 'image', 'key', 'node', 'deploymentNetwork']
++    list_display = ['ip', '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