remove Dashboard Views from user admin
[plstackapi.git] / planetstack / genapi.py
index b368a9a..fdd74d3 100644 (file)
@@ -4,16 +4,24 @@ from rest_framework.reverse import reverse
 from rest_framework import serializers
 from rest_framework import generics
 from rest_framework import status
+from rest_framework.generics import GenericAPIView
 from core.models import *
 from django.forms import widgets
 from rest_framework import filters
 from django.conf.urls import patterns, url
 
+if hasattr(serializers, "ReadOnlyField"):
+    # rest_framework 3.x
+    IdField = serializers.ReadOnlyField
+else:
+    # rest_framework 2.x
+    IdField = serializers.Field
+
 """
     Schema of the generator object:
         all: Set of all Model objects
         all_if(regex): Set of Model objects that match regex
-    
+
     Model object:
         plural: English plural of object name
         camel: CamelCase version of object name
@@ -30,6 +38,12 @@ def get_REST_patterns():
         url(r'plstackapi/serviceattributes/$', ServiceAttributeList.as_view(), name='serviceattribute-list'),
         url(r'plstackapi/serviceattributes/(?P<pk>[a-zA-Z0-9\-]+)/$', ServiceAttributeDetail.as_view(), name ='serviceattribute-detail'),
     
+        url(r'plstackapi/controllerimages/$', ControllerImagesList.as_view(), name='controllerimages-list'),
+        url(r'plstackapi/controllerimages/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerImagesDetail.as_view(), name ='controllerimages-detail'),
+    
+        url(r'plstackapi/controllersiteprivileges/$', ControllerSitePrivilegeList.as_view(), name='controllersiteprivilege-list'),
+        url(r'plstackapi/controllersiteprivileges/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerSitePrivilegeDetail.as_view(), name ='controllersiteprivilege-detail'),
+    
         url(r'plstackapi/images/$', ImageList.as_view(), name='image-list'),
         url(r'plstackapi/images/(?P<pk>[a-zA-Z0-9\-]+)/$', ImageDetail.as_view(), name ='image-detail'),
     
@@ -57,12 +71,12 @@ def get_REST_patterns():
         url(r'plstackapi/networkslivers/$', NetworkSliverList.as_view(), name='networksliver-list'),
         url(r'plstackapi/networkslivers/(?P<pk>[a-zA-Z0-9\-]+)/$', NetworkSliverDetail.as_view(), name ='networksliver-detail'),
     
-        url(r'plstackapi/networkdeployments/$', NetworkDeploymentsList.as_view(), name='networkdeployments-list'),
-        url(r'plstackapi/networkdeployments/(?P<pk>[a-zA-Z0-9\-]+)/$', NetworkDeploymentsDetail.as_view(), name ='networkdeployments-detail'),
-    
         url(r'plstackapi/flavors/$', FlavorList.as_view(), name='flavor-list'),
         url(r'plstackapi/flavors/(?P<pk>[a-zA-Z0-9\-]+)/$', FlavorDetail.as_view(), name ='flavor-detail'),
     
+        url(r'plstackapi/controllersites/$', ControllerSiteList.as_view(), name='controllersite-list'),
+        url(r'plstackapi/controllersites/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerSiteDetail.as_view(), name ='controllersite-detail'),
+    
         url(r'plstackapi/projects/$', ProjectList.as_view(), name='project-list'),
         url(r'plstackapi/projects/(?P<pk>[a-zA-Z0-9\-]+)/$', ProjectDetail.as_view(), name ='project-detail'),
     
@@ -78,8 +92,8 @@ def get_REST_patterns():
         url(r'plstackapi/serviceclasses/$', ServiceClassList.as_view(), name='serviceclass-list'),
         url(r'plstackapi/serviceclasses/(?P<pk>[a-zA-Z0-9\-]+)/$', ServiceClassDetail.as_view(), name ='serviceclass-detail'),
     
-        url(r'plstackapi/payments/$', PaymentList.as_view(), name='payment-list'),
-        url(r'plstackapi/payments/(?P<pk>[a-zA-Z0-9\-]+)/$', PaymentDetail.as_view(), name ='payment-detail'),
+        url(r'plstackapi/planetstacks/$', PlanetStackList.as_view(), name='planetstack-list'),
+        url(r'plstackapi/planetstacks/(?P<pk>[a-zA-Z0-9\-]+)/$', PlanetStackDetail.as_view(), name ='planetstack-detail'),
     
         url(r'plstackapi/charges/$', ChargeList.as_view(), name='charge-list'),
         url(r'plstackapi/charges/(?P<pk>[a-zA-Z0-9\-]+)/$', ChargeDetail.as_view(), name ='charge-detail'),
@@ -105,18 +119,30 @@ def get_REST_patterns():
         url(r'plstackapi/dashboardviews/$', DashboardViewList.as_view(), name='dashboardview-list'),
         url(r'plstackapi/dashboardviews/(?P<pk>[a-zA-Z0-9\-]+)/$', DashboardViewDetail.as_view(), name ='dashboardview-detail'),
     
-        url(r'plstackapi/imagedeployments/$', ImageDeploymentList.as_view(), name='imagedeployments-list'),
-        url(r'plstackapi/imagedeployments/(?P<pk>[a-zA-Z0-9\-]+)/$', ImageDeploymentDetail.as_view(), name ='imagedeployments-detail'),
+        url(r'plstackapi/controllernetworks/$', ControllerNetworkList.as_view(), name='controllernetwork-list'),
+        url(r'plstackapi/controllernetworks/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerNetworkDetail.as_view(), name ='controllernetwork-detail'),
+    
+        url(r'plstackapi/imagedeploymentses/$', ImageDeploymentsList.as_view(), name='imagedeployments-list'),
+        url(r'plstackapi/imagedeploymentses/(?P<pk>[a-zA-Z0-9\-]+)/$', ImageDeploymentsDetail.as_view(), name ='imagedeployments-detail'),
+    
+        url(r'plstackapi/controllerusers/$', ControllerUserList.as_view(), name='controlleruser-list'),
+        url(r'plstackapi/controllerusers/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerUserDetail.as_view(), name ='controlleruser-detail'),
     
         url(r'plstackapi/reservedresources/$', ReservedResourceList.as_view(), name='reservedresource-list'),
         url(r'plstackapi/reservedresources/(?P<pk>[a-zA-Z0-9\-]+)/$', ReservedResourceDetail.as_view(), name ='reservedresource-detail'),
     
+        url(r'plstackapi/payments/$', PaymentList.as_view(), name='payment-list'),
+        url(r'plstackapi/payments/(?P<pk>[a-zA-Z0-9\-]+)/$', PaymentDetail.as_view(), name ='payment-detail'),
+    
         url(r'plstackapi/networkslices/$', NetworkSliceList.as_view(), name='networkslice-list'),
         url(r'plstackapi/networkslices/(?P<pk>[a-zA-Z0-9\-]+)/$', NetworkSliceDetail.as_view(), name ='networkslice-detail'),
     
         url(r'plstackapi/userdashboardviews/$', UserDashboardViewList.as_view(), name='userdashboardview-list'),
         url(r'plstackapi/userdashboardviews/(?P<pk>[a-zA-Z0-9\-]+)/$', UserDashboardViewDetail.as_view(), name ='userdashboardview-detail'),
     
+        url(r'plstackapi/controllers/$', ControllerList.as_view(), name='controller-list'),
+        url(r'plstackapi/controllers/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerDetail.as_view(), name ='controller-detail'),
+    
         url(r'plstackapi/planetstackprivileges/$', PlanetStackPrivilegeList.as_view(), name='planetstackprivilege-list'),
         url(r'plstackapi/planetstackprivileges/(?P<pk>[a-zA-Z0-9\-]+)/$', PlanetStackPrivilegeDetail.as_view(), name ='planetstackprivilege-detail'),
     
@@ -129,21 +155,21 @@ def get_REST_patterns():
         url(r'plstackapi/reservations/$', ReservationList.as_view(), name='reservation-list'),
         url(r'plstackapi/reservations/(?P<pk>[a-zA-Z0-9\-]+)/$', ReservationDetail.as_view(), name ='reservation-detail'),
     
-        url(r'plstackapi/slice_deployments/$', SliceDeploymentList.as_view(), name='slicedeployments-list'),
-        url(r'plstackapi/slice_deployments/(?P<pk>[a-zA-Z0-9\-]+)/$', SliceDeploymentDetail.as_view(), name ='slicedeployments-detail'),
-    
         url(r'plstackapi/siteprivileges/$', SitePrivilegeList.as_view(), name='siteprivilege-list'),
         url(r'plstackapi/siteprivileges/(?P<pk>[a-zA-Z0-9\-]+)/$', SitePrivilegeDetail.as_view(), name ='siteprivilege-detail'),
     
-        url(r'plstackapi/planetstacks/$', PlanetStackList.as_view(), name='planetstack-list'),
-        url(r'plstackapi/planetstacks/(?P<pk>[a-zA-Z0-9\-]+)/$', PlanetStackDetail.as_view(), name ='planetstack-detail'),
+        url(r'plstackapi/controllerslices/$', ControllerSliceList.as_view(), name='controllerslice-list'),
+        url(r'plstackapi/controllerslices/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerSliceDetail.as_view(), name ='controllerslice-detail'),
     
-        url(r'plstackapi/user_deployments/$', UserDeploymentList.as_view(), name='userdeployments-list'),
-        url(r'plstackapi/user_deployments/(?P<pk>[a-zA-Z0-9\-]+)/$', UserDeploymentDetail.as_view(), name ='userdeployments-detail'),
+        url(r'plstackapi/controllerdashboardviews/$', ControllerDashboardViewList.as_view(), name='controllerdashboardview-list'),
+        url(r'plstackapi/controllerdashboardviews/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerDashboardViewDetail.as_view(), name ='controllerdashboardview-detail'),
     
         url(r'plstackapi/accounts/$', AccountList.as_view(), name='account-list'),
         url(r'plstackapi/accounts/(?P<pk>[a-zA-Z0-9\-]+)/$', AccountDetail.as_view(), name ='account-detail'),
     
+        url(r'plstackapi/controllerroles/$', ControllerRoleList.as_view(), name='controllerrole-list'),
+        url(r'plstackapi/controllerroles/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerRoleDetail.as_view(), name ='controllerrole-detail'),
+    
         url(r'plstackapi/networkparametertypes/$', NetworkParameterTypeList.as_view(), name='networkparametertype-list'),
         url(r'plstackapi/networkparametertypes/(?P<pk>[a-zA-Z0-9\-]+)/$', NetworkParameterTypeDetail.as_view(), name ='networkparametertype-detail'),
     
@@ -153,15 +179,18 @@ def get_REST_patterns():
         url(r'plstackapi/deploymentprivileges/$', DeploymentPrivilegeList.as_view(), name='deploymentprivilege-list'),
         url(r'plstackapi/deploymentprivileges/(?P<pk>[a-zA-Z0-9\-]+)/$', DeploymentPrivilegeDetail.as_view(), name ='deploymentprivilege-detail'),
     
+        url(r'plstackapi/controllersliceprivileges/$', ControllerSlicePrivilegeList.as_view(), name='controllersliceprivilege-list'),
+        url(r'plstackapi/controllersliceprivileges/(?P<pk>[a-zA-Z0-9\-]+)/$', ControllerSlicePrivilegeDetail.as_view(), name ='controllersliceprivilege-detail'),
+    
+        url(r'plstackapi/sitedeployments/$', SiteDeploymentList.as_view(), name='sitedeployment-list'),
+        url(r'plstackapi/sitedeployments/(?P<pk>[a-zA-Z0-9\-]+)/$', SiteDeploymentDetail.as_view(), name ='sitedeployment-detail'),
+    
         url(r'plstackapi/deploymentroles/$', DeploymentRoleList.as_view(), name='deploymentrole-list'),
         url(r'plstackapi/deploymentroles/(?P<pk>[a-zA-Z0-9\-]+)/$', DeploymentRoleDetail.as_view(), name ='deploymentrole-detail'),
     
         url(r'plstackapi/usercredentials/$', UserCredentialList.as_view(), name='usercredential-list'),
         url(r'plstackapi/usercredentials/(?P<pk>[a-zA-Z0-9\-]+)/$', UserCredentialDetail.as_view(), name ='usercredential-detail'),
     
-        url(r'plstackapi/sitedeployments/$', SiteDeploymentList.as_view(), name='sitedeployments-list'),
-        url(r'plstackapi/sitedeployments/(?P<pk>[a-zA-Z0-9\-]+)/$', SiteDeploymentDetail.as_view(), name ='sitedeployments-detail'),
-    
         url(r'plstackapi/slicetags/$', SliceTagList.as_view(), name='slicetag-list'),
         url(r'plstackapi/slicetags/(?P<pk>[a-zA-Z0-9\-]+)/$', SliceTagDetail.as_view(), name ='slicetag-detail'),
     
@@ -180,6 +209,8 @@ def get_REST_patterns():
 def api_root(request, format=None):
     return Response({
         'serviceattributes': reverse('serviceattribute-list', request=request, format=format),
+        'controllerimageses': reverse('controllerimages-list', request=request, format=format),
+        'controllersiteprivileges': reverse('controllersiteprivilege-list', request=request, format=format),
         'images': reverse('image-list', request=request, format=format),
         'networkparameters': reverse('networkparameter-list', request=request, format=format),
         'sites': reverse('site-list', request=request, format=format),
@@ -189,14 +220,14 @@ def api_root(request, format=None):
         'sliceprivileges': reverse('sliceprivilege-list', request=request, format=format),
         'planetstackroles': reverse('planetstackrole-list', request=request, format=format),
         'networkslivers': reverse('networksliver-list', request=request, format=format),
-        'networkdeploymentses': reverse('networkdeployments-list', request=request, format=format),
         'flavors': reverse('flavor-list', request=request, format=format),
+        'controllersites': reverse('controllersite-list', request=request, format=format),
         'projects': reverse('project-list', request=request, format=format),
         'slices': reverse('slice-list', request=request, format=format),
         'networks': reverse('network-list', request=request, format=format),
         'services': reverse('service-list', request=request, format=format),
         'serviceclasses': reverse('serviceclass-list', request=request, format=format),
-        'payments': reverse('payment-list', request=request, format=format),
+        'planetstacks': reverse('planetstack-list', request=request, format=format),
         'charges': reverse('charge-list', request=request, format=format),
         'roles': reverse('role-list', request=request, format=format),
         'usableobjects': reverse('usableobject-list', request=request, format=format),
@@ -205,25 +236,30 @@ def api_root(request, format=None):
         'slivers': reverse('sliver-list', request=request, format=format),
         'nodes': reverse('node-list', request=request, format=format),
         'dashboardviews': reverse('dashboardview-list', request=request, format=format),
+        'controllernetworks': reverse('controllernetwork-list', request=request, format=format),
         'imagedeploymentses': reverse('imagedeployments-list', request=request, format=format),
+        'controllerusers': reverse('controlleruser-list', request=request, format=format),
         'reservedresources': reverse('reservedresource-list', request=request, format=format),
+        'payments': reverse('payment-list', request=request, format=format),
         'networkslices': reverse('networkslice-list', request=request, format=format),
         'userdashboardviews': reverse('userdashboardview-list', request=request, format=format),
+        'controllers': reverse('controller-list', request=request, format=format),
         'planetstackprivileges': reverse('planetstackprivilege-list', request=request, format=format),
         'users': reverse('user-list', request=request, format=format),
         'deployments': reverse('deployment-list', request=request, format=format),
         'reservations': reverse('reservation-list', request=request, format=format),
-        'slicedeploymentses': reverse('slicedeployments-list', request=request, format=format),
         'siteprivileges': reverse('siteprivilege-list', request=request, format=format),
-        'planetstacks': reverse('planetstack-list', request=request, format=format),
-        'userdeploymentses': reverse('userdeployments-list', request=request, format=format),
+        'controllerslices': reverse('controllerslice-list', request=request, format=format),
+        'controllerdashboardviews': reverse('controllerdashboardview-list', request=request, format=format),
         'accounts': reverse('account-list', request=request, format=format),
+        'controllerroles': reverse('controllerrole-list', request=request, format=format),
         'networkparametertypes': reverse('networkparametertype-list', request=request, format=format),
         'sitecredentials': reverse('sitecredential-list', request=request, format=format),
         'deploymentprivileges': reverse('deploymentprivilege-list', request=request, format=format),
+        'controllersliceprivileges': reverse('controllersliceprivilege-list', request=request, format=format),
+        'sitedeployments': reverse('sitedeployment-list', request=request, format=format),
         'deploymentroles': reverse('deploymentrole-list', request=request, format=format),
         'usercredentials': reverse('usercredential-list', request=request, format=format),
-        'sitedeploymentses': reverse('sitedeployments-list', request=request, format=format),
         'slicetags': reverse('slicetag-list', request=request, format=format),
         'networktemplates': reverse('networktemplate-list', request=request, format=format),
         'routers': reverse('router-list', request=request, format=format),
@@ -233,239 +269,611 @@ def api_root(request, format=None):
 
 # Based on serializers.py
 
+class XOSModelSerializer(serializers.ModelSerializer):
+    def save_object(self, obj, **kwargs):
+
+        """ rest_framework can't deal with ManyToMany relations that have a
+            through table. In plstackapi, most of the through tables we have
+            use defaults or blank fields, so there's no reason why we shouldn't
+            be able to save these objects.
+
+            So, let's strip out these m2m relations, and deal with them ourself.
+        """
+        obj._complex_m2m_data={};\r
+        if getattr(obj, '_m2m_data', None):\r
+            for relatedObject in obj._meta.get_all_related_many_to_many_objects():\r
+                if (relatedObject.field.rel.through._meta.auto_created):\r
+                    # These are non-trough ManyToMany relations and\r
+                    # can be updated just fine\r
+                    continue\r
+                fieldName = relatedObject.get_accessor_name()\r
+                if fieldName in obj._m2m_data.keys():\r
+                    obj._complex_m2m_data[fieldName] = (relatedObject, obj._m2m_data[fieldName])\r
+                    del obj._m2m_data[fieldName]\r
+\r
+        serializers.ModelSerializer.save_object(self, obj, **kwargs);
+
+        for (accessor, stuff) in obj._complex_m2m_data.items():
+            (relatedObject, data) = stuff
+            through = relatedObject.field.rel.through
+            local_fieldName = relatedObject.field.m2m_reverse_field_name()
+            remote_fieldName = relatedObject.field.m2m_field_name()
+
+            # get the current set of existing relations
+            existing = through.objects.filter(**{local_fieldName: obj});
+
+            data_ids = [item.id for item in data]
+            existing_ids = [getattr(item,remote_fieldName).id for item in existing]
+
+            #print "data_ids", data_ids
+            #print "existing_ids", existing_ids
+
+            # remove relations that are in 'existing' but not in 'data'
+            for item in list(existing):
+               if (getattr(item,remote_fieldName).id not in data_ids):
+                   print "delete", getattr(item,remote_fieldName)
+                   item.delete() #(purge=True)
+
+            # add relations that are in 'data' but not in 'existing'
+            for item in data:
+               if (item.id not in existing_ids):
+                   #print "add", item
+                   newModel = through(**{local_fieldName: obj, remote_fieldName: item})
+                   newModel.save()
+
 
 
 class ServiceAttributeSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = ServiceAttribute
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','value','service',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','value','service',)
+
+class ServiceAttributeIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ServiceAttribute
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','value','service',)
+
+
 
-class ServiceAttributeIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+
+class ControllerImagesSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = ServiceAttribute
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','value','service',)
+        model = ControllerImages
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',)
+
+class ControllerImagesIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ControllerImages
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',)
+
+
+
+
+class ControllerSitePrivilegeSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
+    class Meta:
+        model = ControllerSitePrivilege
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_privilege','role_id',)
+
+class ControllerSitePrivilegeIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ControllerSitePrivilege
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_privilege','role_id',)
 
 
 
 
 class ImageSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+    id = IdField()
     
+    
+    deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail')
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Image
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path','deployments',)
 
-class ImageIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class ImageIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
+    
+    deployments = serializers.PrimaryKeyRelatedField(many=True,  queryset = Deployment.objects.all())
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Image
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path','deployments',)
 
 
 
 
 class NetworkParameterSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = NetworkParameter
-        fields = ('id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',)
-
-class NetworkParameterIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',)
+
+class NetworkParameterIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = NetworkParameter
-        fields = ('id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',)
 
 
 
 
 class SiteSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+    id = IdField()
     
+    
+    deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail')
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Site
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name','deployments',)
 
-class SiteIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class SiteIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
+    
+    deployments = serializers.PrimaryKeyRelatedField(many=True,  queryset = Deployment.objects.all())
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Site
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name','deployments',)
 
 
 
 
 class SliceRoleSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = SliceRole
-        fields = ('id','created','updated','enacted','backend_status','deleted','role',)
-
-class SliceRoleIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
+
+class SliceRoleIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = SliceRole
-        fields = ('id','created','updated','enacted','backend_status','deleted','role',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
 
 
 
 
 class TagSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Tag
-        fields = ('id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',)
-
-class TagIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',)
+
+class TagIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Tag
-        fields = ('id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',)
 
 
 
 
 class InvoiceSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Invoice
-        fields = ('id','created','updated','enacted','backend_status','deleted','date','account',)
-
-class InvoiceIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','date','account',)
+
+class InvoiceIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Invoice
-        fields = ('id','created','updated','enacted','backend_status','deleted','date','account',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','date','account',)
 
 
 
 
 class SlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = SlicePrivilege
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','slice','role',)
-
-class SlicePrivilegeIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','slice','role',)
+
+class SlicePrivilegeIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = SlicePrivilege
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','slice','role',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','slice','role',)
 
 
 
 
 class PlanetStackRoleSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = PlanetStackRole
-        fields = ('id','created','updated','enacted','backend_status','deleted','role',)
-
-class PlanetStackRoleIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
+
+class PlanetStackRoleIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = PlanetStackRole
-        fields = ('id','created','updated','enacted','backend_status','deleted','role',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
 
 
 
 
 class NetworkSliverSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = NetworkSliver
-        fields = ('id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',)
-
-class NetworkSliverIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',)
+
+class NetworkSliverIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = NetworkSliver
-        fields = ('id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',)
 
 
 
 
-class NetworkDeploymentsSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+class FlavorSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
     
+    deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail')
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = NetworkDeployments
-        fields = ('id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',)
+        model = Flavor
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',)
 
-class NetworkDeploymentsIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class FlavorIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
-        model = NetworkDeployments
-        fields = ('id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',)
+    
+    deployments = serializers.PrimaryKeyRelatedField(many=True,  queryset = Deployment.objects.all())
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = Flavor
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',)
 
 
 
 
-class FlavorSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+class ControllerSiteSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = Flavor
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',)
+        model = ControllerSite
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','controller','tenant_id',)
 
-class FlavorIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class ControllerSiteIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
-        model = Flavor
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',)
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ControllerSite
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','controller','tenant_id',)
 
 
 
 
 class ProjectSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Project
-        fields = ('id','created','updated','enacted','backend_status','deleted','name',)
-
-class ProjectIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',)
+
+class ProjectIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Project
-        fields = ('id','created','updated','enacted','backend_status','deleted','name',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',)
 
 
 
 
 class SliceSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
-    
-    networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
-    
-    
-    
-    availableNetworks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
-    
+    id = IdField()
     
     
     networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
@@ -475,45 +883,59 @@ class SliceSerializer(serializers.HyperlinkedModelSerializer):
     networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
     
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Slice
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','availableNetworks','networks','networks',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','service','network','serviceClass','creator','default_flavor','default_image','mount_data_sets','networks','networks',)
 
-class SliceIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    
-    networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
+class SliceIdSerializer(XOSModelSerializer):
+    id = IdField()
     
     
+    networks = serializers.PrimaryKeyRelatedField(many=True,  queryset = Network.objects.all())
     
-    availableNetworks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
     
     
-    
-    networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
-    
+    networks = serializers.PrimaryKeyRelatedField(many=True,  queryset = Network.objects.all())
     
     
-    networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
-    
-    
-    class Meta:
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Slice
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','availableNetworks','networks','networks',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','service','network','serviceClass','creator','default_flavor','default_image','mount_data_sets','networks','networks',)
 
 
 
 
 class NetworkSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+    id = IdField()
     
     
-    routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail')
+    slices = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='slice-detail')
     
     
     
-    availableRouters = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail')
+    slices = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='slice-detail')
+    
+    
+    
+    slivers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='sliver-detail')
     
     
     
@@ -524,346 +946,822 @@ class NetworkSerializer(serializers.HyperlinkedModelSerializer):
     routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail')
     
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Network
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteedBandwidth','permitAllSlices','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteed_bandwidth','permit_all_slices','topology_parameters','controller_url','controller_parameters','network_id','router_id','subnet_id','slices','slices','slivers','routers','routers',)
 
-class NetworkIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class NetworkIdSerializer(XOSModelSerializer):
+    id = IdField()
     
     
-    routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail')
+    slices = serializers.PrimaryKeyRelatedField(many=True,  queryset = Slice.objects.all())
     
     
     
-    availableRouters = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail')
+    slices = serializers.PrimaryKeyRelatedField(many=True,  queryset = Slice.objects.all())
     
     
     
-    routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail')
+    slivers = serializers.PrimaryKeyRelatedField(many=True,  queryset = Sliver.objects.all())
     
     
     
-    routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail')
+    routers = serializers.PrimaryKeyRelatedField(many=True,  queryset = Router.objects.all())
     
     
-    class Meta:
+    
+    routers = serializers.PrimaryKeyRelatedField(many=True,  queryset = Router.objects.all())
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Network
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteedBandwidth','permitAllSlices','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteed_bandwidth','permit_all_slices','topology_parameters','controller_url','controller_parameters','network_id','router_id','subnet_id','slices','slices','slivers','routers','routers',)
 
 
 
 
 class ServiceSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Service
-        fields = ('id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',)
-
-class ServiceIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',)
+
+class ServiceIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Service
-        fields = ('id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',)
 
 
 
 
 class ServiceClassSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = ServiceClass
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',)
-
-class ServiceClassIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',)
+
+class ServiceClassIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = ServiceClass
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',)
-
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',)
 
 
 
-class PaymentSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
-        model = Payment
-        fields = ('id','created','updated','enacted','backend_status','deleted','account','amount','date',)
 
-class PaymentIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
+class PlanetStackSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = Payment
-        fields = ('id','created','updated','enacted','backend_status','deleted','account','amount','date',)
+        model = PlanetStack
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',)
+
+class PlanetStackIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = PlanetStack
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',)
 
 
 
 
 class ChargeSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Charge
-        fields = ('id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',)
-
-class ChargeIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',)
+
+class ChargeIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Charge
-        fields = ('id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',)
 
 
 
 
 class RoleSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Role
-        fields = ('id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',)
-
-class RoleIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',)
+
+class RoleIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Role
-        fields = ('id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',)
 
 
 
 
 class UsableObjectSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = UsableObject
-        fields = ('id','created','updated','enacted','backend_status','deleted','name',)
-
-class UsableObjectIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',)
+
+class UsableObjectIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = UsableObject
-        fields = ('id','created','updated','enacted','backend_status','deleted','name',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',)
 
 
 
 
 class SiteRoleSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = SiteRole
-        fields = ('id','created','updated','enacted','backend_status','deleted','role',)
-
-class SiteRoleIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
+
+class SiteRoleIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = SiteRole
-        fields = ('id','created','updated','enacted','backend_status','deleted','role',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
 
 
 
 
 class SliceCredentialSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = SliceCredential
-        fields = ('id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',)
-
-class SliceCredentialIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',)
+
+class SliceCredentialIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = SliceCredential
-        fields = ('id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',)
 
 
 
 
 class SliverSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
-    
-    networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
-    
+    id = IdField()
     
     
     networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
     
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Sliver
-        fields = ('id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','node','deploymentNetwork','numberCores','flavor','userData','networks','networks',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','deployment','node','numberCores','flavor','userData','networks',)
 
-class SliverIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class SliverIdSerializer(XOSModelSerializer):
+    id = IdField()
     
     
-    networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
+    networks = serializers.PrimaryKeyRelatedField(many=True,  queryset = Network.objects.all())
     
     
-    
-    networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
-    
-    
-    class Meta:
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Sliver
-        fields = ('id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','node','deploymentNetwork','numberCores','flavor','userData','networks','networks',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','deployment','node','numberCores','flavor','userData','networks',)
 
 
 
 
 class NodeSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Node
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','site','deployment',)
-
-class NodeIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_deployment',)
+
+class NodeIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Node
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','site','deployment',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_deployment',)
 
 
 
 
 class DashboardViewSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+    id = IdField()
+    
+    
+    controllers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='controller-detail')
     
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = DashboardView
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','url',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','url','controllers',)
 
-class DashboardViewIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class DashboardViewIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
+    
+    controllers = serializers.PrimaryKeyRelatedField(many=True,  queryset = Controller.objects.all())
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = DashboardView
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','url',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','url','controllers',)
 
 
 
 
-class ImageDeploymentSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+class ControllerNetworkSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
+    class Meta:
+        model = ControllerNetwork
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',)
+
+class ControllerNetworkIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ControllerNetwork
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',)
+
+
+
+
+class ImageDeploymentsSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = ImageDeployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',)
+        model = ImageDeployments
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment',)
+
+class ImageDeploymentsIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ImageDeployments
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment',)
+
+
+
+
+class ControllerUserSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
+    class Meta:
+        model = ControllerUser
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',)
 
-class ImageDeploymentIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class ControllerUserIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
-        model = ImageDeployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',)
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ControllerUser
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',)
 
 
 
 
 class ReservedResourceSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = ReservedResource
-        fields = ('id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',)
+
+class ReservedResourceIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ReservedResource
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',)
 
-class ReservedResourceIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
+
+
+
+class PaymentSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = ReservedResource
-        fields = ('id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',)
+        model = Payment
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',)
+
+class PaymentIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = Payment
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',)
 
 
 
 
 class NetworkSliceSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = NetworkSlice
-        fields = ('id','created','updated','enacted','backend_status','deleted','network','slice',)
-
-class NetworkSliceIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',)
+
+class NetworkSliceIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = NetworkSlice
-        fields = ('id','created','updated','enacted','backend_status','deleted','network','slice',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',)
 
 
 
 
 class UserDashboardViewSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = UserDashboardView
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',)
-
-class UserDashboardViewIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',)
+
+class UserDashboardViewIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = UserDashboardView
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',)
 
 
 
 
-class PlanetStackPrivilegeSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+class ControllerSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
     
+    dashboardviews = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='dashboardview-detail')
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = PlanetStackPrivilege
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','planetstack','role',)
+        model = Controller
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',)
 
-class PlanetStackPrivilegeIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class ControllerIdSerializer(XOSModelSerializer):
+    id = IdField()
     
+    
+    dashboardviews = serializers.PrimaryKeyRelatedField(many=True,  queryset = DashboardView.objects.all())
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = Controller
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',)
+
+
+
+
+class PlanetStackPrivilegeSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = PlanetStackPrivilege
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','planetstack','role',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','planetstack','role',)
+
+class PlanetStackPrivilegeIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = PlanetStackPrivilege
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','planetstack','role',)
 
 
 
 
 class UserSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = User
-        fields = ('id','password','last_login','email','username','firstname','lastname','phone','user_url','site','public_key','is_active','is_admin','is_staff','is_readonly','created','updated','enacted','backend_status','deleted','timezone',)
-
-class UserIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','password','last_login','email','username','firstname','lastname','phone','user_url','site','public_key','is_active','is_admin','is_staff','is_readonly','created','updated','enacted','backend_status','deleted','timezone',)
+
+class UserIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = User
-        fields = ('id','password','last_login','email','username','firstname','lastname','phone','user_url','site','public_key','is_active','is_admin','is_staff','is_readonly','created','updated','enacted','backend_status','deleted','timezone',)
+        fields = ('humanReadableName', 'validators', 'id','password','last_login','email','username','firstname','lastname','phone','user_url','site','public_key','is_active','is_admin','is_staff','is_readonly','created','updated','enacted','backend_status','deleted','timezone',)
 
 
 
 
 class DeploymentSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+    id = IdField()
     
     
-    sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail')
+    images = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='image-detail')
     
     
     
@@ -874,308 +1772,657 @@ class DeploymentSerializer(serializers.HyperlinkedModelSerializer):
     flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail')
     
     
-    
-    flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail')
-    
-    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Deployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','admin_user','admin_password','admin_tenant','auth_url','backend_type','availability_zone','accessControl','sites','sites','flavors','flavors',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','images','sites','flavors',)
 
-class DeploymentIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
+class DeploymentIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail')
     
+    images = serializers.PrimaryKeyRelatedField(many=True,  queryset = Image.objects.all())
     
     
-    sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail')
     
+    sites = serializers.PrimaryKeyRelatedField(many=True,  queryset = Site.objects.all())
     
     
-    flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail')
     
+    flavors = serializers.PrimaryKeyRelatedField(many=True,  queryset = Flavor.objects.all())
     
     
-    flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail')
-    
-    
-    class Meta:
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Deployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','admin_user','admin_password','admin_tenant','auth_url','backend_type','availability_zone','accessControl','sites','sites','flavors','flavors',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','images','sites','flavors',)
 
 
 
 
 class ReservationSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Reservation
-        fields = ('id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',)
-
-class ReservationIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',)
+
+class ReservationIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Reservation
-        fields = ('id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',)
-
-
-
-
-class SliceDeploymentSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
-        model = SliceDeployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',)
-
-class SliceDeploymentIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
-        model = SliceDeployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',)
 
 
 
 
 class SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = SitePrivilege
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','site','role',)
-
-class SitePrivilegeIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',)
+
+class SitePrivilegeIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = SitePrivilege
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','site','role',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',)
 
 
 
 
-class PlanetStackSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+class ControllerSliceSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = PlanetStack
-        fields = ('id','created','updated','enacted','backend_status','deleted','description',)
+        model = ControllerSlice
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',)
+
+class ControllerSliceIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ControllerSlice
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',)
+
+
+
+
+class ControllerDashboardViewSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
+    class Meta:
+        model = ControllerDashboardView
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',)
 
-class PlanetStackIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class ControllerDashboardViewIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
-        model = PlanetStack
-        fields = ('id','created','updated','enacted','backend_status','deleted','description',)
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ControllerDashboardView
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',)
 
 
 
 
-class UserDeploymentSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
-        model = UserDeployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',)
-
-class UserDeploymentIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
+class AccountSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = UserDeployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',)
+        model = Account
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',)
+
+class AccountIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = Account
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',)
 
 
 
 
-class AccountSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+class ControllerRoleSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = Account
-        fields = ('id','created','updated','enacted','backend_status','deleted','site',)
+        model = ControllerRole
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
 
-class AccountIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class ControllerRoleIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
-        model = Account
-        fields = ('id','created','updated','enacted','backend_status','deleted','site',)
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ControllerRole
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
 
 
 
 
 class NetworkParameterTypeSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = NetworkParameterType
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','description',)
-
-class NetworkParameterTypeIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description',)
+
+class NetworkParameterTypeIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = NetworkParameterType
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','description',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description',)
 
 
 
 
 class SiteCredentialSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = SiteCredential
-        fields = ('id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',)
-
-class SiteCredentialIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',)
+
+class SiteCredentialIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = SiteCredential
-        fields = ('id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',)
 
 
 
 
 class DeploymentPrivilegeSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = DeploymentPrivilege
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','role',)
-
-class DeploymentPrivilegeIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','role',)
+
+class DeploymentPrivilegeIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = DeploymentPrivilege
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','role',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','role',)
 
 
 
 
-class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+class ControllerSlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = DeploymentRole
-        fields = ('id','created','updated','enacted','backend_status','deleted','role',)
+        model = ControllerSlicePrivilege
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',)
 
-class DeploymentRoleIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class ControllerSlicePrivilegeIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
-        model = DeploymentRole
-        fields = ('id','created','updated','enacted','backend_status','deleted','role',)
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = ControllerSlicePrivilege
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',)
 
 
 
 
-class UserCredentialSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
-        model = UserCredential
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',)
-
-class UserCredentialIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
+class SiteDeploymentSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = UserCredential
-        fields = ('id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',)
+        model = SiteDeployment
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',)
+
+class SiteDeploymentIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = SiteDeployment
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',)
 
 
 
 
-class SiteDeploymentSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = SiteDeployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','site','deployment','tenant_id',)
+        model = DeploymentRole
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
+
+class DeploymentRoleIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = DeploymentRole
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',)
 
-class SiteDeploymentIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
+
+
+
+class UserCredentialSerializer(serializers.HyperlinkedModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
-        model = SiteDeployment
-        fields = ('id','created','updated','enacted','backend_status','deleted','site','deployment','tenant_id',)
+        model = UserCredential
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',)
+
+class UserCredentialIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
+        model = UserCredential
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',)
 
 
 
 
 class SliceTagSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = SliceTag
-        fields = ('id','created','updated','enacted','backend_status','deleted','slice','name','value',)
-
-class SliceTagIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','value',)
+
+class SliceTagIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = SliceTag
-        fields = ('id','created','updated','enacted','backend_status','deleted','slice','name','value',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','value',)
 
 
 
 
 class NetworkTemplateSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = NetworkTemplate
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId',)
-
-class NetworkTemplateIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteed_bandwidth','visibility','translation','shared_network_name','shared_network_id','topology_kind','controller_kind',)
+
+class NetworkTemplateIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = NetworkTemplate
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteed_bandwidth','visibility','translation','shared_network_name','shared_network_id','topology_kind','controller_kind',)
 
 
 
 
 class RouterSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
+    id = IdField()
+    
+    
+    networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
+    
+    
+    
+    networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')
+    
     
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = Router
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','owner',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',)
 
-class RouterIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
+class RouterIdSerializer(XOSModelSerializer):
+    id = IdField()
     
-    class Meta:
+    
+    networks = serializers.PrimaryKeyRelatedField(many=True,  queryset = Network.objects.all())
+    
+    
+    
+    networks = serializers.PrimaryKeyRelatedField(many=True,  queryset = Network.objects.all())
+    
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = Router
-        fields = ('id','created','updated','enacted','backend_status','deleted','name','owner',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',)
 
 
 
 
 class ServiceResourceSerializer(serializers.HyperlinkedModelSerializer):
-    id = serializers.Field()
-    
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)
+    def getValidators(self, obj):
+        try:
+            return obj.getValidators()
+        except:
+            return None
     class Meta:
         model = ServiceResource
-        fields = ('id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',)
-
-class ServiceResourceIdSerializer(serializers.ModelSerializer):
-    id = serializers.Field()
-    
-    class Meta:
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',)
+
+class ServiceResourceIdSerializer(XOSModelSerializer):
+    id = IdField()
+    
+    humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+    validators = serializers.SerializerMethodField("getValidators")
+    def getHumanReadableName(self, obj):\r
+        return str(obj)\r
+    def getValidators(self, obj):\r
+        try:
+            return obj.getValidators()
+        except:
+            return None\r
+    class Meta:\r
         model = ServiceResource
-        fields = ('id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',)
+        fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',)
 
 
 
@@ -1184,6 +2431,10 @@ serializerLookUp = {
 
                  ServiceAttribute: ServiceAttributeSerializer,
 
+                 ControllerImages: ControllerImagesSerializer,
+
+                 ControllerSitePrivilege: ControllerSitePrivilegeSerializer,
+
                  Image: ImageSerializer,
 
                  NetworkParameter: NetworkParameterSerializer,
@@ -1202,10 +2453,10 @@ serializerLookUp = {
 
                  NetworkSliver: NetworkSliverSerializer,
 
-                 NetworkDeployments: NetworkDeploymentsSerializer,
-
                  Flavor: FlavorSerializer,
 
+                 ControllerSite: ControllerSiteSerializer,
+
                  Project: ProjectSerializer,
 
                  Slice: SliceSerializer,
@@ -1216,7 +2467,7 @@ serializerLookUp = {
 
                  ServiceClass: ServiceClassSerializer,
 
-                 Payment: PaymentSerializer,
+                 PlanetStack: PlanetStackSerializer,
 
                  Charge: ChargeSerializer,
 
@@ -1234,14 +2485,22 @@ serializerLookUp = {
 
                  DashboardView: DashboardViewSerializer,
 
-                 ImageDeployment: ImageDeploymentSerializer,
+                 ControllerNetwork: ControllerNetworkSerializer,
+
+                 ImageDeployments: ImageDeploymentsSerializer,
+
+                 ControllerUser: ControllerUserSerializer,
 
                  ReservedResource: ReservedResourceSerializer,
 
+                 Payment: PaymentSerializer,
+
                  NetworkSlice: NetworkSliceSerializer,
 
                  UserDashboardView: UserDashboardViewSerializer,
 
+                 Controller: ControllerSerializer,
+
                  PlanetStackPrivilege: PlanetStackPrivilegeSerializer,
 
                  User: UserSerializer,
@@ -1250,28 +2509,30 @@ serializerLookUp = {
 
                  Reservation: ReservationSerializer,
 
-                 SliceDeployment: SliceDeploymentSerializer,
-
                  SitePrivilege: SitePrivilegeSerializer,
 
-                 PlanetStack: PlanetStackSerializer,
+                 ControllerSlice: ControllerSliceSerializer,
 
-                 UserDeployment: UserDeploymentSerializer,
+                 ControllerDashboardView: ControllerDashboardViewSerializer,
 
                  Account: AccountSerializer,
 
+                 ControllerRole: ControllerRoleSerializer,
+
                  NetworkParameterType: NetworkParameterTypeSerializer,
 
                  SiteCredential: SiteCredentialSerializer,
 
                  DeploymentPrivilege: DeploymentPrivilegeSerializer,
 
+                 ControllerSlicePrivilege: ControllerSlicePrivilegeSerializer,
+
+                 SiteDeployment: SiteDeploymentSerializer,
+
                  DeploymentRole: DeploymentRoleSerializer,
 
                  UserCredential: UserCredentialSerializer,
 
-                 SiteDeployment: SiteDeploymentSerializer,
-
                  SliceTag: SliceTagSerializer,
 
                  NetworkTemplate: NetworkTemplateSerializer,
@@ -1296,16 +2557,20 @@ class PlanetStackRetrieveUpdateDestroyAPIView(generics.RetrieveUpdateDestroyAPIV
                                          files=request.FILES, partial=partial)\r
 \r
         if not serializer.is_valid():\r
-            print "UpdateModelMixin: not serializer.is_valid"\r
-            print serializer.errors\r
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)\r
+            response = {"error": "validation",\r
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)\r
 \r
         try:\r
             self.pre_save(serializer.object)\r
         except ValidationError as err:\r
             # full_clean on model instance may be called in pre_save,\r
             # so we have to handle eventual errors.\r
-            return Response(err.message_dict, status=status.HTTP_400_BAD_REQUEST)\r
+            response = {"error": "validation",\r
+                         "specific_error": "ValidationError in pre_save",\r
+                         "reasons": err.message_dict}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)\r
 \r
         if serializer.object is not None:\r
             if not serializer.object.can_update(request.user):\r
@@ -1349,7 +2614,13 @@ class ServiceAttributeList(generics.ListCreateAPIView):
         return ServiceAttribute.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = ServiceAttribute(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(ServiceAttributeList, self).create(request, *args, **kwargs)
@@ -1384,12 +2655,130 @@ class ServiceAttributeDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
+class ControllerImagesList(generics.ListCreateAPIView):
+    queryset = ControllerImages.objects.select_related().all()
+    serializer_class = ControllerImagesSerializer
+    id_serializer_class = ControllerImagesIdSerializer
+    filter_backends = (filters.DjangoFilterBackend,)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',)
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+
+    def get_queryset(self):
+        return ControllerImages.select_by_user(self.request.user)
+
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
+        obj.caller = request.user
+        if obj.can_update(request.user):
+            return super(ControllerImagesList, self).create(request, *args, **kwargs)
+        else:
+            raise Exception("failed obj.can_update")
+
+        ret = super(ControllerImagesList, self).create(request, *args, **kwargs)
+        if (ret.status_code%100 != 200):
+            raise Exception(ret.data)
+
+        return ret
+
+
+class ControllerImagesDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ControllerImages.objects.select_related().all()
+    serializer_class = ControllerImagesSerializer
+    id_serializer_class = ControllerImagesIdSerializer
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+    
+    def get_queryset(self):
+        return ControllerImages.select_by_user(self.request.user)
+
+    # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+    # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+
+
+class ControllerSitePrivilegeList(generics.ListCreateAPIView):
+    queryset = ControllerSitePrivilege.objects.select_related().all()
+    serializer_class = ControllerSitePrivilegeSerializer
+    id_serializer_class = ControllerSitePrivilegeIdSerializer
+    filter_backends = (filters.DjangoFilterBackend,)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','site_privilege','role_id',)
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+
+    def get_queryset(self):
+        return ControllerSitePrivilege.select_by_user(self.request.user)
+
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
+        obj.caller = request.user
+        if obj.can_update(request.user):
+            return super(ControllerSitePrivilegeList, self).create(request, *args, **kwargs)
+        else:
+            raise Exception("failed obj.can_update")
+
+        ret = super(ControllerSitePrivilegeList, self).create(request, *args, **kwargs)
+        if (ret.status_code%100 != 200):
+            raise Exception(ret.data)
+
+        return ret
+
+
+class ControllerSitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ControllerSitePrivilege.objects.select_related().all()
+    serializer_class = ControllerSitePrivilegeSerializer
+    id_serializer_class = ControllerSitePrivilegeIdSerializer
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+    
+    def get_queryset(self):
+        return ControllerSitePrivilege.select_by_user(self.request.user)
+
+    # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+    # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+
+
 class ImageList(generics.ListCreateAPIView):
     queryset = Image.objects.select_related().all()
     serializer_class = ImageSerializer
     id_serializer_class = ImageIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path','deployments',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -1402,7 +2791,13 @@ class ImageList(generics.ListCreateAPIView):
         return Image.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Image(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(ImageList, self).create(request, *args, **kwargs)
@@ -1455,7 +2850,13 @@ class NetworkParameterList(generics.ListCreateAPIView):
         return NetworkParameter.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = NetworkParameter(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(NetworkParameterList, self).create(request, *args, **kwargs)
@@ -1495,7 +2896,7 @@ class SiteList(generics.ListCreateAPIView):
     serializer_class = SiteSerializer
     id_serializer_class = SiteIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name','deployments',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -1508,7 +2909,13 @@ class SiteList(generics.ListCreateAPIView):
         return Site.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Site(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(SiteList, self).create(request, *args, **kwargs)
@@ -1561,7 +2968,13 @@ class SliceRoleList(generics.ListCreateAPIView):
         return SliceRole.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = SliceRole(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(SliceRoleList, self).create(request, *args, **kwargs)
@@ -1614,7 +3027,13 @@ class TagList(generics.ListCreateAPIView):
         return Tag.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Tag(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(TagList, self).create(request, *args, **kwargs)
@@ -1667,7 +3086,13 @@ class InvoiceList(generics.ListCreateAPIView):
         return Invoice.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Invoice(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(InvoiceList, self).create(request, *args, **kwargs)
@@ -1720,7 +3145,13 @@ class SlicePrivilegeList(generics.ListCreateAPIView):
         return SlicePrivilege.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = SlicePrivilege(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(SlicePrivilegeList, self).create(request, *args, **kwargs)
@@ -1773,7 +3204,13 @@ class PlanetStackRoleList(generics.ListCreateAPIView):
         return PlanetStackRole.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = PlanetStackRole(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(PlanetStackRoleList, self).create(request, *args, **kwargs)
@@ -1826,7 +3263,13 @@ class NetworkSliverList(generics.ListCreateAPIView):
         return NetworkSliver.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = NetworkSliver(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(NetworkSliverList, self).create(request, *args, **kwargs)
@@ -1861,12 +3304,12 @@ class NetworkSliverDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class NetworkDeploymentsList(generics.ListCreateAPIView):
-    queryset = NetworkDeployments.objects.select_related().all()
-    serializer_class = NetworkDeploymentsSerializer
-    id_serializer_class = NetworkDeploymentsIdSerializer
+class FlavorList(generics.ListCreateAPIView):
+    queryset = Flavor.objects.select_related().all()
+    serializer_class = FlavorSerializer
+    id_serializer_class = FlavorIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -1876,27 +3319,33 @@ class NetworkDeploymentsList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return NetworkDeployments.select_by_user(self.request.user)
+        return Flavor.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = NetworkDeployments(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(NetworkDeploymentsList, self).create(request, *args, **kwargs)
+            return super(FlavorList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(NetworkDeploymentsList, self).create(request, *args, **kwargs)
+        ret = super(FlavorList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class NetworkDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = NetworkDeployments.objects.select_related().all()
-    serializer_class = NetworkDeploymentsSerializer
-    id_serializer_class = NetworkDeploymentsIdSerializer
+class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = Flavor.objects.select_related().all()
+    serializer_class = FlavorSerializer
+    id_serializer_class = FlavorIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -1906,7 +3355,7 @@ class NetworkDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return NetworkDeployments.select_by_user(self.request.user)
+        return Flavor.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -1914,12 +3363,12 @@ class NetworkDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class FlavorList(generics.ListCreateAPIView):
-    queryset = Flavor.objects.select_related().all()
-    serializer_class = FlavorSerializer
-    id_serializer_class = FlavorIdSerializer
+class ControllerSiteList(generics.ListCreateAPIView):
+    queryset = ControllerSite.objects.select_related().all()
+    serializer_class = ControllerSiteSerializer
+    id_serializer_class = ControllerSiteIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','site','controller','tenant_id',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -1929,27 +3378,33 @@ class FlavorList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return Flavor.select_by_user(self.request.user)
+        return ControllerSite.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Flavor(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(FlavorList, self).create(request, *args, **kwargs)
+            return super(ControllerSiteList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(FlavorList, self).create(request, *args, **kwargs)
+        ret = super(ControllerSiteList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = Flavor.objects.select_related().all()
-    serializer_class = FlavorSerializer
-    id_serializer_class = FlavorIdSerializer
+class ControllerSiteDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ControllerSite.objects.select_related().all()
+    serializer_class = ControllerSiteSerializer
+    id_serializer_class = ControllerSiteIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -1959,7 +3414,7 @@ class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return Flavor.select_by_user(self.request.user)
+        return ControllerSite.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -1985,7 +3440,13 @@ class ProjectList(generics.ListCreateAPIView):
         return Project.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Project(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(ProjectList, self).create(request, *args, **kwargs)
@@ -2025,7 +3486,7 @@ class SliceList(generics.ListCreateAPIView):
     serializer_class = SliceSerializer
     id_serializer_class = SliceIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','availableNetworks','networks','networks',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','service','network','serviceClass','creator','default_flavor','default_image','mount_data_sets','networks','networks',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2038,7 +3499,13 @@ class SliceList(generics.ListCreateAPIView):
         return Slice.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Slice(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(SliceList, self).create(request, *args, **kwargs)
@@ -2078,7 +3545,7 @@ class NetworkList(generics.ListCreateAPIView):
     serializer_class = NetworkSerializer
     id_serializer_class = NetworkIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteedBandwidth','permitAllSlices','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteed_bandwidth','permit_all_slices','topology_parameters','controller_url','controller_parameters','network_id','router_id','subnet_id','slices','slices','slivers','routers','routers',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2091,7 +3558,13 @@ class NetworkList(generics.ListCreateAPIView):
         return Network.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Network(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(NetworkList, self).create(request, *args, **kwargs)
@@ -2144,7 +3617,13 @@ class ServiceList(generics.ListCreateAPIView):
         return Service.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Service(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(ServiceList, self).create(request, *args, **kwargs)
@@ -2197,7 +3676,13 @@ class ServiceClassList(generics.ListCreateAPIView):
         return ServiceClass.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = ServiceClass(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(ServiceClassList, self).create(request, *args, **kwargs)
@@ -2232,12 +3717,12 @@ class ServiceClassDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class PaymentList(generics.ListCreateAPIView):
-    queryset = Payment.objects.select_related().all()
-    serializer_class = PaymentSerializer
-    id_serializer_class = PaymentIdSerializer
+class PlanetStackList(generics.ListCreateAPIView):
+    queryset = PlanetStack.objects.select_related().all()
+    serializer_class = PlanetStackSerializer
+    id_serializer_class = PlanetStackIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','account','amount','date',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','description',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2247,27 +3732,33 @@ class PaymentList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return Payment.select_by_user(self.request.user)
+        return PlanetStack.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Payment(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(PaymentList, self).create(request, *args, **kwargs)
+            return super(PlanetStackList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(PaymentList, self).create(request, *args, **kwargs)
+        ret = super(PlanetStackList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = Payment.objects.select_related().all()
-    serializer_class = PaymentSerializer
-    id_serializer_class = PaymentIdSerializer
+class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = PlanetStack.objects.select_related().all()
+    serializer_class = PlanetStackSerializer
+    id_serializer_class = PlanetStackIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2277,7 +3768,7 @@ class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return Payment.select_by_user(self.request.user)
+        return PlanetStack.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -2303,7 +3794,13 @@ class ChargeList(generics.ListCreateAPIView):
         return Charge.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Charge(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(ChargeList, self).create(request, *args, **kwargs)
@@ -2356,7 +3853,13 @@ class RoleList(generics.ListCreateAPIView):
         return Role.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Role(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(RoleList, self).create(request, *args, **kwargs)
@@ -2409,7 +3912,13 @@ class UsableObjectList(generics.ListCreateAPIView):
         return UsableObject.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = UsableObject(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(UsableObjectList, self).create(request, *args, **kwargs)
@@ -2462,7 +3971,13 @@ class SiteRoleList(generics.ListCreateAPIView):
         return SiteRole.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = SiteRole(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(SiteRoleList, self).create(request, *args, **kwargs)
@@ -2515,7 +4030,13 @@ class SliceCredentialList(generics.ListCreateAPIView):
         return SliceCredential.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = SliceCredential(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(SliceCredentialList, self).create(request, *args, **kwargs)
@@ -2555,7 +4076,7 @@ class SliverList(generics.ListCreateAPIView):
     serializer_class = SliverSerializer
     id_serializer_class = SliverIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','node','deploymentNetwork','numberCores','flavor','userData','networks','networks',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','deployment','node','numberCores','flavor','userData','networks',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2568,7 +4089,13 @@ class SliverList(generics.ListCreateAPIView):
         return Sliver.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Sliver(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(SliverList, self).create(request, *args, **kwargs)
@@ -2608,7 +4135,7 @@ class NodeList(generics.ListCreateAPIView):
     serializer_class = NodeSerializer
     id_serializer_class = NodeIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site','deployment',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site_deployment',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2621,7 +4148,13 @@ class NodeList(generics.ListCreateAPIView):
         return Node.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Node(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(NodeList, self).create(request, *args, **kwargs)
@@ -2661,7 +4194,7 @@ class DashboardViewList(generics.ListCreateAPIView):
     serializer_class = DashboardViewSerializer
     id_serializer_class = DashboardViewIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','url',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','url','controllers',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2674,7 +4207,13 @@ class DashboardViewList(generics.ListCreateAPIView):
         return DashboardView.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = DashboardView(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(DashboardViewList, self).create(request, *args, **kwargs)
@@ -2709,12 +4248,189 @@ class DashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class ImageDeploymentList(generics.ListCreateAPIView):
-    queryset = ImageDeployment.objects.select_related().all()
-    serializer_class = ImageDeploymentSerializer
-    id_serializer_class = ImageDeploymentIdSerializer
+class ControllerNetworkList(generics.ListCreateAPIView):
+    queryset = ControllerNetwork.objects.select_related().all()
+    serializer_class = ControllerNetworkSerializer
+    id_serializer_class = ControllerNetworkIdSerializer
+    filter_backends = (filters.DjangoFilterBackend,)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',)
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+
+    def get_queryset(self):
+        return ControllerNetwork.select_by_user(self.request.user)
+
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
+        obj.caller = request.user
+        if obj.can_update(request.user):
+            return super(ControllerNetworkList, self).create(request, *args, **kwargs)
+        else:
+            raise Exception("failed obj.can_update")
+
+        ret = super(ControllerNetworkList, self).create(request, *args, **kwargs)
+        if (ret.status_code%100 != 200):
+            raise Exception(ret.data)
+
+        return ret
+
+
+class ControllerNetworkDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ControllerNetwork.objects.select_related().all()
+    serializer_class = ControllerNetworkSerializer
+    id_serializer_class = ControllerNetworkIdSerializer
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+    
+    def get_queryset(self):
+        return ControllerNetwork.select_by_user(self.request.user)
+
+    # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+    # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+
+
+class ImageDeploymentsList(generics.ListCreateAPIView):
+    queryset = ImageDeployments.objects.select_related().all()
+    serializer_class = ImageDeploymentsSerializer
+    id_serializer_class = ImageDeploymentsIdSerializer
+    filter_backends = (filters.DjangoFilterBackend,)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','image','deployment',)
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+
+    def get_queryset(self):
+        return ImageDeployments.select_by_user(self.request.user)
+
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
+        obj.caller = request.user
+        if obj.can_update(request.user):
+            return super(ImageDeploymentsList, self).create(request, *args, **kwargs)
+        else:
+            raise Exception("failed obj.can_update")
+
+        ret = super(ImageDeploymentsList, self).create(request, *args, **kwargs)
+        if (ret.status_code%100 != 200):
+            raise Exception(ret.data)
+
+        return ret
+
+
+class ImageDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ImageDeployments.objects.select_related().all()
+    serializer_class = ImageDeploymentsSerializer
+    id_serializer_class = ImageDeploymentsIdSerializer
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+    
+    def get_queryset(self):
+        return ImageDeployments.select_by_user(self.request.user)
+
+    # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+    # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+
+
+class ControllerUserList(generics.ListCreateAPIView):
+    queryset = ControllerUser.objects.select_related().all()
+    serializer_class = ControllerUserSerializer
+    id_serializer_class = ControllerUserIdSerializer
+    filter_backends = (filters.DjangoFilterBackend,)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',)
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+
+    def get_queryset(self):
+        return ControllerUser.select_by_user(self.request.user)
+
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
+        obj.caller = request.user
+        if obj.can_update(request.user):
+            return super(ControllerUserList, self).create(request, *args, **kwargs)
+        else:
+            raise Exception("failed obj.can_update")
+
+        ret = super(ControllerUserList, self).create(request, *args, **kwargs)
+        if (ret.status_code%100 != 200):
+            raise Exception(ret.data)
+
+        return ret
+
+
+class ControllerUserDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ControllerUser.objects.select_related().all()
+    serializer_class = ControllerUserSerializer
+    id_serializer_class = ControllerUserIdSerializer
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+    
+    def get_queryset(self):
+        return ControllerUser.select_by_user(self.request.user)
+
+    # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+    # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+
+
+class ReservedResourceList(generics.ListCreateAPIView):
+    queryset = ReservedResource.objects.select_related().all()
+    serializer_class = ReservedResourceSerializer
+    id_serializer_class = ReservedResourceIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2724,27 +4440,33 @@ class ImageDeploymentList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return ImageDeployment.select_by_user(self.request.user)
+        return ReservedResource.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = ImageDeployment(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(ImageDeploymentList, self).create(request, *args, **kwargs)
+            return super(ReservedResourceList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(ImageDeploymentList, self).create(request, *args, **kwargs)
+        ret = super(ReservedResourceList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class ImageDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = ImageDeployment.objects.select_related().all()
-    serializer_class = ImageDeploymentSerializer
-    id_serializer_class = ImageDeploymentIdSerializer
+class ReservedResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ReservedResource.objects.select_related().all()
+    serializer_class = ReservedResourceSerializer
+    id_serializer_class = ReservedResourceIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2754,7 +4476,7 @@ class ImageDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return ImageDeployment.select_by_user(self.request.user)
+        return ReservedResource.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -2762,12 +4484,12 @@ class ImageDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class ReservedResourceList(generics.ListCreateAPIView):
-    queryset = ReservedResource.objects.select_related().all()
-    serializer_class = ReservedResourceSerializer
-    id_serializer_class = ReservedResourceIdSerializer
+class PaymentList(generics.ListCreateAPIView):
+    queryset = Payment.objects.select_related().all()
+    serializer_class = PaymentSerializer
+    id_serializer_class = PaymentIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','account','amount','date',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2777,27 +4499,33 @@ class ReservedResourceList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return ReservedResource.select_by_user(self.request.user)
+        return Payment.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = ReservedResource(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(ReservedResourceList, self).create(request, *args, **kwargs)
+            return super(PaymentList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(ReservedResourceList, self).create(request, *args, **kwargs)
+        ret = super(PaymentList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class ReservedResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = ReservedResource.objects.select_related().all()
-    serializer_class = ReservedResourceSerializer
-    id_serializer_class = ReservedResourceIdSerializer
+class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = Payment.objects.select_related().all()
+    serializer_class = PaymentSerializer
+    id_serializer_class = PaymentIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -2807,7 +4535,7 @@ class ReservedResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return ReservedResource.select_by_user(self.request.user)
+        return Payment.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -2833,7 +4561,13 @@ class NetworkSliceList(generics.ListCreateAPIView):
         return NetworkSlice.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = NetworkSlice(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(NetworkSliceList, self).create(request, *args, **kwargs)
@@ -2886,7 +4620,13 @@ class UserDashboardViewList(generics.ListCreateAPIView):
         return UserDashboardView.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = UserDashboardView(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(UserDashboardViewList, self).create(request, *args, **kwargs)
@@ -2921,6 +4661,65 @@ class UserDashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
+class ControllerList(generics.ListCreateAPIView):
+    queryset = Controller.objects.select_related().all()
+    serializer_class = ControllerSerializer
+    id_serializer_class = ControllerIdSerializer
+    filter_backends = (filters.DjangoFilterBackend,)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',)
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+
+    def get_queryset(self):
+        return Controller.select_by_user(self.request.user)
+
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
+        obj.caller = request.user
+        if obj.can_update(request.user):
+            return super(ControllerList, self).create(request, *args, **kwargs)
+        else:
+            raise Exception("failed obj.can_update")
+
+        ret = super(ControllerList, self).create(request, *args, **kwargs)
+        if (ret.status_code%100 != 200):
+            raise Exception(ret.data)
+
+        return ret
+
+
+class ControllerDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = Controller.objects.select_related().all()
+    serializer_class = ControllerSerializer
+    id_serializer_class = ControllerIdSerializer
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+    
+    def get_queryset(self):
+        return Controller.select_by_user(self.request.user)
+
+    # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+    # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+
+
 class PlanetStackPrivilegeList(generics.ListCreateAPIView):
     queryset = PlanetStackPrivilege.objects.select_related().all()
     serializer_class = PlanetStackPrivilegeSerializer
@@ -2939,7 +4738,13 @@ class PlanetStackPrivilegeList(generics.ListCreateAPIView):
         return PlanetStackPrivilege.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = PlanetStackPrivilege(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(PlanetStackPrivilegeList, self).create(request, *args, **kwargs)
@@ -2992,7 +4797,13 @@ class UserList(generics.ListCreateAPIView):
         return User.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = User(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(UserList, self).create(request, *args, **kwargs)
@@ -3032,7 +4843,7 @@ class DeploymentList(generics.ListCreateAPIView):
     serializer_class = DeploymentSerializer
     id_serializer_class = DeploymentIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','admin_user','admin_password','admin_tenant','auth_url','backend_type','availability_zone','accessControl','sites','sites','flavors','flavors',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','accessControl','images','sites','flavors',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3045,7 +4856,13 @@ class DeploymentList(generics.ListCreateAPIView):
         return Deployment.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Deployment(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(DeploymentList, self).create(request, *args, **kwargs)
@@ -3098,7 +4915,13 @@ class ReservationList(generics.ListCreateAPIView):
         return Reservation.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Reservation(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(ReservationList, self).create(request, *args, **kwargs)
@@ -3133,12 +4956,12 @@ class ReservationDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class SliceDeploymentList(generics.ListCreateAPIView):
-    queryset = SliceDeployment.objects.select_related().all()
-    serializer_class = SliceDeploymentSerializer
-    id_serializer_class = SliceDeploymentIdSerializer
+class SitePrivilegeList(generics.ListCreateAPIView):
+    queryset = SitePrivilege.objects.select_related().all()
+    serializer_class = SitePrivilegeSerializer
+    id_serializer_class = SitePrivilegeIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','site','role',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3148,27 +4971,33 @@ class SliceDeploymentList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return SliceDeployment.select_by_user(self.request.user)
+        return SitePrivilege.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = SliceDeployment(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(SliceDeploymentList, self).create(request, *args, **kwargs)
+            return super(SitePrivilegeList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(SliceDeploymentList, self).create(request, *args, **kwargs)
+        ret = super(SitePrivilegeList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class SliceDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = SliceDeployment.objects.select_related().all()
-    serializer_class = SliceDeploymentSerializer
-    id_serializer_class = SliceDeploymentIdSerializer
+class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = SitePrivilege.objects.select_related().all()
+    serializer_class = SitePrivilegeSerializer
+    id_serializer_class = SitePrivilegeIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3178,7 +5007,7 @@ class SliceDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return SliceDeployment.select_by_user(self.request.user)
+        return SitePrivilege.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -3186,12 +5015,12 @@ class SliceDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class SitePrivilegeList(generics.ListCreateAPIView):
-    queryset = SitePrivilege.objects.select_related().all()
-    serializer_class = SitePrivilegeSerializer
-    id_serializer_class = SitePrivilegeIdSerializer
+class ControllerSliceList(generics.ListCreateAPIView):
+    queryset = ControllerSlice.objects.select_related().all()
+    serializer_class = ControllerSliceSerializer
+    id_serializer_class = ControllerSliceIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','site','role',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3201,27 +5030,33 @@ class SitePrivilegeList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return SitePrivilege.select_by_user(self.request.user)
+        return ControllerSlice.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = SitePrivilege(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(SitePrivilegeList, self).create(request, *args, **kwargs)
+            return super(ControllerSliceList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(SitePrivilegeList, self).create(request, *args, **kwargs)
+        ret = super(ControllerSliceList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = SitePrivilege.objects.select_related().all()
-    serializer_class = SitePrivilegeSerializer
-    id_serializer_class = SitePrivilegeIdSerializer
+class ControllerSliceDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ControllerSlice.objects.select_related().all()
+    serializer_class = ControllerSliceSerializer
+    id_serializer_class = ControllerSliceIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3231,7 +5066,7 @@ class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return SitePrivilege.select_by_user(self.request.user)
+        return ControllerSlice.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -3239,12 +5074,12 @@ class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class PlanetStackList(generics.ListCreateAPIView):
-    queryset = PlanetStack.objects.select_related().all()
-    serializer_class = PlanetStackSerializer
-    id_serializer_class = PlanetStackIdSerializer
+class ControllerDashboardViewList(generics.ListCreateAPIView):
+    queryset = ControllerDashboardView.objects.select_related().all()
+    serializer_class = ControllerDashboardViewSerializer
+    id_serializer_class = ControllerDashboardViewIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','description',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3254,27 +5089,33 @@ class PlanetStackList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return PlanetStack.select_by_user(self.request.user)
+        return ControllerDashboardView.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = PlanetStack(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(PlanetStackList, self).create(request, *args, **kwargs)
+            return super(ControllerDashboardViewList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(PlanetStackList, self).create(request, *args, **kwargs)
+        ret = super(ControllerDashboardViewList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = PlanetStack.objects.select_related().all()
-    serializer_class = PlanetStackSerializer
-    id_serializer_class = PlanetStackIdSerializer
+class ControllerDashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ControllerDashboardView.objects.select_related().all()
+    serializer_class = ControllerDashboardViewSerializer
+    id_serializer_class = ControllerDashboardViewIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3284,7 +5125,7 @@ class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return PlanetStack.select_by_user(self.request.user)
+        return ControllerDashboardView.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -3292,12 +5133,12 @@ class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class UserDeploymentList(generics.ListCreateAPIView):
-    queryset = UserDeployment.objects.select_related().all()
-    serializer_class = UserDeploymentSerializer
-    id_serializer_class = UserDeploymentIdSerializer
+class AccountList(generics.ListCreateAPIView):
+    queryset = Account.objects.select_related().all()
+    serializer_class = AccountSerializer
+    id_serializer_class = AccountIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','site',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3307,27 +5148,33 @@ class UserDeploymentList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return UserDeployment.select_by_user(self.request.user)
+        return Account.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = UserDeployment(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(UserDeploymentList, self).create(request, *args, **kwargs)
+            return super(AccountList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(UserDeploymentList, self).create(request, *args, **kwargs)
+        ret = super(AccountList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class UserDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = UserDeployment.objects.select_related().all()
-    serializer_class = UserDeploymentSerializer
-    id_serializer_class = UserDeploymentIdSerializer
+class AccountDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = Account.objects.select_related().all()
+    serializer_class = AccountSerializer
+    id_serializer_class = AccountIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3337,7 +5184,7 @@ class UserDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return UserDeployment.select_by_user(self.request.user)
+        return Account.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -3345,12 +5192,12 @@ class UserDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class AccountList(generics.ListCreateAPIView):
-    queryset = Account.objects.select_related().all()
-    serializer_class = AccountSerializer
-    id_serializer_class = AccountIdSerializer
+class ControllerRoleList(generics.ListCreateAPIView):
+    queryset = ControllerRole.objects.select_related().all()
+    serializer_class = ControllerRoleSerializer
+    id_serializer_class = ControllerRoleIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','site',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','role',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3360,27 +5207,33 @@ class AccountList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return Account.select_by_user(self.request.user)
+        return ControllerRole.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Account(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(AccountList, self).create(request, *args, **kwargs)
+            return super(ControllerRoleList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(AccountList, self).create(request, *args, **kwargs)
+        ret = super(ControllerRoleList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class AccountDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = Account.objects.select_related().all()
-    serializer_class = AccountSerializer
-    id_serializer_class = AccountIdSerializer
+class ControllerRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ControllerRole.objects.select_related().all()
+    serializer_class = ControllerRoleSerializer
+    id_serializer_class = ControllerRoleIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3390,7 +5243,7 @@ class AccountDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return Account.select_by_user(self.request.user)
+        return ControllerRole.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -3416,7 +5269,13 @@ class NetworkParameterTypeList(generics.ListCreateAPIView):
         return NetworkParameterType.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = NetworkParameterType(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(NetworkParameterTypeList, self).create(request, *args, **kwargs)
@@ -3469,7 +5328,13 @@ class SiteCredentialList(generics.ListCreateAPIView):
         return SiteCredential.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = SiteCredential(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(SiteCredentialList, self).create(request, *args, **kwargs)
@@ -3522,7 +5387,13 @@ class DeploymentPrivilegeList(generics.ListCreateAPIView):
         return DeploymentPrivilege.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = DeploymentPrivilege(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(DeploymentPrivilegeList, self).create(request, *args, **kwargs)
@@ -3557,12 +5428,12 @@ class DeploymentPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class DeploymentRoleList(generics.ListCreateAPIView):
-    queryset = DeploymentRole.objects.select_related().all()
-    serializer_class = DeploymentRoleSerializer
-    id_serializer_class = DeploymentRoleIdSerializer
+class ControllerSlicePrivilegeList(generics.ListCreateAPIView):
+    queryset = ControllerSlicePrivilege.objects.select_related().all()
+    serializer_class = ControllerSlicePrivilegeSerializer
+    id_serializer_class = ControllerSlicePrivilegeIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','role',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3572,27 +5443,33 @@ class DeploymentRoleList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return DeploymentRole.select_by_user(self.request.user)
+        return ControllerSlicePrivilege.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = DeploymentRole(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(DeploymentRoleList, self).create(request, *args, **kwargs)
+            return super(ControllerSlicePrivilegeList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(DeploymentRoleList, self).create(request, *args, **kwargs)
+        ret = super(ControllerSlicePrivilegeList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = DeploymentRole.objects.select_related().all()
-    serializer_class = DeploymentRoleSerializer
-    id_serializer_class = DeploymentRoleIdSerializer
+class ControllerSlicePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = ControllerSlicePrivilege.objects.select_related().all()
+    serializer_class = ControllerSlicePrivilegeSerializer
+    id_serializer_class = ControllerSlicePrivilegeIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3602,7 +5479,7 @@ class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return DeploymentRole.select_by_user(self.request.user)
+        return ControllerSlicePrivilege.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -3610,12 +5487,12 @@ class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class UserCredentialList(generics.ListCreateAPIView):
-    queryset = UserCredential.objects.select_related().all()
-    serializer_class = UserCredentialSerializer
-    id_serializer_class = UserCredentialIdSerializer
+class SiteDeploymentList(generics.ListCreateAPIView):
+    queryset = SiteDeployment.objects.select_related().all()
+    serializer_class = SiteDeploymentSerializer
+    id_serializer_class = SiteDeploymentIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3625,27 +5502,33 @@ class UserCredentialList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return UserCredential.select_by_user(self.request.user)
+        return SiteDeployment.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = UserCredential(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(UserCredentialList, self).create(request, *args, **kwargs)
+            return super(SiteDeploymentList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(UserCredentialList, self).create(request, *args, **kwargs)
+        ret = super(SiteDeploymentList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = UserCredential.objects.select_related().all()
-    serializer_class = UserCredentialSerializer
-    id_serializer_class = UserCredentialIdSerializer
+class SiteDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = SiteDeployment.objects.select_related().all()
+    serializer_class = SiteDeploymentSerializer
+    id_serializer_class = SiteDeploymentIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3655,7 +5538,7 @@ class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return UserCredential.select_by_user(self.request.user)
+        return SiteDeployment.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -3663,12 +5546,12 @@ class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView):
 
 
 
-class SiteDeploymentList(generics.ListCreateAPIView):
-    queryset = SiteDeployment.objects.select_related().all()
-    serializer_class = SiteDeploymentSerializer
-    id_serializer_class = SiteDeploymentIdSerializer
+class DeploymentRoleList(generics.ListCreateAPIView):
+    queryset = DeploymentRole.objects.select_related().all()
+    serializer_class = DeploymentRoleSerializer
+    id_serializer_class = DeploymentRoleIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','site','deployment','tenant_id',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','role',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3678,27 +5561,33 @@ class SiteDeploymentList(generics.ListCreateAPIView):
             return self.serializer_class
 
     def get_queryset(self):
-        return SiteDeployment.select_by_user(self.request.user)
+        return DeploymentRole.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = SiteDeployment(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
-            return super(SiteDeploymentList, self).create(request, *args, **kwargs)
+            return super(DeploymentRoleList, self).create(request, *args, **kwargs)
         else:
             raise Exception("failed obj.can_update")
 
-        ret = super(SiteDeploymentList, self).create(request, *args, **kwargs)
+        ret = super(DeploymentRoleList, self).create(request, *args, **kwargs)
         if (ret.status_code%100 != 200):
             raise Exception(ret.data)
 
         return ret
 
 
-class SiteDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
-    queryset = SiteDeployment.objects.select_related().all()
-    serializer_class = SiteDeploymentSerializer
-    id_serializer_class = SiteDeploymentIdSerializer
+class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = DeploymentRole.objects.select_related().all()
+    serializer_class = DeploymentRoleSerializer
+    id_serializer_class = DeploymentRoleIdSerializer
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3708,7 +5597,66 @@ class SiteDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView):
             return self.serializer_class
     
     def get_queryset(self):
-        return SiteDeployment.select_by_user(self.request.user)
+        return DeploymentRole.select_by_user(self.request.user)
+
+    # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+    # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView
+
+
+
+class UserCredentialList(generics.ListCreateAPIView):
+    queryset = UserCredential.objects.select_related().all()
+    serializer_class = UserCredentialSerializer
+    id_serializer_class = UserCredentialIdSerializer
+    filter_backends = (filters.DjangoFilterBackend,)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',)
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+
+    def get_queryset(self):
+        return UserCredential.select_by_user(self.request.user)
+
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
+        obj.caller = request.user
+        if obj.can_update(request.user):
+            return super(UserCredentialList, self).create(request, *args, **kwargs)
+        else:
+            raise Exception("failed obj.can_update")
+
+        ret = super(UserCredentialList, self).create(request, *args, **kwargs)
+        if (ret.status_code%100 != 200):
+            raise Exception(ret.data)
+
+        return ret
+
+
+class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView):
+    queryset = UserCredential.objects.select_related().all()
+    serializer_class = UserCredentialSerializer
+    id_serializer_class = UserCredentialIdSerializer
+
+    def get_serializer_class(self):
+        no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
+        if (no_hyperlinks):
+            return self.id_serializer_class
+        else:
+            return self.serializer_class
+    
+    def get_queryset(self):
+        return UserCredential.select_by_user(self.request.user)
 
     # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView
 
@@ -3734,7 +5682,13 @@ class SliceTagList(generics.ListCreateAPIView):
         return SliceTag.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = SliceTag(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(SliceTagList, self).create(request, *args, **kwargs)
@@ -3774,7 +5728,7 @@ class NetworkTemplateList(generics.ListCreateAPIView):
     serializer_class = NetworkTemplateSerializer
     id_serializer_class = NetworkTemplateIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','guaranteed_bandwidth','visibility','translation','shared_network_name','shared_network_id','topology_kind','controller_kind',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3787,7 +5741,13 @@ class NetworkTemplateList(generics.ListCreateAPIView):
         return NetworkTemplate.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = NetworkTemplate(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(NetworkTemplateList, self).create(request, *args, **kwargs)
@@ -3827,7 +5787,7 @@ class RouterList(generics.ListCreateAPIView):
     serializer_class = RouterSerializer
     id_serializer_class = RouterIdSerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','owner',)
+    filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',)
 
     def get_serializer_class(self):
         no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)
@@ -3840,7 +5800,13 @@ class RouterList(generics.ListCreateAPIView):
         return Router.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = Router(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(RouterList, self).create(request, *args, **kwargs)
@@ -3893,7 +5859,13 @@ class ServiceResourceList(generics.ListCreateAPIView):
         return ServiceResource.select_by_user(self.request.user)
 
     def create(self, request, *args, **kwargs):
-        obj = ServiceResource(**request.DATA)
+        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
+        if not (serializer.is_valid()):
+            response = {"error": "validation",
+                        "specific_error": "not serializer.is_valid()",\r
+                        "reasons": serializer.errors}\r
+            return Response(response, status=status.HTTP_400_BAD_REQUEST)
+        obj = serializer.object
         obj.caller = request.user
         if obj.can_update(request.user):
             return super(ServiceResourceList, self).create(request, *args, **kwargs)