CORD-1244 cleanup use of get_tenant/get_service
Change-Id: I89474025859ad0d0faf148b5c25706035908c71f
diff --git a/xos/admin.py b/xos/admin.py
index 5ab2f1c..d485b9a 100644
--- a/xos/admin.py
+++ b/xos/admin.py
@@ -43,7 +43,7 @@
)
def get_queryset(self, request):
- return ONOSService.get_service_objects_by_user(request.user)
+ return ONOSService.select_by_user(request.user)
class ONOSAppForm(forms.ModelForm):
def __init__(self,*args,**kwargs):
@@ -55,7 +55,7 @@
self.fields['kind'].initial = ONOS_KIND
self.fields['creator'].initial = get_request().user
if ONOSService.objects.exists():
- self.fields["provider_service"].initial = ONOSService.get_service_objects().all()[0]
+ self.fields["provider_service"].initial = ONOSService.objects.all()[0]
def save(self, commit=True):
return super(ONOSAppForm, self).save(commit=commit)
@@ -77,7 +77,7 @@
suit_form_tabs = (('general','Details'), ('tenantattrs', 'Attributes'))
def get_queryset(self, request):
- return ONOSApp.get_tenant_objects_by_user(request.user)
+ return ONOSApp.select_by_user(request.user)
admin.site.register(ONOSService, ONOSServiceAdmin)
admin.site.register(ONOSApp, ONOSAppAdmin)