From 2d7646e79ff9f8a78dde2f33cc3bc2871df00546 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 19 Nov 2020 13:24:39 +0100
Subject: [PATCH] TMSS-320: made factory creation method for dbcreds instance
---
SAS/TMSS/client/lib/tmss_http_rest_client.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/SAS/TMSS/client/lib/tmss_http_rest_client.py b/SAS/TMSS/client/lib/tmss_http_rest_client.py
index 48df33a1cab..7b5cf54ac67 100644
--- a/SAS/TMSS/client/lib/tmss_http_rest_client.py
+++ b/SAS/TMSS/client/lib/tmss_http_rest_client.py
@@ -7,6 +7,8 @@ import os
import json
from datetime import datetime
from lofar.common.datetimeutils import formatDatetime
+from lofar.common.dbcredentials import DBCredentials
+
# usage example:
#
@@ -43,8 +45,14 @@ class TMSSsession(object):
if dbcreds_name is None:
dbcreds_name = os.environ.get("TMSS_CLIENT_DBCREDENTIALS", "TMSSClient")
- from lofar.common.dbcredentials import DBCredentials
dbcreds = DBCredentials().get(dbcreds_name)
+ return TMSSsession.create_from_dbcreds(dbcreds)
+
+ @staticmethod
+ def create_from_dbcreds(dbcreds: DBCredentials):
+ '''Factory method to create a TMSSSession object which uses the credentials in the dbcreds object.
+ See also: create_from_dbcreds_for_ldap
+ '''
return TMSSsession(username=dbcreds.user, password=dbcreds.password,
host=dbcreds.host,
port=dbcreds.port,
--
GitLab