key is now just an attribute of the user model. Added 'creator' field to sliver model

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

diff --git a/planetstack/core/serializers.py b/planetstack/core/serializers.py
index 7c5dca9..fd0c6c6 100644 (file)
--- 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')
 
 
@@ -27,8 +28,9 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
                   'firstname', 
                   'lastname',
                   'email', 
-                  'password', 
-                  'phone', 
+                  'password',
+                  'phone',
+                  'public_key', 
                   'user_url',
                   'is_admin',
                   'site',
@@ -122,13 +124,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'
@@ -188,7 +190,7 @@ serializerLookUp = {
                  SliceMembership: SliceMembershipSerializer,
                  Node: NodeSerializer,
                  Sliver: SliverSerializer,
-                 DeploymentNetwork: DeploymentNetworkSerializer,
+                 Deployment: DeploymentSerializer,
                  Image: ImageSerializer,
                  None: None,
                 }