X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fgenapi.py;h=fdd74d32f3c189f61ff2f0ada5889633cb3ff81a;hb=HEAD;hp=bac66d84baf3531a2efe6464f62f708d8a56344f;hpb=62a4c9b2fb67ab033574d9c0f4070081f1e3bb6e;p=plstackapi.git diff --git a/planetstack/genapi.py b/planetstack/genapi.py index bac66d8..fdd74d3 100644 --- a/planetstack/genapi.py +++ b/planetstack/genapi.py @@ -10,6 +10,13 @@ from django.forms import widgets from rest_framework import filters from django.conf.urls import patterns, url +if hasattr(serializers, "ReadOnlyField"): + # rest_framework 3.x + IdField = serializers.ReadOnlyField +else: + # rest_framework 2.x + IdField = serializers.Field + """ Schema of the generator object: all: Set of all Model objects @@ -30,199 +37,171 @@ def get_REST_patterns(): url(r'plstackapi/serviceattributes/$', ServiceAttributeList.as_view(), name='serviceattribute-list'), url(r'plstackapi/serviceattributes/(?P[a-zA-Z0-9\-]+)/$', ServiceAttributeDetail.as_view(), name ='serviceattribute-detail'), -# url(r'plstackapi/serviceattributes/!new/$', ServiceAttributeNew.as_view(), name ='serviceattribute-new'), + + 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/controllersiteprivileges/$', ControllerSitePrivilegeList.as_view(), name='controllersiteprivilege-list'), + url(r'plstackapi/controllersiteprivileges/(?P[a-zA-Z0-9\-]+)/$', ControllerSitePrivilegeDetail.as_view(), name ='controllersiteprivilege-detail'), url(r'plstackapi/images/$', ImageList.as_view(), name='image-list'), url(r'plstackapi/images/(?P[a-zA-Z0-9\-]+)/$', ImageDetail.as_view(), name ='image-detail'), -# url(r'plstackapi/images/!new/$', ImageNew.as_view(), name ='image-new'), url(r'plstackapi/networkparameters/$', NetworkParameterList.as_view(), name='networkparameter-list'), url(r'plstackapi/networkparameters/(?P[a-zA-Z0-9\-]+)/$', NetworkParameterDetail.as_view(), name ='networkparameter-detail'), -# url(r'plstackapi/networkparameters/!new/$', NetworkParameterNew.as_view(), name ='networkparameter-new'), url(r'plstackapi/sites/$', SiteList.as_view(), name='site-list'), url(r'plstackapi/sites/(?P[a-zA-Z0-9\-]+)/$', SiteDetail.as_view(), name ='site-detail'), -# url(r'plstackapi/sites/!new/$', SiteNew.as_view(), name ='site-new'), url(r'plstackapi/slice_roles/$', SliceRoleList.as_view(), name='slicerole-list'), url(r'plstackapi/slice_roles/(?P[a-zA-Z0-9\-]+)/$', SliceRoleDetail.as_view(), name ='slicerole-detail'), -# url(r'plstackapi/slice_roles/!new/$', SliceRoleNew.as_view(), name ='slicerole-new'), url(r'plstackapi/tags/$', TagList.as_view(), name='tag-list'), url(r'plstackapi/tags/(?P[a-zA-Z0-9\-]+)/$', TagDetail.as_view(), name ='tag-detail'), -# url(r'plstackapi/tags/!new/$', TagNew.as_view(), name ='tag-new'), url(r'plstackapi/invoices/$', InvoiceList.as_view(), name='invoice-list'), url(r'plstackapi/invoices/(?P[a-zA-Z0-9\-]+)/$', InvoiceDetail.as_view(), name ='invoice-detail'), -# url(r'plstackapi/invoices/!new/$', InvoiceNew.as_view(), name ='invoice-new'), url(r'plstackapi/slice_privileges/$', SlicePrivilegeList.as_view(), name='sliceprivilege-list'), url(r'plstackapi/slice_privileges/(?P[a-zA-Z0-9\-]+)/$', SlicePrivilegeDetail.as_view(), name ='sliceprivilege-detail'), -# url(r'plstackapi/slice_privileges/!new/$', SlicePrivilegeNew.as_view(), name ='sliceprivilege-new'), url(r'plstackapi/planetstackroles/$', PlanetStackRoleList.as_view(), name='planetstackrole-list'), url(r'plstackapi/planetstackroles/(?P[a-zA-Z0-9\-]+)/$', PlanetStackRoleDetail.as_view(), name ='planetstackrole-detail'), -# url(r'plstackapi/planetstackroles/!new/$', PlanetStackRoleNew.as_view(), name ='planetstackrole-new'), 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/networkslivers/!new/$', NetworkSliverNew.as_view(), name ='networksliver-new'), - - 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/networkdeployments/!new/$', NetworkDeploymentsNew.as_view(), name ='networkdeployments-new'), 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'), -# url(r'plstackapi/flavors/!new/$', FlavorNew.as_view(), name ='flavor-new'), + + url(r'plstackapi/controllersites/$', ControllerSiteList.as_view(), name='controllersite-list'), + url(r'plstackapi/controllersites/(?P[a-zA-Z0-9\-]+)/$', ControllerSiteDetail.as_view(), name ='controllersite-detail'), url(r'plstackapi/projects/$', ProjectList.as_view(), name='project-list'), url(r'plstackapi/projects/(?P[a-zA-Z0-9\-]+)/$', ProjectDetail.as_view(), name ='project-detail'), -# url(r'plstackapi/projects/!new/$', ProjectNew.as_view(), name ='project-new'), url(r'plstackapi/slices/$', SliceList.as_view(), name='slice-list'), url(r'plstackapi/slices/(?P[a-zA-Z0-9\-]+)/$', SliceDetail.as_view(), name ='slice-detail'), -# url(r'plstackapi/slices/!new/$', SliceNew.as_view(), name ='slice-new'), url(r'plstackapi/networks/$', NetworkList.as_view(), name='network-list'), url(r'plstackapi/networks/(?P[a-zA-Z0-9\-]+)/$', NetworkDetail.as_view(), name ='network-detail'), -# url(r'plstackapi/networks/!new/$', NetworkNew.as_view(), name ='network-new'), url(r'plstackapi/services/$', ServiceList.as_view(), name='service-list'), url(r'plstackapi/services/(?P[a-zA-Z0-9\-]+)/$', ServiceDetail.as_view(), name ='service-detail'), -# url(r'plstackapi/services/!new/$', ServiceNew.as_view(), name ='service-new'), url(r'plstackapi/serviceclasses/$', ServiceClassList.as_view(), name='serviceclass-list'), url(r'plstackapi/serviceclasses/(?P[a-zA-Z0-9\-]+)/$', ServiceClassDetail.as_view(), name ='serviceclass-detail'), -# url(r'plstackapi/serviceclasses/!new/$', ServiceClassNew.as_view(), name ='serviceclass-new'), 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/planetstacks/!new/$', PlanetStackNew.as_view(), name ='planetstack-new'), url(r'plstackapi/charges/$', ChargeList.as_view(), name='charge-list'), url(r'plstackapi/charges/(?P[a-zA-Z0-9\-]+)/$', ChargeDetail.as_view(), name ='charge-detail'), -# url(r'plstackapi/charges/!new/$', ChargeNew.as_view(), name ='charge-new'), url(r'plstackapi/roles/$', RoleList.as_view(), name='role-list'), url(r'plstackapi/roles/(?P[a-zA-Z0-9\-]+)/$', RoleDetail.as_view(), name ='role-detail'), -# url(r'plstackapi/roles/!new/$', RoleNew.as_view(), name ='role-new'), url(r'plstackapi/usableobjects/$', UsableObjectList.as_view(), name='usableobject-list'), url(r'plstackapi/usableobjects/(?P[a-zA-Z0-9\-]+)/$', UsableObjectDetail.as_view(), name ='usableobject-detail'), -# url(r'plstackapi/usableobjects/!new/$', UsableObjectNew.as_view(), name ='usableobject-new'), url(r'plstackapi/site_roles/$', SiteRoleList.as_view(), name='siterole-list'), url(r'plstackapi/site_roles/(?P[a-zA-Z0-9\-]+)/$', SiteRoleDetail.as_view(), name ='siterole-detail'), -# url(r'plstackapi/site_roles/!new/$', SiteRoleNew.as_view(), name ='siterole-new'), url(r'plstackapi/slicecredentials/$', SliceCredentialList.as_view(), name='slicecredential-list'), url(r'plstackapi/slicecredentials/(?P[a-zA-Z0-9\-]+)/$', SliceCredentialDetail.as_view(), name ='slicecredential-detail'), -# url(r'plstackapi/slicecredentials/!new/$', SliceCredentialNew.as_view(), name ='slicecredential-new'), url(r'plstackapi/slivers/$', SliverList.as_view(), name='sliver-list'), url(r'plstackapi/slivers/(?P[a-zA-Z0-9\-]+)/$', SliverDetail.as_view(), name ='sliver-detail'), -# url(r'plstackapi/slivers/!new/$', SliverNew.as_view(), name ='sliver-new'), url(r'plstackapi/nodes/$', NodeList.as_view(), name='node-list'), url(r'plstackapi/nodes/(?P[a-zA-Z0-9\-]+)/$', NodeDetail.as_view(), name ='node-detail'), -# url(r'plstackapi/nodes/!new/$', NodeNew.as_view(), name ='node-new'), 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/dashboardviews/!new/$', DashboardViewNew.as_view(), name ='dashboardview-new'), + + url(r'plstackapi/controllernetworks/$', ControllerNetworkList.as_view(), name='controllernetwork-list'), + url(r'plstackapi/controllernetworks/(?P[a-zA-Z0-9\-]+)/$', ControllerNetworkDetail.as_view(), name ='controllernetwork-detail'), + + url(r'plstackapi/imagedeploymentses/$', ImageDeploymentsList.as_view(), name='imagedeployments-list'), + url(r'plstackapi/imagedeploymentses/(?P[a-zA-Z0-9\-]+)/$', ImageDeploymentsDetail.as_view(), name ='imagedeployments-detail'), + + url(r'plstackapi/controllerusers/$', ControllerUserList.as_view(), name='controlleruser-list'), + url(r'plstackapi/controllerusers/(?P[a-zA-Z0-9\-]+)/$', ControllerUserDetail.as_view(), name ='controlleruser-detail'), url(r'plstackapi/reservedresources/$', ReservedResourceList.as_view(), name='reservedresource-list'), url(r'plstackapi/reservedresources/(?P[a-zA-Z0-9\-]+)/$', ReservedResourceDetail.as_view(), name ='reservedresource-detail'), -# url(r'plstackapi/reservedresources/!new/$', ReservedResourceNew.as_view(), name ='reservedresource-new'), url(r'plstackapi/payments/$', PaymentList.as_view(), name='payment-list'), url(r'plstackapi/payments/(?P[a-zA-Z0-9\-]+)/$', PaymentDetail.as_view(), name ='payment-detail'), -# url(r'plstackapi/payments/!new/$', PaymentNew.as_view(), name ='payment-new'), url(r'plstackapi/networkslices/$', NetworkSliceList.as_view(), name='networkslice-list'), url(r'plstackapi/networkslices/(?P[a-zA-Z0-9\-]+)/$', NetworkSliceDetail.as_view(), name ='networkslice-detail'), -# url(r'plstackapi/networkslices/!new/$', NetworkSliceNew.as_view(), name ='networkslice-new'), url(r'plstackapi/userdashboardviews/$', UserDashboardViewList.as_view(), name='userdashboardview-list'), url(r'plstackapi/userdashboardviews/(?P[a-zA-Z0-9\-]+)/$', UserDashboardViewDetail.as_view(), name ='userdashboardview-detail'), -# url(r'plstackapi/userdashboardviews/!new/$', UserDashboardViewNew.as_view(), name ='userdashboardview-new'), - url(r'plstackapi/sitedeployments/$', SiteDeploymentsList.as_view(), name='sitedeployment-list'), - url(r'plstackapi/sitedeployments/(?P[a-zA-Z0-9\-]+)/$', SiteDeploymentsDetail.as_view(), name ='sitedeployment-detail'), -# url(r'plstackapi/sitedeployments/!new/$', SiteDeploymentsNew.as_view(), name ='sitedeployment-new'), + url(r'plstackapi/controllers/$', ControllerList.as_view(), name='controller-list'), + url(r'plstackapi/controllers/(?P[a-zA-Z0-9\-]+)/$', ControllerDetail.as_view(), name ='controller-detail'), url(r'plstackapi/planetstackprivileges/$', PlanetStackPrivilegeList.as_view(), name='planetstackprivilege-list'), url(r'plstackapi/planetstackprivileges/(?P[a-zA-Z0-9\-]+)/$', PlanetStackPrivilegeDetail.as_view(), name ='planetstackprivilege-detail'), -# url(r'plstackapi/planetstackprivileges/!new/$', PlanetStackPrivilegeNew.as_view(), name ='planetstackprivilege-new'), url(r'plstackapi/users/$', UserList.as_view(), name='user-list'), url(r'plstackapi/users/(?P[a-zA-Z0-9\-]+)/$', UserDetail.as_view(), name ='user-detail'), -# url(r'plstackapi/users/!new/$', UserNew.as_view(), name ='user-new'), 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/deployments/!new/$', DeploymentNew.as_view(), name ='deployment-new'), 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/reservations/!new/$', ReservationNew.as_view(), name ='reservation-new'), 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'), -# url(r'plstackapi/siteprivileges/!new/$', SitePrivilegeNew.as_view(), name ='siteprivilege-new'), - url(r'plstackapi/slicedeployments/$', SliceDeploymentsList.as_view(), name='slicedeployment-list'), - url(r'plstackapi/slicedeployments/(?P[a-zA-Z0-9\-]+)/$', SliceDeploymentsDetail.as_view(), name ='slicedeployment-detail'), -# url(r'plstackapi/slicedeployments/!new/$', SliceDeploymentsNew.as_view(), name ='slicedeployment-new'), + url(r'plstackapi/controllerslices/$', ControllerSliceList.as_view(), name='controllerslice-list'), + url(r'plstackapi/controllerslices/(?P[a-zA-Z0-9\-]+)/$', ControllerSliceDetail.as_view(), name ='controllerslice-detail'), - url(r'plstackapi/userdeployments/$', UserDeploymentList.as_view(), name='userdeployment-list'), - url(r'plstackapi/userdeployments/(?P[a-zA-Z0-9\-]+)/$', UserDeploymentDetail.as_view(), name ='userdeployment-detail'), -# url(r'plstackapi/userdeployments/!new/$', UserDeploymentNew.as_view(), name ='userdeployment-new'), + url(r'plstackapi/controllerdashboardviews/$', ControllerDashboardViewList.as_view(), name='controllerdashboardview-list'), + url(r'plstackapi/controllerdashboardviews/(?P[a-zA-Z0-9\-]+)/$', ControllerDashboardViewDetail.as_view(), name ='controllerdashboardview-detail'), url(r'plstackapi/accounts/$', AccountList.as_view(), name='account-list'), url(r'plstackapi/accounts/(?P[a-zA-Z0-9\-]+)/$', AccountDetail.as_view(), name ='account-detail'), -# url(r'plstackapi/accounts/!new/$', AccountNew.as_view(), name ='account-new'), + + 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/networkparametertypes/$', NetworkParameterTypeList.as_view(), name='networkparametertype-list'), url(r'plstackapi/networkparametertypes/(?P[a-zA-Z0-9\-]+)/$', NetworkParameterTypeDetail.as_view(), name ='networkparametertype-detail'), -# url(r'plstackapi/networkparametertypes/!new/$', NetworkParameterTypeNew.as_view(), name ='networkparametertype-new'), 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/sitecredentials/!new/$', SiteCredentialNew.as_view(), name ='sitecredential-new'), 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/deploymentprivileges/!new/$', DeploymentPrivilegeNew.as_view(), name ='deploymentprivilege-new'), - url(r'plstackapi/imagedeployments/$', ImageDeploymentList.as_view(), name='imagedeployment-list'), - url(r'plstackapi/imagedeployments/(?P[a-zA-Z0-9\-]+)/$', ImageDeploymentDetail.as_view(), name ='imagedeployment-detail'), -# url(r'plstackapi/imagedeployments/!new/$', ImageDeploymentNew.as_view(), name ='imagedeployment-new'), + url(r'plstackapi/controllersliceprivileges/$', ControllerSlicePrivilegeList.as_view(), name='controllersliceprivilege-list'), + url(r'plstackapi/controllersliceprivileges/(?P[a-zA-Z0-9\-]+)/$', ControllerSlicePrivilegeDetail.as_view(), name ='controllersliceprivilege-detail'), + + url(r'plstackapi/sitedeployments/$', SiteDeploymentList.as_view(), name='sitedeployment-list'), + url(r'plstackapi/sitedeployments/(?P[a-zA-Z0-9\-]+)/$', SiteDeploymentDetail.as_view(), name ='sitedeployment-detail'), url(r'plstackapi/deploymentroles/$', DeploymentRoleList.as_view(), name='deploymentrole-list'), url(r'plstackapi/deploymentroles/(?P[a-zA-Z0-9\-]+)/$', DeploymentRoleDetail.as_view(), name ='deploymentrole-detail'), -# url(r'plstackapi/deploymentroles/!new/$', DeploymentRoleNew.as_view(), name ='deploymentrole-new'), 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/usercredentials/!new/$', UserCredentialNew.as_view(), name ='usercredential-new'), 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'), -# url(r'plstackapi/slicetags/!new/$', SliceTagNew.as_view(), name ='slicetag-new'), url(r'plstackapi/networktemplates/$', NetworkTemplateList.as_view(), name='networktemplate-list'), url(r'plstackapi/networktemplates/(?P[a-zA-Z0-9\-]+)/$', NetworkTemplateDetail.as_view(), name ='networktemplate-detail'), -# url(r'plstackapi/networktemplates/!new/$', NetworkTemplateNew.as_view(), name ='networktemplate-new'), url(r'plstackapi/routers/$', RouterList.as_view(), name='router-list'), url(r'plstackapi/routers/(?P[a-zA-Z0-9\-]+)/$', RouterDetail.as_view(), name ='router-detail'), -# url(r'plstackapi/routers/!new/$', RouterNew.as_view(), name ='router-new'), url(r'plstackapi/serviceresources/$', ServiceResourceList.as_view(), name='serviceresource-list'), url(r'plstackapi/serviceresources/(?P[a-zA-Z0-9\-]+)/$', ServiceResourceDetail.as_view(), name ='serviceresource-detail'), -# url(r'plstackapi/serviceresources/!new/$', ServiceResourceNew.as_view(), name ='serviceresource-new'), ) @@ -230,6 +209,8 @@ def get_REST_patterns(): def api_root(request, format=None): return Response({ 'serviceattributes': reverse('serviceattribute-list', request=request, format=format), + 'controllerimageses': reverse('controllerimages-list', request=request, format=format), + 'controllersiteprivileges': reverse('controllersiteprivilege-list', request=request, format=format), 'images': reverse('image-list', request=request, format=format), 'networkparameters': reverse('networkparameter-list', request=request, format=format), 'sites': reverse('site-list', request=request, format=format), @@ -239,8 +220,8 @@ def api_root(request, format=None): 'sliceprivileges': reverse('sliceprivilege-list', request=request, format=format), 'planetstackroles': reverse('planetstackrole-list', request=request, format=format), 'networkslivers': reverse('networksliver-list', request=request, format=format), - 'networkdeploymentses': reverse('networkdeployments-list', request=request, format=format), 'flavors': reverse('flavor-list', request=request, format=format), + 'controllersites': reverse('controllersite-list', request=request, format=format), 'projects': reverse('project-list', request=request, format=format), 'slices': reverse('slice-list', request=request, format=format), 'networks': reverse('network-list', request=request, format=format), @@ -255,23 +236,28 @@ def api_root(request, format=None): 'slivers': reverse('sliver-list', request=request, format=format), 'nodes': reverse('node-list', request=request, format=format), 'dashboardviews': reverse('dashboardview-list', request=request, format=format), + 'controllernetworks': reverse('controllernetwork-list', request=request, format=format), + 'imagedeploymentses': reverse('imagedeployments-list', request=request, format=format), + 'controllerusers': reverse('controlleruser-list', request=request, format=format), 'reservedresources': reverse('reservedresource-list', request=request, format=format), 'payments': reverse('payment-list', request=request, format=format), 'networkslices': reverse('networkslice-list', request=request, format=format), 'userdashboardviews': reverse('userdashboardview-list', request=request, format=format), - 'sitedeployments': reverse('sitedeployment-list', request=request, format=format), + 'controllers': reverse('controller-list', request=request, format=format), 'planetstackprivileges': reverse('planetstackprivilege-list', request=request, format=format), 'users': reverse('user-list', request=request, format=format), 'deployments': reverse('deployment-list', request=request, format=format), 'reservations': reverse('reservation-list', request=request, format=format), 'siteprivileges': reverse('siteprivilege-list', request=request, format=format), - 'slicedeployments': reverse('slicedeployment-list', request=request, format=format), - 'userdeployments': reverse('userdeployment-list', request=request, format=format), + 'controllerslices': reverse('controllerslice-list', request=request, format=format), + 'controllerdashboardviews': reverse('controllerdashboardview-list', request=request, format=format), 'accounts': reverse('account-list', request=request, format=format), + 'controllerroles': reverse('controllerrole-list', request=request, format=format), 'networkparametertypes': reverse('networkparametertype-list', request=request, format=format), 'sitecredentials': reverse('sitecredential-list', request=request, format=format), 'deploymentprivileges': reverse('deploymentprivilege-list', request=request, format=format), - 'imagedeployments': reverse('imagedeployment-list', request=request, format=format), + 'controllersliceprivileges': reverse('controllersliceprivilege-list', request=request, format=format), + 'sitedeployments': reverse('sitedeployment-list', request=request, format=format), 'deploymentroles': reverse('deploymentrole-list', request=request, format=format), 'usercredentials': reverse('usercredential-list', request=request, format=format), 'slicetags': reverse('slicetag-list', request=request, format=format), @@ -283,239 +269,611 @@ def api_root(request, format=None): # Based on serializers.py +class XOSModelSerializer(serializers.ModelSerializer): + def save_object(self, obj, **kwargs): + + """ rest_framework can't deal with ManyToMany relations that have a + through table. In plstackapi, most of the through tables we have + use defaults or blank fields, so there's no reason why we shouldn't + be able to save these objects. + + So, let's strip out these m2m relations, and deal with them ourself. + """ + obj._complex_m2m_data={}; + if getattr(obj, '_m2m_data', None): + for relatedObject in obj._meta.get_all_related_many_to_many_objects(): + if (relatedObject.field.rel.through._meta.auto_created): + # These are non-trough ManyToMany relations and + # can be updated just fine + continue + fieldName = relatedObject.get_accessor_name() + if fieldName in obj._m2m_data.keys(): + obj._complex_m2m_data[fieldName] = (relatedObject, obj._m2m_data[fieldName]) + del obj._m2m_data[fieldName] + + serializers.ModelSerializer.save_object(self, obj, **kwargs); + + for (accessor, stuff) in obj._complex_m2m_data.items(): + (relatedObject, data) = stuff + through = relatedObject.field.rel.through + local_fieldName = relatedObject.field.m2m_reverse_field_name() + remote_fieldName = relatedObject.field.m2m_field_name() + + # get the current set of existing relations + existing = through.objects.filter(**{local_fieldName: obj}); + + data_ids = [item.id for item in data] + existing_ids = [getattr(item,remote_fieldName).id for item in existing] + + #print "data_ids", data_ids + #print "existing_ids", existing_ids + + # remove relations that are in 'existing' but not in 'data' + for item in list(existing): + if (getattr(item,remote_fieldName).id not in data_ids): + print "delete", getattr(item,remote_fieldName) + item.delete() #(purge=True) + + # add relations that are in 'data' but not in 'existing' + for item in data: + if (item.id not in existing_ids): + #print "add", item + newModel = through(**{local_fieldName: obj, remote_fieldName: item}) + newModel.save() + class ServiceAttributeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = ServiceAttribute - fields = ('id','created','updated','enacted','backend_status','deleted','name','value','service',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','value','service',) + +class ServiceAttributeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ServiceAttribute + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','value','service',) + + -class ServiceAttributeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() + +class ControllerImagesSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: - model = ServiceAttribute - fields = ('id','created','updated','enacted','backend_status','deleted','name','value','service',) + model = ControllerImages + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',) + +class ControllerImagesIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerImages + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',) + + + + +class ControllerSitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerSitePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_privilege','role_id',) + +class ControllerSitePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerSitePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_privilege','role_id',) class ImageSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() + + + deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail') + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = Image - fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path','deployments',) -class ImageIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ImageIdSerializer(XOSModelSerializer): + id = IdField() - class Meta: + + deployments = serializers.PrimaryKeyRelatedField(many=True, queryset = Deployment.objects.all()) + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: model = Image - fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path','deployments',) class NetworkParameterSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class NetworkParameterIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',) + +class NetworkParameterIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SiteSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() + + deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail') + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = Site - fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name','deployments',) -class SiteIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SiteIdSerializer(XOSModelSerializer): + id = IdField() - class Meta: + + deployments = serializers.PrimaryKeyRelatedField(many=True, queryset = Deployment.objects.all()) + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: model = Site - fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name','deployments',) class SliceRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class SliceRoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + +class SliceRoleIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 TagSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class TagIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',) + +class TagIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 InvoiceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class InvoiceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','date','account',) + +class InvoiceIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class SlicePrivilegeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','slice','role',) + +class SlicePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 PlanetStackRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class PlanetStackRoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + +class PlanetStackRoleIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 NetworkSliverSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class NetworkSliverIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) + +class NetworkSliverIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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): - id = serializers.Field() +class FlavorSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail') + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: - model = NetworkDeployments - fields = ('id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',) + model = Flavor + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) -class NetworkDeploymentsIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class FlavorIdSerializer(XOSModelSerializer): + id = IdField() - class Meta: - model = NetworkDeployments - fields = ('id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',) + + deployments = serializers.PrimaryKeyRelatedField(many=True, queryset = Deployment.objects.all()) + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = Flavor + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) -class FlavorSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSiteSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: - model = Flavor - fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',) + model = ControllerSite + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','controller','tenant_id',) -class FlavorIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerSiteIdSerializer(XOSModelSerializer): + id = IdField() - class Meta: - model = Flavor - fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerSite + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','controller','tenant_id',) class ProjectSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = Project - fields = ('id','created','updated','enacted','backend_status','deleted','name',) - -class ProjectIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) + +class ProjectIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SliceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') - - - - availableNetworks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') - + id = IdField() networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') @@ -525,45 +883,59 @@ class SliceSerializer(serializers.HyperlinkedModelSerializer): networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = Slice - fields = ('id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','availableNetworks','networks','networks',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','service','network','serviceClass','creator','default_flavor','default_image','mount_data_sets','networks','networks',) -class SliceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SliceIdSerializer(XOSModelSerializer): + id = IdField() - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') - - - - availableNetworks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') - - - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) - class Meta: + 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','service','network','serviceClass','creator','default_flavor','default_image','mount_data_sets','networks','networks',) class NetworkSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() - routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + slices = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='slice-detail') + + slices = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='slice-detail') - availableRouters = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + + + slivers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='sliver-detail') @@ -574,363 +946,822 @@ class NetworkSerializer(serializers.HyperlinkedModelSerializer): routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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','topologyParameters','controllerUrl','controllerParameters','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteed_bandwidth','permit_all_slices','topology_parameters','controller_url','controller_parameters','network_id','router_id','subnet_id','slices','slices','slivers','routers','routers',) -class NetworkIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class NetworkIdSerializer(XOSModelSerializer): + id = IdField() - routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + slices = serializers.PrimaryKeyRelatedField(many=True, queryset = Slice.objects.all()) - availableRouters = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + slices = serializers.PrimaryKeyRelatedField(many=True, queryset = Slice.objects.all()) - routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + slivers = serializers.PrimaryKeyRelatedField(many=True, queryset = Sliver.objects.all()) - routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + routers = serializers.PrimaryKeyRelatedField(many=True, queryset = Router.objects.all()) - class Meta: + + routers = serializers.PrimaryKeyRelatedField(many=True, queryset = Router.objects.all()) + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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','topologyParameters','controllerUrl','controllerParameters','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteed_bandwidth','permit_all_slices','topology_parameters','controller_url','controller_parameters','network_id','router_id','subnet_id','slices','slices','slivers','routers','routers',) class ServiceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = Service - fields = ('id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',) - -class ServiceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',) + +class ServiceIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 ServiceClassSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class ServiceClassIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',) + +class ServiceClassIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 PlanetStackSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class PlanetStackIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) + +class PlanetStackIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 ChargeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class ChargeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',) + +class ChargeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 RoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class RoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',) + +class RoleIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 UsableObjectSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class UsableObjectIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) + +class UsableObjectIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SiteRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class SiteRoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + +class SiteRoleIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SliceCredentialSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class SliceCredentialIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',) + +class SliceCredentialIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SliverSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') - + id = IdField() networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = Sliver - fields = ('id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','node','deploymentNetwork','numberCores','flavor','userData','networks','networks',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','deployment','node','numberCores','flavor','userData','networks',) -class SliverIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') +class SliverIdSerializer(XOSModelSerializer): + id = IdField() - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) - class Meta: + 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','deployment','node','numberCores','flavor','userData','networks',) class NodeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = Node - fields = ('id','created','updated','enacted','backend_status','deleted','name','site','deployment',) - -class NodeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_deployment',) + +class NodeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 DashboardViewSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() + + controllers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='controller-detail') + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = DashboardView - fields = ('id','created','updated','enacted','backend_status','deleted','name','url',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','url','controllers',) -class DashboardViewIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class DashboardViewIdSerializer(XOSModelSerializer): + id = IdField() - class Meta: + + controllers = serializers.PrimaryKeyRelatedField(many=True, queryset = Controller.objects.all()) + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: model = DashboardView - fields = ('id','created','updated','enacted','backend_status','deleted','name','url',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','url','controllers',) -class ReservedResourceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerNetworkSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + 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',) + model = ControllerNetwork + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',) + +class ControllerNetworkIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerNetwork + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',) + + + + +class ImageDeploymentsSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + 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 = ImageDeployments + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment',) + +class ImageDeploymentsIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ImageDeployments + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment',) + + + + +class ControllerUserSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerUser + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) -class ReservedResourceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerUserIdSerializer(XOSModelSerializer): + id = IdField() + 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 = ControllerUser + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) + + + + +class ReservedResourceSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + 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(XOSModelSerializer): + id = IdField() + + 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 = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) class PaymentSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class PaymentIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) + +class PaymentIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 NetworkSliceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class NetworkSliceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',) + +class NetworkSliceIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 UserDashboardViewSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class UserDashboardViewIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',) + +class UserDashboardViewIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SiteDeploymentsSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + dashboardviews = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='dashboardview-detail') + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: - model = SiteDeployments - fields = ('id','created','updated','enacted','backend_status','deleted','site','deployment','tenant_id',) + model = Controller + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',) -class SiteDeploymentsIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerIdSerializer(XOSModelSerializer): + id = IdField() - class Meta: - model = SiteDeployments - fields = ('id','created','updated','enacted','backend_status','deleted','site','deployment','tenant_id',) + + dashboardviews = serializers.PrimaryKeyRelatedField(many=True, queryset = DashboardView.objects.all()) + + + 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','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',) class PlanetStackPrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class PlanetStackPrivilegeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','planetstack','role',) + +class PlanetStackPrivilegeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 UserSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class UserIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','password','last_login','email','username','firstname','lastname','phone','user_url','site','public_key','is_active','is_admin','is_staff','is_readonly','created','updated','enacted','backend_status','deleted','timezone',) + +class UserIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 DeploymentSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() - sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail') + images = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='image-detail') @@ -941,291 +1772,657 @@ class DeploymentSerializer(serializers.HyperlinkedModelSerializer): flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') - - flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') - - + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = Deployment - fields = ('id','created','updated','enacted','backend_status','deleted','name','admin_user','admin_password','admin_tenant','auth_url','backend_type','availability_zone','accessControl','sites','sites','flavors','flavors',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','images','sites','flavors',) -class DeploymentIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - - sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail') - +class DeploymentIdSerializer(XOSModelSerializer): + id = IdField() - sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail') + images = serializers.PrimaryKeyRelatedField(many=True, queryset = Image.objects.all()) - flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') + sites = serializers.PrimaryKeyRelatedField(many=True, queryset = Site.objects.all()) - flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') + flavors = serializers.PrimaryKeyRelatedField(many=True, queryset = Flavor.objects.all()) - class Meta: + 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','images','sites','flavors',) class ReservationSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class ReservationIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',) + +class ReservationIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class SitePrivilegeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',) + +class SitePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SliceDeploymentsSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSliceSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + 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 = SliceDeployments - fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) - -class SliceDeploymentsIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - + model = ControllerSlice + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) + +class ControllerSliceIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerSlice + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) + + + + +class ControllerDashboardViewSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: - model = SliceDeployments - fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) + model = ControllerDashboardView + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) +class ControllerDashboardViewIdSerializer(XOSModelSerializer): + id = IdField() + + 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 = ControllerDashboardView + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) -class UserDeploymentSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - - class Meta: - model = UserDeployment - fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',) -class UserDeploymentIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - +class AccountSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: - model = UserDeployment - fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',) + model = Account + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) + +class AccountIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = Account + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) -class AccountSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerRoleSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: - model = Account - fields = ('id','created','updated','enacted','backend_status','deleted','site',) + model = ControllerRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) -class AccountIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerRoleIdSerializer(XOSModelSerializer): + id = IdField() - class Meta: - model = Account - fields = ('id','created','updated','enacted','backend_status','deleted','site',) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) class NetworkParameterTypeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = NetworkParameterType - fields = ('id','created','updated','enacted','backend_status','deleted','name','description',) - -class NetworkParameterTypeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description',) + +class NetworkParameterTypeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SiteCredentialSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class SiteCredentialIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',) + +class SiteCredentialIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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): - id = serializers.Field() - + id = IdField() + + 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',) - -class DeploymentPrivilegeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','role',) + +class DeploymentPrivilegeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','role',) -class ImageDeploymentSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + 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 = ControllerSlicePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',) + +class ControllerSlicePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() + + 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 = ControllerSlicePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',) + + + + +class SiteDeploymentSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + 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 = SiteDeployment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) -class ImageDeploymentIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SiteDeploymentIdSerializer(XOSModelSerializer): + id = IdField() - class Meta: - model = ImageDeployment - fields = ('id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = SiteDeployment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class DeploymentRoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + +class DeploymentRoleIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) class UserCredentialSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class UserCredentialIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) + +class UserCredentialIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 SliceTagSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class SliceTagIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','value',) + +class SliceTagIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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 NetworkTemplateSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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','topologyKind','controllerKind',) - -class NetworkTemplateIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteed_bandwidth','visibility','translation','shared_network_name','shared_network_id','topology_kind','controller_kind',) + +class NetworkTemplateIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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','topologyKind','controllerKind',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteed_bandwidth','visibility','translation','shared_network_name','shared_network_id','topology_kind','controller_kind',) class RouterSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() + + networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + + + + networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None class Meta: model = Router - fields = ('id','created','updated','enacted','backend_status','deleted','name','owner',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',) -class RouterIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class RouterIdSerializer(XOSModelSerializer): + id = IdField() - class Meta: + + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) + + + + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) + + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: model = Router - fields = ('id','created','updated','enacted','backend_status','deleted','name','owner',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',) class ServiceResourceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - + id = IdField() + + 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',) - -class ServiceResourceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - class Meta: + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',) + +class ServiceResourceIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + 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',) @@ -1234,6 +2431,10 @@ serializerLookUp = { ServiceAttribute: ServiceAttributeSerializer, + ControllerImages: ControllerImagesSerializer, + + ControllerSitePrivilege: ControllerSitePrivilegeSerializer, + Image: ImageSerializer, NetworkParameter: NetworkParameterSerializer, @@ -1252,10 +2453,10 @@ serializerLookUp = { NetworkSliver: NetworkSliverSerializer, - NetworkDeployments: NetworkDeploymentsSerializer, - Flavor: FlavorSerializer, + ControllerSite: ControllerSiteSerializer, + Project: ProjectSerializer, Slice: SliceSerializer, @@ -1284,6 +2485,12 @@ serializerLookUp = { DashboardView: DashboardViewSerializer, + ControllerNetwork: ControllerNetworkSerializer, + + ImageDeployments: ImageDeploymentsSerializer, + + ControllerUser: ControllerUserSerializer, + ReservedResource: ReservedResourceSerializer, Payment: PaymentSerializer, @@ -1292,7 +2499,7 @@ serializerLookUp = { UserDashboardView: UserDashboardViewSerializer, - SiteDeployments: SiteDeploymentsSerializer, + Controller: ControllerSerializer, PlanetStackPrivilege: PlanetStackPrivilegeSerializer, @@ -1304,19 +2511,23 @@ serializerLookUp = { SitePrivilege: SitePrivilegeSerializer, - SliceDeployments: SliceDeploymentsSerializer, + ControllerSlice: ControllerSliceSerializer, - UserDeployment: UserDeploymentSerializer, + ControllerDashboardView: ControllerDashboardViewSerializer, Account: AccountSerializer, + ControllerRole: ControllerRoleSerializer, + NetworkParameterType: NetworkParameterTypeSerializer, SiteCredential: SiteCredentialSerializer, DeploymentPrivilege: DeploymentPrivilegeSerializer, - ImageDeployment: ImageDeploymentSerializer, + ControllerSlicePrivilege: ControllerSlicePrivilegeSerializer, + + SiteDeployment: SiteDeploymentSerializer, DeploymentRole: DeploymentRoleSerializer, @@ -1346,16 +2557,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): @@ -1401,7 +2616,10 @@ class ServiceAttributeList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -1435,17 +2653,14 @@ class ServiceAttributeDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. -class ServiceAttributeNew(GenericAPIView): - serializer_class = ServiceAttributeSerializer - id_serializer_class = ServiceAttributeIdSerializer - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) +class ControllerImagesList(generics.ListCreateAPIView): + queryset = ControllerImages.objects.select_related().all() + serializer_class = ControllerImagesSerializer + id_serializer_class = ControllerImagesIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -1454,20 +2669,57 @@ class ServiceAttributeNew(GenericAPIView): else: return self.serializer_class - def makenew(self, request, *args, **kwargs): - obj = ServiceAttribute() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" + def get_queryset(self): + return ControllerImages.select_by_user(self.request.user) + def create(self, request, *args, **kwargs): + serializer = self.get_serializer(data=request.DATA, files=request.FILES) + if not (serializer.is_valid()): + response = {"error": "validation", + "specific_error": "not serializer.is_valid()", + "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(ControllerImagesList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + ret = super(ControllerImagesList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) -class ImageList(generics.ListCreateAPIView): - queryset = Image.objects.select_related().all() - serializer_class = ImageSerializer - id_serializer_class = ImageIdSerializer + return ret + + +class ControllerImagesDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerImages.objects.select_related().all() + serializer_class = ControllerImagesSerializer + id_serializer_class = ControllerImagesIdSerializer + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerImages.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +class ControllerSitePrivilegeList(generics.ListCreateAPIView): + queryset = ControllerSitePrivilege.objects.select_related().all() + serializer_class = ControllerSitePrivilegeSerializer + id_serializer_class = ControllerSitePrivilegeIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','site_privilege','role_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -1477,30 +2729,33 @@ class ImageList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return Image.select_by_user(self.request.user) + return ControllerSitePrivilege.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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) + return super(ControllerSitePrivilegeList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ImageList, self).create(request, *args, **kwargs) + ret = super(ControllerSitePrivilegeList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class ImageDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = Image.objects.select_related().all() - serializer_class = ImageSerializer - id_serializer_class = ImageIdSerializer +class ControllerSitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerSitePrivilege.objects.select_related().all() + serializer_class = ControllerSitePrivilegeSerializer + id_serializer_class = ControllerSitePrivilegeIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -1510,23 +2765,56 @@ class ImageDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return Image.select_by_user(self.request.user) + return ControllerSitePrivilege.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. -class ImageNew(GenericAPIView): + +class ImageList(generics.ListCreateAPIView): + queryset = Image.objects.select_related().all() serializer_class = ImageSerializer id_serializer_class = ImageIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path','deployments',) + + 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 Image.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(ImageList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ImageList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + + return ret + - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) +class ImageDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = Image.objects.select_related().all() + serializer_class = ImageSerializer + id_serializer_class = ImageIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -1534,12 +2822,13 @@ class ImageNew(GenericAPIView): return self.id_serializer_class else: return self.serializer_class + + def get_queryset(self): + return Image.select_by_user(self.request.user) - def makenew(self, request, *args, **kwargs): - obj = Image() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -1563,7 +2852,10 @@ class NetworkParameterList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -1597,31 +2889,6 @@ class NetworkParameterDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class NetworkParameterNew(GenericAPIView): - serializer_class = NetworkParameterSerializer - id_serializer_class = NetworkParameterIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = NetworkParameter() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class SiteList(generics.ListCreateAPIView): @@ -1629,7 +2896,7 @@ class SiteList(generics.ListCreateAPIView): serializer_class = SiteSerializer id_serializer_class = SiteIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name','deployments',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -1644,7 +2911,10 @@ class SiteList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -1678,31 +2948,6 @@ class SiteDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SiteNew(GenericAPIView): - serializer_class = SiteSerializer - id_serializer_class = SiteIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Site() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class SliceRoleList(generics.ListCreateAPIView): @@ -1725,7 +2970,10 @@ class SliceRoleList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -1759,31 +3007,6 @@ class SliceRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SliceRoleNew(GenericAPIView): - serializer_class = SliceRoleSerializer - id_serializer_class = SliceRoleIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = SliceRole() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class TagList(generics.ListCreateAPIView): @@ -1806,7 +3029,10 @@ class TagList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -1840,31 +3066,6 @@ class TagDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class TagNew(GenericAPIView): - serializer_class = TagSerializer - id_serializer_class = TagIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Tag() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class InvoiceList(generics.ListCreateAPIView): @@ -1887,7 +3088,10 @@ class InvoiceList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -1921,31 +3125,6 @@ class InvoiceDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class InvoiceNew(GenericAPIView): - serializer_class = InvoiceSerializer - id_serializer_class = InvoiceIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Invoice() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class SlicePrivilegeList(generics.ListCreateAPIView): @@ -1968,7 +3147,10 @@ class SlicePrivilegeList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2002,31 +3184,6 @@ class SlicePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SlicePrivilegeNew(GenericAPIView): - serializer_class = SlicePrivilegeSerializer - id_serializer_class = SlicePrivilegeIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = SlicePrivilege() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class PlanetStackRoleList(generics.ListCreateAPIView): @@ -2049,7 +3206,10 @@ class PlanetStackRoleList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2083,31 +3243,6 @@ class PlanetStackRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class PlanetStackRoleNew(GenericAPIView): - serializer_class = PlanetStackRoleSerializer - id_serializer_class = PlanetStackRoleIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = PlanetStackRole() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class NetworkSliverList(generics.ListCreateAPIView): @@ -2130,7 +3265,10 @@ class NetworkSliverList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2164,17 +3302,14 @@ class NetworkSliverDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. -class NetworkSliverNew(GenericAPIView): - serializer_class = NetworkSliverSerializer - id_serializer_class = NetworkSliverIdSerializer - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) +class FlavorList(generics.ListCreateAPIView): + queryset = Flavor.objects.select_related().all() + serializer_class = FlavorSerializer + id_serializer_class = FlavorIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2183,53 +3318,34 @@ class NetworkSliverNew(GenericAPIView): else: return self.serializer_class - def makenew(self, request, *args, **kwargs): - obj = NetworkSliver() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - - - -class NetworkDeploymentsList(generics.ListCreateAPIView): - queryset = NetworkDeployments.objects.select_related().all() - serializer_class = NetworkDeploymentsSerializer - id_serializer_class = NetworkDeploymentsIdSerializer - filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',) - - def get_serializer_class(self): - no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) - if (no_hyperlinks): - return self.id_serializer_class - else: - return self.serializer_class - - def get_queryset(self): - return NetworkDeployments.select_by_user(self.request.user) + def get_queryset(self): + return Flavor.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()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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(FlavorList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(NetworkDeploymentsList, self).create(request, *args, **kwargs) + ret = super(FlavorList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class NetworkDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = NetworkDeployments.objects.select_related().all() - serializer_class = NetworkDeploymentsSerializer - id_serializer_class = NetworkDeploymentsIdSerializer +class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = Flavor.objects.select_related().all() + serializer_class = FlavorSerializer + id_serializer_class = FlavorIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2239,45 +3355,20 @@ class NetworkDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return NetworkDeployments.select_by_user(self.request.user) + return Flavor.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class NetworkDeploymentsNew(GenericAPIView): - serializer_class = NetworkDeploymentsSerializer - id_serializer_class = NetworkDeploymentsIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - 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 makenew(self, request, *args, **kwargs): - obj = NetworkDeployments() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - - -class FlavorList(generics.ListCreateAPIView): - queryset = Flavor.objects.select_related().all() - serializer_class = FlavorSerializer - id_serializer_class = FlavorIdSerializer +class ControllerSiteList(generics.ListCreateAPIView): + queryset = ControllerSite.objects.select_related().all() + serializer_class = ControllerSiteSerializer + id_serializer_class = ControllerSiteIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','site','controller','tenant_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2287,30 +3378,33 @@ class FlavorList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return Flavor.select_by_user(self.request.user) + return ControllerSite.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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) + return super(ControllerSiteList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(FlavorList, self).create(request, *args, **kwargs) + ret = super(ControllerSiteList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = Flavor.objects.select_related().all() - serializer_class = FlavorSerializer - id_serializer_class = FlavorIdSerializer +class ControllerSiteDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerSite.objects.select_related().all() + serializer_class = ControllerSiteSerializer + id_serializer_class = ControllerSiteIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2320,37 +3414,12 @@ class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return Flavor.select_by_user(self.request.user) + return ControllerSite.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class FlavorNew(GenericAPIView): - serializer_class = FlavorSerializer - id_serializer_class = FlavorIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Flavor() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class ProjectList(generics.ListCreateAPIView): @@ -2373,7 +3442,10 @@ class ProjectList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2407,31 +3479,6 @@ class ProjectDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class ProjectNew(GenericAPIView): - serializer_class = ProjectSerializer - id_serializer_class = ProjectIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Project() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class SliceList(generics.ListCreateAPIView): @@ -2439,7 +3486,7 @@ class SliceList(generics.ListCreateAPIView): serializer_class = SliceSerializer id_serializer_class = SliceIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','availableNetworks','networks','networks',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','service','network','serviceClass','creator','default_flavor','default_image','mount_data_sets','networks','networks',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2454,7 +3501,10 @@ class SliceList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2488,31 +3538,6 @@ class SliceDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SliceNew(GenericAPIView): - serializer_class = SliceSerializer - id_serializer_class = SliceIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Slice() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class NetworkList(generics.ListCreateAPIView): @@ -2520,7 +3545,7 @@ class NetworkList(generics.ListCreateAPIView): serializer_class = NetworkSerializer id_serializer_class = NetworkIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteedBandwidth','permitAllSlices','topologyParameters','controllerUrl','controllerParameters','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteed_bandwidth','permit_all_slices','topology_parameters','controller_url','controller_parameters','network_id','router_id','subnet_id','slices','slices','slivers','routers','routers',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2535,7 +3560,10 @@ class NetworkList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2569,31 +3597,6 @@ class NetworkDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class NetworkNew(GenericAPIView): - serializer_class = NetworkSerializer - id_serializer_class = NetworkIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Network() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class ServiceList(generics.ListCreateAPIView): @@ -2616,7 +3619,10 @@ class ServiceList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2650,31 +3656,6 @@ class ServiceDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class ServiceNew(GenericAPIView): - serializer_class = ServiceSerializer - id_serializer_class = ServiceIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Service() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class ServiceClassList(generics.ListCreateAPIView): @@ -2697,7 +3678,10 @@ class ServiceClassList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2731,31 +3715,6 @@ class ServiceClassDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class ServiceClassNew(GenericAPIView): - serializer_class = ServiceClassSerializer - id_serializer_class = ServiceClassIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = ServiceClass() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class PlanetStackList(generics.ListCreateAPIView): @@ -2778,7 +3737,10 @@ class PlanetStackList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2812,31 +3774,6 @@ class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class PlanetStackNew(GenericAPIView): - serializer_class = PlanetStackSerializer - id_serializer_class = PlanetStackIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = PlanetStack() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class ChargeList(generics.ListCreateAPIView): @@ -2859,7 +3796,10 @@ class ChargeList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2893,31 +3833,6 @@ class ChargeDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class ChargeNew(GenericAPIView): - serializer_class = ChargeSerializer - id_serializer_class = ChargeIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Charge() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class RoleList(generics.ListCreateAPIView): @@ -2940,7 +3855,10 @@ class RoleList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -2974,31 +3892,6 @@ class RoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class RoleNew(GenericAPIView): - serializer_class = RoleSerializer - id_serializer_class = RoleIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Role() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class UsableObjectList(generics.ListCreateAPIView): @@ -3021,7 +3914,10 @@ class UsableObjectList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -3055,31 +3951,6 @@ class UsableObjectDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class UsableObjectNew(GenericAPIView): - serializer_class = UsableObjectSerializer - id_serializer_class = UsableObjectIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = UsableObject() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class SiteRoleList(generics.ListCreateAPIView): @@ -3102,7 +3973,10 @@ class SiteRoleList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -3136,31 +4010,6 @@ class SiteRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SiteRoleNew(GenericAPIView): - serializer_class = SiteRoleSerializer - id_serializer_class = SiteRoleIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = SiteRole() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class SliceCredentialList(generics.ListCreateAPIView): @@ -3183,7 +4032,10 @@ class SliceCredentialList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -3217,31 +4069,6 @@ class SliceCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SliceCredentialNew(GenericAPIView): - serializer_class = SliceCredentialSerializer - id_serializer_class = SliceCredentialIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = SliceCredential() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class SliverList(generics.ListCreateAPIView): @@ -3249,7 +4076,7 @@ class SliverList(generics.ListCreateAPIView): serializer_class = SliverSerializer id_serializer_class = SliverIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','node','deploymentNetwork','numberCores','flavor','userData','networks','networks',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','deployment','node','numberCores','flavor','userData','networks',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3264,7 +4091,10 @@ class SliverList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -3298,31 +4128,6 @@ class SliverDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SliverNew(GenericAPIView): - serializer_class = SliverSerializer - id_serializer_class = SliverIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Sliver() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class NodeList(generics.ListCreateAPIView): @@ -3330,7 +4135,7 @@ class NodeList(generics.ListCreateAPIView): serializer_class = NodeSerializer id_serializer_class = NodeIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site','deployment',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site_deployment',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3345,7 +4150,10 @@ class NodeList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -3379,17 +4187,14 @@ class NodeDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. -class NodeNew(GenericAPIView): - serializer_class = NodeSerializer - id_serializer_class = NodeIdSerializer - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) +class DashboardViewList(generics.ListCreateAPIView): + queryset = DashboardView.objects.select_related().all() + serializer_class = DashboardViewSerializer + id_serializer_class = DashboardViewIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','url','controllers',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3398,20 +4203,57 @@ class NodeNew(GenericAPIView): else: return self.serializer_class - def makenew(self, request, *args, **kwargs): - obj = Node() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" + def get_queryset(self): + return DashboardView.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(DashboardViewList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(DashboardViewList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + return ret -class DashboardViewList(generics.ListCreateAPIView): + +class DashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView): queryset = DashboardView.objects.select_related().all() serializer_class = DashboardViewSerializer id_serializer_class = DashboardViewIdSerializer + + 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 DashboardView.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +class ControllerNetworkList(generics.ListCreateAPIView): + queryset = ControllerNetwork.objects.select_related().all() + serializer_class = ControllerNetworkSerializer + id_serializer_class = ControllerNetworkIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','url',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3421,30 +4263,33 @@ class DashboardViewList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return DashboardView.select_by_user(self.request.user) + return ControllerNetwork.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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) + return super(ControllerNetworkList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(DashboardViewList, self).create(request, *args, **kwargs) + ret = super(ControllerNetworkList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class DashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = DashboardView.objects.select_related().all() - serializer_class = DashboardViewSerializer - id_serializer_class = DashboardViewIdSerializer +class ControllerNetworkDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerNetwork.objects.select_related().all() + serializer_class = ControllerNetworkSerializer + id_serializer_class = ControllerNetworkIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3454,23 +4299,20 @@ class DashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return DashboardView.select_by_user(self.request.user) + return ControllerNetwork.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. -class DashboardViewNew(GenericAPIView): - serializer_class = DashboardViewSerializer - id_serializer_class = DashboardViewIdSerializer - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) +class ImageDeploymentsList(generics.ListCreateAPIView): + queryset = ImageDeployments.objects.select_related().all() + serializer_class = ImageDeploymentsSerializer + id_serializer_class = ImageDeploymentsIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','image','deployment',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3479,20 +4321,57 @@ class DashboardViewNew(GenericAPIView): else: return self.serializer_class - def makenew(self, request, *args, **kwargs): - obj = DashboardView() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" + def get_queryset(self): + return ImageDeployments.select_by_user(self.request.user) + def create(self, request, *args, **kwargs): + serializer = self.get_serializer(data=request.DATA, files=request.FILES) + if not (serializer.is_valid()): + response = {"error": "validation", + "specific_error": "not serializer.is_valid()", + "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(ImageDeploymentsList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + ret = super(ImageDeploymentsList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) -class ReservedResourceList(generics.ListCreateAPIView): - queryset = ReservedResource.objects.select_related().all() - serializer_class = ReservedResourceSerializer - id_serializer_class = ReservedResourceIdSerializer + return ret + + +class ImageDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ImageDeployments.objects.select_related().all() + serializer_class = ImageDeploymentsSerializer + id_serializer_class = ImageDeploymentsIdSerializer + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ImageDeployments.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +class ControllerUserList(generics.ListCreateAPIView): + queryset = ControllerUser.objects.select_related().all() + serializer_class = ControllerUserSerializer + id_serializer_class = ControllerUserIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3502,30 +4381,33 @@ class ReservedResourceList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ReservedResource.select_by_user(self.request.user) + return ControllerUser.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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) + return super(ControllerUserList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ReservedResourceList, self).create(request, *args, **kwargs) + ret = super(ControllerUserList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class ReservedResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ReservedResource.objects.select_related().all() - serializer_class = ReservedResourceSerializer - id_serializer_class = ReservedResourceIdSerializer +class ControllerUserDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerUser.objects.select_related().all() + serializer_class = ControllerUserSerializer + id_serializer_class = ControllerUserIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3535,23 +4417,56 @@ class ReservedResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ReservedResource.select_by_user(self.request.user) + return ControllerUser.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. -class ReservedResourceNew(GenericAPIView): + +class ReservedResourceList(generics.ListCreateAPIView): + queryset = ReservedResource.objects.select_related().all() serializer_class = ReservedResourceSerializer id_serializer_class = ReservedResourceIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) + + 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 ReservedResource.select_by_user(self.request.user) - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) + 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(ReservedResourceList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ReservedResourceList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + + return ret + + +class ReservedResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ReservedResource.objects.select_related().all() + serializer_class = ReservedResourceSerializer + id_serializer_class = ReservedResourceIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3559,12 +4474,13 @@ class ReservedResourceNew(GenericAPIView): return self.id_serializer_class else: return self.serializer_class + + def get_queryset(self): + return ReservedResource.select_by_user(self.request.user) - def makenew(self, request, *args, **kwargs): - obj = ReservedResource() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3588,7 +4504,10 @@ class PaymentList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -3622,31 +4541,6 @@ class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class PaymentNew(GenericAPIView): - serializer_class = PaymentSerializer - id_serializer_class = PaymentIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Payment() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class NetworkSliceList(generics.ListCreateAPIView): @@ -3669,7 +4563,10 @@ class NetworkSliceList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -3703,31 +4600,6 @@ class NetworkSliceDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class NetworkSliceNew(GenericAPIView): - serializer_class = NetworkSliceSerializer - id_serializer_class = NetworkSliceIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = NetworkSlice() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class UserDashboardViewList(generics.ListCreateAPIView): @@ -3750,7 +4622,10 @@ class UserDashboardViewList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -3784,39 +4659,14 @@ class UserDashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class UserDashboardViewNew(GenericAPIView): - serializer_class = UserDashboardViewSerializer - id_serializer_class = UserDashboardViewIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = UserDashboardView() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - -class SiteDeploymentsList(generics.ListCreateAPIView): - queryset = SiteDeployments.objects.select_related().all() - serializer_class = SiteDeploymentsSerializer - id_serializer_class = SiteDeploymentsIdSerializer +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','tenant_id',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3826,30 +4676,33 @@ class SiteDeploymentsList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return SiteDeployments.select_by_user(self.request.user) + 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()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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(SiteDeploymentsList, self).create(request, *args, **kwargs) + return super(ControllerList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(SiteDeploymentsList, self).create(request, *args, **kwargs) + ret = super(ControllerList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class SiteDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = SiteDeployments.objects.select_related().all() - serializer_class = SiteDeploymentsSerializer - id_serializer_class = SiteDeploymentsIdSerializer +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) @@ -3859,37 +4712,12 @@ class SiteDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return SiteDeployments.select_by_user(self.request.user) + return Controller.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SiteDeploymentsNew(GenericAPIView): - serializer_class = SiteDeploymentsSerializer - id_serializer_class = SiteDeploymentsIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = SiteDeployments() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class PlanetStackPrivilegeList(generics.ListCreateAPIView): @@ -3912,7 +4740,10 @@ class PlanetStackPrivilegeList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -3946,31 +4777,6 @@ class PlanetStackPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class PlanetStackPrivilegeNew(GenericAPIView): - serializer_class = PlanetStackPrivilegeSerializer - id_serializer_class = PlanetStackPrivilegeIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = PlanetStackPrivilege() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class UserList(generics.ListCreateAPIView): @@ -3993,7 +4799,10 @@ class UserList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4027,31 +4836,6 @@ class UserDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class UserNew(GenericAPIView): - serializer_class = UserSerializer - id_serializer_class = UserIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = User() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class DeploymentList(generics.ListCreateAPIView): @@ -4059,7 +4843,7 @@ class DeploymentList(generics.ListCreateAPIView): serializer_class = DeploymentSerializer id_serializer_class = DeploymentIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','admin_user','admin_password','admin_tenant','auth_url','backend_type','availability_zone','accessControl','sites','sites','flavors','flavors',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','accessControl','images','sites','flavors',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4074,7 +4858,10 @@ class DeploymentList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4108,31 +4895,6 @@ class DeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class DeploymentNew(GenericAPIView): - serializer_class = DeploymentSerializer - id_serializer_class = DeploymentIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Deployment() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class ReservationList(generics.ListCreateAPIView): @@ -4155,7 +4917,10 @@ class ReservationList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4170,49 +4935,24 @@ class ReservationList(generics.ListCreateAPIView): return ret -class ReservationDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = Reservation.objects.select_related().all() - serializer_class = ReservationSerializer - id_serializer_class = ReservationIdSerializer - - 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 Reservation.select_by_user(self.request.user) - - # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView - - # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView - -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class ReservationNew(GenericAPIView): +class ReservationDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = Reservation.objects.select_related().all() serializer_class = ReservationSerializer id_serializer_class = ReservationIdSerializer - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - 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 Reservation.select_by_user(self.request.user) - def makenew(self, request, *args, **kwargs): - obj = Reservation() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4236,7 +4976,10 @@ class SitePrivilegeList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4270,39 +5013,14 @@ class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SitePrivilegeNew(GenericAPIView): - serializer_class = SitePrivilegeSerializer - id_serializer_class = SitePrivilegeIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - 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 makenew(self, request, *args, **kwargs): - obj = SitePrivilege() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - - -class SliceDeploymentsList(generics.ListCreateAPIView): - queryset = SliceDeployments.objects.select_related().all() - serializer_class = SliceDeploymentsSerializer - id_serializer_class = SliceDeploymentsIdSerializer +class ControllerSliceList(generics.ListCreateAPIView): + queryset = ControllerSlice.objects.select_related().all() + serializer_class = ControllerSliceSerializer + id_serializer_class = ControllerSliceIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4312,30 +5030,33 @@ class SliceDeploymentsList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return SliceDeployments.select_by_user(self.request.user) + return ControllerSlice.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()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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(SliceDeploymentsList, self).create(request, *args, **kwargs) + return super(ControllerSliceList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(SliceDeploymentsList, self).create(request, *args, **kwargs) + ret = super(ControllerSliceList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class SliceDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = SliceDeployments.objects.select_related().all() - serializer_class = SliceDeploymentsSerializer - id_serializer_class = SliceDeploymentsIdSerializer +class ControllerSliceDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerSlice.objects.select_related().all() + serializer_class = ControllerSliceSerializer + id_serializer_class = ControllerSliceIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4345,45 +5066,20 @@ class SliceDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return SliceDeployments.select_by_user(self.request.user) + return ControllerSlice.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SliceDeploymentsNew(GenericAPIView): - serializer_class = SliceDeploymentsSerializer - id_serializer_class = SliceDeploymentsIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = SliceDeployments() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - -class UserDeploymentList(generics.ListCreateAPIView): - queryset = UserDeployment.objects.select_related().all() - serializer_class = UserDeploymentSerializer - id_serializer_class = UserDeploymentIdSerializer +class ControllerDashboardViewList(generics.ListCreateAPIView): + queryset = ControllerDashboardView.objects.select_related().all() + serializer_class = ControllerDashboardViewSerializer + id_serializer_class = ControllerDashboardViewIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4393,30 +5089,33 @@ class UserDeploymentList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return UserDeployment.select_by_user(self.request.user) + return ControllerDashboardView.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()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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(ControllerDashboardViewList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(UserDeploymentList, self).create(request, *args, **kwargs) + ret = super(ControllerDashboardViewList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class UserDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = UserDeployment.objects.select_related().all() - serializer_class = UserDeploymentSerializer - id_serializer_class = UserDeploymentIdSerializer +class ControllerDashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerDashboardView.objects.select_related().all() + serializer_class = ControllerDashboardViewSerializer + id_serializer_class = ControllerDashboardViewIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4426,37 +5125,12 @@ class UserDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return UserDeployment.select_by_user(self.request.user) + return ControllerDashboardView.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class UserDeploymentNew(GenericAPIView): - serializer_class = UserDeploymentSerializer - id_serializer_class = UserDeploymentIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = UserDeployment() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class AccountList(generics.ListCreateAPIView): @@ -4479,7 +5153,10 @@ class AccountList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4513,17 +5190,14 @@ class AccountDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. -class AccountNew(GenericAPIView): - serializer_class = AccountSerializer - id_serializer_class = AccountIdSerializer - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) +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',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4532,11 +5206,48 @@ class AccountNew(GenericAPIView): else: return self.serializer_class - def makenew(self, request, *args, **kwargs): - obj = Account() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" + def get_queryset(self): + return ControllerRole.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(ControllerRoleList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ControllerRoleList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + + return ret + + +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) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerRole.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4560,7 +5271,10 @@ class NetworkParameterTypeList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4594,31 +5308,6 @@ class NetworkParameterTypeDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class NetworkParameterTypeNew(GenericAPIView): - serializer_class = NetworkParameterTypeSerializer - id_serializer_class = NetworkParameterTypeIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = NetworkParameterType() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class SiteCredentialList(generics.ListCreateAPIView): @@ -4641,7 +5330,10 @@ class SiteCredentialList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4675,31 +5367,6 @@ class SiteCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SiteCredentialNew(GenericAPIView): - serializer_class = SiteCredentialSerializer - id_serializer_class = SiteCredentialIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = SiteCredential() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class DeploymentPrivilegeList(generics.ListCreateAPIView): @@ -4722,7 +5389,10 @@ class DeploymentPrivilegeList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4756,39 +5426,14 @@ class DeploymentPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class DeploymentPrivilegeNew(GenericAPIView): - serializer_class = DeploymentPrivilegeSerializer - id_serializer_class = DeploymentPrivilegeIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = DeploymentPrivilege() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - -class ImageDeploymentList(generics.ListCreateAPIView): - queryset = ImageDeployment.objects.select_related().all() - serializer_class = ImageDeploymentSerializer - id_serializer_class = ImageDeploymentIdSerializer +class ControllerSlicePrivilegeList(generics.ListCreateAPIView): + queryset = ControllerSlicePrivilege.objects.select_related().all() + serializer_class = ControllerSlicePrivilegeSerializer + id_serializer_class = ControllerSlicePrivilegeIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4798,30 +5443,33 @@ class ImageDeploymentList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ImageDeployment.select_by_user(self.request.user) + return ControllerSlicePrivilege.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()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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(ControllerSlicePrivilegeList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ImageDeploymentList, self).create(request, *args, **kwargs) + ret = super(ControllerSlicePrivilegeList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class ImageDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ImageDeployment.objects.select_related().all() - serializer_class = ImageDeploymentSerializer - id_serializer_class = ImageDeploymentIdSerializer +class ControllerSlicePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerSlicePrivilege.objects.select_related().all() + serializer_class = ControllerSlicePrivilegeSerializer + id_serializer_class = ControllerSlicePrivilegeIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4831,23 +5479,20 @@ class ImageDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ImageDeployment.select_by_user(self.request.user) + return ControllerSlicePrivilege.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. -class ImageDeploymentNew(GenericAPIView): - serializer_class = ImageDeploymentSerializer - id_serializer_class = ImageDeploymentIdSerializer - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) +class SiteDeploymentList(generics.ListCreateAPIView): + queryset = SiteDeployment.objects.select_related().all() + serializer_class = SiteDeploymentSerializer + id_serializer_class = SiteDeploymentIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4856,11 +5501,48 @@ class ImageDeploymentNew(GenericAPIView): else: return self.serializer_class - def makenew(self, request, *args, **kwargs): - obj = ImageDeployment() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" + def get_queryset(self): + return SiteDeployment.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(SiteDeploymentList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(SiteDeploymentList, 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 + + 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 SiteDeployment.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4884,7 +5566,10 @@ class DeploymentRoleList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4918,31 +5603,6 @@ class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class DeploymentRoleNew(GenericAPIView): - serializer_class = DeploymentRoleSerializer - id_serializer_class = DeploymentRoleIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = DeploymentRole() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class UserCredentialList(generics.ListCreateAPIView): @@ -4965,7 +5625,10 @@ class UserCredentialList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -4999,31 +5662,6 @@ class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class UserCredentialNew(GenericAPIView): - serializer_class = UserCredentialSerializer - id_serializer_class = UserCredentialIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = UserCredential() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class SliceTagList(generics.ListCreateAPIView): @@ -5046,7 +5684,10 @@ class SliceTagList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -5080,31 +5721,6 @@ class SliceTagDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class SliceTagNew(GenericAPIView): - serializer_class = SliceTagSerializer - id_serializer_class = SliceTagIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = SliceTag() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class NetworkTemplateList(generics.ListCreateAPIView): @@ -5112,7 +5728,7 @@ class NetworkTemplateList(generics.ListCreateAPIView): serializer_class = NetworkTemplateSerializer id_serializer_class = NetworkTemplateIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId','topologyKind','controllerKind',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','guaranteed_bandwidth','visibility','translation','shared_network_name','shared_network_id','topology_kind','controller_kind',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -5127,7 +5743,10 @@ class NetworkTemplateList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -5161,31 +5780,6 @@ class NetworkTemplateDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class NetworkTemplateNew(GenericAPIView): - serializer_class = NetworkTemplateSerializer - id_serializer_class = NetworkTemplateIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = NetworkTemplate() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class RouterList(generics.ListCreateAPIView): @@ -5193,7 +5787,7 @@ class RouterList(generics.ListCreateAPIView): serializer_class = RouterSerializer id_serializer_class = RouterIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','owner',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -5208,7 +5802,10 @@ class RouterList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -5242,31 +5839,6 @@ class RouterDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class RouterNew(GenericAPIView): - serializer_class = RouterSerializer - id_serializer_class = RouterIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = Router() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" - class ServiceResourceList(generics.ListCreateAPIView): @@ -5289,7 +5861,10 @@ class ServiceResourceList(generics.ListCreateAPIView): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) if not (serializer.is_valid()): - raise Exception("failed serializer.is_valid: " + str(serializer.errors)) + 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): @@ -5323,30 +5898,5 @@ class ServiceResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView -""" - XXX smbaker: my intent was to create a view that would return 'new' objects - filled with defaults. I solved it another way, so this code may soon be - abandoned. - -class ServiceResourceNew(GenericAPIView): - serializer_class = ServiceResourceSerializer - id_serializer_class = ServiceResourceIdSerializer - - def get(self, request, *args, **kwargs): - return self.makenew(request, *args, **kwargs) - - 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 makenew(self, request, *args, **kwargs): - obj = ServiceResource() - serializer = self.get_serializer(obj) - return Response(serializer.data) -""" -