fixup

Author: duanhongyi

rootfs/helmbroker/broker.py

@@ -7,7 +7,7 @@
     ErrBindingAlreadyExists, ErrBadRequest, ErrInstanceDoesNotExist
 from openbrokerapi.service_broker import *
 
-from .meta import load_instance_meta
+from .meta import load_instance_meta, dump_binding_meta
 from .utils import get_instance_path, get_chart_path, get_plan_path, \
     get_addon_path, get_addon_name
 from .tasks import provision, bind, deprovision
@@ -55,7 +55,7 @@ def bind(self,
              async_allowed: bool,
              **kwargs
              ) -> Binding:
-        instance_meta = load_instance_meta(instance_id)
+        instance_meta = dump_binding_meta(instance_id)
         if not (instance_meta and
                 instance_meta['last_operation']['state'] == 'Ready'):
             raise ErrBadRequest(msg="This instance %s is not ready" % instance_id)
@@ -107,7 +107,7 @@ def last_operation(self,
                        operation_data: Optional[str],
                        **kwargs
                        ) -> LastOperation:
-        data = load_instance_meta()
+        data = load_instance_meta(instance_id)
         return LastOperation(
             data["last_operation"]["state"],
             data["last_operation"]["description"]

rootfs/helmbroker/meta.py

@@ -3,8 +3,6 @@
 from jsonschema import validate
 from .config import INSTANCES_PATH
 
-INSTANCE_META_FILE = os.path.join(INSTANCES_PATH, "instance.json")
-BINDING_META_FILE = os.path.join(INSTANCES_PATH, "binding.yaml")
 
 INSTANCE_META_SCHEMA = {
     "type": "object",
@@ -30,14 +28,16 @@
 }
 
 
-def load_instance_meta(file=INSTANCE_META_FILE):
+def load_instance_meta(instance_id):
+    file = os.path.join(INSTANCES_PATH, instance_id, "instance.json")
     with open(file) as f:
         data = json.load(f)
         validate(instance=data, schema=INSTANCE_META_SCHEMA)
         return data
 
 
-def dump_instance_meta(data, file=INSTANCE_META_FILE):
+def dump_instance_meta(instance_id, data):
+    file = os.path.join(INSTANCES_PATH, instance_id, "instance.json")
     validate(instance=data, schema=INSTANCE_META_SCHEMA)
     with open(file, "w") as f:
         json.dump(f, data)
@@ -61,14 +61,16 @@ def dump_instance_meta(data, file=INSTANCE_META_FILE):
 }
 
 
-def load_binding_meta(file=BINDING_META_FILE):
+def load_binding_meta(instance_id):
+    file = os.path.join(INSTANCES_PATH, instance_id, "binding.yaml")
     with open(file, 'r') as f:
         data = json.loads(f.read())
         validate(instance=data, schema=INSTANCE_META_SCHEMA)
         return data
 
 
-def dump_binding_meta(data, file=BINDING_META_FILE):
+def dump_binding_meta(instance_id, data):
+    file = os.path.join(INSTANCES_PATH, instance_id, "binding.yaml")
     validate(instance=data, schema=INSTANCE_META_SCHEMA)
     with open(file, "w") as f:
         f.write(json.dumps(data))

rootfs/helmbroker/tasks.py

@@ -3,7 +3,7 @@
 import yaml
 
 from .utils import command, get_plan_path, get_chart_path, get_cred_value
-from .meta import dump_instance_meta
+from .meta import dump_instance_meta, dump_binding_meta
 from openbrokerapi.service_broker import *
 
 
@@ -21,7 +21,7 @@ def provision(instance_id: str, details: ProvisionDetails):
             "description": "%s in progress at %s" % (instance_id, time.time())
         }
     }
-    dump_instance_meta(data)
+    dump_instance_meta(instance_id, data)
     chart_path = get_chart_path(instance_id)
     values_file =  os.path.join(get_plan_path(instance_id), "values.yaml")
     args = [
@@ -60,7 +60,7 @@ def bind(instance_id: str,
             "description": "%s in progress at %s" % (binding_id, time.time())
         }
     }
-    dump_instance_meta(data)
+    dump_binding_meta(instance_id, data)
 
     chart_path = get_chart_path(instance_id)
     values_file =  os.path.join(get_plan_path(instance_id), "values.yaml")
@@ -93,7 +93,7 @@ def bind(instance_id: str,
             'state': OperationState.FAILED,
             'description': OperationState.FAILED,
         }
-    dump_instance_meta(data)
+    dump_binding_meta(instance_id, data)
 
 
 def deprovision(instance_id: str, details: DeprovisionDetails):