Enhance vid CSIT tests, added for scaleout

Issue-ID: VID-323
Change-Id: I31ad377ee766eaf66c848ad802c33e21ea1dfe76
Signed-off-by: Sandra Koblosz <sandra.koblosz@nokia.com>

9 files changed, 259 insertions, 23 deletions

diff --git a/tests/vid/resources/simulators/Dockerfile b/tests/vid/resources/simulators/Dockerfile
new file mode 100644
index 00000000..5aa13925
--- /dev/null
+++ b/tests/vid/resources/simulators/Dockerfile
@@ -0,0 +1,8 @@
+FROM frolvlad/alpine-python3
+
+COPY SO.py /
+ADD ./test_data_assets/ /
+
+EXPOSE 8443
+
+CMD [ "python", "./SO.py", "expected_so_requests.json", "expected_so_responses.json" ]
diff --git a/tests/vid/resources/simulators/SO-simulator b/tests/vid/resources/simulators/SO-simulator
deleted file mode 100644
index 54587665..00000000
--- a/tests/vid/resources/simulators/SO-simulator
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM frolvlad/alpine-python3
-
-ADD SO.py /
-ADD so_post_response.json /
-
-EXPOSE 8443
-
-CMD [ "python", "./SO.py" ]
\ No newline at end of file
diff --git a/tests/vid/resources/simulators/SO.py b/tests/vid/resources/simulators/SO.py
index edc15f62..c1199390 100644
--- a/tests/vid/resources/simulators/SO.py
+++ b/tests/vid/resources/simulators/SO.py
@@ -1,45 +1,115 @@
+# ============LICENSE_START=======================================================
+# INTEGRATION CSIT
+# ================================================================================
+# Copyright (C) 2018 Nokia Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
+import json
 import logging
+from functools import partial
+from sys import argv
 from http.server import BaseHTTPRequestHandler, HTTPServer
 
 DEFAULT_PORT = 8443
 
 
 class SOHandler(BaseHTTPRequestHandler):
+    def __init__(self, expected_requests, expected_responses, *args, **kwargs):
 
-    def __init__(self, request, client_address, server):
-        self.response_on_get = self._read_on_get_response()
-        super().__init__(request, client_address, server)
+        self._expected_requests = expected_requests
+        self._expected_responses = expected_responses
+        super().__init__(*args, **kwargs)
 
     def do_POST(self):
-        logging.info('POST called')
+        logging.info(
+            'POST called. Expected POST REQUEST: ' + json.dumps(
+                self._expected_requests["post"]) + '\nExpected POST response: ' +
+            json.dumps(self._expected_responses["post"]))
         self.send_response(200)
         self._set_headers()
 
-        self.wfile.write(self.response_on_get.encode("utf-8"))
+        self.wfile.write(json.dumps(self._expected_responses["post"]).encode("utf-8"))
         return
 
     def do_GET(self):
-        logging.info('GET called')
+        logging.info(
+            'GET called. Expected GET REQUEST: ' + json.dumps(
+                self._expected_requests["get"]) + '\nExpected GET response: ' +
+            json.dumps(self._expected_responses["get"]))
         self.send_response(200)
         self._set_headers()
 
-        self.wfile.write(self.response_on_get.encode("utf-8"))
-        return
+        self.wfile.write(json.dumps(self._expected_responses["get"]).encode("utf-8"))
+        return self._expected_responses["get"]
+
+    def do_PUT(self):
+        request_body_json = self._get_request_body()
+        if request_body_json is not None:
+            self._apply_expected_data(request_body_json)
+            logging.info("EXPECTED RESPONSES: " + str(self._expected_responses))
+            logging.info("EXPECTED REQUESTS: " + str(self._expected_requests))
+            response_status = 200
+        else:
+            response_status = 400
+        self.send_response(response_status)
+        self._set_headers()
+
+    def _get_request_body(self):
+        content_len = int(self.headers['Content-Length'], 0)
+        parsed_req_body = None
+        if content_len > 0:
+            body = self.rfile.read(content_len)
+            body_decoded = body.decode('utf8')
+            logging.info("BODY: %s type: %s  body decoded: %s type: %s", str(body), type(body), str(body_decoded),
+                         type(body_decoded))
+            parsed_req_body = json.loads(body_decoded)
+        return parsed_req_body
+
+    def _apply_expected_data(self, request_body_json):
+        if self.path == '/setResponse':
+            logging.info("IN PUT /setResponse: " + str(request_body_json))
+            print("TYPE: %s and text: %s", type(request_body_json), str(request_body_json))
+            self._expected_responses.update(request_body_json)
+            print("TYPE: %s", type(request_body_json))
+        elif self.path == '/setRequest':
+            logging.info("IN PUT /setRequest: " + str(request_body_json))
+            self._expected_requests.update(request_body_json)
 
     def _set_headers(self):
         self.send_header('Content-Type', 'application/json')
         self.end_headers()
 
