Merge pull request #224 from RedHatInsights/fix_extend

Look up ns pool when releasing/extending

bonfire/namespaces.py

@@ -275,15 +275,15 @@ def reserve_namespace(name, requester, duration, pool, timeout, local=True):
     return Namespace(name=ns_name)
 
 
-def release_reservation(name=None, namespace=None, pool=None, local=True):
+def release_reservation(name=None, namespace=None, local=True):
     res = get_reservation(name=name, namespace=namespace)
     if res:
         res_name = res["metadata"]["name"]
         res_config = process_reservation(
             res["metadata"]["name"],
             res["spec"]["requester"],
             "0s",  # on release set duration to 0s
-            pool=pool if pool else "unknown",
+            pool=res["spec"].get("pool"),
             local=local,
         )
 
@@ -313,6 +313,7 @@ def extend_namespace(namespace, duration, local=True):
             res["metadata"]["name"],
             res["spec"]["requester"],
             _duration_fmt(new_duration),
+            pool=res["spec"].get("pool"),
             local=local,
         )
 

bonfire/processor.py

@@ -170,7 +170,7 @@ def process_iqe_cji(
     return processed_template
 
 
-def process_reservation(name, requester, duration, pool, template_path=None, local=True):
+def process_reservation(name, requester, duration, pool=None, template_path=None, local=True):
     log.info("processing namespace reservation")
 
     template_path = Path(template_path if template_path else conf.DEFAULT_RESERVATION_TEMPLATE)
@@ -194,7 +194,7 @@ def process_reservation(name, requester, duration, pool, template_path=None, loc
             requester = "bonfire"
 
     params["REQUESTER"] = requester
-    params["POOL"] = pool
+    params["POOL"] = pool if pool else "default"
 
     processed_template = _process_template(template_data, params=params, local=local)