X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fgenapi.py;h=fdd74d32f3c189f61ff2f0ada5889633cb3ff81a;hb=HEAD;hp=3e6f7b00d4e8fa473b31ca96e7086f20b110f506;hpb=ed58549b7d9fd2f89cda8af20d66cfcb4224e405;p=plstackapi.git diff --git a/planetstack/genapi.py b/planetstack/genapi.py index 3e6f7b0..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 @@ -28,15 +35,15 @@ def get_REST_patterns(): return patterns('', url(r'^plstackapi/$', api_root), - 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/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/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'), @@ -61,12 +68,15 @@ def get_REST_patterns(): 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/controllerprivileges/$', ControllerPrivilegeList.as_view(), name='controllerprivilege-list'), - url(r'plstackapi/controllerprivileges/(?P[a-zA-Z0-9\-]+)/$', ControllerPrivilegeDetail.as_view(), name ='controllerprivilege-detail'), - url(r'plstackapi/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/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/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'), @@ -82,8 +92,8 @@ def get_REST_patterns(): 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/controllernetworks/$', ControllerNetworksList.as_view(), name='controllernetworks-list'), - url(r'plstackapi/controllernetworks/(?P[a-zA-Z0-9\-]+)/$', ControllerNetworksDetail.as_view(), name ='controllernetworks-detail'), + url(r'plstackapi/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/charges/$', ChargeList.as_view(), name='charge-list'), url(r'plstackapi/charges/(?P[a-zA-Z0-9\-]+)/$', ChargeDetail.as_view(), name ='charge-detail'), @@ -94,9 +104,6 @@ def get_REST_patterns(): 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/controllersitedeploymentses/$', ControllerSiteDeploymentsList.as_view(), name='controllersitedeployments-list'), - url(r'plstackapi/controllersitedeploymentses/(?P[a-zA-Z0-9\-]+)/$', ControllerSiteDeploymentsDetail.as_view(), name ='controllersitedeployments-detail'), - 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'), @@ -112,18 +119,21 @@ def get_REST_patterns(): url(r'plstackapi/dashboardviews/$', DashboardViewList.as_view(), name='dashboardview-list'), url(r'plstackapi/dashboardviews/(?P[a-zA-Z0-9\-]+)/$', DashboardViewDetail.as_view(), name ='dashboardview-detail'), + url(r'plstackapi/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/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/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/networkslices/$', NetworkSliceList.as_view(), name='networkslice-list'), url(r'plstackapi/networkslices/(?P[a-zA-Z0-9\-]+)/$', NetworkSliceDetail.as_view(), name ='networkslice-detail'), @@ -148,8 +158,11 @@ def get_REST_patterns(): 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/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/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/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'), @@ -166,8 +179,11 @@ def get_REST_patterns(): 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/controllerusers/$', ControllerUsersList.as_view(), name='controllerusers-list'), - url(r'plstackapi/controllerusers/(?P[a-zA-Z0-9\-]+)/$', ControllerUsersDetail.as_view(), name ='controllerusers-detail'), + url(r'plstackapi/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'), @@ -175,14 +191,11 @@ def get_REST_patterns(): url(r'plstackapi/usercredentials/$', UserCredentialList.as_view(), name='usercredential-list'), url(r'plstackapi/usercredentials/(?P[a-zA-Z0-9\-]+)/$', UserCredentialDetail.as_view(), name ='usercredential-detail'), - url(r'plstackapi/sitedeployments/$', SiteDeploymentsList.as_view(), name='sitedeployments-list'), - url(r'plstackapi/sitedeployments/(?P[a-zA-Z0-9\-]+)/$', SiteDeploymentsDetail.as_view(), name ='sitedeployments-detail'), - url(r'plstackapi/slicetags/$', SliceTagList.as_view(), name='slicetag-list'), url(r'plstackapi/slicetags/(?P[a-zA-Z0-9\-]+)/$', SliceTagDetail.as_view(), name ='slicetag-detail'), - url(r'plstackapi/controllerdashboards/$', ControllerDashboardList.as_view(), name='controllerdashboard-list'), - url(r'plstackapi/controllerdashboards/(?P[a-zA-Z0-9\-]+)/$', ControllerDashboardDetail.as_view(), name ='controllerdashboard-detail'), + 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/routers/$', RouterList.as_view(), name='router-list'), url(r'plstackapi/routers/(?P[a-zA-Z0-9\-]+)/$', RouterDetail.as_view(), name ='router-detail'), @@ -190,17 +203,14 @@ def get_REST_patterns(): 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/controllerslices/$', ControllerSlicesList.as_view(), name='controllerslices-list'), - url(r'plstackapi/controllerslices/(?P[a-zA-Z0-9\-]+)/$', ControllerSlicesDetail.as_view(), name ='controllerslices-detail'), - ) @api_view(['GET']) def api_root(request, format=None): return Response({ - 'flavors': reverse('flavor-list', request=request, format=format), '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), @@ -209,27 +219,28 @@ def api_root(request, format=None): 'invoices': reverse('invoice-list', request=request, format=format), 'sliceprivileges': reverse('sliceprivilege-list', request=request, format=format), 'planetstackroles': reverse('planetstackrole-list', request=request, format=format), - 'controllerprivileges': reverse('controllerprivilege-list', request=request, format=format), 'networkslivers': reverse('networksliver-list', request=request, format=format), + 'flavors': reverse('flavor-list', request=request, format=format), + 'controllersites': reverse('controllersite-list', request=request, format=format), 'projects': reverse('project-list', request=request, format=format), 'slices': reverse('slice-list', request=request, format=format), 'networks': reverse('network-list', request=request, format=format), 'services': reverse('service-list', request=request, format=format), 'serviceclasses': reverse('serviceclass-list', request=request, format=format), - 'controllernetworkses': reverse('controllernetworks-list', request=request, format=format), + 'planetstacks': reverse('planetstack-list', request=request, format=format), 'charges': reverse('charge-list', request=request, format=format), 'roles': reverse('role-list', request=request, format=format), 'usableobjects': reverse('usableobject-list', request=request, format=format), - 'controllersitedeploymentses': reverse('controllersitedeployments-list', request=request, format=format), 'siteroles': reverse('siterole-list', request=request, format=format), 'slicecredentials': reverse('slicecredential-list', request=request, format=format), '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), - 'networktemplates': reverse('networktemplate-list', request=request, format=format), 'networkslices': reverse('networkslice-list', request=request, format=format), 'userdashboardviews': reverse('userdashboardview-list', request=request, format=format), 'controllers': reverse('controller-list', request=request, format=format), @@ -238,21 +249,21 @@ def api_root(request, format=None): 'deployments': reverse('deployment-list', request=request, format=format), 'reservations': reverse('reservation-list', request=request, format=format), 'siteprivileges': reverse('siteprivilege-list', request=request, format=format), - 'planetstacks': reverse('planetstack-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), - 'controlleruserses': reverse('controllerusers-list', request=request, format=format), + 'controllersliceprivileges': reverse('controllersliceprivilege-list', request=request, format=format), + 'sitedeployments': reverse('sitedeployment-list', request=request, format=format), 'deploymentroles': reverse('deploymentrole-list', request=request, format=format), 'usercredentials': reverse('usercredential-list', request=request, format=format), - 'sitedeploymentses': reverse('sitedeployments-list', request=request, format=format), 'slicetags': reverse('slicetag-list', request=request, format=format), - 'controllerdashboards': reverse('controllerdashboard-list', request=request, format=format), + 'networktemplates': reverse('networktemplate-list', request=request, format=format), 'routers': reverse('router-list', request=request, format=format), 'serviceresources': reverse('serviceresource-list', request=request, format=format), - 'controllersliceses': reverse('controllerslices-list', request=request, format=format), }) @@ -312,12 +323,8 @@ class XOSModelSerializer(serializers.ModelSerializer): -class FlavorSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - - - deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail') - +class ServiceAttributeSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -329,15 +336,11 @@ class FlavorSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = Flavor - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) + model = ServiceAttribute + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','value','service',) -class FlavorIdSerializer(XOSModelSerializer): - id = serializers.Field() - - - deployments = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='deployment-detail') - +class ServiceAttributeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -349,14 +352,14 @@ class FlavorIdSerializer(XOSModelSerializer): except: return None class Meta: - model = Flavor - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) + model = ServiceAttribute + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','value','service',) -class ServiceAttributeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerImagesSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -368,11 +371,11 @@ class ServiceAttributeSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = ServiceAttribute - fields = ('humanReadableName', 'validators', '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 ServiceAttributeIdSerializer(XOSModelSerializer): - id = serializers.Field() +class ControllerImagesIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -384,14 +387,14 @@ class ServiceAttributeIdSerializer(XOSModelSerializer): except: return None class Meta: - model = ServiceAttribute - fields = ('humanReadableName', 'validators', '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 ControllerImagesSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -403,11 +406,11 @@ class ControllerImagesSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = ControllerImages - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',) + model = ControllerSitePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_privilege','role_id',) -class ControllerImagesIdSerializer(XOSModelSerializer): - id = serializers.Field() +class ControllerSitePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -419,14 +422,18 @@ class ControllerImagesIdSerializer(XOSModelSerializer): except: return None class Meta: - model = ControllerImages - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',) + 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") @@ -439,10 +446,14 @@ class ImageSerializer(serializers.HyperlinkedModelSerializer): return None class Meta: model = Image - fields = ('humanReadableName', 'validators', '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(XOSModelSerializer): - id = serializers.Field() + id = IdField() + + + deployments = serializers.PrimaryKeyRelatedField(many=True, queryset = Deployment.objects.all()) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -455,13 +466,13 @@ class ImageIdSerializer(XOSModelSerializer): return None class Meta: model = Image - fields = ('humanReadableName', 'validators', '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") @@ -477,7 +488,7 @@ class NetworkParameterSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',) class NetworkParameterIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -496,7 +507,7 @@ class NetworkParameterIdSerializer(XOSModelSerializer): class SiteSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail') @@ -516,10 +527,10 @@ class SiteSerializer(serializers.HyperlinkedModelSerializer): 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(XOSModelSerializer): - id = serializers.Field() + id = IdField() - deployments = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='deployment-detail') + deployments = serializers.PrimaryKeyRelatedField(many=True, queryset = Deployment.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -539,7 +550,7 @@ class SiteIdSerializer(XOSModelSerializer): class SliceRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -555,7 +566,7 @@ class SliceRoleSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) class SliceRoleIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -574,7 +585,7 @@ class SliceRoleIdSerializer(XOSModelSerializer): class TagSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -590,7 +601,7 @@ class TagSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',) class TagIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -609,7 +620,7 @@ class TagIdSerializer(XOSModelSerializer): class InvoiceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -625,7 +636,7 @@ class InvoiceSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','date','account',) class InvoiceIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -644,7 +655,7 @@ class InvoiceIdSerializer(XOSModelSerializer): class SlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -660,7 +671,7 @@ class SlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','slice','role',) class SlicePrivilegeIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -679,7 +690,7 @@ class SlicePrivilegeIdSerializer(XOSModelSerializer): class PlanetStackRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -695,7 +706,7 @@ class PlanetStackRoleSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) class PlanetStackRoleIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -713,8 +724,8 @@ class PlanetStackRoleIdSerializer(XOSModelSerializer): -class ControllerPrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class NetworkSliverSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -726,11 +737,11 @@ class ControllerPrivilegeSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = ControllerPrivilege - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','role',) + model = NetworkSliver + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) -class ControllerPrivilegeIdSerializer(XOSModelSerializer): - id = serializers.Field() +class NetworkSliverIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -742,14 +753,18 @@ class ControllerPrivilegeIdSerializer(XOSModelSerializer): except: return None class Meta: - model = ControllerPrivilege - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','role',) + model = NetworkSliver + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) -class NetworkSliverSerializer(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") @@ -761,11 +776,15 @@ class NetworkSliverSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = NetworkSliver - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) + model = Flavor + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) -class NetworkSliverIdSerializer(XOSModelSerializer): - id = serializers.Field() +class FlavorIdSerializer(XOSModelSerializer): + id = IdField() + + + deployments = serializers.PrimaryKeyRelatedField(many=True, queryset = Deployment.objects.all()) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -777,14 +796,49 @@ class NetworkSliverIdSerializer(XOSModelSerializer): except: return None class Meta: - model = NetworkSliver - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) + model = Flavor + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) + + + + +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 = ControllerSite + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','controller','tenant_id',) + +class ControllerSiteIdSerializer(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 = 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") @@ -800,7 +854,7 @@ class ProjectSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) class ProjectIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -819,7 +873,7 @@ class ProjectIdSerializer(XOSModelSerializer): class SliceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') @@ -840,17 +894,17 @@ class SliceSerializer(serializers.HyperlinkedModelSerializer): return None class Meta: model = Slice - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','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(XOSModelSerializer): - id = serializers.Field() + id = IdField() - networks = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) - networks = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -864,13 +918,13 @@ class SliceIdSerializer(XOSModelSerializer): return None class Meta: model = Slice - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','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() slices = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='slice-detail') @@ -903,29 +957,29 @@ class NetworkSerializer(serializers.HyperlinkedModelSerializer): return None class Meta: model = Network - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteedBandwidth','permitAllSlices','topologyParameters','controllerUrl','controllerParameters','network_id','router_id','subnet_id','slices','slices','slivers','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(XOSModelSerializer): - id = serializers.Field() + id = IdField() - slices = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='slice-detail') + slices = serializers.PrimaryKeyRelatedField(many=True, queryset = Slice.objects.all()) - slices = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='slice-detail') + slices = serializers.PrimaryKeyRelatedField(many=True, queryset = Slice.objects.all()) - slivers = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='sliver-detail') + slivers = serializers.PrimaryKeyRelatedField(many=True, queryset = Sliver.objects.all()) - routers = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='router-detail') + routers = serializers.PrimaryKeyRelatedField(many=True, queryset = Router.objects.all()) - routers = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='router-detail') + routers = serializers.PrimaryKeyRelatedField(many=True, queryset = Router.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -939,13 +993,13 @@ class NetworkIdSerializer(XOSModelSerializer): return None class Meta: model = Network - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteedBandwidth','permitAllSlices','topologyParameters','controllerUrl','controllerParameters','network_id','router_id','subnet_id','slices','slices','slivers','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") @@ -961,7 +1015,7 @@ class ServiceSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',) class ServiceIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -980,7 +1034,7 @@ class ServiceIdSerializer(XOSModelSerializer): class ServiceClassSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -996,7 +1050,7 @@ class ServiceClassSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',) class ServiceClassIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1014,8 +1068,8 @@ class ServiceClassIdSerializer(XOSModelSerializer): -class ControllerNetworksSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class PlanetStackSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1027,11 +1081,11 @@ class ControllerNetworksSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = ControllerNetworks - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',) + model = PlanetStack + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) -class ControllerNetworksIdSerializer(XOSModelSerializer): - id = serializers.Field() +class PlanetStackIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1043,14 +1097,14 @@ class ControllerNetworksIdSerializer(XOSModelSerializer): except: return None class Meta: - model = ControllerNetworks - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',) + model = PlanetStack + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) class ChargeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1066,7 +1120,7 @@ class ChargeSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',) class ChargeIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1085,7 +1139,7 @@ class ChargeIdSerializer(XOSModelSerializer): class RoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1101,7 +1155,7 @@ class RoleSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',) class RoleIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1120,7 +1174,7 @@ class RoleIdSerializer(XOSModelSerializer): class UsableObjectSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1136,7 +1190,7 @@ class UsableObjectSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) class UsableObjectIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1154,43 +1208,8 @@ class UsableObjectIdSerializer(XOSModelSerializer): -class ControllerSiteDeploymentsSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - - humanReadableName = serializers.SerializerMethodField("getHumanReadableName") - validators = serializers.SerializerMethodField("getValidators") - def getHumanReadableName(self, obj): - return str(obj) - def getValidators(self, obj): - try: - return obj.getValidators() - except: - return None - class Meta: - model = ControllerSiteDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_deployment','tenant_id',) - -class ControllerSiteDeploymentsIdSerializer(XOSModelSerializer): - id = serializers.Field() - - humanReadableName = serializers.SerializerMethodField("getHumanReadableName") - validators = serializers.SerializerMethodField("getValidators") - def getHumanReadableName(self, obj): - return str(obj) - def getValidators(self, obj): - try: - return obj.getValidators() - except: - return None - class Meta: - model = ControllerSiteDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_deployment','tenant_id',) - - - - class SiteRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1206,7 +1225,7 @@ class SiteRoleSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) class SiteRoleIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1225,7 +1244,7 @@ class SiteRoleIdSerializer(XOSModelSerializer): class SliceCredentialSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1241,7 +1260,7 @@ class SliceCredentialSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',) class SliceCredentialIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1260,7 +1279,7 @@ class SliceCredentialIdSerializer(XOSModelSerializer): class SliverSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') @@ -1277,13 +1296,13 @@ class SliverSerializer(serializers.HyperlinkedModelSerializer): return None class Meta: model = Sliver - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','node','controllerNetwork','numberCores','flavor','userData','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(XOSModelSerializer): - id = serializers.Field() + id = IdField() - networks = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -1297,13 +1316,13 @@ class SliverIdSerializer(XOSModelSerializer): return None class Meta: model = Sliver - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','node','controllerNetwork','numberCores','flavor','userData','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") @@ -1319,7 +1338,7 @@ class NodeSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_deployment',) class NodeIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1338,7 +1357,7 @@ class NodeIdSerializer(XOSModelSerializer): class DashboardViewSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() controllers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='controller-detail') @@ -1358,10 +1377,10 @@ class DashboardViewSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','url','controllers',) class DashboardViewIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() - controllers = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='controller-detail') + controllers = serializers.PrimaryKeyRelatedField(many=True, queryset = Controller.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -1380,8 +1399,43 @@ class DashboardViewIdSerializer(XOSModelSerializer): +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 = 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 = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1397,7 +1451,7 @@ class ImageDeploymentsSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment',) class ImageDeploymentsIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1415,8 +1469,8 @@ class ImageDeploymentsIdSerializer(XOSModelSerializer): -class ReservedResourceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerUserSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1428,11 +1482,11 @@ class ReservedResourceSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = ReservedResource - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) + model = ControllerUser + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) -class ReservedResourceIdSerializer(XOSModelSerializer): - id = serializers.Field() +class ControllerUserIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1444,14 +1498,14 @@ class ReservedResourceIdSerializer(XOSModelSerializer): except: return None class Meta: - model = ReservedResource - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) + model = ControllerUser + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) -class PaymentSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ReservedResourceSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1463,11 +1517,11 @@ class PaymentSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = Payment - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) + model = ReservedResource + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) -class PaymentIdSerializer(XOSModelSerializer): - id = serializers.Field() +class ReservedResourceIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1479,14 +1533,14 @@ class PaymentIdSerializer(XOSModelSerializer): except: return None class Meta: - model = Payment - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) + model = ReservedResource + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) -class NetworkTemplateSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class PaymentSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1498,11 +1552,11 @@ class NetworkTemplateSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = NetworkTemplate - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId','topologyKind','controllerKind',) + model = Payment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) -class NetworkTemplateIdSerializer(XOSModelSerializer): - id = serializers.Field() +class PaymentIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1514,14 +1568,14 @@ class NetworkTemplateIdSerializer(XOSModelSerializer): except: return None class Meta: - model = NetworkTemplate - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId','topologyKind','controllerKind',) + model = Payment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) class NetworkSliceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1537,7 +1591,7 @@ class NetworkSliceSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',) class NetworkSliceIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1556,7 +1610,7 @@ class NetworkSliceIdSerializer(XOSModelSerializer): class UserDashboardViewSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1572,7 +1626,7 @@ class UserDashboardViewSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',) class UserDashboardViewIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1591,7 +1645,7 @@ class UserDashboardViewIdSerializer(XOSModelSerializer): class ControllerSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() dashboardviews = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='dashboardview-detail') @@ -1611,10 +1665,10 @@ class ControllerSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',) class ControllerIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() - dashboardviews = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='dashboardview-detail') + dashboardviews = serializers.PrimaryKeyRelatedField(many=True, queryset = DashboardView.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -1634,7 +1688,7 @@ class ControllerIdSerializer(XOSModelSerializer): class PlanetStackPrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1650,7 +1704,7 @@ class PlanetStackPrivilegeSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','planetstack','role',) class PlanetStackPrivilegeIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1669,7 +1723,7 @@ class PlanetStackPrivilegeIdSerializer(XOSModelSerializer): class UserSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1685,7 +1739,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer): 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 = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1704,16 +1758,20 @@ class UserIdSerializer(XOSModelSerializer): class DeploymentSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() - flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') + images = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='image-detail') sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-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): @@ -1725,17 +1783,21 @@ class DeploymentSerializer(serializers.HyperlinkedModelSerializer): return None class Meta: model = Deployment - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','flavors','sites',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','images','sites','flavors',) class DeploymentIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() + + images = serializers.PrimaryKeyRelatedField(many=True, queryset = Image.objects.all()) - flavors = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='flavor-detail') + sites = serializers.PrimaryKeyRelatedField(many=True, queryset = Site.objects.all()) - sites = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='site-detail') + + + flavors = serializers.PrimaryKeyRelatedField(many=True, queryset = Flavor.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -1749,13 +1811,13 @@ class DeploymentIdSerializer(XOSModelSerializer): return None class Meta: model = Deployment - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','flavors','sites',) + 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") @@ -1771,7 +1833,7 @@ class ReservationSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',) class ReservationIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1790,7 +1852,7 @@ class ReservationIdSerializer(XOSModelSerializer): class SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1806,7 +1868,7 @@ class SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',) class SitePrivilegeIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1824,8 +1886,8 @@ class SitePrivilegeIdSerializer(XOSModelSerializer): -class PlanetStackSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSliceSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1837,11 +1899,11 @@ class PlanetStackSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = PlanetStack - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) + model = ControllerSlice + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) -class PlanetStackIdSerializer(XOSModelSerializer): - id = serializers.Field() +class ControllerSliceIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1853,14 +1915,14 @@ class PlanetStackIdSerializer(XOSModelSerializer): except: return None class Meta: - model = PlanetStack - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) + model = ControllerSlice + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) -class AccountSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerDashboardViewSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1872,11 +1934,11 @@ class AccountSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = Account - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) + model = ControllerDashboardView + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) -class AccountIdSerializer(XOSModelSerializer): - id = serializers.Field() +class ControllerDashboardViewIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1888,14 +1950,14 @@ class AccountIdSerializer(XOSModelSerializer): except: return None class Meta: - model = Account - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) + model = ControllerDashboardView + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) -class ControllerRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class AccountSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1907,11 +1969,11 @@ class ControllerRoleSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = ControllerRole - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + model = Account + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) -class ControllerRoleIdSerializer(XOSModelSerializer): - id = serializers.Field() +class AccountIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1923,14 +1985,49 @@ class ControllerRoleIdSerializer(XOSModelSerializer): except: return None class Meta: - model = ControllerRole - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + model = Account + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) + + + + +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 = ControllerRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + +class ControllerRoleIdSerializer(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 = 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") @@ -1946,7 +2043,7 @@ class NetworkParameterTypeSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description',) class NetworkParameterTypeIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1965,7 +2062,7 @@ class NetworkParameterTypeIdSerializer(XOSModelSerializer): class SiteCredentialSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1981,7 +2078,7 @@ class SiteCredentialSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',) class SiteCredentialIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2000,7 +2097,7 @@ class SiteCredentialIdSerializer(XOSModelSerializer): class DeploymentPrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2016,7 +2113,7 @@ class DeploymentPrivilegeSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','role',) class DeploymentPrivilegeIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2034,8 +2131,8 @@ class DeploymentPrivilegeIdSerializer(XOSModelSerializer): -class ControllerUsersSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2047,11 +2144,11 @@ class ControllerUsersSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = ControllerUsers - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) + model = ControllerSlicePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',) -class ControllerUsersIdSerializer(XOSModelSerializer): - id = serializers.Field() +class ControllerSlicePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2063,14 +2160,14 @@ class ControllerUsersIdSerializer(XOSModelSerializer): except: return None class Meta: - model = ControllerUsers - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) + model = ControllerSlicePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',) -class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class SiteDeploymentSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2082,11 +2179,11 @@ class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = DeploymentRole - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + model = SiteDeployment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) -class DeploymentRoleIdSerializer(XOSModelSerializer): - id = serializers.Field() +class SiteDeploymentIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2098,14 +2195,14 @@ class DeploymentRoleIdSerializer(XOSModelSerializer): except: return None class Meta: - model = DeploymentRole - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + model = SiteDeployment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) -class UserCredentialSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2117,11 +2214,11 @@ class UserCredentialSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = UserCredential - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) + model = DeploymentRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) -class UserCredentialIdSerializer(XOSModelSerializer): - id = serializers.Field() +class DeploymentRoleIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2133,14 +2230,14 @@ class UserCredentialIdSerializer(XOSModelSerializer): except: return None class Meta: - model = UserCredential - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) + model = DeploymentRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) -class SiteDeploymentsSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class UserCredentialSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2152,11 +2249,11 @@ class SiteDeploymentsSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = SiteDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) + model = UserCredential + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) -class SiteDeploymentsIdSerializer(XOSModelSerializer): - id = serializers.Field() +class UserCredentialIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2168,14 +2265,14 @@ class SiteDeploymentsIdSerializer(XOSModelSerializer): except: return None class Meta: - model = SiteDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) + model = UserCredential + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) class SliceTagSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2191,7 +2288,7 @@ class SliceTagSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','value',) class SliceTagIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2209,8 +2306,8 @@ class SliceTagIdSerializer(XOSModelSerializer): -class ControllerDashboardSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class NetworkTemplateSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2222,11 +2319,11 @@ class ControllerDashboardSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = ControllerDashboard - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) + model = NetworkTemplate + 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 ControllerDashboardIdSerializer(XOSModelSerializer): - id = serializers.Field() +class NetworkTemplateIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2238,14 +2335,14 @@ class ControllerDashboardIdSerializer(XOSModelSerializer): except: return None class Meta: - model = ControllerDashboard - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) + model = NetworkTemplate + 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') @@ -2269,14 +2366,14 @@ class RouterSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',) class RouterIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() - networks = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) - networks = serializers.PrimaryKeyRelatedField(many=True) #, read_only=True) #, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -2296,7 +2393,7 @@ class RouterIdSerializer(XOSModelSerializer): class ServiceResourceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2312,7 +2409,7 @@ class ServiceResourceSerializer(serializers.HyperlinkedModelSerializer): fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',) class ServiceResourceIdSerializer(XOSModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2330,49 +2427,14 @@ class ServiceResourceIdSerializer(XOSModelSerializer): -class ControllerSlicesSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - - humanReadableName = serializers.SerializerMethodField("getHumanReadableName") - validators = serializers.SerializerMethodField("getValidators") - def getHumanReadableName(self, obj): - return str(obj) - def getValidators(self, obj): - try: - return obj.getValidators() - except: - return None - class Meta: - model = ControllerSlices - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) - -class ControllerSlicesIdSerializer(XOSModelSerializer): - id = serializers.Field() - - humanReadableName = serializers.SerializerMethodField("getHumanReadableName") - validators = serializers.SerializerMethodField("getValidators") - def getHumanReadableName(self, obj): - return str(obj) - def getValidators(self, obj): - try: - return obj.getValidators() - except: - return None - class Meta: - model = ControllerSlices - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) - - - - serializerLookUp = { - Flavor: FlavorSerializer, - ServiceAttribute: ServiceAttributeSerializer, ControllerImages: ControllerImagesSerializer, + ControllerSitePrivilege: ControllerSitePrivilegeSerializer, + Image: ImageSerializer, NetworkParameter: NetworkParameterSerializer, @@ -2389,10 +2451,12 @@ serializerLookUp = { PlanetStackRole: PlanetStackRoleSerializer, - ControllerPrivilege: ControllerPrivilegeSerializer, - NetworkSliver: NetworkSliverSerializer, + Flavor: FlavorSerializer, + + ControllerSite: ControllerSiteSerializer, + Project: ProjectSerializer, Slice: SliceSerializer, @@ -2403,7 +2467,7 @@ serializerLookUp = { ServiceClass: ServiceClassSerializer, - ControllerNetworks: ControllerNetworksSerializer, + PlanetStack: PlanetStackSerializer, Charge: ChargeSerializer, @@ -2411,8 +2475,6 @@ serializerLookUp = { UsableObject: UsableObjectSerializer, - ControllerSiteDeployments: ControllerSiteDeploymentsSerializer, - SiteRole: SiteRoleSerializer, SliceCredential: SliceCredentialSerializer, @@ -2423,14 +2485,16 @@ serializerLookUp = { DashboardView: DashboardViewSerializer, + ControllerNetwork: ControllerNetworkSerializer, + ImageDeployments: ImageDeploymentsSerializer, + ControllerUser: ControllerUserSerializer, + ReservedResource: ReservedResourceSerializer, Payment: PaymentSerializer, - NetworkTemplate: NetworkTemplateSerializer, - NetworkSlice: NetworkSliceSerializer, UserDashboardView: UserDashboardViewSerializer, @@ -2447,7 +2511,9 @@ serializerLookUp = { SitePrivilege: SitePrivilegeSerializer, - PlanetStack: PlanetStackSerializer, + ControllerSlice: ControllerSliceSerializer, + + ControllerDashboardView: ControllerDashboardViewSerializer, Account: AccountSerializer, @@ -2459,24 +2525,22 @@ serializerLookUp = { DeploymentPrivilege: DeploymentPrivilegeSerializer, - ControllerUsers: ControllerUsersSerializer, + ControllerSlicePrivilege: ControllerSlicePrivilegeSerializer, + + SiteDeployment: SiteDeploymentSerializer, DeploymentRole: DeploymentRoleSerializer, UserCredential: UserCredentialSerializer, - SiteDeployments: SiteDeploymentsSerializer, - SliceTag: SliceTagSerializer, - ControllerDashboard: ControllerDashboardSerializer, + NetworkTemplate: NetworkTemplateSerializer, Router: RouterSerializer, ServiceResource: ServiceResourceSerializer, - ControllerSlices: ControllerSlicesSerializer, - None: None, } @@ -2532,12 +2596,12 @@ class PlanetStackRetrieveUpdateDestroyAPIView(generics.RetrieveUpdateDestroyAPIV # Based on core/views/*.py -class FlavorList(generics.ListCreateAPIView): - queryset = Flavor.objects.select_related().all() - serializer_class = FlavorSerializer - id_serializer_class = FlavorIdSerializer +class ServiceAttributeList(generics.ListCreateAPIView): + queryset = ServiceAttribute.objects.select_related().all() + serializer_class = ServiceAttributeSerializer + id_serializer_class = ServiceAttributeIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','value','service',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2547,7 +2611,7 @@ class FlavorList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return Flavor.select_by_user(self.request.user) + return ServiceAttribute.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -2559,21 +2623,21 @@ class FlavorList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(FlavorList, self).create(request, *args, **kwargs) + return super(ServiceAttributeList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(FlavorList, self).create(request, *args, **kwargs) + ret = super(ServiceAttributeList, 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 ServiceAttributeDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ServiceAttribute.objects.select_related().all() + serializer_class = ServiceAttributeSerializer + id_serializer_class = ServiceAttributeIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2583,7 +2647,7 @@ class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return Flavor.select_by_user(self.request.user) + return ServiceAttribute.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -2591,12 +2655,12 @@ class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ServiceAttributeList(generics.ListCreateAPIView): - queryset = ServiceAttribute.objects.select_related().all() - serializer_class = ServiceAttributeSerializer - id_serializer_class = ServiceAttributeIdSerializer +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','name','value','service',) + 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) @@ -2606,7 +2670,7 @@ class ServiceAttributeList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ServiceAttribute.select_by_user(self.request.user) + return ControllerImages.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -2618,21 +2682,21 @@ class ServiceAttributeList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(ServiceAttributeList, self).create(request, *args, **kwargs) + return super(ControllerImagesList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ServiceAttributeList, self).create(request, *args, **kwargs) + ret = super(ControllerImagesList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class ServiceAttributeDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ServiceAttribute.objects.select_related().all() - serializer_class = ServiceAttributeSerializer - id_serializer_class = ServiceAttributeIdSerializer +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) @@ -2642,7 +2706,7 @@ class ServiceAttributeDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ServiceAttribute.select_by_user(self.request.user) + return ControllerImages.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -2650,12 +2714,12 @@ class ServiceAttributeDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ControllerImagesList(generics.ListCreateAPIView): - queryset = ControllerImages.objects.select_related().all() - serializer_class = ControllerImagesSerializer - id_serializer_class = ControllerImagesIdSerializer +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','image','controller','glance_image_id',) + 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) @@ -2665,7 +2729,7 @@ class ControllerImagesList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ControllerImages.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) @@ -2677,21 +2741,21 @@ class ControllerImagesList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(ControllerImagesList, self).create(request, *args, **kwargs) + return super(ControllerSitePrivilegeList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ControllerImagesList, 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 ControllerImagesDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ControllerImages.objects.select_related().all() - serializer_class = ControllerImagesSerializer - id_serializer_class = ControllerImagesIdSerializer +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) @@ -2701,7 +2765,7 @@ class ControllerImagesDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ControllerImages.select_by_user(self.request.user) + return ControllerSitePrivilege.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -2714,7 +2778,7 @@ class ImageList(generics.ListCreateAPIView): serializer_class = ImageSerializer id_serializer_class = ImageIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','disk_format','container_format','path','deployments',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3181,12 +3245,12 @@ class PlanetStackRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ControllerPrivilegeList(generics.ListCreateAPIView): - queryset = ControllerPrivilege.objects.select_related().all() - serializer_class = ControllerPrivilegeSerializer - id_serializer_class = ControllerPrivilegeIdSerializer +class NetworkSliverList(generics.ListCreateAPIView): + queryset = NetworkSliver.objects.select_related().all() + serializer_class = NetworkSliverSerializer + id_serializer_class = NetworkSliverIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','controller','role',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3196,7 +3260,7 @@ class ControllerPrivilegeList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ControllerPrivilege.select_by_user(self.request.user) + return NetworkSliver.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -3208,21 +3272,21 @@ class ControllerPrivilegeList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(ControllerPrivilegeList, self).create(request, *args, **kwargs) + return super(NetworkSliverList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ControllerPrivilegeList, self).create(request, *args, **kwargs) + ret = super(NetworkSliverList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class ControllerPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ControllerPrivilege.objects.select_related().all() - serializer_class = ControllerPrivilegeSerializer - id_serializer_class = ControllerPrivilegeIdSerializer +class NetworkSliverDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = NetworkSliver.objects.select_related().all() + serializer_class = NetworkSliverSerializer + id_serializer_class = NetworkSliverIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3232,7 +3296,7 @@ class ControllerPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ControllerPrivilege.select_by_user(self.request.user) + return NetworkSliver.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3240,12 +3304,12 @@ class ControllerPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class NetworkSliverList(generics.ListCreateAPIView): - queryset = NetworkSliver.objects.select_related().all() - serializer_class = NetworkSliverSerializer - id_serializer_class = NetworkSliverIdSerializer +class FlavorList(generics.ListCreateAPIView): + queryset = Flavor.objects.select_related().all() + serializer_class = FlavorSerializer + id_serializer_class = FlavorIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) + 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) @@ -3255,7 +3319,7 @@ class NetworkSliverList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return NetworkSliver.select_by_user(self.request.user) + return Flavor.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -3267,21 +3331,21 @@ class NetworkSliverList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(NetworkSliverList, self).create(request, *args, **kwargs) + return super(FlavorList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(NetworkSliverList, 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 NetworkSliverDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = NetworkSliver.objects.select_related().all() - serializer_class = NetworkSliverSerializer - id_serializer_class = NetworkSliverIdSerializer +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) @@ -3291,7 +3355,66 @@ class NetworkSliverDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return NetworkSliver.select_by_user(self.request.user) + return Flavor.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +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','site','controller','tenant_id',) + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return 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()): + 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(ControllerSiteList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ControllerSiteList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + + return ret + + +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) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerSite.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3363,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','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) @@ -3422,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','slices','slices','slivers','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) @@ -3594,12 +3717,12 @@ class ServiceClassDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ControllerNetworksList(generics.ListCreateAPIView): - queryset = ControllerNetworks.objects.select_related().all() - serializer_class = ControllerNetworksSerializer - id_serializer_class = ControllerNetworksIdSerializer +class PlanetStackList(generics.ListCreateAPIView): + queryset = PlanetStack.objects.select_related().all() + serializer_class = PlanetStackSerializer + id_serializer_class = PlanetStackIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','description',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3609,7 +3732,7 @@ class ControllerNetworksList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ControllerNetworks.select_by_user(self.request.user) + return PlanetStack.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -3621,21 +3744,21 @@ class ControllerNetworksList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(ControllerNetworksList, self).create(request, *args, **kwargs) + return super(PlanetStackList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ControllerNetworksList, self).create(request, *args, **kwargs) + ret = super(PlanetStackList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class ControllerNetworksDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ControllerNetworks.objects.select_related().all() - serializer_class = ControllerNetworksSerializer - id_serializer_class = ControllerNetworksIdSerializer +class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = PlanetStack.objects.select_related().all() + serializer_class = PlanetStackSerializer + id_serializer_class = PlanetStackIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3645,7 +3768,7 @@ class ControllerNetworksDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ControllerNetworks.select_by_user(self.request.user) + return PlanetStack.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3830,65 +3953,6 @@ class UsableObjectDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ControllerSiteDeploymentsList(generics.ListCreateAPIView): - queryset = ControllerSiteDeployments.objects.select_related().all() - serializer_class = ControllerSiteDeploymentsSerializer - id_serializer_class = ControllerSiteDeploymentsIdSerializer - filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','site_deployment','tenant_id',) - - def get_serializer_class(self): - no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) - if (no_hyperlinks): - return self.id_serializer_class - else: - return self.serializer_class - - def get_queryset(self): - return ControllerSiteDeployments.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(ControllerSiteDeploymentsList, self).create(request, *args, **kwargs) - else: - raise Exception("failed obj.can_update") - - ret = super(ControllerSiteDeploymentsList, self).create(request, *args, **kwargs) - if (ret.status_code%100 != 200): - raise Exception(ret.data) - - return ret - - -class ControllerSiteDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ControllerSiteDeployments.objects.select_related().all() - serializer_class = ControllerSiteDeploymentsSerializer - id_serializer_class = ControllerSiteDeploymentsIdSerializer - - 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 ControllerSiteDeployments.select_by_user(self.request.user) - - # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView - - # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView - - - class SiteRoleList(generics.ListCreateAPIView): queryset = SiteRole.objects.select_related().all() serializer_class = SiteRoleSerializer @@ -4012,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','controllerNetwork','numberCores','flavor','userData','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) @@ -4125,12 +4189,71 @@ class NodeDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class DashboardViewList(generics.ListCreateAPIView): - queryset = DashboardView.objects.select_related().all() - serializer_class = DashboardViewSerializer - id_serializer_class = DashboardViewIdSerializer +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) + 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) + + 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 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','controllers',) + 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) @@ -4140,7 +4263,7 @@ 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) @@ -4152,21 +4275,21 @@ class DashboardViewList(generics.ListCreateAPIView): 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) @@ -4176,7 +4299,7 @@ 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 @@ -4243,12 +4366,12 @@ class ImageDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ReservedResourceList(generics.ListCreateAPIView): - queryset = ReservedResource.objects.select_related().all() - serializer_class = ReservedResourceSerializer - id_serializer_class = ReservedResourceIdSerializer +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) @@ -4258,7 +4381,7 @@ 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) @@ -4270,21 +4393,21 @@ class ReservedResourceList(generics.ListCreateAPIView): 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) @@ -4294,7 +4417,7 @@ 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 @@ -4302,12 +4425,12 @@ class ReservedResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class PaymentList(generics.ListCreateAPIView): - queryset = Payment.objects.select_related().all() - serializer_class = PaymentSerializer - id_serializer_class = PaymentIdSerializer +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','account','amount','date',) + 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) @@ -4317,7 +4440,7 @@ class PaymentList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return Payment.select_by_user(self.request.user) + return ReservedResource.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -4329,21 +4452,21 @@ class PaymentList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(PaymentList, self).create(request, *args, **kwargs) + return super(ReservedResourceList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(PaymentList, self).create(request, *args, **kwargs) + ret = super(ReservedResourceList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = Payment.objects.select_related().all() - serializer_class = PaymentSerializer - id_serializer_class = PaymentIdSerializer +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) @@ -4353,7 +4476,7 @@ class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return Payment.select_by_user(self.request.user) + return ReservedResource.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4361,12 +4484,12 @@ class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class NetworkTemplateList(generics.ListCreateAPIView): - queryset = NetworkTemplate.objects.select_related().all() - serializer_class = NetworkTemplateSerializer - id_serializer_class = NetworkTemplateIdSerializer +class PaymentList(generics.ListCreateAPIView): + queryset = Payment.objects.select_related().all() + serializer_class = PaymentSerializer + id_serializer_class = PaymentIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId','topologyKind','controllerKind',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','account','amount','date',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4376,7 +4499,7 @@ class NetworkTemplateList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return NetworkTemplate.select_by_user(self.request.user) + return Payment.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -4388,21 +4511,21 @@ class NetworkTemplateList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(NetworkTemplateList, self).create(request, *args, **kwargs) + return super(PaymentList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(NetworkTemplateList, self).create(request, *args, **kwargs) + ret = super(PaymentList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class NetworkTemplateDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = NetworkTemplate.objects.select_related().all() - serializer_class = NetworkTemplateSerializer - id_serializer_class = NetworkTemplateIdSerializer +class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = Payment.objects.select_related().all() + serializer_class = PaymentSerializer + id_serializer_class = PaymentIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4412,7 +4535,7 @@ class NetworkTemplateDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return NetworkTemplate.select_by_user(self.request.user) + return Payment.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4720,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','accessControl','flavors','sites',) + 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) @@ -4892,12 +5015,12 @@ class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class PlanetStackList(generics.ListCreateAPIView): - queryset = PlanetStack.objects.select_related().all() - serializer_class = PlanetStackSerializer - id_serializer_class = PlanetStackIdSerializer +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','description',) + 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) @@ -4907,7 +5030,7 @@ class PlanetStackList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return PlanetStack.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) @@ -4919,21 +5042,21 @@ class PlanetStackList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(PlanetStackList, self).create(request, *args, **kwargs) + return super(ControllerSliceList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(PlanetStackList, 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 PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = PlanetStack.objects.select_related().all() - serializer_class = PlanetStackSerializer - id_serializer_class = PlanetStackIdSerializer +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) @@ -4943,7 +5066,66 @@ class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return PlanetStack.select_by_user(self.request.user) + return ControllerSlice.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +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','controller','dashboardView','url',) + + 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 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()): + 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(ControllerDashboardViewList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ControllerDashboardViewList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + + return ret + + +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) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerDashboardView.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -5246,12 +5428,12 @@ class DeploymentPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ControllerUsersList(generics.ListCreateAPIView): - queryset = ControllerUsers.objects.select_related().all() - serializer_class = ControllerUsersSerializer - id_serializer_class = ControllerUsersIdSerializer +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','user','controller','kuser_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) @@ -5261,7 +5443,7 @@ class ControllerUsersList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ControllerUsers.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) @@ -5273,21 +5455,21 @@ class ControllerUsersList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(ControllerUsersList, self).create(request, *args, **kwargs) + return super(ControllerSlicePrivilegeList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ControllerUsersList, 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 ControllerUsersDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ControllerUsers.objects.select_related().all() - serializer_class = ControllerUsersSerializer - id_serializer_class = ControllerUsersIdSerializer +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) @@ -5297,7 +5479,7 @@ class ControllerUsersDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ControllerUsers.select_by_user(self.request.user) + return ControllerSlicePrivilege.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -5305,12 +5487,12 @@ class ControllerUsersDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class DeploymentRoleList(generics.ListCreateAPIView): - queryset = DeploymentRole.objects.select_related().all() - serializer_class = DeploymentRoleSerializer - id_serializer_class = DeploymentRoleIdSerializer +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','role',) + 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) @@ -5320,7 +5502,7 @@ class DeploymentRoleList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return DeploymentRole.select_by_user(self.request.user) + return SiteDeployment.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -5332,21 +5514,21 @@ class DeploymentRoleList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(DeploymentRoleList, self).create(request, *args, **kwargs) + return super(SiteDeploymentList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(DeploymentRoleList, self).create(request, *args, **kwargs) + ret = super(SiteDeploymentList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = DeploymentRole.objects.select_related().all() - serializer_class = DeploymentRoleSerializer - id_serializer_class = DeploymentRoleIdSerializer +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) @@ -5356,7 +5538,7 @@ class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return DeploymentRole.select_by_user(self.request.user) + return SiteDeployment.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -5364,12 +5546,12 @@ class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class UserCredentialList(generics.ListCreateAPIView): - queryset = UserCredential.objects.select_related().all() - serializer_class = UserCredentialSerializer - id_serializer_class = UserCredentialIdSerializer +class DeploymentRoleList(generics.ListCreateAPIView): + queryset = DeploymentRole.objects.select_related().all() + serializer_class = DeploymentRoleSerializer + id_serializer_class = DeploymentRoleIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) + 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) @@ -5379,7 +5561,7 @@ class UserCredentialList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return UserCredential.select_by_user(self.request.user) + return DeploymentRole.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -5391,21 +5573,21 @@ class UserCredentialList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(UserCredentialList, self).create(request, *args, **kwargs) + return super(DeploymentRoleList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(UserCredentialList, self).create(request, *args, **kwargs) + ret = super(DeploymentRoleList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = UserCredential.objects.select_related().all() - serializer_class = UserCredentialSerializer - id_serializer_class = UserCredentialIdSerializer +class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = DeploymentRole.objects.select_related().all() + serializer_class = DeploymentRoleSerializer + id_serializer_class = DeploymentRoleIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -5415,7 +5597,7 @@ class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return UserCredential.select_by_user(self.request.user) + return DeploymentRole.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -5423,12 +5605,12 @@ class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class SiteDeploymentsList(generics.ListCreateAPIView): - queryset = SiteDeployments.objects.select_related().all() - serializer_class = SiteDeploymentsSerializer - id_serializer_class = SiteDeploymentsIdSerializer +class UserCredentialList(generics.ListCreateAPIView): + queryset = UserCredential.objects.select_related().all() + serializer_class = UserCredentialSerializer + id_serializer_class = UserCredentialIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -5438,7 +5620,7 @@ class SiteDeploymentsList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return SiteDeployments.select_by_user(self.request.user) + return UserCredential.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -5450,21 +5632,21 @@ class SiteDeploymentsList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(SiteDeploymentsList, self).create(request, *args, **kwargs) + return super(UserCredentialList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(SiteDeploymentsList, self).create(request, *args, **kwargs) + ret = super(UserCredentialList, 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 UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = UserCredential.objects.select_related().all() + serializer_class = UserCredentialSerializer + id_serializer_class = UserCredentialIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -5474,7 +5656,7 @@ class SiteDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return SiteDeployments.select_by_user(self.request.user) + return UserCredential.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -5541,12 +5723,12 @@ class SliceTagDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ControllerDashboardList(generics.ListCreateAPIView): - queryset = ControllerDashboard.objects.select_related().all() - serializer_class = ControllerDashboardSerializer - id_serializer_class = ControllerDashboardIdSerializer +class NetworkTemplateList(generics.ListCreateAPIView): + queryset = NetworkTemplate.objects.select_related().all() + serializer_class = NetworkTemplateSerializer + id_serializer_class = NetworkTemplateIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) + 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) @@ -5556,7 +5738,7 @@ class ControllerDashboardList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ControllerDashboard.select_by_user(self.request.user) + return NetworkTemplate.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -5568,21 +5750,21 @@ class ControllerDashboardList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(ControllerDashboardList, self).create(request, *args, **kwargs) + return super(NetworkTemplateList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ControllerDashboardList, self).create(request, *args, **kwargs) + ret = super(NetworkTemplateList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class ControllerDashboardDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ControllerDashboard.objects.select_related().all() - serializer_class = ControllerDashboardSerializer - id_serializer_class = ControllerDashboardIdSerializer +class NetworkTemplateDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = NetworkTemplate.objects.select_related().all() + serializer_class = NetworkTemplateSerializer + id_serializer_class = NetworkTemplateIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -5592,7 +5774,7 @@ class ControllerDashboardDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ControllerDashboard.select_by_user(self.request.user) + return NetworkTemplate.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -5718,62 +5900,3 @@ class ServiceResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ControllerSlicesList(generics.ListCreateAPIView): - queryset = ControllerSlices.objects.select_related().all() - serializer_class = ControllerSlicesSerializer - id_serializer_class = ControllerSlicesIdSerializer - filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) - - def get_serializer_class(self): - no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) - if (no_hyperlinks): - return self.id_serializer_class - else: - return self.serializer_class - - def get_queryset(self): - return ControllerSlices.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(ControllerSlicesList, self).create(request, *args, **kwargs) - else: - raise Exception("failed obj.can_update") - - ret = super(ControllerSlicesList, self).create(request, *args, **kwargs) - if (ret.status_code%100 != 200): - raise Exception(ret.data) - - return ret - - -class ControllerSlicesDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ControllerSlices.objects.select_related().all() - serializer_class = ControllerSlicesSerializer - id_serializer_class = ControllerSlicesIdSerializer - - def get_serializer_class(self): - no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) - if (no_hyperlinks): - return self.id_serializer_class - else: - return self.serializer_class - - def get_queryset(self): - return ControllerSlices.select_by_user(self.request.user) - - # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView - - # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView - - -