diff options
| author |   Ethan Lynn <ethanlynnl@vmware.com> | 2019-02-13 11:41:10 +0800 |
|---|---|---|
| committer | Ethan Lynn <ethanlynnl@vmware.com> | 2019-02-13 11:49:57 +0800 |
| commit | 28d1a79e30e3e74764fc586586f744a9bef69e03 (patch) | |
| tree | 0e02b9a01f06aceb9254f9efbf5c71285c13a969 /multivimbroker | |
| parent | f6ac0d7459954dfbe39d71864dc47a6f9d6a7535 (diff) | |
Fix infraworkload forwarder
Check content_Type, if is multipart, then use multipart handler,
otherwise use normal forwarder.
Change-Id: Ia84b859168d3301390c4ec28be850800ae4677ed
Issue-ID: MULTICLOUD-476
Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
Diffstat (limited to 'multivimbroker')
| -rw-r--r-- | multivimbroker/multivimbroker/forwarder/views.py | 3 | ||||
| -rw-r--r-- | multivimbroker/multivimbroker/pub/utils/syscomm.py | 26 |
2 files changed, 15 insertions, 14 deletions
diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py index 7b9000c..5c7cd0a 100644 --- a/multivimbroker/multivimbroker/forwarder/views.py +++ b/multivimbroker/multivimbroker/forwarder/views.py @@ -269,7 +269,8 @@ class APIv1InfraWorkload(BaseServer): def post(self, request, cloud_owner, cloud_region_id): vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) - if len(request.FILES) != 0: + content_type = request.META.get('CONTENT_TYPE', 'application/json') + if content_type.startswith("multipart"): return self.__process_multipart(request, vimid) return self.send(vimid, request.get_full_path(), request.body, "POST", headers=originHeaders(request)) diff --git a/multivimbroker/multivimbroker/pub/utils/syscomm.py b/multivimbroker/multivimbroker/pub/utils/syscomm.py index 9e96d2e..7516d4b 100644 --- a/multivimbroker/multivimbroker/pub/utils/syscomm.py +++ b/multivimbroker/multivimbroker/pub/utils/syscomm.py @@ -68,16 +68,16 @@ def getMultivimDriver(vimid, full_path=""): def getVIMTypes(): - # Fix here unless we have plugin registry - json_file = os.path.join(os.path.dirname(__file__), - '../config/provider-plugin.json') - with open(json_file, "r") as f: - plugins = json.load(f) - ret = [] - for k, v in plugins.items(): - item = {} - item["vim_type"] = v.get("vim_type") - item["versions"] = [k for k in v.get('versions', {})] - ret.append(item) - - return ret + # Fix here unless we have plugin registry + json_file = os.path.join(os.path.dirname(__file__), + '../config/provider-plugin.json') + with open(json_file, "r") as f: + plugins = json.load(f) + ret = [] + for k, v in plugins.items(): + item = {} + item["vim_type"] = v.get("vim_type") + item["versions"] = [k for k in v.get('versions', {})] + ret.append(item) + + return ret |