+
+class JsonFileToDictReader(object):
+
     @staticmethod
-    def _read_on_get_response():
-        with open('so_post_response.json', 'r') as file:
-            return file.read()
+    def read_expected_test_data(expected_responses_filename):
+        with open(expected_responses_filename, 'r') as file:
+            return json.load(file)
 
 
-if __name__ == '__main__':
+def init_so_simulator():
+    expected_so_requests = JsonFileToDictReader.read_expected_test_data(argv[1])
+    expected_so_responses = JsonFileToDictReader.read_expected_test_data(argv[2])
     logging.basicConfig(filename='output.log', level=logging.INFO)
-    SOHandler.protocol_version = "HTTP/1.0"
-
-    httpd = HTTPServer(('', DEFAULT_PORT), SOHandler)
+    handler = partial(SOHandler, expected_so_requests, expected_so_responses)
+    handler.protocol_version = "HTTP/1.0"
+    httpd = HTTPServer(('', DEFAULT_PORT), handler)
     logging.info("serving on: " + str(httpd.socket.getsockname()))
     httpd.serve_forever()
+
+
+if __name__ == '__main__':
+    init_so_simulator()
diff --git a/tests/vid/resources/simulators/test_data_assets/expected_so_requests.json b/tests/vid/resources/simulators/test_data_assets/expected_so_requests.json
new file mode 100644
index 00000000..214fa6f0
--- /dev/null
+++ b/tests/vid/resources/simulators/test_data_assets/expected_so_requests.json
@@ -0,0 +1,57 @@
+{
+  "get": {
+    "get_request": "accepted"
+  },
+  "post":  {
+    "requestDetails": {
+      "cloudConfiguration": {
+        "lcpCloudRegionId": "RegionOne",
+        "tenantId": "982c540f6e69488eb6be5664255e00c0"
+      },
+      "modelInfo": {
+        "modelInvariantId": "41b3c314-dfab-4501-9c5e-1c9fe5d8e151",
+        "modelName": "SoWs1..base_ws..module-0",
+        "modelType": "vfModule",
+        "modelVersion": "1",
+        "modelVersionId": "7ea96ae9-9eac-4eaa-882e-077478a6c44a"
+      },
+      "relatedInstanceList": [{
+        "relatedInstance": {
+          "instanceId": "0d8a98d8-d7ca-4c26-b7ab-81d3729e3b6c",
+          "modelInfo": {
+            "modelInvariantId": "a4413616-cf96-4615-a94e-0dc5a6a65430",
+            "modelName": "SC_WS_SW_2",
+            "modelType": "service",
+            "modelVersion": "3.0",
+            "modelVersionId": "0fdaaf44-3c6c-4d81-9c57-b2ce7224dbb9"
+          }
+        }
+      },
+        {
+          "relatedInstance": {
+            "instanceId": "61c19619-2714-46f8-90c9-39734e4f545f",
+            "modelInfo": {
+              "modelCustomizationName": "SO_WS_1 0",
+              "modelInvariantId": "3b2c9dcb-6ef8-4c3c-8d5b-43d5776f7110",
+              "modelName": "SO_WS_1",
+              "modelType": "vnf",
+              "modelVersion": "1.0",
+              "modelVersionId": "0fdaaf44-3c6c-4d81-9c57-b2ce7224dbb9"
+            }
+          }
+        }
+      ],
+      "requestInfo": {
+        "source": "VID",
+        "suppressRollback": "false",
+        "requestorId": "az2016",
+        "instanceName": "SC_WS_VNF_1_2"
+      },
+      "requestParameters": {
+        "controllerType": "SDNC",
+        "userParams": []
+      }
+
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/vid/resources/simulators/test_data_assets/expected_so_responses.json b/tests/vid/resources/simulators/test_data_assets/expected_so_responses.json
new file mode 100644
index 00000000..1b735225
--- /dev/null
+++ b/tests/vid/resources/simulators/test_data_assets/expected_so_responses.json
@@ -0,0 +1,14 @@
+{
+  "get": {
+    "get_response": "accepted"
+  },
+  "post": {
+    "status": 202,
+    "entity": {
+      "requestReferences": {
+        "instanceId": "fffcbb6c-1983-42df-9ca8-89ae8b3a46c1",
+        "requestId": "b2197d7e-3a7d-410e-82ba-7b7e8191bc46"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/vid/resources/simulators/test_data_assets/so_action_response.json b/tests/vid/resources/simulators/test_data_assets/so_action_response.json
new file mode 100644
index 00000000..391231dc
--- /dev/null
+++ b/tests/vid/resources/simulators/test_data_assets/so_action_response.json
@@ -0,0 +1,9 @@
+{
+  "status": 202,
+  "entity": {
+    "requestReferences": {
+      "instanceId": "fffcbb6c-1983-42df-9ca8-89ae8b3a46c1",
+      "requestId": "b2197d7e-3a7d-410e-82ba-7b7e8191bc46"
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/vid/resources/simulators/test_data_assets/so_response_for_invalid_request.json b/tests/vid/resources/simulators/test_data_assets/so_response_for_invalid_request.json
new file mode 100644
index 00000000..477de145
--- /dev/null
+++ b/tests/vid/resources/simulators/test_data_assets/so_response_for_invalid_request.json
@@ -0,0 +1,11 @@
+{
+  "status": 400,
+  "entity": {
+    "requestError": {
+      "serviceException": {
+        "messageId": "SVC0002",
+        "text": "Error mapping request: Unrecognized field \"configurationParameters\" (class org.onap.so.serviceinstancebeans.ServiceInstancesRequest), not marked as ignorable (8 known properties: \"configurationId\", \"requestDetails\", \"serviceInstanceId\", \"vfModuleInstanceId\", \"correlationId\", \"vnfInstanceId\", \"volumeGroupInstanceId\", \"networkInstanceId\"])\n at [Source: {\"configurationParameters\":[],\"requestDetails\":{\"cloudConfiguration\":{\"lcpCloudRegionId\":\"RegionOne\",\"tenantId\":\"982c540f6e69488eb6be5664255e00c0\"},\"modelInfo\":{\"modelInvariantId\":\"41b3c314-dfab-4501-9c5e-1c9fe5d8e151\",\"modelName\":\"SoWs1..base_ws..module-0\",\"modelType\":\"vfModule\",\"modelVersion\":\"1\",\"modelVersionId\":\"7ea96ae9-9eac-4eaa-882e-077478a6c44a\"},\"relatedInstanceList\":[{\"relatedInstance\":{\"instanceId\":\"0d8a98d8-d7ca-4c26-b7ab-81d3729e3b6c\",\"modelInfo\":{\"modelInvariantId\":\"a4413616-cf96-4615-a94e-0dc5a6a65430\",\"modelName\":\"SC_WS_SW_2\",\"modelType\":\"service\",\"modelVersion\":\"3.0\",\"modelVersionId\":\"00e0bb964-e687-4439-9a9e-de9cd1ff5367\"}}},{\"relatedInstance\":{\"instanceId\":\"61c19619-2714-46f8-90c9-39734e4f545f\",\"modelInfo\":{\"modelCustomizationName\":\"SO_WS_1 0\",\"modelInvariantId\":\"3b2c9dcb-6ef8-4c3c-8d5b-43d5776f7110\",\"modelName\":\"SO_WS_1\",\"modelType\":\"vnf\",\"modelVersion\":\"1.0\",\"modelVersionId\":\"0fdaaf44-3c6c-4d81-9c57-b2ce7224dbb9\"}}}],\"requestInfo\":{\"source\":\"VID\",\"suppressRollback\":false,\"requestorId\":\"az2016\",\"instanceName\":\"SC_WS_VNF_1_2\"},\"requestParameters\":{\"controllerType\":\"SDNC\",\"userParams\":[]}}}; line: 1, column: 29] (through reference chain: org.onap.so.serviceinstancebeans.ServiceInstancesRequest[\"configurationParameters\"])"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/vid/resources/simulators/test_data_assets/vid_create_vfmodule_request.json b/tests/vid/resources/simulators/test_data_assets/vid_create_vfmodule_request.json
new file mode 100644
index 00000000..7f0b6eb0
--- /dev/null
+++ b/tests/vid/resources/simulators/test_data_assets/vid_create_vfmodule_request.json
@@ -0,0 +1,52 @@
+{
+  "requestDetails": {
+    "cloudConfiguration": {
+      "lcpCloudRegionId": "RegionOne",
+      "tenantId": "982c540f6e69488eb6be5664255e00c0"
+    },
+    "modelInfo": {
+      "modelInvariantId": "41b3c314-dfab-4501-9c5e-1c9fe5d8e151",
+      "modelName": "SoWs1..base_ws..module-0",
+      "modelType": "vfModule",
+      "modelVersion": "1",
+      "modelVersionId": "7ea96ae9-9eac-4eaa-882e-077478a6c44a"
+    },
+    "relatedInstanceList": [
+      {
+        "relatedInstance": {
+          "instanceId": "0d8a98d8-d7ca-4c26-b7ab-81d3729e3b6c",
+          "modelInfo": {
+            "modelInvariantId": "a4413616-cf96-4615-a94e-0dc5a6a65430",
+            "modelName": "SC_WS_SW_2",
+            "modelType": "service",
+            "modelVersion": "3.0",
+            "modelVersionId": "0fdaaf44-3c6c-4d81-9c57-b2ce7224dbb9"
+          }
+        }
+      },
+      {
+        "relatedInstance": {
+          "instanceId": "61c19619-2714-46f8-90c9-39734e4f545f",
+          "modelInfo": {
+            "modelCustomizationName": "SO_WS_1 0",
+            "modelInvariantId": "3b2c9dcb-6ef8-4c3c-8d5b-43d5776f7110",
+            "modelName": "SO_WS_1",
+            "modelType": "vnf",
+            "modelVersion": "1.0",
+            "modelVersionId": "0fdaaf44-3c6c-4d81-9c57-b2ce7224dbb9"
+          }
+        }
+      }
+    ],
+    "requestInfo": {
+      "source": "VID",
+      "suppressRollback": "false",
+      "requestorId": "az2016",
+      "instanceName": "SC_WS_VNF_1_2"
+    },
+    "requestParameters": {
+      "controllerType": "SDNC",
+      "userParams": []
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/vid/resources/simulators/test_data_assets/vid_scaleout_request.json b/tests/vid/resources/simulators/test_data_assets/vid_scaleout_request.json
new file mode 100644
index 00000000..70761ec1
--- /dev/null
+++ b/tests/vid/resources/simulators/test_data_assets/vid_scaleout_request.json
@@ -0,0 +1,23 @@
+{
+  "requestDetails":[
+    {
+      "vnfName":"ws-test-0310-8",
+      "vnfInstanceId":"980fe98e-47f8-4164-862d-4ebb026cec75",
+      "relatedInstanceList":[
+        {
+          "relatedInstance":{
+            "instanceId":"fd84f066-ea75-4b23-acd0-3cf3fce7a99b",
+            "modelInfo":{
+              "modelVersionId":"0e0bb964-e687-4439-9a9e-de9cd1ff5367",
+              "modelName":"ws-service",
+              "modelInvariantId":"734f0952-6678-44e7-8918-f9aa4694b687",
+              "modelType":"service",
+              "modelVersion":"1.0"
+            }
+          }
+        }
+      ]
+    }
+  ],
+  "requestType":"VNF Scale Out"
+}
\ No newline at end of file