From 4188380fb7b806640103f557afec344455787a34 Mon Sep 17 00:00:00 2001 From: Michael Hwang Date: Fri, 15 Sep 2017 13:41:58 -0400 Subject: Make server url into a user inputted config param Change-Id: I90e94445fe0f3c003307355cade493e97d0a202d Issue-Id: DCAEGEN2-110 Signed-off-by: Michael Hwang --- dcae-cli/dcae_cli/util/__init__.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'dcae-cli/dcae_cli/util/__init__.py') diff --git a/dcae-cli/dcae_cli/util/__init__.py b/dcae-cli/dcae_cli/util/__init__.py index e91c573..b39de74 100644 --- a/dcae-cli/dcae_cli/util/__init__.py +++ b/dcae-cli/dcae_cli/util/__init__.py @@ -106,15 +106,13 @@ def load_json(path): raise DcaeException("File '{}' appears to be a malformed JSON.".format(path)) -def fetch_file_from_nexus(path, transform_func=json.loads): - """Fetch file from nexus +def fetch_file_from_web(server_url, path, transform_func=json.loads): + """Fetch file from a web server The default behavior is to transform the response to a json. """ - # TODO: Source this from app's configuration [ONAP URL TBD] - server_uri = "https://make-me-valid" - nexus_url = "{0}/{1}".format(server_uri, path) - r = requests.get(nexus_url) + artifact_url = "{0}/{1}".format(server_url, path) + r = requests.get(artifact_url) r.raise_for_status() if transform_func: return transform_func(r.text) -- cgit 1.2.3-korg