X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fgenapi.py;h=fdd74d32f3c189f61ff2f0ada5889633cb3ff81a;hb=e42cedcb2caf20b1118db570a9650348958d7590;hp=2510db9027c55943d696760f2816aa0f0c9cda96;hpb=993df9301afc7a04a9e518265ca995d17b95b377;p=plstackapi.git diff --git a/planetstack/genapi.py b/planetstack/genapi.py index 2510db9..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 @@ -31,6 +38,12 @@ def get_REST_patterns(): url(r'plstackapi/serviceattributes/$', ServiceAttributeList.as_view(), name='serviceattribute-list'), url(r'plstackapi/serviceattributes/(?P[a-zA-Z0-9\-]+)/$', ServiceAttributeDetail.as_view(), name ='serviceattribute-detail'), + url(r'plstackapi/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'), @@ -58,12 +71,12 @@ def get_REST_patterns(): url(r'plstackapi/networkslivers/$', NetworkSliverList.as_view(), name='networksliver-list'), url(r'plstackapi/networkslivers/(?P[a-zA-Z0-9\-]+)/$', NetworkSliverDetail.as_view(), name ='networksliver-detail'), - url(r'plstackapi/networkdeployments/$', NetworkDeploymentsList.as_view(), name='networkdeployments-list'), - url(r'plstackapi/networkdeployments/(?P[a-zA-Z0-9\-]+)/$', NetworkDeploymentsDetail.as_view(), name ='networkdeployments-detail'), - url(r'plstackapi/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'), @@ -79,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/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/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'), @@ -106,18 +119,30 @@ def get_REST_patterns(): url(r'plstackapi/dashboardviews/$', DashboardViewList.as_view(), name='dashboardview-list'), url(r'plstackapi/dashboardviews/(?P[a-zA-Z0-9\-]+)/$', DashboardViewDetail.as_view(), name ='dashboardview-detail'), - url(r'plstackapi/imagedeployments/$', ImageDeploymentsList.as_view(), name='imagedeployments-list'), - url(r'plstackapi/imagedeployments/(?P[a-zA-Z0-9\-]+)/$', ImageDeploymentsDetail.as_view(), name ='imagedeployments-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/networkslices/$', NetworkSliceList.as_view(), name='networkslice-list'), url(r'plstackapi/networkslices/(?P[a-zA-Z0-9\-]+)/$', NetworkSliceDetail.as_view(), name ='networkslice-detail'), url(r'plstackapi/userdashboardviews/$', UserDashboardViewList.as_view(), name='userdashboardview-list'), url(r'plstackapi/userdashboardviews/(?P[a-zA-Z0-9\-]+)/$', UserDashboardViewDetail.as_view(), name ='userdashboardview-detail'), + url(r'plstackapi/controllers/$', ControllerList.as_view(), name='controller-list'), + url(r'plstackapi/controllers/(?P[a-zA-Z0-9\-]+)/$', ControllerDetail.as_view(), name ='controller-detail'), + url(r'plstackapi/planetstackprivileges/$', PlanetStackPrivilegeList.as_view(), name='planetstackprivilege-list'), url(r'plstackapi/planetstackprivileges/(?P[a-zA-Z0-9\-]+)/$', PlanetStackPrivilegeDetail.as_view(), name ='planetstackprivilege-detail'), @@ -130,21 +155,21 @@ def get_REST_patterns(): url(r'plstackapi/reservations/$', ReservationList.as_view(), name='reservation-list'), url(r'plstackapi/reservations/(?P[a-zA-Z0-9\-]+)/$', ReservationDetail.as_view(), name ='reservation-detail'), - url(r'plstackapi/slicedeployments/$', SliceDeploymentsList.as_view(), name='slicedeployments-list'), - url(r'plstackapi/slicedeployments/(?P[a-zA-Z0-9\-]+)/$', SliceDeploymentsDetail.as_view(), name ='slicedeployments-detail'), - url(r'plstackapi/siteprivileges/$', SitePrivilegeList.as_view(), name='siteprivilege-list'), url(r'plstackapi/siteprivileges/(?P[a-zA-Z0-9\-]+)/$', SitePrivilegeDetail.as_view(), name ='siteprivilege-detail'), - 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/userdeployments/$', UserDeploymentsList.as_view(), name='userdeployments-list'), - url(r'plstackapi/userdeployments/(?P[a-zA-Z0-9\-]+)/$', UserDeploymentsDetail.as_view(), name ='userdeployments-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'), + url(r'plstackapi/controllerroles/$', ControllerRoleList.as_view(), name='controllerrole-list'), + url(r'plstackapi/controllerroles/(?P[a-zA-Z0-9\-]+)/$', ControllerRoleDetail.as_view(), name ='controllerrole-detail'), + url(r'plstackapi/networkparametertypes/$', NetworkParameterTypeList.as_view(), name='networkparametertype-list'), url(r'plstackapi/networkparametertypes/(?P[a-zA-Z0-9\-]+)/$', NetworkParameterTypeDetail.as_view(), name ='networkparametertype-detail'), @@ -154,15 +179,18 @@ 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/controllersliceprivileges/$', ControllerSlicePrivilegeList.as_view(), name='controllersliceprivilege-list'), + url(r'plstackapi/controllersliceprivileges/(?P[a-zA-Z0-9\-]+)/$', ControllerSlicePrivilegeDetail.as_view(), name ='controllersliceprivilege-detail'), + + url(r'plstackapi/sitedeployments/$', SiteDeploymentList.as_view(), name='sitedeployment-list'), + url(r'plstackapi/sitedeployments/(?P[a-zA-Z0-9\-]+)/$', SiteDeploymentDetail.as_view(), name ='sitedeployment-detail'), + url(r'plstackapi/deploymentroles/$', DeploymentRoleList.as_view(), name='deploymentrole-list'), url(r'plstackapi/deploymentroles/(?P[a-zA-Z0-9\-]+)/$', DeploymentRoleDetail.as_view(), name ='deploymentrole-detail'), url(r'plstackapi/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'), @@ -181,6 +209,8 @@ def get_REST_patterns(): def api_root(request, format=None): return Response({ 'serviceattributes': reverse('serviceattribute-list', request=request, format=format), + 'controllerimageses': reverse('controllerimages-list', request=request, format=format), + 'controllersiteprivileges': reverse('controllersiteprivilege-list', request=request, format=format), 'images': reverse('image-list', request=request, format=format), 'networkparameters': reverse('networkparameter-list', request=request, format=format), 'sites': reverse('site-list', request=request, format=format), @@ -190,14 +220,14 @@ def api_root(request, format=None): 'sliceprivileges': reverse('sliceprivilege-list', request=request, format=format), 'planetstackroles': reverse('planetstackrole-list', request=request, format=format), 'networkslivers': reverse('networksliver-list', request=request, format=format), - 'networkdeploymentses': reverse('networkdeployments-list', request=request, format=format), 'flavors': reverse('flavor-list', request=request, format=format), + 'controllersites': reverse('controllersite-list', request=request, format=format), 'projects': reverse('project-list', request=request, format=format), 'slices': reverse('slice-list', request=request, format=format), 'networks': reverse('network-list', request=request, format=format), 'services': reverse('service-list', request=request, format=format), 'serviceclasses': reverse('serviceclass-list', request=request, format=format), - 'payments': reverse('payment-list', request=request, format=format), + 'planetstacks': reverse('planetstack-list', request=request, format=format), 'charges': reverse('charge-list', request=request, format=format), 'roles': reverse('role-list', request=request, format=format), 'usableobjects': reverse('usableobject-list', request=request, format=format), @@ -206,25 +236,30 @@ def api_root(request, format=None): 'slivers': reverse('sliver-list', request=request, format=format), 'nodes': reverse('node-list', request=request, format=format), 'dashboardviews': reverse('dashboardview-list', request=request, format=format), + 'controllernetworks': reverse('controllernetwork-list', request=request, format=format), 'imagedeploymentses': reverse('imagedeployments-list', request=request, format=format), + 'controllerusers': reverse('controlleruser-list', request=request, format=format), 'reservedresources': reverse('reservedresource-list', request=request, format=format), + 'payments': reverse('payment-list', request=request, format=format), 'networkslices': reverse('networkslice-list', request=request, format=format), 'userdashboardviews': reverse('userdashboardview-list', request=request, format=format), + 'controllers': reverse('controller-list', request=request, format=format), 'planetstackprivileges': reverse('planetstackprivilege-list', request=request, format=format), 'users': reverse('user-list', request=request, format=format), 'deployments': reverse('deployment-list', request=request, format=format), 'reservations': reverse('reservation-list', request=request, format=format), - 'slicedeploymentses': reverse('slicedeployments-list', request=request, format=format), 'siteprivileges': reverse('siteprivilege-list', request=request, format=format), - 'planetstacks': reverse('planetstack-list', request=request, format=format), - 'userdeploymentses': reverse('userdeployments-list', request=request, format=format), + 'controllerslices': reverse('controllerslice-list', request=request, format=format), + 'controllerdashboardviews': reverse('controllerdashboardview-list', request=request, format=format), 'accounts': reverse('account-list', request=request, format=format), + 'controllerroles': reverse('controllerrole-list', request=request, format=format), 'networkparametertypes': reverse('networkparametertype-list', request=request, format=format), 'sitecredentials': reverse('sitecredential-list', request=request, format=format), 'deploymentprivileges': reverse('deploymentprivilege-list', request=request, format=format), + 'controllersliceprivileges': reverse('controllersliceprivilege-list', request=request, format=format), + 'sitedeployments': reverse('sitedeployment-list', request=request, format=format), 'deploymentroles': reverse('deploymentrole-list', request=request, format=format), 'usercredentials': reverse('usercredential-list', request=request, format=format), - 'sitedeploymentses': reverse('sitedeployments-list', request=request, format=format), 'slicetags': reverse('slicetag-list', request=request, format=format), 'networktemplates': reverse('networktemplate-list', request=request, format=format), 'routers': reverse('router-list', request=request, format=format), @@ -234,10 +269,62 @@ def api_root(request, format=None): # Based on serializers.py +class XOSModelSerializer(serializers.ModelSerializer): + def save_object(self, obj, **kwargs): + + """ rest_framework can't deal with ManyToMany relations that have a + through table. In plstackapi, most of the through tables we have + use defaults or blank fields, so there's no reason why we shouldn't + be able to save these objects. + + So, let's strip out these m2m relations, and deal with them ourself. + """ + obj._complex_m2m_data={}; + if getattr(obj, '_m2m_data', None): + for relatedObject in obj._meta.get_all_related_many_to_many_objects(): + if (relatedObject.field.rel.through._meta.auto_created): + # These are non-trough ManyToMany relations and + # can be updated just fine + continue + fieldName = relatedObject.get_accessor_name() + if fieldName in obj._m2m_data.keys(): + obj._complex_m2m_data[fieldName] = (relatedObject, obj._m2m_data[fieldName]) + del obj._m2m_data[fieldName] + + serializers.ModelSerializer.save_object(self, obj, **kwargs); + + for (accessor, stuff) in obj._complex_m2m_data.items(): + (relatedObject, data) = stuff + through = relatedObject.field.rel.through + local_fieldName = relatedObject.field.m2m_reverse_field_name() + remote_fieldName = relatedObject.field.m2m_field_name() + + # get the current set of existing relations + existing = through.objects.filter(**{local_fieldName: obj}); + + data_ids = [item.id for item in data] + existing_ids = [getattr(item,remote_fieldName).id for item in existing] + + #print "data_ids", data_ids + #print "existing_ids", existing_ids + + # remove relations that are in 'existing' but not in 'data' + for item in list(existing): + if (getattr(item,remote_fieldName).id not in data_ids): + print "delete", getattr(item,remote_fieldName) + item.delete() #(purge=True) + + # add relations that are in 'data' but not in 'existing' + for item in data: + if (item.id not in existing_ids): + #print "add", item + newModel = through(**{local_fieldName: obj, remote_fieldName: item}) + newModel.save() + class ServiceAttributeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -252,8 +339,8 @@ class ServiceAttributeSerializer(serializers.HyperlinkedModelSerializer): model = ServiceAttribute fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','value','service',) -class ServiceAttributeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ServiceAttributeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -264,15 +351,89 @@ class ServiceAttributeIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = ServiceAttribute fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','value','service',) +class ControllerImagesSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerImages + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',) + +class ControllerImagesIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerImages + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',) + + + + +class ControllerSitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerSitePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_privilege','role_id',) + +class ControllerSitePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = ControllerSitePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_privilege','role_id',) + + + + class ImageSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() + + + deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -285,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(serializers.ModelSerializer): - id = serializers.Field() +class ImageIdSerializer(XOSModelSerializer): + id = IdField() + + + deployments = serializers.PrimaryKeyRelatedField(many=True, queryset = Deployment.objects.all()) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -299,15 +464,15 @@ class ImageIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + 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") @@ -322,8 +487,8 @@ class NetworkParameterSerializer(serializers.HyperlinkedModelSerializer): model = NetworkParameter fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',) -class NetworkParameterIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class NetworkParameterIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -334,7 +499,7 @@ class NetworkParameterIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = NetworkParameter fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','parameter','value','content_type','object_id',) @@ -342,7 +507,11 @@ class NetworkParameterIdSerializer(serializers.ModelSerializer): class SiteSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() + + + deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -355,10 +524,14 @@ class SiteSerializer(serializers.HyperlinkedModelSerializer): return None class Meta: model = Site - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name','deployments',) -class SiteIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SiteIdSerializer(XOSModelSerializer): + id = IdField() + + + deployments = serializers.PrimaryKeyRelatedField(many=True, queryset = Deployment.objects.all()) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -369,15 +542,15 @@ class SiteIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Site - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name','deployments',) class SliceRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -392,8 +565,8 @@ class SliceRoleSerializer(serializers.HyperlinkedModelSerializer): model = SliceRole fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) -class SliceRoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SliceRoleIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -404,7 +577,7 @@ class SliceRoleIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = SliceRole fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) @@ -412,7 +585,7 @@ class SliceRoleIdSerializer(serializers.ModelSerializer): class TagSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -427,8 +600,8 @@ class TagSerializer(serializers.HyperlinkedModelSerializer): model = Tag fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',) -class TagIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class TagIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -439,7 +612,7 @@ class TagIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Tag fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','service','name','value','content_type','object_id',) @@ -447,7 +620,7 @@ class TagIdSerializer(serializers.ModelSerializer): class InvoiceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -462,8 +635,8 @@ class InvoiceSerializer(serializers.HyperlinkedModelSerializer): model = Invoice fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','date','account',) -class InvoiceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class InvoiceIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -474,7 +647,7 @@ class InvoiceIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Invoice fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','date','account',) @@ -482,7 +655,7 @@ class InvoiceIdSerializer(serializers.ModelSerializer): class SlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -497,8 +670,8 @@ class SlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer): model = SlicePrivilege fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','slice','role',) -class SlicePrivilegeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SlicePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -509,7 +682,7 @@ class SlicePrivilegeIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = SlicePrivilege fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','slice','role',) @@ -517,7 +690,7 @@ class SlicePrivilegeIdSerializer(serializers.ModelSerializer): class PlanetStackRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -532,8 +705,8 @@ class PlanetStackRoleSerializer(serializers.HyperlinkedModelSerializer): model = PlanetStackRole fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) -class PlanetStackRoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class PlanetStackRoleIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -544,7 +717,7 @@ class PlanetStackRoleIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = PlanetStackRole fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) @@ -552,7 +725,7 @@ class PlanetStackRoleIdSerializer(serializers.ModelSerializer): class NetworkSliverSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -567,8 +740,8 @@ class NetworkSliverSerializer(serializers.HyperlinkedModelSerializer): model = NetworkSliver fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) -class NetworkSliverIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class NetworkSliverIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -579,15 +752,19 @@ class NetworkSliverIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = NetworkSliver fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','sliver','ip','port_id',) -class NetworkDeploymentsSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class FlavorSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + + deployments = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='deployment-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -599,11 +776,15 @@ class NetworkDeploymentsSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = NetworkDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',) + model = Flavor + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) -class NetworkDeploymentsIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class FlavorIdSerializer(XOSModelSerializer): + id = IdField() + + + deployments = serializers.PrimaryKeyRelatedField(many=True, queryset = Deployment.objects.all()) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -614,15 +795,15 @@ class NetworkDeploymentsIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = NetworkDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',) + class Meta: + model = Flavor + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) -class FlavorSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSiteSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -634,11 +815,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',) + model = ControllerSite + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','controller','tenant_id',) -class FlavorIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerSiteIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -649,15 +830,15 @@ class FlavorIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = Flavor - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',) + 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") @@ -672,8 +853,8 @@ class ProjectSerializer(serializers.HyperlinkedModelSerializer): model = Project fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) -class ProjectIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ProjectIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -684,7 +865,7 @@ class ProjectIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Project fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) @@ -692,15 +873,7 @@ class ProjectIdSerializer(serializers.ModelSerializer): class SliceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') - - - - availableNetworks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') - + id = IdField() networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') @@ -721,25 +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','availableNetworks','networks','networks',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','service','network','serviceClass','creator','default_flavor','default_image','mount_data_sets','networks','networks',) -class SliceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') - - - - availableNetworks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') +class SliceIdSerializer(XOSModelSerializer): + id = IdField() - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -751,22 +916,26 @@ class SliceIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + 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','availableNetworks','networks','networks',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','service','network','serviceClass','creator','default_flavor','default_image','mount_data_sets','networks','networks',) class NetworkSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() - routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + slices = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='slice-detail') + + + + slices = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='slice-detail') - availableRouters = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + slivers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='sliver-detail') @@ -788,25 +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','routers','availableRouters','routers','routers',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteed_bandwidth','permit_all_slices','topology_parameters','controller_url','controller_parameters','network_id','router_id','subnet_id','slices','slices','slivers','routers','routers',) -class NetworkIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class NetworkIdSerializer(XOSModelSerializer): + id = IdField() - routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + slices = serializers.PrimaryKeyRelatedField(many=True, queryset = Slice.objects.all()) - availableRouters = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + slices = serializers.PrimaryKeyRelatedField(many=True, queryset = Slice.objects.all()) - routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + slivers = serializers.PrimaryKeyRelatedField(many=True, queryset = Sliver.objects.all()) - routers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='router-detail') + routers = serializers.PrimaryKeyRelatedField(many=True, queryset = Router.objects.all()) + + + + routers = serializers.PrimaryKeyRelatedField(many=True, queryset = Router.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -818,15 +991,15 @@ class NetworkIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + 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','routers','availableRouters','routers','routers',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteed_bandwidth','permit_all_slices','topology_parameters','controller_url','controller_parameters','network_id','router_id','subnet_id','slices','slices','slivers','routers','routers',) class ServiceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -841,8 +1014,8 @@ class ServiceSerializer(serializers.HyperlinkedModelSerializer): model = Service fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',) -class ServiceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ServiceIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -853,7 +1026,7 @@ class ServiceIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Service fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description','enabled','name','versionNumber','published',) @@ -861,7 +1034,7 @@ class ServiceIdSerializer(serializers.ModelSerializer): class ServiceClassSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -876,8 +1049,8 @@ class ServiceClassSerializer(serializers.HyperlinkedModelSerializer): model = ServiceClass fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',) -class ServiceClassIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ServiceClassIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -888,15 +1061,15 @@ class ServiceClassIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = ServiceClass fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','commitment','membershipFee','membershipFeeMonths','upgradeRequiresApproval',) -class PaymentSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class PlanetStackSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -908,11 +1081,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 = PlanetStack + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) -class PaymentIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class PlanetStackIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -923,15 +1096,15 @@ class PaymentIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = Payment - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) + class Meta: + 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") @@ -946,8 +1119,8 @@ class ChargeSerializer(serializers.HyperlinkedModelSerializer): model = Charge fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',) -class ChargeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ChargeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -958,7 +1131,7 @@ class ChargeIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Charge fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','slice','kind','state','date','object','amount','coreHours','invoice',) @@ -966,7 +1139,7 @@ class ChargeIdSerializer(serializers.ModelSerializer): class RoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -981,8 +1154,8 @@ class RoleSerializer(serializers.HyperlinkedModelSerializer): model = Role fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',) -class RoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class RoleIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -993,7 +1166,7 @@ class RoleIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Role fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role_type','role','description','content_type',) @@ -1001,7 +1174,7 @@ class RoleIdSerializer(serializers.ModelSerializer): class UsableObjectSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1016,8 +1189,8 @@ class UsableObjectSerializer(serializers.HyperlinkedModelSerializer): model = UsableObject fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) -class UsableObjectIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class UsableObjectIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1028,7 +1201,7 @@ class UsableObjectIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = UsableObject fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) @@ -1036,7 +1209,7 @@ class UsableObjectIdSerializer(serializers.ModelSerializer): class SiteRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1051,8 +1224,8 @@ class SiteRoleSerializer(serializers.HyperlinkedModelSerializer): model = SiteRole fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) -class SiteRoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SiteRoleIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1063,7 +1236,7 @@ class SiteRoleIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = SiteRole fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) @@ -1071,7 +1244,7 @@ class SiteRoleIdSerializer(serializers.ModelSerializer): class SliceCredentialSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1086,8 +1259,8 @@ class SliceCredentialSerializer(serializers.HyperlinkedModelSerializer): model = SliceCredential fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',) -class SliceCredentialIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SliceCredentialIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1098,7 +1271,7 @@ class SliceCredentialIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = SliceCredential fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','key_id','enc_value',) @@ -1106,11 +1279,7 @@ class SliceCredentialIdSerializer(serializers.ModelSerializer): class SliverSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') - + id = IdField() networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') @@ -1127,17 +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','deploymentNetwork','numberCores','flavor','userData','networks','networks',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','deployment','node','numberCores','flavor','userData','networks',) -class SliverIdSerializer(serializers.ModelSerializer): - id = serializers.Field() - - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') +class SliverIdSerializer(XOSModelSerializer): + id = IdField() - - networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -1149,15 +1314,15 @@ class SliverIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Sliver - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','node','deploymentNetwork','numberCores','flavor','userData','networks','networks',) + 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") @@ -1170,10 +1335,10 @@ class NodeSerializer(serializers.HyperlinkedModelSerializer): return None class Meta: model = Node - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site','deployment',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_deployment',) -class NodeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class NodeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1184,15 +1349,19 @@ class NodeIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Node - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site','deployment',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','site_deployment',) class DashboardViewSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() + + + controllers = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='controller-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1205,10 +1374,14 @@ class DashboardViewSerializer(serializers.HyperlinkedModelSerializer): return None class Meta: model = DashboardView - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','url',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','url','controllers',) -class DashboardViewIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class DashboardViewIdSerializer(XOSModelSerializer): + id = IdField() + + + controllers = serializers.PrimaryKeyRelatedField(many=True, queryset = Controller.objects.all()) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1219,15 +1392,15 @@ class DashboardViewIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = DashboardView - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','url',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','url','controllers',) -class ImageDeploymentsSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerNetworkSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1239,11 +1412,11 @@ class ImageDeploymentsSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = ImageDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',) + model = ControllerNetwork + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',) -class ImageDeploymentsIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerNetworkIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1254,15 +1427,15 @@ class ImageDeploymentsIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = ImageDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',) + class Meta: + model = ControllerNetwork + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','controller','net_id','router_id','subnet_id','subnet',) -class ReservedResourceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ImageDeploymentsSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1274,11 +1447,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 = ImageDeployments + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment',) -class ReservedResourceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ImageDeploymentsIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1289,15 +1462,15 @@ class ReservedResourceIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = ReservedResource - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) + class Meta: + model = ImageDeployments + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','image','deployment',) -class NetworkSliceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerUserSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1309,11 +1482,11 @@ class NetworkSliceSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = NetworkSlice - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',) + model = ControllerUser + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) -class NetworkSliceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerUserIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1324,15 +1497,15 @@ class NetworkSliceIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = NetworkSlice - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',) + class Meta: + model = ControllerUser + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) -class UserDashboardViewSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ReservedResourceSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1344,11 +1517,11 @@ class UserDashboardViewSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = UserDashboardView - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',) + model = ReservedResource + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) -class UserDashboardViewIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ReservedResourceIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1359,15 +1532,15 @@ class UserDashboardViewIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = UserDashboardView - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',) + class Meta: + model = ReservedResource + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) -class PlanetStackPrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class PaymentSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1379,11 +1552,11 @@ class PlanetStackPrivilegeSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = PlanetStackPrivilege - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','planetstack','role',) + model = Payment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) -class PlanetStackPrivilegeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class PaymentIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1394,15 +1567,15 @@ class PlanetStackPrivilegeIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = PlanetStackPrivilege - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','planetstack','role',) + class Meta: + model = Payment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','account','amount','date',) -class UserSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class NetworkSliceSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1414,11 +1587,11 @@ class UserSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = User - 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',) + model = NetworkSlice + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',) -class UserIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class NetworkSliceIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1429,31 +1602,128 @@ class UserIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = User - 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 Meta: + model = NetworkSlice + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','network','slice',) -class DeploymentSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() - +class UserDashboardViewSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() - sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = UserDashboardView + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',) + +class UserDashboardViewIdSerializer(XOSModelSerializer): + id = IdField() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = UserDashboardView + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','dashboardView','order',) + + + + +class ControllerSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() - sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail') + dashboardviews = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='dashboardview-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = Controller + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',) + +class ControllerIdSerializer(XOSModelSerializer): + id = IdField() - flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') + dashboardviews = serializers.PrimaryKeyRelatedField(many=True, queryset = DashboardView.objects.all()) - flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = Controller + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',) + + + + +class PlanetStackPrivilegeSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = PlanetStackPrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','planetstack','role',) + +class PlanetStackPrivilegeIdSerializer(XOSModelSerializer): + id = IdField() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = PlanetStackPrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','planetstack','role',) + + + + +class UserSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1465,14 +1735,33 @@ class DeploymentSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = Deployment - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','admin_user','admin_password','admin_tenant','auth_url','backend_type','availability_zone','accessControl','sites','sites','flavors','flavors',) + model = User + 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 DeploymentIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class UserIdSerializer(XOSModelSerializer): + id = IdField() + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = User + fields = ('humanReadableName', 'validators', 'id','password','last_login','email','username','firstname','lastname','phone','user_url','site','public_key','is_active','is_admin','is_staff','is_readonly','created','updated','enacted','backend_status','deleted','timezone',) + + + + +class DeploymentSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() - sites = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='site-detail') + + images = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='image-detail') @@ -1483,8 +1772,32 @@ class DeploymentIdSerializer(serializers.ModelSerializer): flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + model = Deployment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','accessControl','images','sites','flavors',) + +class DeploymentIdSerializer(XOSModelSerializer): + id = IdField() + - flavors = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='flavor-detail') + images = serializers.PrimaryKeyRelatedField(many=True, queryset = Image.objects.all()) + + + + sites = serializers.PrimaryKeyRelatedField(many=True, queryset = Site.objects.all()) + + + + flavors = serializers.PrimaryKeyRelatedField(many=True, queryset = Flavor.objects.all()) humanReadableName = serializers.SerializerMethodField("getHumanReadableName") @@ -1496,15 +1809,15 @@ class DeploymentIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Deployment - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','admin_user','admin_password','admin_tenant','auth_url','backend_type','availability_zone','accessControl','sites','sites','flavors','flavors',) + 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") @@ -1519,8 +1832,8 @@ class ReservationSerializer(serializers.HyperlinkedModelSerializer): model = Reservation fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',) -class ReservationIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ReservationIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1531,15 +1844,15 @@ class ReservationIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Reservation fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','startTime','slice','duration',) -class SliceDeploymentsSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1551,11 +1864,11 @@ class SliceDeploymentsSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = SliceDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) + model = SitePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',) -class SliceDeploymentsIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SitePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1566,15 +1879,15 @@ class SliceDeploymentsIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = SliceDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) + class Meta: + model = SitePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',) -class SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSliceSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1586,11 +1899,11 @@ class SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = SitePrivilege - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',) + model = ControllerSlice + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) -class SitePrivilegeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerSliceIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1601,15 +1914,15 @@ class SitePrivilegeIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = SitePrivilege - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','site','role',) + class Meta: + model = ControllerSlice + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) -class PlanetStackSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerDashboardViewSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1621,11 +1934,11 @@ class PlanetStackSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = PlanetStack - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) + model = ControllerDashboardView + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) -class PlanetStackIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerDashboardViewIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1636,15 +1949,15 @@ class PlanetStackIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = PlanetStack - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','description',) + class Meta: + model = ControllerDashboardView + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) -class UserDeploymentsSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class AccountSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1656,11 +1969,11 @@ class UserDeploymentsSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = UserDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',) + model = Account + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) -class UserDeploymentsIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class AccountIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1671,15 +1984,15 @@ class UserDeploymentsIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = UserDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',) + class Meta: + model = Account + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) -class AccountSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerRoleSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1691,11 +2004,11 @@ class AccountSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = Account - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) + model = ControllerRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) -class AccountIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerRoleIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1706,15 +2019,15 @@ class AccountIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = Account - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site',) + 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") @@ -1729,8 +2042,8 @@ class NetworkParameterTypeSerializer(serializers.HyperlinkedModelSerializer): model = NetworkParameterType fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description',) -class NetworkParameterTypeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class NetworkParameterTypeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1741,7 +2054,7 @@ class NetworkParameterTypeIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = NetworkParameterType fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description',) @@ -1749,7 +2062,7 @@ class NetworkParameterTypeIdSerializer(serializers.ModelSerializer): class SiteCredentialSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1764,8 +2077,8 @@ class SiteCredentialSerializer(serializers.HyperlinkedModelSerializer): model = SiteCredential fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',) -class SiteCredentialIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SiteCredentialIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1776,7 +2089,7 @@ class SiteCredentialIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = SiteCredential fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','name','key_id','enc_value',) @@ -1784,7 +2097,7 @@ class SiteCredentialIdSerializer(serializers.ModelSerializer): class DeploymentPrivilegeSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1799,8 +2112,8 @@ class DeploymentPrivilegeSerializer(serializers.HyperlinkedModelSerializer): model = DeploymentPrivilege fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','role',) -class DeploymentPrivilegeIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class DeploymentPrivilegeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1811,15 +2124,15 @@ class DeploymentPrivilegeIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = DeploymentPrivilege fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','deployment','role',) -class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class ControllerSlicePrivilegeSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1831,11 +2144,11 @@ class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = DeploymentRole - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + model = ControllerSlicePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',) -class DeploymentRoleIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ControllerSlicePrivilegeIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1846,15 +2159,15 @@ class DeploymentRoleIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = DeploymentRole - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + class Meta: + model = ControllerSlicePrivilege + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',) -class UserCredentialSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class SiteDeploymentSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1866,11 +2179,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 = SiteDeployment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) -class UserCredentialIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SiteDeploymentIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1881,15 +2194,15 @@ class UserCredentialIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: - model = UserCredential - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) + class Meta: + model = SiteDeployment + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) -class SiteDeploymentsSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() +class DeploymentRoleSerializer(serializers.HyperlinkedModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1901,11 +2214,11 @@ class SiteDeploymentsSerializer(serializers.HyperlinkedModelSerializer): except: return None class Meta: - model = SiteDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','tenant_id',) + model = DeploymentRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) -class SiteDeploymentsIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class DeploymentRoleIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1916,15 +2229,50 @@ class SiteDeploymentsIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None + class Meta: + model = DeploymentRole + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','role',) + + + + +class UserCredentialSerializer(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 = SiteDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','site','deployment','tenant_id',) + model = UserCredential + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) + +class UserCredentialIdSerializer(XOSModelSerializer): + id = IdField() + + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") + validators = serializers.SerializerMethodField("getValidators") + def getHumanReadableName(self, obj): + return str(obj) + def getValidators(self, obj): + try: + return obj.getValidators() + except: + return None + class Meta: + 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") @@ -1939,8 +2287,8 @@ class SliceTagSerializer(serializers.HyperlinkedModelSerializer): model = SliceTag fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','value',) -class SliceTagIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class SliceTagIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1951,7 +2299,7 @@ class SliceTagIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = SliceTag fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','slice','name','value',) @@ -1959,7 +2307,7 @@ class SliceTagIdSerializer(serializers.ModelSerializer): class NetworkTemplateSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1972,10 +2320,10 @@ class NetworkTemplateSerializer(serializers.HyperlinkedModelSerializer): 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',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteed_bandwidth','visibility','translation','shared_network_name','shared_network_id','topology_kind','controller_kind',) -class NetworkTemplateIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class NetworkTemplateIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -1986,15 +2334,23 @@ class NetworkTemplateIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = NetworkTemplate - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId','topologyKind','controllerKind',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','description','guaranteed_bandwidth','visibility','translation','shared_network_name','shared_network_id','topology_kind','controller_kind',) class RouterSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() + + + networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + + + + networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail') + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2007,10 +2363,18 @@ class RouterSerializer(serializers.HyperlinkedModelSerializer): return None class Meta: model = Router - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','owner',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',) -class RouterIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class RouterIdSerializer(XOSModelSerializer): + id = IdField() + + + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) + + + + networks = serializers.PrimaryKeyRelatedField(many=True, queryset = Network.objects.all()) + humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2021,15 +2385,15 @@ class RouterIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = Router - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','owner',) + fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',) class ServiceResourceSerializer(serializers.HyperlinkedModelSerializer): - id = serializers.Field() + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2044,8 +2408,8 @@ class ServiceResourceSerializer(serializers.HyperlinkedModelSerializer): model = ServiceResource fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',) -class ServiceResourceIdSerializer(serializers.ModelSerializer): - id = serializers.Field() +class ServiceResourceIdSerializer(XOSModelSerializer): + id = IdField() humanReadableName = serializers.SerializerMethodField("getHumanReadableName") validators = serializers.SerializerMethodField("getValidators") @@ -2056,7 +2420,7 @@ class ServiceResourceIdSerializer(serializers.ModelSerializer): return obj.getValidators() except: return None - class Meta: + class Meta: model = ServiceResource fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','serviceClass','name','maxUnitsDeployment','maxUnitsNode','maxDuration','bucketInRate','bucketMaxSize','cost','calendarReservable',) @@ -2067,6 +2431,10 @@ serializerLookUp = { ServiceAttribute: ServiceAttributeSerializer, + ControllerImages: ControllerImagesSerializer, + + ControllerSitePrivilege: ControllerSitePrivilegeSerializer, + Image: ImageSerializer, NetworkParameter: NetworkParameterSerializer, @@ -2085,10 +2453,10 @@ serializerLookUp = { NetworkSliver: NetworkSliverSerializer, - NetworkDeployments: NetworkDeploymentsSerializer, - Flavor: FlavorSerializer, + ControllerSite: ControllerSiteSerializer, + Project: ProjectSerializer, Slice: SliceSerializer, @@ -2099,7 +2467,7 @@ serializerLookUp = { ServiceClass: ServiceClassSerializer, - Payment: PaymentSerializer, + PlanetStack: PlanetStackSerializer, Charge: ChargeSerializer, @@ -2117,14 +2485,22 @@ serializerLookUp = { DashboardView: DashboardViewSerializer, + ControllerNetwork: ControllerNetworkSerializer, + ImageDeployments: ImageDeploymentsSerializer, + ControllerUser: ControllerUserSerializer, + ReservedResource: ReservedResourceSerializer, + Payment: PaymentSerializer, + NetworkSlice: NetworkSliceSerializer, UserDashboardView: UserDashboardViewSerializer, + Controller: ControllerSerializer, + PlanetStackPrivilege: PlanetStackPrivilegeSerializer, User: UserSerializer, @@ -2133,28 +2509,30 @@ serializerLookUp = { Reservation: ReservationSerializer, - SliceDeployments: SliceDeploymentsSerializer, - SitePrivilege: SitePrivilegeSerializer, - PlanetStack: PlanetStackSerializer, + ControllerSlice: ControllerSliceSerializer, - UserDeployments: UserDeploymentsSerializer, + ControllerDashboardView: ControllerDashboardViewSerializer, Account: AccountSerializer, + ControllerRole: ControllerRoleSerializer, + NetworkParameterType: NetworkParameterTypeSerializer, SiteCredential: SiteCredentialSerializer, DeploymentPrivilege: DeploymentPrivilegeSerializer, + ControllerSlicePrivilege: ControllerSlicePrivilegeSerializer, + + SiteDeployment: SiteDeploymentSerializer, + DeploymentRole: DeploymentRoleSerializer, UserCredential: UserCredentialSerializer, - SiteDeployments: SiteDeploymentsSerializer, - SliceTag: SliceTagSerializer, NetworkTemplate: NetworkTemplateSerializer, @@ -2207,23 +2585,141 @@ class PlanetStackRetrieveUpdateDestroyAPIView(generics.RetrieveUpdateDestroyAPIV self.post_save(self.object, created=False) return Response(serializer.data, status=status.HTTP_200_OK) - def destroy(self, request, *args, **kwargs): - obj = self.get_object() + def destroy(self, request, *args, **kwargs): + obj = self.get_object() + if obj.can_update(request.user): + return super(generics.RetrieveUpdateDestroyAPIView, self).destroy(request, *args, **kwargs) + else: + return Response(status=status.HTTP_400_BAD_REQUEST) + + +# Based on core/views/*.py + + +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','value','service',) + + 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 ServiceAttribute.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(ServiceAttributeList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ServiceAttributeList, 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 + + 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 ServiceAttribute.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +class ControllerImagesList(generics.ListCreateAPIView): + queryset = ControllerImages.objects.select_related().all() + serializer_class = ControllerImagesSerializer + id_serializer_class = ControllerImagesIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','image','controller','glance_image_id',) + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerImages.select_by_user(self.request.user) + + def create(self, request, *args, **kwargs): + serializer = self.get_serializer(data=request.DATA, files=request.FILES) + if not (serializer.is_valid()): + response = {"error": "validation", + "specific_error": "not serializer.is_valid()", + "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(generics.RetrieveUpdateDestroyAPIView, self).destroy(request, *args, **kwargs) + return super(ControllerImagesList, self).create(request, *args, **kwargs) else: - return Response(status=status.HTTP_400_BAD_REQUEST) + raise Exception("failed obj.can_update") + ret = super(ControllerImagesList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) -# Based on core/views/*.py + return ret -class ServiceAttributeList(generics.ListCreateAPIView): - 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) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerImages.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +class ControllerSitePrivilegeList(generics.ListCreateAPIView): + queryset = ControllerSitePrivilege.objects.select_related().all() + serializer_class = ControllerSitePrivilegeSerializer + id_serializer_class = ControllerSitePrivilegeIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','value','service',) + 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) @@ -2233,7 +2729,7 @@ class ServiceAttributeList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ServiceAttribute.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) @@ -2245,21 +2741,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(ControllerSitePrivilegeList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ServiceAttributeList, 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 ServiceAttributeDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ServiceAttribute.objects.select_related().all() - serializer_class = ServiceAttributeSerializer - id_serializer_class = ServiceAttributeIdSerializer +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) @@ -2269,7 +2765,7 @@ class ServiceAttributeDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ServiceAttribute.select_by_user(self.request.user) + return ControllerSitePrivilege.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -2282,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) @@ -2400,7 +2896,7 @@ class SiteList(generics.ListCreateAPIView): serializer_class = SiteSerializer id_serializer_class = SiteIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site_url','enabled','location','longitude','latitude','login_base','is_public','abbreviated_name','deployments',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2808,12 +3304,12 @@ class NetworkSliverDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class NetworkDeploymentsList(generics.ListCreateAPIView): - queryset = NetworkDeployments.objects.select_related().all() - serializer_class = NetworkDeploymentsSerializer - id_serializer_class = NetworkDeploymentsIdSerializer +class FlavorList(generics.ListCreateAPIView): + queryset = Flavor.objects.select_related().all() + serializer_class = FlavorSerializer + id_serializer_class = FlavorIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','network','deployment','net_id','router_id','subnet_id','subnet',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default','deployments',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2823,7 +3319,7 @@ class NetworkDeploymentsList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return NetworkDeployments.select_by_user(self.request.user) + return Flavor.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -2835,21 +3331,21 @@ class NetworkDeploymentsList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(NetworkDeploymentsList, self).create(request, *args, **kwargs) + return super(FlavorList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(NetworkDeploymentsList, self).create(request, *args, **kwargs) + ret = super(FlavorList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class NetworkDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = NetworkDeployments.objects.select_related().all() - serializer_class = NetworkDeploymentsSerializer - id_serializer_class = NetworkDeploymentsIdSerializer +class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = Flavor.objects.select_related().all() + serializer_class = FlavorSerializer + id_serializer_class = FlavorIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2859,7 +3355,7 @@ class NetworkDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return NetworkDeployments.select_by_user(self.request.user) + return Flavor.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -2867,12 +3363,12 @@ class NetworkDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class FlavorList(generics.ListCreateAPIView): - queryset = Flavor.objects.select_related().all() - serializer_class = FlavorSerializer - id_serializer_class = FlavorIdSerializer +class ControllerSiteList(generics.ListCreateAPIView): + queryset = ControllerSite.objects.select_related().all() + serializer_class = ControllerSiteSerializer + id_serializer_class = ControllerSiteIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','flavor','order','default',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','site','controller','tenant_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2882,7 +3378,7 @@ class FlavorList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return Flavor.select_by_user(self.request.user) + return ControllerSite.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -2894,21 +3390,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(ControllerSiteList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(FlavorList, self).create(request, *args, **kwargs) + ret = super(ControllerSiteList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = Flavor.objects.select_related().all() - serializer_class = FlavorSerializer - id_serializer_class = FlavorIdSerializer +class ControllerSiteDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerSite.objects.select_related().all() + serializer_class = ControllerSiteSerializer + id_serializer_class = ControllerSiteIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -2918,7 +3414,7 @@ class FlavorDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return Flavor.select_by_user(self.request.user) + return ControllerSite.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -2990,7 +3486,7 @@ class SliceList(generics.ListCreateAPIView): serializer_class = SliceSerializer id_serializer_class = SliceIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','imagePreference','service','network','mountDataSets','serviceClass','creator','networks','availableNetworks','networks','networks',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','enabled','omf_friendly','description','slice_url','site','max_slivers','service','network','serviceClass','creator','default_flavor','default_image','mount_data_sets','networks','networks',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3049,7 +3545,7 @@ class NetworkList(generics.ListCreateAPIView): serializer_class = NetworkSerializer id_serializer_class = NetworkIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteedBandwidth','permitAllSlices','topologyParameters','controllerUrl','controllerParameters','network_id','router_id','subnet_id','routers','availableRouters','routers','routers',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','template','subnet','ports','labels','owner','guaranteed_bandwidth','permit_all_slices','topology_parameters','controller_url','controller_parameters','network_id','router_id','subnet_id','slices','slices','slivers','routers','routers',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3221,12 +3717,12 @@ class ServiceClassDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class PaymentList(generics.ListCreateAPIView): - queryset = Payment.objects.select_related().all() - serializer_class = PaymentSerializer - id_serializer_class = PaymentIdSerializer +class PlanetStackList(generics.ListCreateAPIView): + queryset = PlanetStack.objects.select_related().all() + serializer_class = PlanetStackSerializer + id_serializer_class = PlanetStackIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','account','amount','date',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','description',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3236,7 +3732,7 @@ class PaymentList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return Payment.select_by_user(self.request.user) + return PlanetStack.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -3248,21 +3744,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(PlanetStackList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(PaymentList, self).create(request, *args, **kwargs) + ret = super(PlanetStackList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = Payment.objects.select_related().all() - serializer_class = PaymentSerializer - id_serializer_class = PaymentIdSerializer +class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = PlanetStack.objects.select_related().all() + serializer_class = PlanetStackSerializer + id_serializer_class = PlanetStackIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3272,7 +3768,7 @@ class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return Payment.select_by_user(self.request.user) + return PlanetStack.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3580,7 +4076,7 @@ class SliverList(generics.ListCreateAPIView): serializer_class = SliverSerializer id_serializer_class = SliverIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','node','deploymentNetwork','numberCores','flavor','userData','networks','networks',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','instance_id','name','instance_name','ip','image','creator','slice','deployment','node','numberCores','flavor','userData','networks',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3639,7 +4135,7 @@ class NodeList(generics.ListCreateAPIView): serializer_class = NodeSerializer id_serializer_class = NodeIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site','deployment',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','site_deployment',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3698,7 +4194,7 @@ class DashboardViewList(generics.ListCreateAPIView): serializer_class = DashboardViewSerializer id_serializer_class = DashboardViewIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','url',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','url','controllers',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3752,12 +4248,189 @@ class DashboardViewDetail(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','network','controller','net_id','router_id','subnet_id','subnet',) + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerNetwork.select_by_user(self.request.user) + + def create(self, request, *args, **kwargs): + serializer = self.get_serializer(data=request.DATA, files=request.FILES) + if not (serializer.is_valid()): + response = {"error": "validation", + "specific_error": "not serializer.is_valid()", + "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(ControllerNetworkList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ControllerNetworkList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + + return ret + + +class ControllerNetworkDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerNetwork.objects.select_related().all() + serializer_class = ControllerNetworkSerializer + id_serializer_class = ControllerNetworkIdSerializer + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerNetwork.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + class ImageDeploymentsList(generics.ListCreateAPIView): queryset = ImageDeployments.objects.select_related().all() serializer_class = ImageDeploymentsSerializer id_serializer_class = ImageDeploymentsIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','image','deployment','glance_image_id',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','image','deployment',) + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ImageDeployments.select_by_user(self.request.user) + + def create(self, request, *args, **kwargs): + serializer = self.get_serializer(data=request.DATA, files=request.FILES) + if not (serializer.is_valid()): + response = {"error": "validation", + "specific_error": "not serializer.is_valid()", + "reasons": serializer.errors} + return Response(response, status=status.HTTP_400_BAD_REQUEST) + obj = serializer.object + obj.caller = request.user + if obj.can_update(request.user): + return super(ImageDeploymentsList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ImageDeploymentsList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + + return ret + + +class ImageDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ImageDeployments.objects.select_related().all() + serializer_class = ImageDeploymentsSerializer + id_serializer_class = ImageDeploymentsIdSerializer + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ImageDeployments.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +class ControllerUserList(generics.ListCreateAPIView): + queryset = ControllerUser.objects.select_related().all() + serializer_class = ControllerUserSerializer + id_serializer_class = ControllerUserIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','controller','kuser_id',) + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerUser.select_by_user(self.request.user) + + def create(self, request, *args, **kwargs): + serializer = self.get_serializer(data=request.DATA, files=request.FILES) + if not (serializer.is_valid()): + response = {"error": "validation", + "specific_error": "not serializer.is_valid()", + "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(ControllerUserList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ControllerUserList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + + return ret + + +class ControllerUserDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerUser.objects.select_related().all() + serializer_class = ControllerUserSerializer + id_serializer_class = ControllerUserIdSerializer + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return ControllerUser.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +class ReservedResourceList(generics.ListCreateAPIView): + queryset = ReservedResource.objects.select_related().all() + serializer_class = ReservedResourceSerializer + id_serializer_class = ReservedResourceIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3767,7 +4440,7 @@ class ImageDeploymentsList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ImageDeployments.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) @@ -3779,21 +4452,21 @@ class ImageDeploymentsList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(ImageDeploymentsList, self).create(request, *args, **kwargs) + return super(ReservedResourceList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ImageDeploymentsList, 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 ImageDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ImageDeployments.objects.select_related().all() - serializer_class = ImageDeploymentsSerializer - id_serializer_class = ImageDeploymentsIdSerializer +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) @@ -3803,7 +4476,7 @@ class ImageDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ImageDeployments.select_by_user(self.request.user) + return ReservedResource.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3811,12 +4484,12 @@ class ImageDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class ReservedResourceList(generics.ListCreateAPIView): - queryset = ReservedResource.objects.select_related().all() - serializer_class = ReservedResourceSerializer - id_serializer_class = ReservedResourceIdSerializer +class PaymentList(generics.ListCreateAPIView): + queryset = Payment.objects.select_related().all() + serializer_class = PaymentSerializer + id_serializer_class = PaymentIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','sliver','resource','quantity','reservationSet',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','account','amount','date',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3826,7 +4499,7 @@ class ReservedResourceList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return ReservedResource.select_by_user(self.request.user) + return Payment.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -3838,21 +4511,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(PaymentList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(ReservedResourceList, self).create(request, *args, **kwargs) + ret = super(PaymentList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class ReservedResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ReservedResource.objects.select_related().all() - serializer_class = ReservedResourceSerializer - id_serializer_class = ReservedResourceIdSerializer +class PaymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = Payment.objects.select_related().all() + serializer_class = PaymentSerializer + id_serializer_class = PaymentIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -3862,7 +4535,7 @@ class ReservedResourceDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return ReservedResource.select_by_user(self.request.user) + return Payment.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -3988,6 +4661,65 @@ class UserDashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView): +class ControllerList(generics.ListCreateAPIView): + queryset = Controller.objects.select_related().all() + serializer_class = ControllerSerializer + id_serializer_class = ControllerIdSerializer + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','version','backend_type','auth_url','admin_user','admin_password','admin_tenant','dashboardviews',) + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return Controller.select_by_user(self.request.user) + + def create(self, request, *args, **kwargs): + serializer = self.get_serializer(data=request.DATA, files=request.FILES) + if not (serializer.is_valid()): + response = {"error": "validation", + "specific_error": "not serializer.is_valid()", + "reasons": serializer.errors} + return Response(response, status=status.HTTP_400_BAD_REQUEST) + obj = serializer.object + obj.caller = request.user + if obj.can_update(request.user): + return super(ControllerList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(ControllerList, self).create(request, *args, **kwargs) + if (ret.status_code%100 != 200): + raise Exception(ret.data) + + return ret + + +class ControllerDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = Controller.objects.select_related().all() + serializer_class = ControllerSerializer + id_serializer_class = ControllerIdSerializer + + def get_serializer_class(self): + no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) + if (no_hyperlinks): + return self.id_serializer_class + else: + return self.serializer_class + + def get_queryset(self): + return Controller.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + class PlanetStackPrivilegeList(generics.ListCreateAPIView): queryset = PlanetStackPrivilege.objects.select_related().all() serializer_class = PlanetStackPrivilegeSerializer @@ -4111,7 +4843,7 @@ class DeploymentList(generics.ListCreateAPIView): serializer_class = DeploymentSerializer id_serializer_class = DeploymentIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','admin_user','admin_password','admin_tenant','auth_url','backend_type','availability_zone','accessControl','sites','sites','flavors','flavors',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','accessControl','images','sites','flavors',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4224,12 +4956,12 @@ class ReservationDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class SliceDeploymentsList(generics.ListCreateAPIView): - queryset = SliceDeployments.objects.select_related().all() - serializer_class = SliceDeploymentsSerializer - id_serializer_class = SliceDeploymentsIdSerializer +class SitePrivilegeList(generics.ListCreateAPIView): + queryset = SitePrivilege.objects.select_related().all() + serializer_class = SitePrivilegeSerializer + id_serializer_class = SitePrivilegeIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','slice','deployment','tenant_id','network_id','router_id','subnet_id',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','site','role',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4239,7 +4971,7 @@ class SliceDeploymentsList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return SliceDeployments.select_by_user(self.request.user) + return SitePrivilege.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -4251,21 +4983,21 @@ class SliceDeploymentsList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(SliceDeploymentsList, self).create(request, *args, **kwargs) + return super(SitePrivilegeList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(SliceDeploymentsList, self).create(request, *args, **kwargs) + ret = super(SitePrivilegeList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class SliceDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = SliceDeployments.objects.select_related().all() - serializer_class = SliceDeploymentsSerializer - id_serializer_class = SliceDeploymentsIdSerializer +class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = SitePrivilege.objects.select_related().all() + serializer_class = SitePrivilegeSerializer + id_serializer_class = SitePrivilegeIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4275,7 +5007,7 @@ class SliceDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return SliceDeployments.select_by_user(self.request.user) + return SitePrivilege.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4283,12 +5015,12 @@ class SliceDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class SitePrivilegeList(generics.ListCreateAPIView): - queryset = SitePrivilege.objects.select_related().all() - serializer_class = SitePrivilegeSerializer - id_serializer_class = SitePrivilegeIdSerializer +class ControllerSliceList(generics.ListCreateAPIView): + queryset = ControllerSlice.objects.select_related().all() + serializer_class = ControllerSliceSerializer + id_serializer_class = ControllerSliceIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','site','role',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','slice','tenant_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4298,7 +5030,7 @@ class SitePrivilegeList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return SitePrivilege.select_by_user(self.request.user) + return ControllerSlice.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -4310,21 +5042,21 @@ class SitePrivilegeList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(SitePrivilegeList, self).create(request, *args, **kwargs) + return super(ControllerSliceList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(SitePrivilegeList, self).create(request, *args, **kwargs) + ret = super(ControllerSliceList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = SitePrivilege.objects.select_related().all() - serializer_class = SitePrivilegeSerializer - id_serializer_class = SitePrivilegeIdSerializer +class ControllerSliceDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerSlice.objects.select_related().all() + serializer_class = ControllerSliceSerializer + id_serializer_class = ControllerSliceIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4334,7 +5066,7 @@ class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return SitePrivilege.select_by_user(self.request.user) + return ControllerSlice.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4342,12 +5074,12 @@ class SitePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class PlanetStackList(generics.ListCreateAPIView): - queryset = PlanetStack.objects.select_related().all() - serializer_class = PlanetStackSerializer - id_serializer_class = PlanetStackIdSerializer +class ControllerDashboardViewList(generics.ListCreateAPIView): + queryset = ControllerDashboardView.objects.select_related().all() + serializer_class = ControllerDashboardViewSerializer + id_serializer_class = ControllerDashboardViewIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','description',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','dashboardView','url',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4357,7 +5089,7 @@ class PlanetStackList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return PlanetStack.select_by_user(self.request.user) + return ControllerDashboardView.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -4369,21 +5101,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(ControllerDashboardViewList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(PlanetStackList, self).create(request, *args, **kwargs) + ret = super(ControllerDashboardViewList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = PlanetStack.objects.select_related().all() - serializer_class = PlanetStackSerializer - id_serializer_class = PlanetStackIdSerializer +class ControllerDashboardViewDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerDashboardView.objects.select_related().all() + serializer_class = ControllerDashboardViewSerializer + id_serializer_class = ControllerDashboardViewIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4393,7 +5125,7 @@ class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return PlanetStack.select_by_user(self.request.user) + return ControllerDashboardView.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4401,12 +5133,12 @@ class PlanetStackDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class UserDeploymentsList(generics.ListCreateAPIView): - queryset = UserDeployments.objects.select_related().all() - serializer_class = UserDeploymentsSerializer - id_serializer_class = UserDeploymentsIdSerializer +class AccountList(generics.ListCreateAPIView): + queryset = Account.objects.select_related().all() + serializer_class = AccountSerializer + id_serializer_class = AccountIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','deployment','kuser_id',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','site',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4416,7 +5148,7 @@ class UserDeploymentsList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return UserDeployments.select_by_user(self.request.user) + return Account.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -4428,21 +5160,21 @@ class UserDeploymentsList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(UserDeploymentsList, self).create(request, *args, **kwargs) + return super(AccountList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(UserDeploymentsList, self).create(request, *args, **kwargs) + ret = super(AccountList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class UserDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = UserDeployments.objects.select_related().all() - serializer_class = UserDeploymentsSerializer - id_serializer_class = UserDeploymentsIdSerializer +class AccountDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = Account.objects.select_related().all() + serializer_class = AccountSerializer + id_serializer_class = AccountIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4452,7 +5184,7 @@ class UserDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return UserDeployments.select_by_user(self.request.user) + return Account.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4460,12 +5192,12 @@ class UserDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class AccountList(generics.ListCreateAPIView): - queryset = Account.objects.select_related().all() - serializer_class = AccountSerializer - id_serializer_class = AccountIdSerializer +class ControllerRoleList(generics.ListCreateAPIView): + queryset = ControllerRole.objects.select_related().all() + serializer_class = ControllerRoleSerializer + id_serializer_class = ControllerRoleIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','site',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','role',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4475,7 +5207,7 @@ class AccountList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return Account.select_by_user(self.request.user) + return ControllerRole.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -4487,21 +5219,21 @@ class AccountList(generics.ListCreateAPIView): obj = serializer.object obj.caller = request.user if obj.can_update(request.user): - return super(AccountList, self).create(request, *args, **kwargs) + return super(ControllerRoleList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(AccountList, self).create(request, *args, **kwargs) + ret = super(ControllerRoleList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class AccountDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = Account.objects.select_related().all() - serializer_class = AccountSerializer - id_serializer_class = AccountIdSerializer +class ControllerRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerRole.objects.select_related().all() + serializer_class = ControllerRoleSerializer + id_serializer_class = ControllerRoleIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4511,7 +5243,7 @@ class AccountDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return Account.select_by_user(self.request.user) + return ControllerRole.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4696,12 +5428,12 @@ class DeploymentPrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class DeploymentRoleList(generics.ListCreateAPIView): - queryset = DeploymentRole.objects.select_related().all() - serializer_class = DeploymentRoleSerializer - id_serializer_class = DeploymentRoleIdSerializer +class ControllerSlicePrivilegeList(generics.ListCreateAPIView): + queryset = ControllerSlicePrivilege.objects.select_related().all() + serializer_class = ControllerSlicePrivilegeSerializer + id_serializer_class = ControllerSlicePrivilegeIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','role',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','slice_privilege','role_id',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4711,7 +5443,7 @@ class DeploymentRoleList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return DeploymentRole.select_by_user(self.request.user) + return ControllerSlicePrivilege.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -4723,21 +5455,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(ControllerSlicePrivilegeList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(DeploymentRoleList, self).create(request, *args, **kwargs) + ret = super(ControllerSlicePrivilegeList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = DeploymentRole.objects.select_related().all() - serializer_class = DeploymentRoleSerializer - id_serializer_class = DeploymentRoleIdSerializer +class ControllerSlicePrivilegeDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = ControllerSlicePrivilege.objects.select_related().all() + serializer_class = ControllerSlicePrivilegeSerializer + id_serializer_class = ControllerSlicePrivilegeIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4747,7 +5479,7 @@ class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return DeploymentRole.select_by_user(self.request.user) + return ControllerSlicePrivilege.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4755,12 +5487,12 @@ class DeploymentRoleDetail(PlanetStackRetrieveUpdateDestroyAPIView): -class UserCredentialList(generics.ListCreateAPIView): - queryset = UserCredential.objects.select_related().all() - serializer_class = UserCredentialSerializer - id_serializer_class = UserCredentialIdSerializer +class SiteDeploymentList(generics.ListCreateAPIView): + queryset = SiteDeployment.objects.select_related().all() + serializer_class = SiteDeploymentSerializer + id_serializer_class = SiteDeploymentIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','user','name','key_id','enc_value',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','site','deployment','controller','availability_zone',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4770,7 +5502,7 @@ class UserCredentialList(generics.ListCreateAPIView): return self.serializer_class def get_queryset(self): - return UserCredential.select_by_user(self.request.user) + return SiteDeployment.select_by_user(self.request.user) def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA, files=request.FILES) @@ -4782,21 +5514,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(SiteDeploymentList, self).create(request, *args, **kwargs) else: raise Exception("failed obj.can_update") - ret = super(UserCredentialList, self).create(request, *args, **kwargs) + ret = super(SiteDeploymentList, self).create(request, *args, **kwargs) if (ret.status_code%100 != 200): raise Exception(ret.data) return ret -class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = UserCredential.objects.select_related().all() - serializer_class = UserCredentialSerializer - id_serializer_class = UserCredentialIdSerializer +class SiteDeploymentDetail(PlanetStackRetrieveUpdateDestroyAPIView): + queryset = SiteDeployment.objects.select_related().all() + serializer_class = SiteDeploymentSerializer + id_serializer_class = SiteDeploymentIdSerializer def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4806,7 +5538,66 @@ class UserCredentialDetail(PlanetStackRetrieveUpdateDestroyAPIView): return self.serializer_class def get_queryset(self): - return UserCredential.select_by_user(self.request.user) + return SiteDeployment.select_by_user(self.request.user) + + # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView + + + +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','role',) + + 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 DeploymentRole.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(DeploymentRoleList, self).create(request, *args, **kwargs) + else: + raise Exception("failed obj.can_update") + + ret = super(DeploymentRoleList, 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 + + 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 DeploymentRole.select_by_user(self.request.user) # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView @@ -4814,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','tenant_id',) + 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) @@ -4829,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) @@ -4841,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) @@ -4865,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 @@ -4937,7 +5728,7 @@ class NetworkTemplateList(generics.ListCreateAPIView): serializer_class = NetworkTemplateSerializer id_serializer_class = NetworkTemplateIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','guaranteedBandwidth','visibility','translation','sharedNetworkName','sharedNetworkId','topologyKind','controllerKind',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','description','guaranteed_bandwidth','visibility','translation','shared_network_name','shared_network_id','topology_kind','controller_kind',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) @@ -4996,7 +5787,7 @@ class RouterList(generics.ListCreateAPIView): serializer_class = RouterSerializer id_serializer_class = RouterIdSerializer filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','owner',) + filter_fields = ('id','created','updated','enacted','backend_status','deleted','name','owner','networks','networks',) def get_serializer_class(self): no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False)