remove refrences to flavor. use m1.small as the default flavor

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

diff --git a/plstackapi/core/serializers.py b/plstackapi/core/serializers.py
index 6317803..381db05 100644 (file)
--- a/plstackapi/core/serializers.py
+++ b/plstackapi/core/serializers.py
@@ -20,12 +20,13 @@ 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', 
                   'lastname',
                   'email', 
+                  'password', 
                   'phone', 
                   'user_url',
                   'is_admin',
@@ -150,7 +151,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')
@@ -165,7 +165,7 @@ class SliverSerializer(serializers.HyperlinkedModelSerializer):
         fields = ('id',
                   'instance_id',
                   'name',
-                  'flavor',
+                  'ip',
                   'image',
                   'key',
                   'slice',
@@ -191,21 +191,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,
@@ -216,7 +204,6 @@ serializerLookUp = {
                  Sliver: SliverSerializer,
                  DeploymentNetwork: DeploymentNetworkSerializer,
                  Image: ImageSerializer,
-                 Flavor: FlavorSerializer, 
                  None: None,
                 }