From b11dae55f54720759431107e83f1070c10aacd96 Mon Sep 17 00:00:00 2001 From: Michael Hwang Date: Fri, 2 Mar 2018 20:46:21 -0500 Subject: 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 --- dcae-cli/dcae_cli/util/run.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'dcae-cli/dcae_cli/util/run.py') 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) -- cgit 1.2.3-korg