From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 6 May 2013 21:06:37 +0000 (-0400)
Subject: remove Slice.instantiation field
X-Git-Tag: 1.0~61^2~28
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=659dd52fcd50b58549f1eaa2812223792b4e4104;p=plstackapi.git

remove Slice.instantiation field
---

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 KeyAdmin(OSModelAdmin):
         
 
 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):
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 @@ class Slice(PlCoreBase):
     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)
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 @@ class SliceSerializer(serializers.HyperlinkedModelSerializer):
                   'enabled',
                   'name',
                   'url',
-                  'instantiation',
                   'omf_friendly',
                   'description',
                   'slice_url',
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 @@ class SliceImporter:
             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'],