diff options
| author |   Thomas Duval <thomas.duval@orange.com> | 2018-01-04 14:41:56 +0100 |
|---|---|---|
| committer | Thomas Duval <thomas.duval@orange.com> | 2018-01-04 14:41:56 +0100 |
| commit | 295ba85cba341338a2e74fef729dc74d091ac778 (patch) | |
| tree | c131d0168a9f2ee10792d9257102dc9266175ed1 /moon_orchestrator | |
| parent | bb86c23b2b634b855d743e2b005b50391051372b (diff) | |
update interface pod name to pipeline
Change-Id: I6a5a9ce3a27ea3ea40735dffa5f6a713f571cdc8
Diffstat (limited to 'moon_orchestrator')
| -rw-r--r-- | moon_orchestrator/moon_orchestrator/http_server.py | 11 | ||||
| -rw-r--r-- | moon_orchestrator/tests/unit_python/utilities.py | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/moon_orchestrator/moon_orchestrator/http_server.py b/moon_orchestrator/moon_orchestrator/http_server.py index 7105ea7a..00be0335 100644 --- a/moon_orchestrator/moon_orchestrator/http_server.py +++ b/moon_orchestrator/moon_orchestrator/http_server.py @@ -179,7 +179,6 @@ class HTTPServer(Server): logger.debug("_config={}".format(_config)) api_client = client.CoreV1Api(_config) ext_client = client.ExtensionsV1beta1Api(_config) - # TODO: get data from consul data = [{ "name": hostname + "-" + get_random_name(), "container": container, @@ -217,15 +216,15 @@ class HTTPServer(Server): return plugins = configuration.get_plugins() - conf = configuration.get_configuration("components/interface") - i_hostname = conf["components/interface"].get("hostname", "interface") - i_port = conf["components/interface"].get("port", 80) - i_container = conf["components/interface"].get( + conf = configuration.get_configuration("components/pipeline") + # i_hostname = conf["components/pipeline"].get("interface").get("hostname", "interface") + i_port = conf["components/pipeline"].get("interface").get("port", 80) + i_container = conf["components/pipeline"].get("interface").get( "container", "wukongsun/moon_interface:v4.3") data = [ { - "name": i_hostname + "-" + get_random_name(), + "name": "pipeline-" + get_random_name(), "container": i_container, "port": i_port, 'pdp_id': pdp_id, diff --git a/moon_orchestrator/tests/unit_python/utilities.py b/moon_orchestrator/tests/unit_python/utilities.py index aec03d9d..d64e4c7b 100644 --- a/moon_orchestrator/tests/unit_python/utilities.py +++ b/moon_orchestrator/tests/unit_python/utilities.py @@ -144,7 +144,7 @@ COMPONENTS = ( "slave", "components/manager", "components/orchestrator", - "components/interface", + "components/pipeline", "components/wrapper", ) |