Make server url into a user inputted config param

Change-Id: I90e94445fe0f3c003307355cade493e97d0a202d
Issue-Id: DCAEGEN2-110
Signed-off-by: Michael Hwang <mhwang@research.att.com>

1 files changed, 12 insertions, 9 deletions

diff --git a/dcae-cli/dcae_cli/util/tests/test_config.py b/dcae-cli/dcae_cli/util/tests/test_config.py
index 97be773..82f0679 100644
--- a/dcae-cli/dcae_cli/util/tests/test_config.py
+++ b/dcae-cli/dcae_cli/util/tests/test_config.py
@@ -59,31 +59,34 @@ def test_init_config_user(monkeypatch):
 
 def test_init_config(monkeypatch):
     monkeypatch.setattr(config, '_init_config_user', lambda: "bigmama")
-    monkeypatch.setattr(dcae_cli.util, 'fetch_file_from_nexus',
-            lambda path: { "db_url": "conn" })
+    monkeypatch.setattr(config, '_init_config_server_url',
+            lambda: "http://some-nexus-in-the-sky.com")
+    monkeypatch.setattr(dcae_cli.util, 'fetch_file_from_web',
+            lambda server_url, path: { "db_url": "conn" })
     monkeypatch.setattr("dcae_cli._version.__version__", "2.X.X")
 
-    expected = {'cli_version': '2.X.X', 'user': 'bigmama', 'db_url': 'conn'}
+    expected = {'cli_version': '2.X.X', 'user': 'bigmama', 'db_url': 'conn',
+            'server_url': 'http://some-nexus-in-the-sky.com'}
     assert expected == config._init_config()
 
     # Test using of db fallback
 
-    monkeypatch.setattr(dcae_cli.util, 'fetch_file_from_nexus',
-            lambda path: { "db_url": "" })
+    monkeypatch.setattr(dcae_cli.util, 'fetch_file_from_web',
+            lambda server_url, path: { "db_url": "" })
 
     assert "sqlite" in config._init_config()["db_url"]
 
-    monkeypatch.setattr(dcae_cli.util, 'fetch_file_from_nexus',
-            lambda path: {})
+    monkeypatch.setattr(dcae_cli.util, 'fetch_file_from_web',
+            lambda server_url, path: {})
 
     assert "sqlite" in config._init_config()["db_url"]
 
     # Simulate error trying to fetch
 
-    def fetch_simulate_error(path):
+    def fetch_simulate_error(server_url, path):
         raise RuntimeError("Simulated error")
 
-    monkeypatch.setattr(dcae_cli.util, 'fetch_file_from_nexus',
+    monkeypatch.setattr(dcae_cli.util, 'fetch_file_from_web',
             fetch_simulate_error)
 
     with pytest.raises(config.ConfigurationInitError):