remove webbase property

fgcz · Mar 5, 2024 · fdd5372 · fdd5372
1 parent 0c8d72b
commit fdd5372
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/bfabric/bfabric.py b/bfabric/bfabric.py
@@ -126,11 +126,6 @@ def __init__(self, login=None, password=None, webbase=None, externaljobid=None,
         msg = f"\033[93m--- webbase {self.config.base_url}; login; {self.config.login} ---\033[0m\n"
         sys.stderr.write(msg)
 
-    @property
-    def webbase(self):
-        # TODO remove after refactoring is complete
-        return self.config.base_url
-
     def read_object(self, endpoint, obj, login=None, password=None, page=1, plain=False, idonly=False):
         """
         A generic method which can connect to any endpoint, e.g., workunit, project, order,
@@ -156,7 +151,7 @@ def read_object(self, endpoint, obj, login=None, password=None, page=1, plain=Fa
 
         try:
             if not endpoint in self.cl:
-                self.cl[endpoint] = Client("".join((self.webbase, '/', endpoint, "?wsdl")), cache=None)
+                self.cl[endpoint] = Client("".join((self.config.base_url, '/', endpoint, "?wsdl")), cache=None)
         except Exception as e:
             print (e)
             raise
@@ -201,7 +196,7 @@ def readid_object(self, endpoint, obj, login=None, password=None, page=1, plain=
 
         try:
             if not endpoint in self.cl:
-                self.cl[endpoint] = Client("".join((self.webbase, '/', endpoint, "?wsdl")), cache=None)
+                self.cl[endpoint] = Client("".join((self.config.base_url, '/', endpoint, "?wsdl")), cache=None)
         except Exception as e:
             print (e)
             raise
@@ -232,7 +227,7 @@ def save_object(self, endpoint, obj, debug=None):
 
         try:
             if not endpoint in self.cl:
-                self.cl[endpoint] = Client("".join((self.webbase, '/', endpoint, "?wsdl")), cache=None)
+                self.cl[endpoint] = Client("".join((self.config.base_url, '/', endpoint, "?wsdl")), cache=None)
         except:
             raise
 
@@ -256,7 +251,7 @@ def checkandinsert_object(self, endpoint, obj, debug=None):
 
         try:
             if not endpoint in self.cl:
-                self.cl[endpoint] = Client("".join((self.webbase, '/', endpoint, "?wsdl")), cache=None)
+                self.cl[endpoint] = Client("".join((self.config.base_url, '/', endpoint, "?wsdl")), cache=None)
         except:
             raise
 
@@ -280,7 +275,7 @@ def delete_object(self, endpoint, id=None, debug=None):
 
         try:
             if not endpoint in self.cl:
-                self.cl[endpoint] = Client("".join((self.webbase, '/', endpoint, "?wsdl")), cache=None)
+                self.cl[endpoint] = Client("".join((self.config.base_url, '/', endpoint, "?wsdl")), cache=None)
         except:
             raise
 
@@ -935,12 +930,12 @@ def write_yaml(self,  data_serializer=lambda x: yaml.dump(x, default_flow_style=
                 sample_id = self.get_sampleid(int(resource_iterator._id))
 
                 _resource_sample = {'resource_id': int(resource_iterator._id),
-                                        'resource_url': "{0}/userlab/show-resource.html?id={1}".format(self.webbase,resource_iterator._id)}
+                                        'resource_url': "{0}/userlab/show-resource.html?id={1}".format(self.config.base_url,resource_iterator._id)}
 
 
                 if not sample_id is None:
                     _resource_sample['sample_id'] = int(sample_id)
-                    _resource_sample['sample_url'] = "{0}/userlab/show-sample.html?id={1}".format(self.webbase, sample_id)
+                    _resource_sample['sample_url'] = "{0}/userlab/show-sample.html?id={1}".format(self.config.base_url, sample_id)
 
                 resource_ids[_application_name].append(_resource_sample)
             except:
@@ -1035,7 +1030,7 @@ def write_yaml(self,  data_serializer=lambda x: yaml.dump(x, default_flow_style=
                     },
                 'workunit_id': int(workunit._id),
                 'workunit_createdby': str(workunit.createdby),
-                'workunit_url': "{0}/userlab/show-workunit.html?workunitId={1}".format(self.webbase, workunit._id),
+                'workunit_url': "{0}/userlab/show-workunit.html?workunitId={1}".format(self.config.base_url, workunit._id),
                 'external_job_id': int(yaml_workunit_externaljob._id),
                 'order_id': order_id,
                 'project_id': project_id,

diff --git a/bfabric/tests/test_bfabric_functional.py b/bfabric/tests/test_bfabric_functional.py
@@ -41,7 +41,7 @@ def test_wrappercreator_submitter(self):
         self.assertEqual(B.config.login, 'pfeeder', msg)
 
         msg = "This test case requires a bfabric test system!"
-        self.assertIn("bfabric-test", B.webbase, msg)
+        self.assertIn("bfabric-test", B.config.base_url, msg)
         # TODO
         # create input resource