chore(helmbroker): add bind

Author: lijianguo

rootfs/helmbroker/broker.py

@@ -6,8 +6,10 @@
 from openbrokerapi.catalog import ServicePlan
 from openbrokerapi.service_broker import *
 
-from .utils import get_instance_path, get_chart_path, get_plan_path, get_addon_path
-from .tasks import provision
+from .meta import InstanceMeta
+from .utils import get_instance_path, get_chart_path, get_plan_path, \
+    get_addon_path, get_addon_name
+from .tasks import provision, bind
 from helmbroker.loader import read_addons_file
 
 
@@ -17,26 +19,7 @@ def catalog(self) -> Union[Service, List[Service]]:
         services = read_addons_file()
         return [Service(
             **addons
-        ) for _,addons in services.items()]
-        # return Service(
-        #     id='server',
-        #     name='server',
-        #     description='service description',
-        #     bindable=True,
-        #     plans=[
-        #         ServicePlan(
-        #             id='server-1:1-1',
-        #             name='1-1',
-        #             description='plan description',
-        #         ),
-        #         ServicePlan(
-        #             id='server-2:2-2',
-        #             name='2-2',
-        #             description='plan description',
-        #         )
-        #     ],
-        #     plan_updateable=True,
-        # )
+        ) for _, addons in services.items()]
 
     def provision(self,
                   instance_id: str,
@@ -54,9 +37,9 @@ def provision(self,
         shutil.copy(addon_chart_path, chart_path)
         shutil.copy(addon_plan_path, plan_path)
         if async_allowed:
-            provision.delay(instance_id, details. async_allowed, **kwargs)
+            provision.delay(instance_id, details, async_allowed, **kwargs)
             return ProvisionedServiceSpec(state=ProvisionState.IS_ASYNC)
-        return provision(instance_id, details. async_allowed, **kwargs)
+        return provision(instance_id, details, async_allowed, **kwargs)
 
     def get_binding(self,
                     instance_id: str,
@@ -72,7 +55,21 @@ def bind(self,
              async_allowed: bool,
              **kwargs
              ) -> Binding:
-        return Binding(credentials={"url": "postgres://1.1.1.1", "passwd": "123"})
+
+        if not (InstanceMeta.load(instance_id) and
+                InstanceMeta.load(instance_id)['last_operation']['state'] == 'Ready'):
+            return Binding(state="status error: this instance is not ready")
+
+        instance_path = get_instance_path(instance_id)
+        if os.path.exists(f'{instance_path}/bind.yaml'):
+            return Binding(state=BindState.IDENTICAL_ALREADY_EXISTS)
+        chart_path, plan_path =get_chart_path(instance_id), get_plan_path(instance_id)
+        addon_name = get_addon_name(details.service_id)
+        shutil.copy(f'{plan_path}/bind.yaml', f'{chart_path}/{addon_name}/templates')
+        if async_allowed:
+            bind.delay(instance_id, binding_id, details, async_allowed, **kwargs)
+            return Binding(state=BindState.IS_ASYNC)
+        return bind(instance_id, binding_id, details, async_allowed, **kwargs)
 
     def unbind(self,
                instance_id: str,

rootfs/helmbroker/loader.py

@@ -21,6 +21,8 @@ def download_file(url, dest):
 
 def read_addons_file():
     data = read_file(f'{ADDONS_PATH}/addons.yaml')
+    if not data:
+        return {}
     addons_info = yaml.load(data, Loader=yaml.Loader)
     return addons_info
 
@@ -69,8 +71,7 @@ def addons_meta_file():
             plans_meta.append(meta_file.split('/')[1:])
     addons_dict = {}
     for addon_meta in addons_meta:
-        with open(f'{ADDONS_PATH}/{"/".join(addon_meta)}',
-                  'r') as f:
+        with open(f'{ADDONS_PATH}/{"/".join(addon_meta)}', 'r') as f:
             meta = yaml.load(f.read(), Loader=yaml.Loader)
             meta['plans'] = []
             addons_dict[meta['name']] = meta

rootfs/helmbroker/tasks.py

@@ -1,14 +1,14 @@
 import os
 import shutil
-from .utils import command, get_plan_path, get_chart_path, get_or_create_instance_meta
+from .utils import command, get_plan_path, get_chart_path, \
+    get_or_create_instance_meta, get_or_create_binding_meta
 from openbrokerapi.service_broker import *
 
 
-def provision(iself,
-                  instance_id: str,
-                  details: ProvisionDetails,
-                  async_allowed: bool,
-                  **kwargs) -> ProvisionedServiceSpec:
+def provision(instance_id: str,
+              details: ProvisionDetails,
+              async_allowed: bool,
+              **kwargs) -> ProvisionedServiceSpec:
     chart_path = get_chart_path(instance_id)
     values_file =  os.path.join(get_plan_path(instance_id), "values.yaml")
     args = [
@@ -33,4 +33,30 @@ def provision(iself,
             dashboard_url=config.get("dashboard_url", None),
             state=ProvisionState.SUCCESSFUL_CREATED,
             operation=config.get("operation", None),
-        )
+        )
+
+
+def bind(instance_id: str,
+         binding_id: str,
+         details: BindDetails,
+         async_allowed: bool,
+         **kwargs) -> Binding:
+    chart_path = get_chart_path(instance_id)
+    values_file =  os.path.join(get_plan_path(instance_id), "values.yaml")
+    args = [
+        "template",
+        details.context["instance_name"],
+        chart_path,
+        "-f",
+        values_file
+    ]
+    status, output = command("helm", *args)  # templates.yaml
+    if status != 0:
+        return Binding(state="status error: %s" % status, operation=output)
+    else:
+        config = get_or_create_binding_meta(binding_id, output.split('bind.yaml')[1])
+        return Binding(
+            credentials=config.get("credential", None),
+            state=ProvisionState.SUCCESSFUL_CREATED,
+            operation=config.get("operation", None),
+        )

rootfs/helmbroker/utils.py

@@ -3,7 +3,8 @@
 import json
 import subprocess
 
-from .config import INSTANCES_PATH
+from .config import INSTANCES_PATH, ADDONS_PATH
+from .loader import read_addons_file
 
 
 def command(cmd, *args, output_type="text"):
@@ -19,9 +20,29 @@ def command(cmd, *args, output_type="text"):
 get_chart_path = lambda instance_id: os.path.join(get_instance_path(instance_id), "chart")
 get_plan_path = lambda instance_id: os.path.join(get_instance_path(instance_id), "plan")
 
+
 def get_addon_path(service_id, plan_id):
-    return ""
+    services = read_addons_file()
+    service = [addon for addon in [addons for _, addons in services.items()]
+               if addon['id'] == service_id][0]
+    plan = [plan for plan in service['plans'] if plan['id'] == plan_id][0]
+    service_name = f'{service["name"]}-{service["version"]}'
+    plan_name = plan['name']
+    service_path = f'{ADDONS_PATH}/{service_name}'
+    plan_path = f'{service_path}/plans/{plan_name}'
+    return service_path, plan_path
+
+
+def get_addon_name(service_id):
+    services = read_addons_file()
+    service = [addon for addon in [addons for _, addons in services.items()]
+               if addon['id'] == service_id][0]
+    return service['name']
 
 
 def get_or_create_instance_meta(instance_id):
+    pass
+
+
+def get_or_create_binding_meta(binding_id, credential):
     pass