commit c6ed1c461a68d00d0ecacbed572492eb914b9a8b
author Scott Baker <smbaker@gmail.com> Tue Jan 29 16:57:10 2019 -0800
committer Scott Baker <smbaker@gmail.com> Fri Feb 01 10:34:03 2019 -0800
tree 3c54780959753829f623d20437eb1239936473df
parent 7f1eacd8cd9ceb62f8631d2c367ab6a18589c844

SEBA-405 Update SimpleExampleService to use synchronizer library

Change-Id: Ibe0d8cd56325cdc2f6f7a4752c4012fad4162121

xos/synchronizer/model_policies/model_policy_simpleexampleserviceinstance.py

diff --git a/xos/synchronizer/model_policies/model_policy_simpleexampleserviceinstance.py b/xos/synchronizer/model_policies/model_policy_simpleexampleserviceinstance.py
index 63db3ef..169024f 100644
--- a/xos/synchronizer/model_policies/model_policy_simpleexampleserviceinstance.py
+++ b/xos/synchronizer/model_policies/model_policy_simpleexampleserviceinstance.py
@@ -16,8 +16,8 @@
 import base64
 import jinja2
 import json
-from synchronizers.new_base.modelaccessor import *
-from synchronizers.new_base.policy import Policy
+import os
+from xossynchronizer.model_policies.policy import Policy
 
 from xosconfig import Config
 from multistructlog import create_logger
@@ -57,8 +57,10 @@
     def handle_update(self, service_instance):
         if not service_instance.compute_instance:
             # TODO: Break dependency
-            compute_service = KubernetesService.objects.first()
-            compute_service_instance_class = Service.objects.get(id=compute_service.id).get_service_instance_class()
+            compute_service = self.model_accessor.KubernetesService.objects.first()
+            compute_service_instance_class = self.model_accessor.Service.objects.get(
+                id=compute_service.id
+            ).get_service_instance_class()
 
             exampleservice = service_instance.owner.leaf_model
 
@@ -74,11 +76,11 @@
 
             # Create a configmap and attach it to the compute instance
             data = {"index.html": self.render_index(service_instance)}
-            cfmap = KubernetesConfigMap(name="simpleexampleserviceinstance-map-%s" % service_instance.id,
+            cfmap = self.model_accessor.KubernetesConfigMap(name="simpleexampleserviceinstance-map-%s" % service_instance.id,
                                       trust_domain=slice.trust_domain,
                                       data=json.dumps(data))
             cfmap.save()
-            cfmap_mnt = KubernetesConfigVolumeMount(config=cfmap,
+            cfmap_mnt = self.model_accessor.KubernetesConfigVolumeMount(config=cfmap,
                                                     service_instance=compute_service_instance,
                                                     mount_path="/usr/local/apache2/htdocs")
             cfmap_mnt.save()
@@ -86,11 +88,14 @@
             # Create a secret and attach it to the compute instance
             data = {"service_secret.txt": base64.b64encode(str(exampleservice.service_secret)),
                     "tenant_secret.txt": base64.b64encode(str(service_instance.tenant_secret))}
-            secret = KubernetesSecret(name="simpleexampleserviceinstance-secret-%s" % service_instance.id,
+            secret = self.model_accessor.KubernetesSecret(name="simpleexampleserviceinstance-secret-%s" % service_instance.id,
                                       trust_domain=slice.trust_domain,
                                       data=json.dumps(data))
             secret.save()
-            secret_mnt = KubernetesSecretVolumeMount(secret=secret, service_instance=compute_service_instance, mount_path="/usr/local/apache2/secrets")
+            secret_mnt = self.model_accessor.KubernetesSecretVolumeMount(
+                secret=secret,
+                service_instance=compute_service_instance,
+                mount_path="/usr/local/apache2/secrets")
             secret_mnt.save()
 
             compute_service_instance.no_sync = False