CORD-1250 Update to new Service/Tenancy models

Change-Id: I37e73892af3d33163d60cc0095d9bf8368ec3e22
diff --git a/xos/synchronizer/steps/sync_onosapp.py b/xos/synchronizer/steps/sync_onosapp.py
index ae9c5d7..e26cc1e 100644
--- a/xos/synchronizer/steps/sync_onosapp.py
+++ b/xos/synchronizer/steps/sync_onosapp.py
@@ -42,10 +42,10 @@
         return None
 
     def get_onos_service(self, o):
-        if not o.provider_service:
+        if not o.owner:
             return None
 
-        onoses = ONOSService.objects.filter(id=o.provider_service.id)
+        onoses = ONOSService.objects.filter(id=o.owner.id)
         if not onoses:
             return None
 
@@ -115,7 +115,7 @@
 
         # Combine the service attributes with the tenant attributes. Tenant
         # attribute can override service attributes.
-        attrs = o.provider_service.serviceattribute_dict
+        attrs = o.owner.serviceattribute_dict
         attrs.update(o.tenantattribute_dict)
 
         ordered_attrs = attrs.keys()