summaryrefslogtreecommitdiffstats
path: root/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client
diff options
context:
space:
mode:
authorTommy Carpenter <tommy@research.att.com>2019-06-24 15:52:59 +0000
committerTommy Carpenter <tommy@research.att.com>2019-06-24 17:22:59 +0000
commit1474cbb0aec7a0636d4d53ad09eba501d9c75458 (patch)
treeb24ac03546c2ddf352b29a4ac4a60363a808edbf /onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client
parent6778c62c6f9bfb7f6dc0123f268eb3f4e960b847 (diff)
Add CBS https/tls support
Issue-ID: DCAEGEN2-1551 Change-Id: I657d13ec87e051bd4836bd4c42385a580eaebe01 Signed-off-by: Tommy Carpenter <tommy@research.att.com>
Diffstat (limited to 'onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client')
-rw-r--r--onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py b/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py
index ef0dfbc..c1193d9 100644
--- a/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py
+++ b/onap-dcae-cbs-docker-client/onap_dcae_cbs_docker_client/client.py
@@ -36,17 +36,20 @@ def _get_path(path):
hostname = os.environ["HOSTNAME"] # this is the name of the component itself
# in most cases, this is the K8s service name which is a resolvable DNS name
# if running outside k8s, this name needs to be resolvable by DNS via other means.
- cbs_resolvable_hostname = os.environ["CONFIG_BINDING_SERVICE"]
+ cbs_name = os.environ["CONFIG_BINDING_SERVICE"]
except KeyError as e:
raise ENVsMissing("Required ENV Variable {0} missing".format(e))
- # TODO: https
- cbs_url = "http://{0}:10000".format(cbs_resolvable_hostname)
+ # See if we are using https
+ https_cacert = os.environ.get("DCAE_CA_CERTPATH", None)
+
+ # Get the CBS URL.
+ cbs_url = "https://{0}:10443".format(cbs_name) if https_cacert else "http://{0}:10000".format(cbs_name)
# get my config
try:
my_config_endpoint = "{0}/{1}/{2}".format(cbs_url, path, hostname)
- res = requests.get(my_config_endpoint)
+ res = requests.get(my_config_endpoint, verify=https_cacert) if https_cacert else requests.get(my_config_endpoint)
res.raise_for_status()
config = res.json()
logger.debug(