X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fgenapi.py;h=880587cbd8e206248c6c9599cf09dc7d35a293f6;hb=087a7d31bc0c760e40cdc12906ec49d0d2cb8ebb;hp=b368a9a750da8e28036b0e471e7016bb43a05ca1;hpb=f4612de67d2f00fe21b3a4b161034259fdf8ab4d;p=plstackapi.git diff --git a/planetstack/genapi.py b/planetstack/genapi.py index b368a9a..880587c 100644 --- a/planetstack/genapi.py +++ b/planetstack/genapi.py @@ -4,6 +4,7 @@ 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 @@ -13,7 +14,7 @@ from django.conf.urls import patterns, url 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 @@ -57,8 +58,8 @@ def get_REST_patterns(): url(r'plstackapi/networkslivers/$', NetworkSliverList.as_view(), name='networksliver-list'), url(r'plstackapi/networkslivers/(?P[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[a-zA-Z0-9\-]+)/$', NetworkDeploymentsDetail.as_view(), name ='networkdeployments-detail'), + url(r'plstackapi/controllernetworks/$', ControllerNetworksList.as_view(), name='controllernetworks-list'), + url(r'plstackapi/controllernetworks/(?P[a-zA-Z0-9\-]+)/$', ControllerNetworksDetail.as_view(), name ='controllernetworks-detail'), url(r'plstackapi/flavors/$', FlavorList.as_view(), name='flavor-list'), url(r'plstackapi/flavors/(?P[a-zA-Z0-9\-]+)/$', FlavorDetail.as_view(), name ='flavor-detail'), @@ -105,8 +106,8 @@ def get_REST_patterns(): url(r'plstackapi/dashboardviews/$', DashboardViewList.as_view(), name='dashboardview-list'), url(r'plstackapi/dashboardviews/(?P[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[a-zA-Z0-9\-]+)/$', ImageDeploymentDetail.as_view(), name ='imagedeployments-detail'), + url(r'plstackapi/controllerimages/$', ControllerImagesList.as_view(), name='controllerimages-list'), + url(r'plstackapi/controllerimages/(?P[a-zA-Z0-9\-]+)/$', ControllerImagesDetail.as_view(), name ='controllerimages-detail'), url(r'plstackapi/reservedresources/$', ReservedResourceList.as_view(), name='reservedresource-list'), url(r'plstackapi/reservedresources/(?P[a-zA-Z0-9\-]+)/$', ReservedResourceDetail.as_view(), name ='reservedresource-detail'), @@ -125,12 +126,14 @@ def get_REST_patterns(): url(r'plstackapi/deployments/$', DeploymentList.as_view(), name='deployment-list'), url(r'plstackapi/deployments/(?P[a-zA-Z0-9\-]+)/$', DeploymentDetail.as_view(), name ='deployment-detail'), + url(r'plstackapi/Controller/$', ControllerList.as_view(), name='controller-list'), + url(r'plstackapi/Controller/(?P[a-zA-Z0-9\-]+)/$', ControllerDetail.as_view(), name ='controller-detail'), url(r'plstackapi/reservations/$', ReservationList.as_view(), name='reservation-list'), url(r'plstackapi/reservations/(?P[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[a-zA-Z0-9\-]+)/$', SliceDeploymentDetail.as_view(), name ='slicedeployments-detail'), + url(r'plstackapi/controllerslices/$', ControllerSlicesList.as_view(), name='controllerslices-list'), + url(r'plstackapi/controllerslices/(?P[a-zA-Z0-9\-]+)/$', ControllerSlicesDetail.as_view(), name ='controllerslices-detail'), url(r'plstackapi/siteprivileges/$', SitePrivilegeList.as_view(), name='siteprivilege-list'), url(r'plstackapi/siteprivileges/(?P[a-zA-Z0-9\-]+)/$', SitePrivilegeDetail.as_view(), name ='siteprivilege-detail'), @@ -138,8 +141,8 @@ def get_REST_patterns(): url(r'plstackapi/planetstacks/$', PlanetStackList.as_view(), name='planetstack-list'), url(r'plstackapi/planetstacks/(?P[a-zA-Z0-9\-]+)/$', PlanetStackDetail.as_view(), name ='planetstack-detail'), - url(r'plstackapi/user_deployments/$', UserDeploymentList.as_view(), name='userdeployments-list'), - url(r'plstackapi/user_deployments/(?P[a-zA-Z0-9\-]+)/$', UserDeploymentDetail.as_view(), name ='userdeployments-detail'), + url(r'plstackapi/controllerusers/$', ControllerUsersList.as_view(), name='controllerusers-list'), + url(r'plstackapi/controllerusers/(?P[a-zA-Z0-9\-]+)/$', ControllerUsersDetail.as_view(), name ='controllerusers-detail'), url(r'plstackapi/accounts/$', AccountList.as_view(), name='account-list'), url(r'plstackapi/accounts/(?P[a-zA-Z0-9\-]+)/$', AccountDetail.as_view(), name ='account-detail'), @@ -150,17 +153,17 @@ def get_REST_patterns(): url(r'plstackapi/sitecredentials/$', SiteCredentialList.as_view(), name='sitecredential-list'), url(r'plstackapi/sitecredentials/(?P[a-zA-Z0-9\-]+)/$', SiteCredentialDetail.as_view(), name ='sitecredential-detail'), - url(r'plstackapi/deploymentprivileges/$', DeploymentPrivilegeList.as_view(), name='deploymentprivilege-list'), - url(r'plstackapi/deploymentprivileges/(?P[a-zA-Z0-9\-]+)/$', DeploymentPrivilegeDetail.as_view(), name ='deploymentprivilege-detail'), + url(r'plstackapi/controllerprivileges/$', ControllerPrivilegeList.as_view(), name='controllerprivilege-list'), + url(r'plstackapi/controllerprivileges/(?P[a-zA-Z0-9\-]+)/$', ControllerPrivilegeDetail.as_view(), name ='controllerprivilege-detail'), - url(r'plstackapi/deploymentroles/$', DeploymentRoleList.as_view(), name='deploymentrole-list'), - url(r'plstackapi/deploymentroles/(?P[a-zA-Z0-9\-]+)/$', DeploymentRoleDetail.as_view(), name ='deploymentrole-detail'), + url(r'plstackapi/controllerroles/$', ControllerRoleList.as_view(), name='controllerrole-list'), + url(r'plstackapi/controllerroles/(?P[a-zA-Z0-9\-]+)/$', ControllerRoleDetail.as_view(), name ='controllerrole-detail'), url(r'plstackapi/usercredentials/$', UserCredentialList.as_view(), name='usercredential-list'), url(r'plstackapi/usercredentials/(?P[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[a-zA-Z0-9\-]+)/$', SiteDeploymentDetail.as_view(), name ='sitedeployments-detail'), + url(r'plstackapi/sitedeployments/$', SiteDeploymentsList.as_view(), name='sitedeployments-list'), + url(r'plstackapi/sitedeployments/(?P[a-zA-Z0-9\-]+)/$', SiteDeploymentsDetail.as_view(), name ='sitedeployments-detail'), url(r'plstackapi/slicetags/$', SliceTagList.as_view(), name='slicetag-list'), url(r'plstackapi/slicetags/(?P[a-zA-Z0-9\-]+)/$', SliceTagDetail.as_view(), name ='slicetag-detail'), @@ -189,7 +192,7 @@ 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), + 'controllernetworkses': reverse('controllernetworks-list', request=request, format=format), 'flavors': reverse('flavor-list', request=request, format=format), 'projects': reverse('project-list', request=request, format=format), 'slices': reverse('slice-list', request=request, format=format), @@ -205,25 +208,27 @@ 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), - 'imagedeploymentses': reverse('imagedeployments-list', request=request, format=format), + 'controllerimageses': reverse('controllerimages-list', request=request, format=format), 'reservedresources': reverse('reservedresource-list', request=request, format=format), 'networkslices': reverse('networkslice-list', request=request, format=format), 'userdashboardviews': reverse('userdashboardview-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), + 'controllers': reverse('controller-list', request=request, format=format), 'reservations': reverse('reservation-list', request=request, format=format), - 'slicedeploymentses': reverse('slicedeployments-list', request=request, format=format), + 'controllersliceses': reverse('controllerslices-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), + 'controlleruserses': reverse('controllerusers-list', request=request, format=format), 'accounts': reverse('account-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), - 'deploymentroles': reverse('deploymentrole-list', request=request, format=format), + 'controllerprivileges': reverse('controllerprivilege-list', request=request, format=format), + 'controllerroles': reverse('controllerrole-list', request=request, format=format), 'usercredentials': reverse('usercredential-list', request=request, format=format), 'sitedeploymentses': reverse('sitedeployments-list', request=request, format=format), + 'controllersiteses': reverse('controllersites-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), @@ -238,16 +243,34 @@ def api_root(request, format=None): class ServiceAttributeSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) @@ -255,16 +278,34 @@ class ServiceAttributeIdSerializer(serializers.ModelSerializer): class ImageSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) class ImageIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) @@ -272,16 +313,34 @@ class ImageIdSerializer(serializers.ModelSerializer): class NetworkParameterSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',) class NetworkParameterIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',) @@ -289,16 +348,34 @@ class NetworkParameterIdSerializer(serializers.ModelSerializer): class SiteSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) class SiteIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) @@ -306,16 +383,34 @@ class SiteIdSerializer(serializers.ModelSerializer): class SliceRoleSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) class SliceRoleIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) @@ -323,16 +418,34 @@ class SliceRoleIdSerializer(serializers.ModelSerializer): class TagSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',) class TagIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',) @@ -340,16 +453,34 @@ class TagIdSerializer(serializers.ModelSerializer): class InvoiceSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','date','account',) class InvoiceIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','date','account',) @@ -357,16 +488,34 @@ class InvoiceIdSerializer(serializers.ModelSerializer): class SlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','slice','role',) class SlicePrivilegeIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','slice','role',) @@ -374,16 +523,34 @@ class SlicePrivilegeIdSerializer(serializers.ModelSerializer): class PlanetStackRoleSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) class PlanetStackRoleIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) @@ -391,33 +558,69 @@ class PlanetStackRoleIdSerializer(serializers.ModelSerializer): class NetworkSliverSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) class NetworkSliverIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) -class NetworkDeploymentsSerializer(serializers.HyperlinkedModelSerializer): +class ControllerNetworksSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = ControllerNetworks + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',) -class NetworkDeploymentsIdSerializer(serializers.ModelSerializer): +class ControllerNetworksIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = ControllerNetworks + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',) @@ -425,16 +628,34 @@ class NetworkDeploymentsIdSerializer(serializers.ModelSerializer): class FlavorSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',) class FlavorIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',) @@ -442,16 +663,34 @@ class FlavorIdSerializer(serializers.ModelSerializer): class ProjectSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) class ProjectIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) @@ -475,9 +714,18 @@ 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): + 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','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','availableNetworks','networks','networks',) class SliceIdSerializer(serializers.ModelSerializer): id = serializers.Field() @@ -498,9 +746,18 @@ class SliceIdSerializer(serializers.ModelSerializer): networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','availableNetworks','networks','networks',) @@ -524,9 +781,18 @@ 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): + 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','guaranteedBandwidth','permitAllSlices','topologyParameters','controllerUrl','controllerParameters','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',) class NetworkIdSerializer(serializers.ModelSerializer): id = serializers.Field() @@ -547,9 +813,18 @@ class NetworkIdSerializer(serializers.ModelSerializer): routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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','guaranteedBandwidth','permitAllSlices','topologyParameters','controllerUrl','controllerParameters','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',) @@ -557,16 +832,34 @@ class NetworkIdSerializer(serializers.ModelSerializer): class ServiceSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',) class ServiceIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',) @@ -574,16 +867,34 @@ class ServiceIdSerializer(serializers.ModelSerializer): class ServiceClassSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',) class ServiceClassIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',) @@ -591,16 +902,34 @@ class ServiceClassIdSerializer(serializers.ModelSerializer): class PaymentSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) class PaymentIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) @@ -608,16 +937,34 @@ class PaymentIdSerializer(serializers.ModelSerializer): class ChargeSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',) class ChargeIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',) @@ -625,16 +972,34 @@ class ChargeIdSerializer(serializers.ModelSerializer): class RoleSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',) class RoleIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',) @@ -642,16 +1007,34 @@ class RoleIdSerializer(serializers.ModelSerializer): class UsableObjectSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) class UsableObjectIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) @@ -659,16 +1042,34 @@ class UsableObjectIdSerializer(serializers.ModelSerializer): class SiteRoleSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) class SiteRoleIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) @@ -676,16 +1077,34 @@ class SiteRoleIdSerializer(serializers.ModelSerializer): class SliceCredentialSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',) class SliceCredentialIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',) @@ -701,9 +1120,18 @@ class SliverSerializer(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): + 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','node','deploymentNetwork','numberCores','flavor','userData','networks','networks',) class SliverIdSerializer(serializers.ModelSerializer): id = serializers.Field() @@ -716,9 +1144,18 @@ class SliverIdSerializer(serializers.ModelSerializer): networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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','node','deploymentNetwork','numberCores','flavor','userData','networks','networks',) @@ -726,16 +1163,34 @@ class SliverIdSerializer(serializers.ModelSerializer): class NodeSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site','deployment',) class NodeIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site','deployment',) @@ -743,33 +1198,69 @@ class NodeIdSerializer(serializers.ModelSerializer): class DashboardViewSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) class DashboardViewIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) -class ImageDeploymentSerializer(serializers.HyperlinkedModelSerializer): +class ControllerImagesSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = ControllerImages + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',) -class ImageDeploymentIdSerializer(serializers.ModelSerializer): +class ControllerImagesIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = ControllerImages + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',) @@ -777,16 +1268,34 @@ class ImageDeploymentIdSerializer(serializers.ModelSerializer): class ReservedResourceSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) @@ -794,16 +1303,34 @@ class ReservedResourceIdSerializer(serializers.ModelSerializer): class NetworkSliceSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',) class NetworkSliceIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',) @@ -811,16 +1338,34 @@ class NetworkSliceIdSerializer(serializers.ModelSerializer): class UserDashboardViewSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',) class UserDashboardViewIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',) @@ -828,16 +1373,34 @@ class UserDashboardViewIdSerializer(serializers.ModelSerializer): class PlanetStackPrivilegeSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) @@ -845,16 +1408,34 @@ class PlanetStackPrivilegeIdSerializer(serializers.ModelSerializer): class UserSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + 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(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + 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',) @@ -878,9 +1459,18 @@ class DeploymentSerializer(serializers.HyperlinkedModelSerializer): flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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','sites','sites','flavors','flavors',) class DeploymentIdSerializer(serializers.ModelSerializer): id = serializers.Field() @@ -901,43 +1491,120 @@ class DeploymentIdSerializer(serializers.ModelSerializer): flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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','admin_user','admin_password','admin_tenant','auth_url','backend_type','availability_zone','accessControl','sites','sites','flavors','flavors',) +class ControllerSerializer(serializers.HyperlinkedModelSerializer): + id = serializers.Field() + site_deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='sitedeployment-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = Controller + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','admin_user','admin_password','admin_tenant','auth_url','backend_type') + + +class ControllerIdSerializer(serializers.ModelSerializer): + id = serializers.Field() + site_deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='sitedeployment-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = Controller + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','admin_user','admin_password','admin_tenant','auth_url','backend_type') class ReservationSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',) class ReservationIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',) -class SliceDeploymentSerializer(serializers.HyperlinkedModelSerializer): +class ControllerSlicesSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: - model = SliceDeployment - fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) + model = ControllerSlices + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) -class SliceDeploymentIdSerializer(serializers.ModelSerializer): +class ControllerSlicesIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: - model = SliceDeployment - fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) + model = ControllerSlices + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) @@ -945,16 +1612,34 @@ class SliceDeploymentIdSerializer(serializers.ModelSerializer): class SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',) class SitePrivilegeIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',) @@ -962,33 +1647,69 @@ class SitePrivilegeIdSerializer(serializers.ModelSerializer): class PlanetStackSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) class PlanetStackIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) -class UserDeploymentSerializer(serializers.HyperlinkedModelSerializer): +class ControllerUsersSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = ControllerUsers + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',) -class UserDeploymentIdSerializer(serializers.ModelSerializer): +class ControllerUsersIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = ControllerUsers + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',) @@ -996,16 +1717,34 @@ class UserDeploymentIdSerializer(serializers.ModelSerializer): class AccountSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) class AccountIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) @@ -1013,16 +1752,34 @@ class AccountIdSerializer(serializers.ModelSerializer): class NetworkParameterTypeSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description',) class NetworkParameterTypeIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description',) @@ -1030,50 +1787,104 @@ class NetworkParameterTypeIdSerializer(serializers.ModelSerializer): class SiteCredentialSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',) class SiteCredentialIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',) -class DeploymentPrivilegeSerializer(serializers.HyperlinkedModelSerializer): +class ControllerPrivilegeSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + model = ControllerPrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','role',) -class DeploymentPrivilegeIdSerializer(serializers.ModelSerializer): +class ControllerPrivilegeIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + model = ControllerPrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','role',) -class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer): +class ControllerRoleSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = ControllerRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) -class DeploymentRoleIdSerializer(serializers.ModelSerializer): +class ControllerRoleIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = ControllerRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) @@ -1081,50 +1892,102 @@ class DeploymentRoleIdSerializer(serializers.ModelSerializer): class UserCredentialSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) class UserCredentialIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) -class SiteDeploymentSerializer(serializers.HyperlinkedModelSerializer): +class SiteDeploymentsSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = SiteDeployments + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','tenant_id',) -class SiteDeploymentIdSerializer(serializers.ModelSerializer): +class SiteDeploymentsIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 = SiteDeployments + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment') class SliceTagSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','value',) class SliceTagIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','value',) @@ -1132,16 +1995,34 @@ class SliceTagIdSerializer(serializers.ModelSerializer): class NetworkTemplateSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId','topologyKind','controllerKind',) class NetworkTemplateIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId','topologyKind','controllerKind',) @@ -1149,16 +2030,34 @@ class NetworkTemplateIdSerializer(serializers.ModelSerializer): class RouterSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) class RouterIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) @@ -1166,16 +2065,34 @@ class RouterIdSerializer(serializers.ModelSerializer): class ServiceResourceSerializer(serializers.HyperlinkedModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',) class ServiceResourceIdSerializer(serializers.ModelSerializer): id = serializers.Field() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',) @@ -1202,7 +2119,7 @@ serializerLookUp = { NetworkSliver: NetworkSliverSerializer, - NetworkDeployments: NetworkDeploymentsSerializer, + ControllerNetworks: ControllerNetworksSerializer, Flavor: FlavorSerializer, @@ -1234,7 +2151,7 @@ serializerLookUp = { DashboardView: DashboardViewSerializer, - ImageDeployment: ImageDeploymentSerializer, + ControllerImages: ControllerImagesSerializer, ReservedResource: ReservedResourceSerializer, @@ -1250,13 +2167,13 @@ serializerLookUp = { Reservation: ReservationSerializer, - SliceDeployment: SliceDeploymentSerializer, + ControllerSlices: ControllerSlicesSerializer, SitePrivilege: SitePrivilegeSerializer, PlanetStack: PlanetStackSerializer, - UserDeployment: UserDeploymentSerializer, + ControllerUsers: ControllerUsersSerializer, Account: AccountSerializer, @@ -1264,13 +2181,13 @@ serializerLookUp = { SiteCredential: SiteCredentialSerializer, - DeploymentPrivilege: DeploymentPrivilegeSerializer, + ControllerPrivilege: ControllerPrivilegeSerializer, - DeploymentRole: DeploymentRoleSerializer, + ControllerRole: ControllerRoleSerializer, UserCredential: UserCredentialSerializer, - SiteDeployment: SiteDeploymentSerializer, + SiteDeployments: SiteDeploymentsSerializer, SliceTag: SliceTagSerializer, @@ -1296,16 +2213,20 @@ class PlanetStackRetrieveUpdateDestroyAPIView(generics.RetrieveUpdateDestroyAPIV files=request.FILES, partial=partial) if not serializer.is_valid(): - print "UpdateModelMixin: not serializer.is_valid" - print serializer.errors - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + response = {"error": "validation", + "specific_error": "not serializer.is_valid()", + "reasons": serializer.errors} + return Response(response, status=status.HTTP_400_BAD_REQUEST) try: self.pre_save(serializer.object) except ValidationError as err: # full_clean on model instance may be called in pre_save, # so we have to handle eventual errors. - return Response(err.message_dict, status=status.HTTP_400_BAD_REQUEST) + response = {"error": "validation", + "specific_error": "ValidationError in pre_save", + "reasons": err.message_dict} + return Response(response, status=status.HTTP_400_BAD_REQUEST) if serializer.object is not None: if not serializer.object.can_update(request.user): @@ -1349,7 +2270,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()", + "reasons": serializer.errors} + 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) @@ -1402,7 +2329,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()", + "reasons": serializer.errors} + 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 +2388,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()", + "reasons": serializer.errors} + 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) @@ -1508,7 +2447,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()", + "reasons": serializer.errors} + 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 +2506,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()", + "reasons": serializer.errors} + 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 +2565,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()", + "reasons": serializer.errors} + 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 +2624,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()", + "reasons": serializer.errors} + 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 +2683,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()", + "reasons": serializer.errors} + 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 +2742,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()", + "reasons": serializer.errors} + 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 +2801,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()", + "reasons": serializer.errors} + 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,10 +2842,10 @@ class NetworkSliverDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class NetworkDeploymentsList(generics.ListCreateAPIView): - queryset = NetworkDeployments.objects.select_related().all() - serializer_class = NetworkDeploymentsSerializer - id_serializer_class = NetworkDeploymentsIdSerializer +class ControllerNetworksList(generics.ListCreateAPIView): + queryset = ControllerNetworks.objects.select_related().all() + serializer_class = ControllerNetworksSerializer + id_serializer_class = ControllerNetworksIdSerializer filter_backends = (filters.DjangoFilterBackend,) filter_fields = ('id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',) @@ -1876,27 +2857,33 @@ class NetworkDeploymentsList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return NetworkDeployments.select_by_user(self.request.user) + return ControllerNetworks.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()", + "reasons": serializer.errors} + 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(ControllerNetworksList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(NetworkDeploymentsList, self).create(request, *args, **kwargs) + ret = super(ControllerNetworksList, 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 ControllerNetworksDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerNetworks.objects.select_related().all() + serializer_class = ControllerNetworksSerializer + id_serializer_class = ControllerNetworksIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -1906,7 +2893,7 @@ class NetworkDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return NetworkDeployments.select_by_user(self.request.user) + return ControllerNetworks.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -1932,7 +2919,13 @@ class FlavorList(generics.ListCreateAPIView): return Flavor.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()", + "reasons": serializer.errors} + 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) @@ -1985,7 +2978,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()", + "reasons": serializer.errors} + 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) @@ -2038,7 +3037,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()", + "reasons": serializer.errors} + 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 +3083,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','guaranteedBandwidth','permitAllSlices','topologyParameters','controllerUrl','controllerParameters','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2091,7 +3096,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()", + "reasons": serializer.errors} + 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 +3155,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()", + "reasons": serializer.errors} + 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 +3214,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()", + "reasons": serializer.errors} + 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) @@ -2250,7 +3273,13 @@ class PaymentList(generics.ListCreateAPIView): return Payment.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()", + "reasons": serializer.errors} + 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) @@ -2303,7 +3332,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()", + "reasons": serializer.errors} + 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 +3391,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()", + "reasons": serializer.errors} + 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 +3450,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()", + "reasons": serializer.errors} + 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 +3509,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()", + "reasons": serializer.errors} + 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 +3568,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()", + "reasons": serializer.errors} + 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) @@ -2568,7 +3627,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()", + "reasons": serializer.errors} + 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) @@ -2621,7 +3686,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()", + "reasons": serializer.errors} + 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) @@ -2674,7 +3745,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()", + "reasons": serializer.errors} + 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,10 +3786,10 @@ class DashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ImageDeploymentList(generics.ListCreateAPIView): - queryset = ImageDeployment.objects.select_related().all() - serializer_class = ImageDeploymentSerializer - id_serializer_class = ImageDeploymentIdSerializer +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','deployment','glance_image_id',) @@ -2724,27 +3801,33 @@ class ImageDeploymentList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ImageDeployment.select_by_user(self.request.user) + return ControllerImages.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()", + "reasons": serializer.errors} + 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(ControllerImagesList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ImageDeploymentList, self).create(request, *args, **kwargs) + ret = super(ControllerImagesList, 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 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) @@ -2754,7 +3837,7 @@ class ImageDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ImageDeployment.select_by_user(self.request.user) + return ControllerImages.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -2780,7 +3863,13 @@ class ReservedResourceList(generics.ListCreateAPIView): return ReservedResource.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()", + "reasons": serializer.errors} + 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) @@ -2833,7 +3922,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()", + "reasons": serializer.errors} + 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 +3981,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()", + "reasons": serializer.errors} + 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) @@ -2939,7 +4040,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()", + "reasons": serializer.errors} + 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 +4099,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()", + "reasons": serializer.errors} + 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 +4145,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','sites','sites','flavors','flavors',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3045,7 +4158,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()", + "reasons": serializer.errors} + 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) @@ -3078,7 +4197,57 @@ class DeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by 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','site_deployment','admin_user','admin_password','admin_tenant','auth_url','backend_type') + + 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()", + "reasons": serializer.errors} + 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) class ReservationList(generics.ListCreateAPIView): queryset = Reservation.objects.select_related().all() @@ -3098,7 +4267,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()", + "reasons": serializer.errors} + 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,10 +4308,10 @@ class ReservationDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class SliceDeploymentList(generics.ListCreateAPIView): - queryset = SliceDeployment.objects.select_related().all() - serializer_class = SliceDeploymentSerializer - id_serializer_class = SliceDeploymentIdSerializer +class ControllerSlicesList(generics.ListCreateAPIView): + queryset = ControllerSlices.objects.select_related().all() + serializer_class = ControllerSlicesSerializer + id_serializer_class = ControllerSlicesIdSerializer filter_backends = (filters.DjangoFilterBackend,) filter_fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) @@ -3148,27 +4323,33 @@ class SliceDeploymentList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return SliceDeployment.select_by_user(self.request.user) + return ControllerSlices.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()", + "reasons": serializer.errors} + 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(ControllerSlicesList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(SliceDeploymentList, self).create(request, *args, **kwargs) + ret = super(ControllerSlicesList, 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 ControllerSlicesDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerSlices.objects.select_related().all() + serializer_class = ControllerSlicesSerializer + id_serializer_class = ControllerSlicesIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3178,7 +4359,7 @@ class SliceDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return SliceDeployment.select_by_user(self.request.user) + return ControllerSlices.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3204,7 +4385,13 @@ class SitePrivilegeList(generics.ListCreateAPIView): return SitePrivilege.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()", + "reasons": serializer.errors} + 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) @@ -3257,7 +4444,13 @@ class PlanetStackList(generics.ListCreateAPIView): return PlanetStack.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()", + "reasons": serializer.errors} + 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) @@ -3292,10 +4485,10 @@ class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class UserDeploymentList(generics.ListCreateAPIView): - queryset = UserDeployment.objects.select_related().all() - serializer_class = UserDeploymentSerializer - id_serializer_class = UserDeploymentIdSerializer +class ControllerUsersList(generics.ListCreateAPIView): + queryset = ControllerUsers.objects.select_related().all() + serializer_class = ControllerUsersSerializer + id_serializer_class = ControllerUsersIdSerializer filter_backends = (filters.DjangoFilterBackend,) filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',) @@ -3307,27 +4500,33 @@ class UserDeploymentList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return UserDeployment.select_by_user(self.request.user) + return ControllerUsers.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()", + "reasons": serializer.errors} + 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(ControllerUsersList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(UserDeploymentList, self).create(request, *args, **kwargs) + ret = super(ControllerUsersList, 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 ControllerUsersDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerUsers.objects.select_related().all() + serializer_class = ControllerUsersSerializer + id_serializer_class = ControllerUsersIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3337,7 +4536,7 @@ class UserDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return UserDeployment.select_by_user(self.request.user) + return ControllerUsers.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3363,7 +4562,13 @@ class AccountList(generics.ListCreateAPIView): return Account.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()", + "reasons": serializer.errors} + 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) @@ -3416,7 +4621,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()", + "reasons": serializer.errors} + 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 +4680,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()", + "reasons": serializer.errors} + 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) @@ -3504,10 +4721,10 @@ class SiteCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class DeploymentPrivilegeList(generics.ListCreateAPIView): - queryset = DeploymentPrivilege.objects.select_related().all() - serializer_class = DeploymentPrivilegeSerializer - id_serializer_class = DeploymentPrivilegeIdSerializer +class ControllerPrivilegeList(generics.ListCreateAPIView): + queryset = ControllerPrivilege.objects.select_related().all() + serializer_class = ControllerPrivilegeSerializer + id_serializer_class = ControllerPrivilegeIdSerializer filter_backends = (filters.DjangoFilterBackend,) filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','role',) @@ -3519,27 +4736,33 @@ class DeploymentPrivilegeList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return DeploymentPrivilege.select_by_user(self.request.user) + return ControllerPrivilege.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()", + "reasons": serializer.errors} + 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) + return super(ControllerPrivilegeList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(DeploymentPrivilegeList, self).create(request, *args, **kwargs) + ret = super(ControllerPrivilegeList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class DeploymentPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = DeploymentPrivilege.objects.select_related().all() - serializer_class = DeploymentPrivilegeSerializer - id_serializer_class = DeploymentPrivilegeIdSerializer +class ControllerPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerPrivilege.objects.select_related().all() + serializer_class = ControllerPrivilegeSerializer + id_serializer_class = ControllerPrivilegeIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3549,7 +4772,7 @@ class DeploymentPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return DeploymentPrivilege.select_by_user(self.request.user) + return ControllerPrivilege.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3557,10 +4780,10 @@ class DeploymentPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class DeploymentRoleList(generics.ListCreateAPIView): - queryset = DeploymentRole.objects.select_related().all() - serializer_class = DeploymentRoleSerializer - id_serializer_class = DeploymentRoleIdSerializer +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','role',) @@ -3572,27 +4795,33 @@ class DeploymentRoleList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return DeploymentRole.select_by_user(self.request.user) + return ControllerRole.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()", + "reasons": serializer.errors} + 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(ControllerRoleList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(DeploymentRoleList, 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 DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = DeploymentRole.objects.select_related().all() - serializer_class = DeploymentRoleSerializer - id_serializer_class = DeploymentRoleIdSerializer +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) @@ -3602,7 +4831,7 @@ class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return DeploymentRole.select_by_user(self.request.user) + return ControllerRole.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3628,7 +4857,13 @@ class UserCredentialList(generics.ListCreateAPIView): return UserCredential.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()", + "reasons": serializer.errors} + 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) @@ -3663,12 +4898,12 @@ class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class SiteDeploymentList(generics.ListCreateAPIView): - queryset = SiteDeployment.objects.select_related().all() - serializer_class = SiteDeploymentSerializer - id_serializer_class = SiteDeploymentIdSerializer +class SiteDeploymentsList(generics.ListCreateAPIView): + queryset = SiteDeployments.objects.select_related().all() + serializer_class = SiteDeploymentsSerializer + id_serializer_class = SiteDeploymentsIdSerializer 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','site','deployment') def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3678,27 +4913,33 @@ class SiteDeploymentList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return SiteDeployment.select_by_user(self.request.user) + return SiteDeployments.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()", + "reasons": serializer.errors} + 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(SiteDeploymentsList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(SiteDeploymentList, self).create(request, *args, **kwargs) + ret = super(SiteDeploymentsList, 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 SiteDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = SiteDeployments.objects.select_related().all() + serializer_class = SiteDeploymentsSerializer + id_serializer_class = SiteDeploymentsIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3708,14 +4949,12 @@ class SiteDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return SiteDeployment.select_by_user(self.request.user) + return SiteDeployments.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView - - class SliceTagList(generics.ListCreateAPIView): queryset = SliceTag.objects.select_related().all() serializer_class = SliceTagSerializer @@ -3734,7 +4973,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()", + "reasons": serializer.errors} + 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 +5019,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','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId','topologyKind','controllerKind',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3787,7 +5032,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()", + "reasons": serializer.errors} + 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) @@ -3840,7 +5091,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()", + "reasons": serializer.errors} + 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 +5150,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()", + "reasons": serializer.errors} + 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)