commit 659dd52fcd50b58549f1eaa2812223792b4e4104
author Tony Mack <tmack@paris.CS.Princeton.EDU> Mon May 06 17:06:37 2013 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Mon May 06 17:06:37 2013 -0400
tree 1d732268c4da58019d98c9c732c89447cd8103b9
parent b30ac0582534c294cacb3599a96ce1960d637cf1

remove Slice.instantiation field

plstackapi/core/admin.py

diff --git a/plstackapi/core/admin.py b/plstackapi/core/admin.py
index dfb4e0d..d0b83e7 100644
--- a/plstackapi/core/admin.py
+++ b/plstackapi/core/admin.py
@@ -189,8 +189,8 @@
         
 
 class SliceAdmin(OSModelAdmin):
-    fields = ['name', 'site', 'serviceClass', 'instantiation', 'description', 'slice_url']
-    list_display = ('name', 'site','serviceClass', 'slice_url', 'instantiation')
+    fields = ['name', 'site', 'serviceClass', 'description', 'slice_url']
+    list_display = ('name', 'site','serviceClass', 'slice_url')
     inlines = [SliverInline]
 
     def get_formsets(self, request, obj=None):

plstackapi/core/models/slice.py

diff --git a/plstackapi/core/models/slice.py b/plstackapi/core/models/slice.py
index d509cc0..7122167 100644
--- a/plstackapi/core/models/slice.py
+++ b/plstackapi/core/models/slice.py
@@ -12,8 +12,6 @@
     tenant_id = models.CharField(max_length=200, help_text="Keystone tenant id")
     name = models.CharField(unique=True, help_text="The Name of the Slice", max_length=80)
     enabled = models.BooleanField(default=True, help_text="Status for this Slice")
-    SLICE_CHOICES = (('plc', 'PLC'), ('delegated', 'Delegated'), ('controller','Controller'), ('none','None'))
-    instantiation = models.CharField(help_text="The instantiation type of the slice", max_length=80, choices=SLICE_CHOICES)
     omf_friendly = models.BooleanField()
     description=models.TextField(blank=True,help_text="High level description of the slice and expected activities", max_length=1024)
     slice_url = models.URLField(blank=True, max_length=512)

plstackapi/core/serializers.py

diff --git a/plstackapi/core/serializers.py b/plstackapi/core/serializers.py
index a341508..ded1859 100644
--- a/plstackapi/core/serializers.py
+++ b/plstackapi/core/serializers.py
@@ -60,7 +60,6 @@
                   'enabled',
                   'name',
                   'url',
-                  'instantiation',
                   'omf_friendly',
                   'description',
                   'slice_url',

plstackapi/importer/plclassic/slice_importer.py

diff --git a/plstackapi/importer/plclassic/slice_importer.py b/plstackapi/importer/plclassic/slice_importer.py
index 4f57c3b..4717b3d 100644
--- a/plstackapi/importer/plclassic/slice_importer.py
+++ b/plstackapi/importer/plclassic/slice_importer.py
@@ -33,7 +33,6 @@
             if slice['name'] not in self.local_slices:
                 site = local_sites[remote_sites[slice['site_id']]['login_base']]
                 new_slice = Slice(name=slice['name'],
-                                   instantiation=slice['instantiation'],
                                    omf_friendly = False,
                                    description = slice['description'],
                                    slice_url = slice['url'],