CORD-879 eliminate proxy Subscriber and Provider objects
Change-Id: I51f6b779892f671d4e38dbc37ee0268993aed65d
diff --git a/xos/core/models/__init__.py b/xos/core/models/__init__.py
index f5b4213..095a37d 100644
--- a/xos/core/models/__init__.py
+++ b/xos/core/models/__init__.py
@@ -2,7 +2,7 @@
from .project import Project
from .singletonmodel import SingletonModel
from .xosmodel import XOS, XOSVolume
-from .service import Service, Tenant, TenantWithContainer, ServiceDependency, ServicePrivilege, TenantRoot, TenantRootPrivilege, TenantRootRole, TenantPrivilege, TenantRole, Subscriber, Provider
+from .service import Service, Tenant, TenantWithContainer, ServiceDependency, ServicePrivilege, TenantRoot, TenantRootPrivilege, TenantRootRole, TenantPrivilege, TenantRole
from .service import ServiceAttribute, TenantAttribute, ServiceRole, ServiceMonitoringAgentInfo
from .service import ServiceController, ServiceControllerResource, LoadableModule, LoadableModuleResource, Library
from .service import XOSComponent, XOSComponentLink, XOSComponentVolume, XOSComponentVolumeContainer
diff --git a/xos/core/models/service.py b/xos/core/models/service.py
index bc5f370..08a5834 100644
--- a/xos/core/models/service.py
+++ b/xos/core/models/service.py
@@ -1005,24 +1005,6 @@
super(ServiceDependency, self).save()
-class Subscriber(TenantRoot):
- """ Intermediate class for TenantRoots that are to be Subscribers """
-
- class Meta:
- proxy = True
-
- KIND = "Subscriber"
-
-
-class Provider(TenantRoot):
- """ Intermediate class for TenantRoots that are to be Providers """
-
- class Meta:
- proxy = True
-
- KIND = "Provider"
-
-
class TenantAttribute(PlCoreBase):
name = models.CharField(help_text="Attribute Name", max_length=128)
value = models.TextField(help_text="Attribute Value")
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 924dfa8..03f16bd 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -608,14 +608,6 @@
xos_base_props
xos_base_service_props
- tosca.nodes.Subscriber:
- derived_from: tosca.nodes.Root
- description: XOS subscriber base class.
- capabilities:
- xos_base_subscriber_caps
- properties:
- xos_base_subscriber_props
-
tosca.nodes.CORDSubscriber:
derived_from: tosca.nodes.Root
description: >
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 7c96180..8439771 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -1199,22 +1199,6 @@
required: false
description: Version number of Service.
- tosca.nodes.Subscriber:
- derived_from: tosca.nodes.Root
- description: XOS subscriber base class.
- capabilities:
- subscriber:
- type: tosca.capabilities.xos.Subscriber
- properties:
- kind:
- type: string
- default: generic
- description: Kind of subscriber
- service_specific_id:
- type: string
- required: false
- description: Service specific ID opaque to XOS but meaningful to service
-
tosca.nodes.CORDSubscriber:
derived_from: tosca.nodes.Root
description: >
diff --git a/xos/tosca/resources/subscriber.py b/xos/tosca/resources/subscriber.py
deleted file mode 100644
index f69a3be..0000000
--- a/xos/tosca/resources/subscriber.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from xosresource import XOSResource
-from core.models import Subscriber
-
-class XOSSubscriber(XOSResource):
- provides = "tosca.nodes.Subscriber"
- xos_model = Subscriber
- copyin_props = ["service_specific_id"]
-
- def postprocess(self, obj):
- pass
-
- def can_delete(self, obj):
- return super(XOSService, self).can_delete(obj)
-
diff --git a/xos/tosca/resources/tenant.py b/xos/tosca/resources/tenant.py
index 221c288..716008a 100644
--- a/xos/tosca/resources/tenant.py
+++ b/xos/tosca/resources/tenant.py
@@ -2,7 +2,7 @@
from xosresource import XOSResource
from toscaparser.tosca_template import ToscaTemplate
-from core.models import Tenant, Service, Subscriber
+from core.models import Tenant, Service, TenantRoot
class XOSTenant(XOSResource):
provides = "tosca.nodes.Tenant"
@@ -18,7 +18,7 @@
subscriber_name = self.get_requirement("tosca.relationships.BelongsToSubscriber")
if subscriber_name:
- args["subscriber_root"] = self.get_xos_object(Subscriber, throw_exception=throw_exception,
+ args["subscriber_root"] = self.get_xos_object(TenantRoot, throw_exception=throw_exception,
name=subscriber_name)
tenant_name = self.get_requirement("tosca.relationships.BelongsToTenant")
diff --git a/xos/xos/xosapi.py b/xos/xos/xosapi.py
index f2bd621..594768a 100644
--- a/xos/xos/xosapi.py
+++ b/xos/xos/xosapi.py
@@ -138,9 +138,6 @@
url(r'xos/site_roles/$', SiteRoleList.as_view(), name='siterole-list-legacy'),
url(r'xos/site_roles/(?P<pk>[a-zA-Z0-9\-]+)/$', SiteRoleDetail.as_view(), name ='siterole-detail-legacy'),
- url(r'xos/subscribers/$', SubscriberList.as_view(), name='subscriber-list-legacy'),
- url(r'xos/subscribers/(?P<pk>[a-zA-Z0-9\-]+)/$', SubscriberDetail.as_view(), name ='subscriber-detail-legacy'),
-
url(r'xos/instances/$', InstanceList.as_view(), name='instance-list-legacy'),
url(r'xos/instances/(?P<pk>[a-zA-Z0-9\-]+)/$', InstanceDetail.as_view(), name ='instance-detail-legacy'),
@@ -186,9 +183,6 @@
url(r'xos/reservedresources/$', ReservedResourceList.as_view(), name='reservedresource-list-legacy'),
url(r'xos/reservedresources/(?P<pk>[a-zA-Z0-9\-]+)/$', ReservedResourceDetail.as_view(), name ='reservedresource-detail-legacy'),
- url(r'xos/providers/$', ProviderList.as_view(), name='provider-list-legacy'),
- url(r'xos/providers/(?P<pk>[a-zA-Z0-9\-]+)/$', ProviderDetail.as_view(), name ='provider-detail-legacy'),
-
url(r'xos/usercredentials/$', UserCredentialList.as_view(), name='usercredential-list-legacy'),
url(r'xos/usercredentials/(?P<pk>[a-zA-Z0-9\-]+)/$', UserCredentialDetail.as_view(), name ='usercredential-detail-legacy'),
@@ -391,9 +385,6 @@
url(r'api/core/site_roles/$', SiteRoleList.as_view(), name='siterole-list'),
url(r'api/core/site_roles/(?P<pk>[a-zA-Z0-9\-]+)/$', SiteRoleDetail.as_view(), name ='siterole-detail'),
- url(r'api/core/subscribers/$', SubscriberList.as_view(), name='subscriber-list'),
- url(r'api/core/subscribers/(?P<pk>[a-zA-Z0-9\-]+)/$', SubscriberDetail.as_view(), name ='subscriber-detail'),
-
url(r'api/core/instances/$', InstanceList.as_view(), name='instance-list'),
url(r'api/core/instances/(?P<pk>[a-zA-Z0-9\-]+)/$', InstanceDetail.as_view(), name ='instance-detail'),
@@ -439,9 +430,6 @@
url(r'api/core/reservedresources/$', ReservedResourceList.as_view(), name='reservedresource-list'),
url(r'api/core/reservedresources/(?P<pk>[a-zA-Z0-9\-]+)/$', ReservedResourceDetail.as_view(), name ='reservedresource-detail'),
- url(r'api/core/providers/$', ProviderList.as_view(), name='provider-list'),
- url(r'api/core/providers/(?P<pk>[a-zA-Z0-9\-]+)/$', ProviderDetail.as_view(), name ='provider-detail'),
-
url(r'api/core/usercredentials/$', UserCredentialList.as_view(), name='usercredential-list'),
url(r'api/core/usercredentials/(?P<pk>[a-zA-Z0-9\-]+)/$', UserCredentialDetail.as_view(), name ='usercredential-detail'),
@@ -579,7 +567,6 @@
'serviceclasses': reverse('serviceclass-list-legacy', request=request, format=format),
'tenantattributes': reverse('tenantattribute-list-legacy', request=request, format=format),
'siteroles': reverse('siterole-list-legacy', request=request, format=format),
- 'subscribers': reverse('subscriber-list-legacy', request=request, format=format),
'instances': reverse('instance-list-legacy', request=request, format=format),
'charges': reverse('charge-list-legacy', request=request, format=format),
'programs': reverse('program-list-legacy', request=request, format=format),
@@ -595,7 +582,6 @@
'imagedeploymentses': reverse('imagedeployments-list-legacy', request=request, format=format),
'controllerusers': reverse('controlleruser-list-legacy', request=request, format=format),
'reservedresources': reverse('reservedresource-list-legacy', request=request, format=format),
- 'providers': reverse('provider-list-legacy', request=request, format=format),
'usercredentials': reverse('usercredential-list-legacy', request=request, format=format),
'controllerdashboardviews': reverse('controllerdashboardview-list-legacy', request=request, format=format),
'userdashboardviews': reverse('userdashboardview-list-legacy', request=request, format=format),
@@ -668,7 +654,6 @@
'serviceclasses': reverse('serviceclass-list', request=request, format=format),
'tenantattributes': reverse('tenantattribute-list', request=request, format=format),
'siteroles': reverse('siterole-list', request=request, format=format),
- 'subscribers': reverse('subscriber-list', request=request, format=format),
'instances': reverse('instance-list', request=request, format=format),
'charges': reverse('charge-list', request=request, format=format),
'programs': reverse('program-list', request=request, format=format),
@@ -684,7 +669,6 @@
'imagedeploymentses': reverse('imagedeployments-list', request=request, format=format),
'controllerusers': reverse('controlleruser-list', request=request, format=format),
'reservedresources': reverse('reservedresource-list', request=request, format=format),
- 'providers': reverse('provider-list', request=request, format=format),
'usercredentials': reverse('usercredential-list', request=request, format=format),
'controllerdashboardviews': reverse('controllerdashboardview-list', request=request, format=format),
'userdashboardviews': reverse('userdashboardview-list', request=request, format=format),
@@ -1691,7 +1675,7 @@
return None
class Meta:
model = ServiceDependency
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','name','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
class ServiceDependencyIdSerializer(XOSModelSerializer):
id = IdField()
@@ -1707,7 +1691,7 @@
return None
class Meta:
model = ServiceDependency
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','name','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
@@ -1957,41 +1941,6 @@
-class SubscriberSerializer(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 = Subscriber
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','name','service_specific_attribute','service_specific_id',)
-
-class SubscriberIdSerializer(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 = Subscriber
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','name','service_specific_attribute','service_specific_id',)
-
-
-
-
class InstanceSerializer(serializers.HyperlinkedModelSerializer):
id = IdField()
@@ -2557,41 +2506,6 @@
-class ProviderSerializer(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 = Provider
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','name','service_specific_attribute','service_specific_id',)
-
-class ProviderIdSerializer(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 = Provider
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','name','service_specific_attribute','service_specific_id',)
-
-
-
-
class UserCredentialSerializer(serializers.HyperlinkedModelSerializer):
id = IdField()
@@ -3012,7 +2926,7 @@
return None
class Meta:
model = Tenant
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','name','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
class TenantIdSerializer(XOSModelSerializer):
id = IdField()
@@ -3028,7 +2942,7 @@
return None
class Meta:
model = Tenant
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','name','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
@@ -3437,7 +3351,7 @@
return None
class Meta:
model = TenantWithContainer
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method','instance','creator','external_hostname','external_container',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','name','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method','instance','creator','external_hostname','external_container',)
class TenantWithContainerIdSerializer(XOSModelSerializer):
id = IdField()
@@ -3453,7 +3367,7 @@
return None
class Meta:
model = TenantWithContainer
- fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method','instance','creator','external_hostname','external_container',)
+ fields = ('humanReadableName', 'validators', 'id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','name','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method','instance','creator','external_hostname','external_container',)
@@ -3927,8 +3841,6 @@
SiteRole: SiteRoleSerializer,
- Subscriber: SubscriberSerializer,
-
Instance: InstanceSerializer,
Charge: ChargeSerializer,
@@ -3959,8 +3871,6 @@
ReservedResource: ReservedResourceSerializer,
- Provider: ProviderSerializer,
-
UserCredential: UserCredentialSerializer,
ControllerDashboardView: ControllerDashboardViewSerializer,
@@ -5213,7 +5123,7 @@
serializer_class = ServiceDependencySerializer
id_serializer_class = ServiceDependencyIdSerializer
filter_backends = (filters.DjangoFilterBackend,)
- filter_fields = ('id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
+ filter_fields = ('id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','name','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
def get_serializer_class(self):
no_hyperlinks=False
@@ -5584,53 +5494,6 @@
-class SubscriberList(XOSListCreateAPIView):
- queryset = Subscriber.objects.select_related().all()
- serializer_class = SubscriberSerializer
- id_serializer_class = SubscriberIdSerializer
- filter_backends = (filters.DjangoFilterBackend,)
- filter_fields = ('id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','name','service_specific_attribute','service_specific_id',)
-
- def get_serializer_class(self):
- no_hyperlinks=False
- if hasattr(self.request,"query_params"):
- 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):
- if (not self.request.user.is_authenticated()):
- raise XOSNotAuthenticated()
- return Subscriber.select_by_user(self.request.user)
-
-
-class SubscriberDetail(XOSRetrieveUpdateDestroyAPIView):
- queryset = Subscriber.objects.select_related().all()
- serializer_class = SubscriberSerializer
- id_serializer_class = SubscriberIdSerializer
-
- def get_serializer_class(self):
- no_hyperlinks=False
- if hasattr(self.request,"query_params"):
- 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):
- if (not self.request.user.is_authenticated()):
- raise XOSNotAuthenticated()
- return Subscriber.select_by_user(self.request.user)
-
- # update() is handled by XOSRetrieveUpdateDestroyAPIView
-
- # destroy() is handled by XOSRetrieveUpdateDestroyAPIView
-
-
-
class InstanceList(XOSListCreateAPIView):
queryset = Instance.objects.select_related().all()
serializer_class = InstanceSerializer
@@ -6336,53 +6199,6 @@
-class ProviderList(XOSListCreateAPIView):
- queryset = Provider.objects.select_related().all()
- serializer_class = ProviderSerializer
- id_serializer_class = ProviderIdSerializer
- filter_backends = (filters.DjangoFilterBackend,)
- filter_fields = ('id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','name','service_specific_attribute','service_specific_id',)
-
- def get_serializer_class(self):
- no_hyperlinks=False
- if hasattr(self.request,"query_params"):
- 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):
- if (not self.request.user.is_authenticated()):
- raise XOSNotAuthenticated()
- return Provider.select_by_user(self.request.user)
-
-
-class ProviderDetail(XOSRetrieveUpdateDestroyAPIView):
- queryset = Provider.objects.select_related().all()
- serializer_class = ProviderSerializer
- id_serializer_class = ProviderIdSerializer
-
- def get_serializer_class(self):
- no_hyperlinks=False
- if hasattr(self.request,"query_params"):
- 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):
- if (not self.request.user.is_authenticated()):
- raise XOSNotAuthenticated()
- return Provider.select_by_user(self.request.user)
-
- # update() is handled by XOSRetrieveUpdateDestroyAPIView
-
- # destroy() is handled by XOSRetrieveUpdateDestroyAPIView
-
-
-
class UserCredentialList(XOSListCreateAPIView):
queryset = UserCredential.objects.select_related().all()
serializer_class = UserCredentialSerializer
@@ -6858,7 +6674,7 @@
serializer_class = TenantSerializer
id_serializer_class = TenantIdSerializer
filter_backends = (filters.DjangoFilterBackend,)
- filter_fields = ('id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
+ filter_fields = ('id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','name','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method',)
def get_serializer_class(self):
no_hyperlinks=False
@@ -7375,7 +7191,7 @@
serializer_class = TenantWithContainerSerializer
id_serializer_class = TenantWithContainerIdSerializer
filter_backends = (filters.DjangoFilterBackend,)
- filter_fields = ('id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method','instance','creator','external_hostname','external_container',)
+ filter_fields = ('id','created','updated','enacted','policed','backend_register','backend_need_delete','backend_need_reap','backend_status','deleted','write_protect','lazy_blocked','no_sync','no_policy','name','kind','provider_service','subscriber_service','subscriber_tenant','subscriber_user','subscriber_root','subscriber_network','service_specific_id','service_specific_attribute','connect_method','instance','creator','external_hostname','external_container',)
def get_serializer_class(self):
no_hyperlinks=False