diff options
| author |   Asteroide <thomas.duval@orange.com> | 2018-10-05 15:01:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-05 15:01:17 +0000 |
| commit | cbea4e360e9bfaa9698cf7c61c83c96a1ba89b8c (patch) | |
| tree | a8bf6a7bfb06605ed5bfab77570afbe1e46cff4b /python_moonclient/python_moonclient/core/json_import.py | |
| parent | a3f68df52836676b23ac0f5e3d8c40c957ee80a7 (diff) | |
| parent | 2e35a7e46f0929438c1c206e3116caa829f07dc6 (diff) | |
Merge "Update code to 4.6 official version"
Diffstat (limited to 'python_moonclient/python_moonclient/core/json_import.py')
| -rw-r--r-- | python_moonclient/python_moonclient/core/json_import.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/python_moonclient/python_moonclient/core/json_import.py b/python_moonclient/python_moonclient/core/json_import.py index a724476b..b65ec39b 100644 --- a/python_moonclient/python_moonclient/core/json_import.py +++ b/python_moonclient/python_moonclient/core/json_import.py @@ -3,12 +3,12 @@ import requests import copy from python_moonclient.core import config - -logger = logging.getLogger("moonclient.core.import_json") +LOGGER = logging.getLogger("moonclient.core.import_json") URL = None HEADERS = None + def init(consul_host, consul_port): conf_data = config.get_config_data(consul_host, consul_port) global URL, HEADERS @@ -23,7 +23,7 @@ def import_json(file_name): files = {'file': open(file_name, 'rb')} req = requests.post(URL.format("/import"), files=files) result = req.json() - if isinstance(result,dict) and "message" in result: + if isinstance(result, dict) and "message" in result: req.reason = result["message"] req.raise_for_status() - return result
\ No newline at end of file + return result |