remove reference to Subnet

[plstackapi.git] / plstackapi / core / serializers.py

diff --git a/plstackapi/core/serializers.py b/plstackapi/core/serializers.py
index 2b70357..b6a9e7d 100644 (file)
--- a/plstackapi/core/serializers.py
+++ b/plstackapi/core/serializers.py
@@ -20,7 +20,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
     slice_memberships = serializers.HyperlinkedRelatedField(view_name='slice-membership-detail')
     site_privileges = serializers.HyperlinkedRelatedField(view_name='site-privilege-detail')
     class Meta:
-        model = User
+        model = PLUser
         fields = ('id',
                   'user_id', 
                   'firstname', 
@@ -52,7 +52,6 @@ class SliceSerializer(serializers.HyperlinkedModelSerializer):
     id = serializers.Field()
     site = serializers.HyperlinkedRelatedField(view_name='site-detail')
     slivers = serializers.HyperlinkedRelatedField(view_name='sliver-detail')
-    subnet= serializers.HyperlinkedRelatedField(view_name='subnet-detail')
     class Meta:
         model = Slice
         fields = ('id',
@@ -60,15 +59,14 @@ class SliceSerializer(serializers.HyperlinkedModelSerializer):
                   'enabled',
                   'name',
                   'url',
-                  'instantiation',
                   'omf_friendly',
                   'description',
                   'slice_url',
                   'network_id',
                   'router_id',
+                  'subnet_id',
                   'site',
                   'slivers',
-                  'subnet',
                   'updated',
                   'created')
 
@@ -84,19 +82,6 @@ class SliceMembershipSerializer(serializers.HyperlinkedModelSerializer):
                   'slice',
                   'role')
 
-class SubnetSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    slice = serializers.HyperlinkedRelatedField(view_name='slice-detail')
-    class Meta:
-        model = Subnet
-        fields = ('id',
-                  'subnet_id',
-                  'cidr',
-                  'ip_version',
-                  'start',
-                  'end',
-                  'slice')  
-
 class SiteSerializer(serializers.HyperlinkedModelSerializer):
 
     #Experimenting with whether to use ids, hyperlinks, or nested includes
@@ -151,7 +136,6 @@ class DeploymentNetworkSerializer(serializers.HyperlinkedModelSerializer):
 class SliverSerializer(serializers.HyperlinkedModelSerializer):
     # HyperlinkedModelSerializer doesn't include the id by default
     id = serializers.Field()
-    flavor = serializers.HyperlinkedRelatedField(view_name='flavor-detail')
     image = serializers.HyperlinkedRelatedField(view_name='image-detail')
     key = serializers.HyperlinkedRelatedField(view_name='key-detail')
     slice = serializers.HyperlinkedRelatedField(view_name='slice-detail')
@@ -166,8 +150,8 @@ class SliverSerializer(serializers.HyperlinkedModelSerializer):
         fields = ('id',
                   'instance_id',
                   'name',
+                  'instance_name',
                   'ip',
-                  'flavor',
                   'image',
                   'key',
                   'slice',
@@ -193,21 +177,9 @@ class ImageSerializer(serializers.HyperlinkedModelSerializer):
                   'disk_format',
                   'container_format')
 
-class FlavorSerializer(serializers.HyperlinkedModelSerializer):
-    # HyperlinkedModelSerializer doesn't include the id by default
-    id = serializers.Field()
-    class Meta:
-        model = Flavor
-        fields = ('id',
-                  'flavor_id',
-                  'name',
-                  'memory_mb',
-                  'disk_gb',
-                  'vcpus')
-
 serializerLookUp = { 
                  Role: RoleSerializer,
-                 User: UserSerializer,
+                 PLUser: UserSerializer,
                  Key: KeySerializer,
                  Site: SiteSerializer,
                  SitePrivilege: SitePrivilegeSerializer,
@@ -218,7 +190,6 @@ serializerLookUp = {
                  Sliver: SliverSerializer,
                  DeploymentNetwork: DeploymentNetworkSerializer,
                  Image: ImageSerializer,
-                 Flavor: FlavorSerializer, 
                  None: None,
                 }