From 6b79bd3cbdc4eaf196fc0dadd0631badfbe521cc Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sat, 3 Jan 2015 17:37:36 -0500 Subject: [PATCH] removing ControllerSiteDeployment object. Move tenant_id field to SiteDeployments model --- planetstack/core/models/__init__.py | 2 +- planetstack/genapi.py | 103 ---------------------------- 2 files changed, 1 insertion(+), 104 deletions(-) diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py index d0f1744..3a63602 100644 --- a/planetstack/core/models/__init__.py +++ b/planetstack/core/models/__init__.py @@ -5,7 +5,7 @@ from .service import Service from .service import ServiceAttribute from .tag import Tag from .role import Role -from .site import Site, Deployment, DeploymentRole, DeploymentPrivilege, Controller, ControllerRole, ControllerPrivilege, SiteDeployments, ControllerSiteDeployments +from .site import Site, Deployment, DeploymentRole, DeploymentPrivilege, Controller, ControllerRole, ControllerPrivilege, SiteDeployments from .dashboard import DashboardView, ControllerDashboardView from .user import User, UserDashboardView from .serviceclass import ServiceClass diff --git a/planetstack/genapi.py b/planetstack/genapi.py index 9b5112d..00a5c94 100644 --- a/planetstack/genapi.py +++ b/planetstack/genapi.py @@ -101,9 +101,6 @@ def get_REST_patterns(): url(r'plstackapi/usableobjects/$', UsableObjectList.as_view(), name='usableobject-list'), url(r'plstackapi/usableobjects/(?P[a-zA-Z0-9\-]+)/$', UsableObjectDetail.as_view(), name ='usableobject-detail'), - url(r'plstackapi/controllersitedeploymentses/$', ControllerSiteDeploymentsList.as_view(), name='controllersitedeployments-list'), - url(r'plstackapi/controllersitedeploymentses/(?P[a-zA-Z0-9\-]+)/$', ControllerSiteDeploymentsDetail.as_view(), name ='controllersitedeployments-detail'), - url(r'plstackapi/site_roles/$', SiteRoleList.as_view(), name='siterole-list'), url(r'plstackapi/site_roles/(?P[a-zA-Z0-9\-]+)/$', SiteRoleDetail.as_view(), name ='siterole-detail'), @@ -1166,44 +1163,6 @@ class UsableObjectIdSerializer(XOSModelSerializer): model = UsableObject fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','name',) - - - -class ControllerSiteDeploymentsSerializer(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 = ControllerSiteDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_deployment','tenant_id',) - -class ControllerSiteDeploymentsIdSerializer(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 = ControllerSiteDeployments - fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','backend_status','deleted','controller','site_deployment','tenant_id',) - - - - class SiteRoleSerializer(serializers.HyperlinkedModelSerializer): id = IdField() @@ -2434,8 +2393,6 @@ serializerLookUp = { UsableObject: UsableObjectSerializer, - ControllerSiteDeployments: ControllerSiteDeploymentsSerializer, - SiteRole: SiteRoleSerializer, SliceCredential: SliceCredentialSerializer, @@ -3852,66 +3809,6 @@ class UsableObjectDetail(PlanetStackRetrieveUpdateDestroyAPIView): # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView - -class ControllerSiteDeploymentsList(generics.ListCreateAPIView): - queryset = ControllerSiteDeployments.objects.select_related().all() - serializer_class = ControllerSiteDeploymentsSerializer - id_serializer_class = ControllerSiteDeploymentsIdSerializer - filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ('id','created','updated','enacted','backend_status','deleted','controller','site_deployment','tenant_id',) - - def get_serializer_class(self): - no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) - if (no_hyperlinks): - return self.id_serializer_class - else: - return self.serializer_class - - def get_queryset(self): - return ControllerSiteDeployments.select_by_user(self.request.user) - - def create(self, request, *args, **kwargs): - serializer = self.get_serializer(data=request.DATA, files=request.FILES) - if not (serializer.is_valid()): - response = {"error": "validation", - "specific_error": "not serializer.is_valid()", - "reasons": serializer.errors} - return Response(response, status=status.HTTP_400_BAD_REQUEST) - obj = serializer.object - obj.caller = request.user - if obj.can_update(request.user): - return super(ControllerSiteDeploymentsList, self).create(request, *args, **kwargs) - else: - raise Exception("failed obj.can_update") - - ret = super(ControllerSiteDeploymentsList, self).create(request, *args, **kwargs) - if (ret.status_code%100 != 200): - raise Exception(ret.data) - - return ret - - -class ControllerSiteDeploymentsDetail(PlanetStackRetrieveUpdateDestroyAPIView): - queryset = ControllerSiteDeployments.objects.select_related().all() - serializer_class = ControllerSiteDeploymentsSerializer - id_serializer_class = ControllerSiteDeploymentsIdSerializer - - def get_serializer_class(self): - no_hyperlinks = self.request.QUERY_PARAMS.get('no_hyperlinks', False) - if (no_hyperlinks): - return self.id_serializer_class - else: - return self.serializer_class - - def get_queryset(self): - return ControllerSiteDeployments.select_by_user(self.request.user) - - # update() is handled by PlanetStackRetrieveUpdateDestroyAPIView - - # destroy() is handled by PlanetStackRetrieveUpdateDestroyAPIView - - - class SiteRoleList(generics.ListCreateAPIView): queryset = SiteRole.objects.select_related().all() serializer_class = SiteRoleSerializer -- 2.43.0