Merge "Draft the enhancement of capacity_check API"

diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile
index bc72323..1525e47 100644 (file)
--- a/multivimbroker/docker/Dockerfile
+++ b/multivimbroker/docker/Dockerfile
@@ -10,6 +10,8 @@ ENV AAI_PASSWORD "AAI"
 
 EXPOSE 9001
 
+RUN groupadd -r onap && useradd -r -g onap onap
+
 # COPY ./ /opt/multivimbroker/
 RUN apt-get update && \
     apt-get install -y unzip && \
@@ -17,7 +19,10 @@ RUN apt-get update && \
     wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework.broker&a=multicloud-framework-broker&e=zip&v=1.2.3-SNAPSHOT" && \
     unzip -q -o -B multicloud-framework.zip && \
     rm -f multicloud-framework.zip && \
-    pip install -r /opt/multivimbroker/requirements.txt
+    pip install -r /opt/multivimbroker/requirements.txt && \
+    chown onap:onap /opt/multivimbroker -R
+
+USER onap
 
 WORKDIR /opt/multivimbroker
-CMD /bin/sh -c /opt/multivimbroker/run.sh
\ No newline at end of file
+CMD /bin/sh -c /opt/multivimbroker/run.sh

diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py
index 7b9000c..5c7cd0a 100644 (file)
--- 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 (file)
--- 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