diff options
| author |   Michael Hwang <mhwang@research.att.com> | 2018-03-02 20:46:21 -0500 |
|---|---|---|
| committer | Michael Hwang <mhwang@research.att.com> | 2018-03-09 16:25:24 -0500 |
| commit | b11dae55f54720759431107e83f1070c10aacd96 (patch) | |
| tree | dda6037b9301cbd20300bd566485cf4463124f4c /dcae-cli/dcae_cli/util/run.py | |
| parent | 141bcd47087b39d2ac3846ace864b9d9b0706ff5 (diff) | |
Make tox work in a fresh scenario
Severing the unit tests from the local config dependency
meant refactoring code that made pure unit testing
impossible. Introduced a conftest in this commit.
Change-Id: Id005b8b5b0704ccac33fa8768be1642941281f34
Issue-ID: DCAEGEN2-372
Signed-off-by: Michael Hwang <mhwang@research.att.com>
Diffstat (limited to 'dcae-cli/dcae_cli/util/run.py')
| -rw-r--r-- | dcae-cli/dcae_cli/util/run.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dcae-cli/dcae_cli/util/run.py b/dcae-cli/dcae_cli/util/run.py index e483d04..f0f1309 100644 --- a/dcae-cli/dcae_cli/util/run.py +++ b/dcae-cli/dcae_cli/util/run.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -183,13 +183,15 @@ def run_component(user, cname, cver, catalog, additional_user, attached, force, # TODO: Be smarter here but for now wait longer i.e. 5min max_wait = 300 # 300s == 5min - if _verify_component(instance_name, max_wait, dis.consul_host): + if _verify_component(instance_name, max_wait, + dis.default_consul_host()): log.info("Container is up and healthy") # This block of code is used to construct the delivery # urls for data router subscribers and to display it for # users to help with manually provisioning feeds. - results = dis.lookup_instance(dis.consul_host, instance_name) + results = dis.lookup_instance(dis.default_consul_host(), + instance_name) target_host = dis.parse_instance_lookup(results) dmaap_map = _update_delivery_urls(spec, target_host, dmaap_map) |