Fix issue where getting empty consul in discovery

[dcaegen2/platform/cli.git] / dcae-cli / dcae_cli / util / tests / test_discovery.py

diff --git a/dcae-cli/dcae_cli/util/tests/test_discovery.py b/dcae-cli/dcae_cli/util/tests/test_discovery.py
index bf9205a..2148ea3 100644 (file)
--- a/dcae-cli/dcae_cli/util/tests/test_discovery.py
+++ b/dcae-cli/dcae_cli/util/tests/test_discovery.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.
@@ -29,7 +29,7 @@ from copy import deepcopy
 import pytest
 
 from dcae_cli.util import discovery as dis
-from dcae_cli.util.discovery import create_config, Consul, config_context, consul_host, DiscoveryNoDownstreamComponentError
+from dcae_cli.util.discovery import create_config, Consul, config_context, DiscoveryNoDownstreamComponentError
 
 
 user = 'bob'
@@ -177,8 +177,8 @@ def test_create_config():
     assert dmaap_map == {'some-config-key': {'topic_url': 'http://some-topic-url.com/abc'}}
 
 
-
-def test_config_context():
+@pytest.mark.skip(reason="Not a pure unit test")
+def test_config_context(mock_cli_config):
     interface_map = {'param1': [('foo.bar.comp1', '1.1.1'),
                                 ('foo.bar.comp2', '2.2.2')],
                      'param2': [('foo.bar.comp3', '3.3.3')]
@@ -200,7 +200,7 @@ def test_config_context():
             'bob.bbb222.1-1-1.foo-bar-comp1.suffix',
             'bob.ddd444.3-3-3.foo-bar-comp3.suffix']
 
-    c = Consul(consul_host)
+    c = Consul(dis.default_consul_host())
     with config_context(user, cname, cver, params, interface_map, instance_map,
             config_key_map, instance_prefix=inst_pref) as (instance,_):
         assert json.loads(c.kv.get(ckey)[1]['Value'].decode('utf-8')) == expected_conf
@@ -373,21 +373,6 @@ def test_make_instance_map():
     instances_map = dis._make_instances_map(instances_latest_format)
     assert instances_map.get(("sandbox.platform.laika", "0.5.0")) == set(instances_latest_format)
 
-    instances_other_format = ["mike.39f809be-7d13-4799-b8d0-ba0d5358282b.0-5-0.sandbox-platform-laika.rework-central.dcae.com"]
-
-    instances_map = dis._make_instances_map(instances_other_format)
-    assert instances_map.get(("sandbox.platform.laika", "0.5.0")) == set(instances_other_format)
-
-    instances_other_format = ["mike.b5435a8c-ef56-4371-94d8-560a61f7352f.0-5-0.sandbox-platform-laika.solutioning-central.dcae.com"]
-
-    instances_map = dis._make_instances_map(instances_other_format)
-    assert instances_map.get(("sandbox.platform.laika", "0.5.0")) == set(instances_other_format)
-
-    instances_other_format = ["mike.b5435a8c-ef56-4371-94d8-560a61f7352f.0-5-0.sandbox-platform-laika.dcae.com"]
-
-    instances_map = dis._make_instances_map(instances_other_format)
-    assert instances_map.get(("sandbox.platform.laika", "0.5.0")) == set(instances_other_format)
-
 
 def test_get_component_instances(monkeypatch):
     instances = [
@@ -443,6 +428,20 @@ def test_parse_instance_lookup():
     assert dis.parse_instance_lookup(results) == "192.168.1.100:8080"
 
 
+def test_apply_inputs():
+    updated_config = dis._apply_inputs({"foo": "bar"}, {"foo": "baz"})
+    assert updated_config == {"foo": "baz"}
+
+
+def test_choose_consul_host(monkeypatch):
+    def fake_default_consul_host():
+        return "default-consul-host"
+
+    monkeypatch.setattr(dis, "default_consul_host", fake_default_consul_host)
+    assert "default-consul-host" == dis._choose_consul_host(None)
+    assert "provided-consul-host" == dis._choose_consul_host("provided-consul-host")
+
+
 if __name__ == '__main__':
     '''Test area'''
     pytest.main([__file__, ])