commit 2d20057fd134e440e5abdc002f7d373e7d7e8a8f
author Scott Baker <smbaker@gmail.com> Thu May 25 10:52:00 2017 -0700
committer Scott Baker <smbaker@gmail.com> Thu May 25 19:46:29 2017 -0700
tree 5273469d9a54e6c6a61cc012e225d6242aba7414
parent baf92789e2a3e1a6bfed07168a68ce5c66c0d7b7

CORD-1244 cleanup use of get_tenant/get_service

Change-Id: I89474025859ad0d0faf148b5c25706035908c71f

xos/api/service/onos.py

diff --git a/xos/api/service/onos.py b/xos/api/service/onos.py
index a143b3d..5861947 100644
--- a/xos/api/service/onos.py
+++ b/xos/api/service/onos.py
@@ -34,7 +34,7 @@
     base_name = "onos"
     method_name = "onos"
     method_kind = "viewset"
-    queryset = ONOSService.get_service_objects().all()
+    queryset = ONOSService.objects.all()
     serializer_class = ONOSServiceSerializer
 
     custom_serializers = {"set_attribute": ServiceAttributeSerializer}

xos/api/tenant/onos/app.py

diff --git a/xos/api/tenant/onos/app.py b/xos/api/tenant/onos/app.py
index d4d3ab0..a93fa0d 100644
--- a/xos/api/tenant/onos/app.py
+++ b/xos/api/tenant/onos/app.py
@@ -11,7 +11,7 @@
 from api.xosapi_helpers import PlusModelSerializer, XOSViewSet, ReadOnlyField
 
 def get_default_onos_service():
-    onos_services = ONOSService.get_service_objects().all()
+    onos_services = ONOSService.objects.all()
     if onos_services:
         return onos_services[0].id
     return None
@@ -52,7 +52,7 @@
         return patterns
 
     def get_queryset(self):
-        queryset = ONOSApp.get_tenant_objects().all()
+        queryset = ONOSApp.objects.all()
 
         # Since name isn't a real database field of the Tenant object, we have
         # to go through some extra work...