samweb split to samnova, samgm2, etc.

webservice/FilesPOMS.py

@@ -151,7 +151,8 @@ def campaign_task_files(self, ctx, campaign_stage_id=None, campaign_id=None):
                     [
                         s.project,
                         "%s/station_monitor/%s/stations/%s/projects/%s"
-                        % (ctx.web_config.get("SAM", "sam_base"), cs.experiment, cs.experiment, s.project),
+                        % (ctx.web_config.get("SAM", "sam_base").re
+place("web",cs.experiment).replace("samsamdev","samdev"), cs.experiment, cs.experiment, s.project),
                     ],
                     [s.submission_params and s.submission_params.get("dataset", "-") or "-"],
                     [s.created.strftime("%Y-%m-%d %H:%M"), None],
@@ -745,4 +746,4 @@ def authorize_agent(self, ctx, agent_header):
 
         return True
 
-
+

webservice/samweb_lite.py

@@ -126,7 +126,7 @@ def take_snapshot(self, experiment, defname):
             return -1
 
         res = None
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         url = "%s/sam/%s/api/definitions/name/%s/snapshot" % (base, experiment, defname)
         retries = 3
         for i in range(retries + 1):
@@ -160,7 +160,7 @@ def recovery_dimensions(self, experiment, projid, useprocess=0, dbhandle=None):
         if not experiment or not projid or projid == "None":
             return ""
 
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         url = "%s/sam/%s/api/projects/name/%s/recovery_dimensions?useProcess=%s" % (base, experiment, projid, useprocess)
         with requests.Session() as sess:
             res = safe_get(sess, url, dbhandle=dbhandle)
@@ -178,7 +178,7 @@ def fetch_info(self, experiment, projid, dbhandle=None):
         if self.have_cache(experiment, projid):
             return self.proj_cache[experiment + projid]
 
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         url = "%s/sam/%s/api/projects/name/%s/summary?format=json&process_limit=0" % (base, experiment, projid)
         with requests.Session() as sess:
             res = safe_get(sess, url, dbhandle=dbhandle)
@@ -199,7 +199,7 @@ def fetch_info_list(self, task_list, dbhandle=None):
         base = "%s" % config.get("SAM", "sam_base")
         urls = [
             "%s/sam/%s/api/projects/name/%s/summary?format=json&process_limit=0"
-            % (base, s.campaign_stage_snapshot_obj.experiment, s.project)
+            % (base.replace("web",s.campaign_stage_snapshot_obj.experiment).replace("samsamdev","samdev"), s.campaign_stage_snapshot_obj.experiment, s.project)
             if s.project and s.project != "None"
             else None
             for s in task_list
@@ -274,7 +274,7 @@ def do_totals(self, info):
             del info["processes"]
 
     def update_project_description(self, experiment, projname, desc):
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         url = "%s/sam/%s/api/projects/%s/%s/description" % (base, experiment, experiment, projname)
         res = None
         r1 = None
@@ -315,7 +315,7 @@ def cleanup_dims(self, dims):
         return dims
 
     def get_metadata(self, experiment, filename):
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         url = "%s/sam/%s/api/files/name/%s/metadata?format=json" % (base, experiment, filename)
         res = requests.get(url, verify=False)
         try:
@@ -324,7 +324,7 @@ def get_metadata(self, experiment, filename):
             return {}
 
     def plain_list_files(self, experiment, dims):
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         url = "%s/sam/%s/api/files/list" % (base, experiment)
         flist = []
         dims = self.cleanup_dims(dims)
@@ -342,7 +342,7 @@ def plain_list_files(self, experiment, dims):
         return flist
 
     def list_files(self, experiment, dims, dbhandle=None):
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         url = "%s/sam/%s/api/files/list" % (base, experiment)
         flist = deque()
         dims = self.cleanup_dims(dims)
@@ -357,7 +357,7 @@ def list_files(self, experiment, dims, dbhandle=None):
 
     def count_files(self, experiment, dims, dbhandle=None):
         logit.log("INFO", "count_files(experiment=%s, dims=%s)" % (experiment, dims))
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         url = "%s/sam/%s/api/files/count" % (base, experiment)
         dims = self.cleanup_dims(dims)
         count = -1
@@ -395,7 +395,7 @@ def getit(req, url):
         base = "%s" % config.get("SAM", "sam_base")
         urls = [
             "%s/sam/%s/api/files/count?%s"
-            % (base, experiment[i], urllib.parse.urlencode({"dims": self.cleanup_dims(dims_list[i])}))
+            % (base.replace("web",experiment[i]).replace("samsamdev","samdev"), experiment[i], urllib.parse.urlencode({"dims": self.cleanup_dims(dims_list[i])}))
             for i in range(len(dims_list))
         ]
         replies = None
@@ -428,7 +428,7 @@ def getit(req, url):
 
     def create_definition(self, experiment, name, dims):
         logit.log("INFO", "create_definition( %s, %s, %s )" % (experiment, name, dims))
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         path = "/sam/%s/api/definitions/create" % experiment
         url = "%s%s" % (base, path)
         res = None
@@ -474,7 +474,7 @@ def create_definition(self, experiment, name, dims):
 
     def remove_existing_definition(self, experiment, name):
         logit.log("INFO", "remove_existing_definition( %s, %s )" % (experiment, name))
-        base = "%s" % config.get("SAM", "sam_base")
+        base = "%s" % config.get("SAM", "sam_base").replace("web",experiment).replace("samsamdev","samdev")
         path = "/sam/%s/api/definitions/name/%s" % (experiment, name)
         url = "%s%s" % (base, path)
         res = None

webservice/service.py

@@ -192,7 +192,7 @@ def augment_params():
             version=root.version,
             pomspath=root.path,
             docspath=root.docspath,
-            sam_base = root.sam_base,
+            sam_base = root.sam_base.replace("web",exp).replace("samsamdev","samdev"),
             landscape_base = root.landscape_base,
             fifemon_base = root.fifemon_base,
             hostname=socket.gethostname(),