commit 1bfb91b2733fc4eac076f6b08a70be2b19f5eae5
author Scott Baker <smbaker@gmail.com> Mon Mar 20 11:00:23 2017 -0700
committer Scott Baker <smbaker@gmail.com> Mon Mar 20 11:22:22 2017 -0700
tree 842ad3e7a34f98824c5302fcaf9b0318838b2510
parent 333548104787ce8b5df044f855a70c5f347f3fb3

CORD-1057 remove ExampleService reference to CoarseTenant

Change-Id: I438a1bdce2b9c0d02b9c21bfaf3294754fadbe30

xos/synchronizer/steps/sync_exampletenant.py

diff --git a/xos/synchronizer/steps/sync_exampletenant.py b/xos/synchronizer/steps/sync_exampletenant.py
index bb40a86..47c045f 100644
--- a/xos/synchronizer/steps/sync_exampletenant.py
+++ b/xos/synchronizer/steps/sync_exampletenant.py
@@ -21,7 +21,7 @@
 
     service_key_name = "/opt/xos/synchronizers/exampleservice/exampleservice_private_key"
 
-    watches = [ModelLink(CoarseTenant,via='coarsetenant'), ModelLink(ServiceMonitoringAgentInfo,via='monitoringagentinfo')]
+    watches = [ModelLink(ServiceDependency,via='servicedependency'), ModelLink(ServiceMonitoringAgentInfo,via='monitoringagentinfo')]
 
     def __init__(self, *args, **kwargs):
         super(SyncExampleTenant, self).__init__(*args, **kwargs)

xos/tosca/resources/exampleservice.py

diff --git a/xos/tosca/resources/exampleservice.py b/xos/tosca/resources/exampleservice.py
index 5d2e721..1e5a702 100644
--- a/xos/tosca/resources/exampleservice.py
+++ b/xos/tosca/resources/exampleservice.py
@@ -1,29 +1,9 @@
-from xosresource import XOSResource
-from core.models import Service, User, CoarseTenant
+from service import XOSService
 from services.exampleservice.models import ExampleService
 
-class XOSExampleService(XOSResource):
+class XOSExampleService(XOSService):
     provides = "tosca.nodes.ExampleService"
     xos_model = ExampleService
     copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "private_key_fn", "versionNumber", "service_message"]
 
-    def postprocess(self, obj):
-        for provider_service_name in self.get_requirements("tosca.relationships.TenantOfService"):
-            provider_service = self.get_xos_object(ExampleService, name=provider_service_name)
-
-            existing_tenancy = CoarseTenant.get_tenant_objects().filter(provider_service = provider_service, subscriber_service = obj)
-            if existing_tenancy:
-                self.info("Tenancy relationship from %s to %s already exists" % (str(obj), str(provider_service)))
-            else:
-                tenancy = CoarseTenant(provider_service = provider_service,
-                                       subscriber_service = obj)
-                tenancy.save()
-
-                self.info("Created Tenancy relationship  from %s to %s" % (str(obj), str(provider_service)))
-
-    def can_delete(self, obj):
-        if obj.slices.exists():
-            self.info("Service %s has active slices; skipping delete" % obj.name)
-            return False
-        return super(XOSExampleService, self).can_delete(obj)