X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fserializers.py;h=447bac4675383fdc59355062a64a47def5a4acaf;hb=bf1153a32d6f27291dd7a3238bc1a9451e9d6154;hp=55cf7c8f084aeafe35abc21b377c6237047aa19e;hpb=30fd4291ad7fdb809bb8ebbf738c3195436c2455;p=plstackapi.git

diff --git a/planetstack/core/serializers.py b/planetstack/core/serializers.py
index 55cf7c8..447bac4 100644
--- a/planetstack/core/serializers.py
+++ b/planetstack/core/serializers.py
@@ -10,6 +10,7 @@ class RoleSerializer(serializers.HyperlinkedModelSerializer):
         model = Role
         fields = ('id', 
                   'role_id',
+                  'role',
                   'role_type')
 
 
@@ -53,7 +54,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',
@@ -61,12 +61,12 @@ class SliceSerializer(serializers.HyperlinkedModelSerializer):
                   'enabled',
                   'name',
                   'url',
-                  'instantiation',
                   'omf_friendly',
                   'description',
                   'slice_url',
                   'network_id',
                   'router_id',
+                  'subnet_id',
                   'site',
                   'slivers',
                   'updated',
@@ -84,19 +84,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
@@ -136,13 +123,13 @@ class SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer):
                   'site',
                   'role')
 
-class DeploymentNetworkSerializer(serializers.HyperlinkedModelSerializer):
+class DeploymentSerializer(serializers.HyperlinkedModelSerializer):
 
     # HyperlinkedModelSerializer doesn't include the id by default
     id = serializers.Field()
     sites = serializers.HyperlinkedRelatedField(view_name='deploymentnetwork-detail')
     class Meta:
-        model = DeploymentNetwork
+        model = Deployment
         fields = ('id',
                   'name',
                   'sites'
@@ -200,10 +187,9 @@ serializerLookUp = {
                  SitePrivilege: SitePrivilegeSerializer,
                  Slice: SliceSerializer,
                  SliceMembership: SliceMembershipSerializer,
-                 Subnet: SubnetSerializer,
                  Node: NodeSerializer,
                  Sliver: SliverSerializer,
-                 DeploymentNetwork: DeploymentNetworkSerializer,
+                 Deployment: DeploymentSerializer,
                  Image: ImageSerializer,
                  None: None,
                 }