Merge remote-tracking branch 'origin/issue-54-remove-common-dependency' into issue-56-parameterize-auth

# Conflicts:
#	minos/api_gateway/rest/config.py
#	tests/test_api_gateway/test_rest/test_config.py

Author: Sergio García Prado

minos/api_gateway/rest/config.py

@@ -33,8 +33,8 @@
     "rest.auth.port": "API_GATEWAY_REST_AUTH_PORT",
     "rest.auth.method": "API_GATEWAY_REST_AUTH_METHOD",
     "rest.auth.path": "API_GATEWAY_REST_AUTH_PATH",
-    "discovery.host": "DISCOVERY_SERVICE_HOST",
-    "discovery.port": "DISCOVERY_SERVICE_PORT",
+    "discovery.host": "API_GATEWAY_DISCOVERY_HOST",
+    "discovery.port": "API_GATEWAY_DISCOVERY_PORT",
 }
 
 _PARAMETERIZED_MAPPER = {
@@ -46,8 +46,8 @@
     "rest.auth.port": "api_gateway_rest_auth_port",
     "rest.auth.method": "api_gateway_rest_auth_method",
     "rest.auth.path": "api_gateway_rest_auth_path",
-    "discovery.host": "discovery_service_host",
-    "discovery.port": "discovery_service_port",
+    "discovery.host": "api_gateway_discovery_host",
+    "discovery.port": "api_gateway_discovery_port",
 }
 
 

tests/test_api_gateway/test_rest/test_config.py

@@ -62,12 +62,12 @@ def test_config_discovery(self):
         self.assertEqual("localhost", discovery.host)
         self.assertEqual(5567, discovery.port)
 
-    @mock.patch.dict(os.environ, {"DISCOVERY_SERVICE_HOST": "::1"})
+    @mock.patch.dict(os.environ, {"API_GATEWAY_DISCOVERY_HOST": "::1"})
     def test_overwrite_with_environment_discovery_host(self):
         config = ApiGatewayConfig(path=self.config_file_path)
         self.assertEqual("::1", config.discovery.host)
 
-    @mock.patch.dict(os.environ, {"DISCOVERY_SERVICE_PORT": "4040"})
+    @mock.patch.dict(os.environ, {"API_GATEWAY_DISCOVERY_PORT": "4040"})
     def test_overwrite_with_environment_discovery_port(self):
         config = ApiGatewayConfig(path=self.config_file_path)
         self.assertEqual(4040, config.discovery.port)