removing refrences to keys model

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

diff --git a/planetstack/core/serializers.py b/planetstack/core/serializers.py
index bc4dd01..00d7160 100644 (file)
--- a/planetstack/core/serializers.py
+++ b/planetstack/core/serializers.py
@@ -28,27 +28,15 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
                   'firstname', 
                   'lastname',
                   'email', 
-                  'password', 
-                  'phone', 
+                  'password',
+                  'phone',
+                  'public_key', 
                   'user_url',
                   'is_admin',
                   'site',
                   'slice_memberships',
                   'site_privileges')
                     
-class KeySerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    user = serializers.HyperlinkedRelatedField(view_name='user-detail') 
-    class Meta:
-        model = Key
-        fields = ('id',
-                  'name',
-                  'key',
-                  'type',
-                  'blacklisted', 
-                  'user')
-
-
 class SliceSerializer(serializers.HyperlinkedModelSerializer):
     # HyperlinkedModelSerializer doesn't include the id by default
     id = serializers.Field()
@@ -123,13 +111,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'
@@ -182,14 +170,13 @@ class ImageSerializer(serializers.HyperlinkedModelSerializer):
 serializerLookUp = { 
                  Role: RoleSerializer,
                  User: UserSerializer,
-                 Key: KeySerializer,
                  Site: SiteSerializer,
                  SitePrivilege: SitePrivilegeSerializer,
                  Slice: SliceSerializer,
                  SliceMembership: SliceMembershipSerializer,
                  Node: NodeSerializer,
                  Sliver: SliverSerializer,
-                 DeploymentNetwork: DeploymentNetworkSerializer,
+                 Deployment: DeploymentSerializer,
                  Image: ImageSerializer,
                  None: None,
                 }