From 7488e41c44830201ba6e79530067b662b7efc4be Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 23 Apr 2024 10:07:42 +0200 Subject: [PATCH] Feature 11037 Changes to work with ingress controller Change-Id: I75657d047fd528f5a960bdc42281d0b370bf5c0d Signed-off-by: garciadeblas --- osmclient/sol005/client.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/osmclient/sol005/client.py b/osmclient/sol005/client.py index 5146fe2..fadd377 100644 --- a/osmclient/sol005/client.py +++ b/osmclient/sol005/client.py @@ -63,17 +63,19 @@ class Client(object): self._auth_endpoint = "/admin/v1/tokens" self._headers = {} self._token = None - if len(host.split(":")) > 1: - # backwards compatible, port provided as part of host - self._host = host.split(":")[0] - self._so_port = host.split(":")[1] + self._url = None + if host.startswith("http://") or host.startswith("https://"): + self._url = self._host else: - self._host = host - self._so_port = so_port - - self._http_client = http.Http( - "https://{}:{}/osm".format(self._host, self._so_port), **kwargs - ) + if len(host.split(":")) > 1: + # backwards compatible, port provided as part of host + self._host = host.split(":")[0] + self._so_port = host.split(":")[1] + else: + self._host = host + self._so_port = so_port + self._url = "https://{}:{}/osm".format(self._host, self._so_port) + self._http_client = http.Http(self._url, **kwargs) self._headers["Accept"] = "application/json" self._headers["Content-Type"] = "application/yaml" self._http_client.set_http_header(self._headers) -- 2.25.1