CORD-1244 cleanup use of get_tenant/get_service

Change-Id: I004fbd98eff478951d0f03a39eb8fd9cf82bea69
diff --git a/xos/admin.py b/xos/admin.py
index 9973bc9..c7aa42c 100644
--- a/xos/admin.py
+++ b/xos/admin.py
@@ -45,6 +45,6 @@
                            ) #('hpctools.html', 'top', 'tools') )
 
     def get_queryset(self, request):
-        return VTNService.get_service_objects_by_user(request.user)
+        return VTNService.select_by_user(request.user)
 
 admin.site.register(VTNService, VTNServiceAdmin)
diff --git a/xos/api/service/vtn.py b/xos/api/service/vtn.py
index d78e1a9..862ca97 100644
--- a/xos/api/service/vtn.py
+++ b/xos/api/service/vtn.py
@@ -105,7 +105,7 @@
 
     # these are just because ViewSet needs some queryset and model, even if we don't use the
     # default endpoints
-    queryset = VTNService.get_service_objects().all()
+    queryset = VTNService.objects.all()
     model = VTNService
     serializer_class = VTNServiceSerializer