Update VID in docker-compose to 4.0-STAGING-latest
Added AAI simulator for new enrichCloudConfigurationWithCloudOwner
feature:
- Add AAI response
- Update Dockerfile with FROM python, and parametrized config
- Add aai-simulator to docker-compose file
BTW, modified SO.py to log to stdio. This enable running `docker logs
so-simulator` to see the rolling output.
Issue-ID: VID-453
Change-Id: Icd1ee2dd51d404261c3e0484b22a4d32b8e4aad8
Signed-off-by: Ittay Stern <ittay.stern@att.com>
diff --git a/tests/vid/resources/docker-compose.yml b/tests/vid/resources/docker-compose.yml
index 5f2c0fe..01fa92b 100644
--- a/tests/vid/resources/docker-compose.yml
+++ b/tests/vid/resources/docker-compose.yml
@@ -1,11 +1,12 @@
version: '3'
services:
vid-server:
- image: nexus3.onap.org:10001/onap/vid:3.0-STAGING-latest
+ image: nexus3.onap.org:10001/onap/vid:4.0-STAGING-latest
environment:
- VID_MYSQL_DBNAME=vid_openecomp_epsdk
- VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
- VID_MSO_SERVER_URL=https://so-simulator:8443
+ - VID_AAI_URL=http://aai-simulator:8443
ports:
- "8080:8080"
- "8443:8443"
@@ -29,6 +30,19 @@
build:
context: simulators
dockerfile: Dockerfile
+ args:
+ component: so
ports:
- "8444:8443"
- container_name: so-simulator
\ No newline at end of file
+ container_name: so-simulator
+
+ aai-simulator:
+ build:
+ context: simulators
+ dockerfile: Dockerfile
+ args:
+ component: aai
+ ports:
+ - "8445:8443"
+ container_name: aai-simulator
+
diff --git a/tests/vid/resources/simulators/Dockerfile b/tests/vid/resources/simulators/Dockerfile
index ace6d56..e6586b1 100644
--- a/tests/vid/resources/simulators/Dockerfile
+++ b/tests/vid/resources/simulators/Dockerfile
@@ -1,16 +1,12 @@
-FROM alpine:3.9
+FROM python:3-alpine3.9
-RUN apk add --no-cache python3 && \
- python3 -m ensurepip && \
- rm -r /usr/lib/python*/ensurepip && \
- pip3 install --upgrade pip setuptools && \
- if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
- if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi && \
- rm -r /root/.cache
+# `component` should be `so` or `aai`
+ARG component
+ENV component=$component
COPY SO.py /
ADD ./test_data_assets/ /
EXPOSE 8443
-CMD [ "python", "./SO.py", "expected_so_requests.json", "expected_so_responses.json" ]
+CMD python ./SO.py expected_${component}_requests.json expected_${component}_responses.json
diff --git a/tests/vid/resources/simulators/SO.py b/tests/vid/resources/simulators/SO.py
index c119939..fa481b3 100644
--- a/tests/vid/resources/simulators/SO.py
+++ b/tests/vid/resources/simulators/SO.py
@@ -103,7 +103,7 @@
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)
+ logging.basicConfig(level=logging.INFO)
handler = partial(SOHandler, expected_so_requests, expected_so_responses)
handler.protocol_version = "HTTP/1.0"
httpd = HTTPServer(('', DEFAULT_PORT), handler)
diff --git a/tests/vid/resources/simulators/test_data_assets/expected_aai_requests.json b/tests/vid/resources/simulators/test_data_assets/expected_aai_requests.json
new file mode 100644
index 0000000..3d77fe5
--- /dev/null
+++ b/tests/vid/resources/simulators/test_data_assets/expected_aai_requests.json
@@ -0,0 +1,4 @@
+{
+ "get": {
+ }
+}
\ No newline at end of file
diff --git a/tests/vid/resources/simulators/test_data_assets/expected_aai_responses.json b/tests/vid/resources/simulators/test_data_assets/expected_aai_responses.json
new file mode 100644
index 0000000..c809bca
--- /dev/null
+++ b/tests/vid/resources/simulators/test_data_assets/expected_aai_responses.json
@@ -0,0 +1,9 @@
+{
+ "get": {
+ "cloud-region": [{
+ "cloud-owner": "CloudOwner",
+ "cloud-region-id": "RegionOne"
+ }
+ ]
+ }
+}