Issue #134 on Mock configuration inconsistency

Elian Krajarequested to merge
2.4.1-mock-fix into 2.4.1-fix-plu

Merge request reports

SOL005/NSDManagement-API/environment/variables.txt

+1 −1
Changes for SOL005/NSDManagement-API/environment/variables.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ ${NFVO_AUTH_USAGE} 1 
${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar



${callback_port}    9091

${callback_uri}    http://172.22.1.7:${callback_port}

${callback_uri}    http://172.22.1.7

${callback_endpoint}    /nsd/subscriptions

${callback_endpoint_error}    /subs_404

${callback_endpoint_fwd}    /endpoint/check

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+1 −1
Changes for SOL005/NSDManagement-API/NSDManagementKeywords.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ Create Sessions 
    Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint

    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance

    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue

    Create Mock Session  ${callback_uri}

    Create Mock Session  ${callback_uri}:${callback_port}

    

    

Check Notification Endpoint

SOL005/NSPerformanceManagement-API/environment/variables.txt

+1 −1
Changes for SOL005/NSPerformanceManagement-API/environment/variables.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies. 
${testOptionalMethods}    0



${callback_port}    9091

${callback_uri}    http://172.22.1.7:${callback_port}

${callback_uri}    http://172.22.1.7

${callback_endpoint}    /nspm/subscriptions

${callback_endpoint_error}    /subs_404

${sleep_interval}    20s

SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot

+1 −1
Changes for SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ Create Sessions 
    Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint

    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance

    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue

    Create Mock Session  ${callback_uri}

    Create Mock Session  ${callback_uri}:${callback_port}

    

    

Check Notification Endpoint

scripts/docker/Dockerfile

0 → 100644
+58 −0
Changes for scripts/docker/Dockerfile: 58 added lines, 0 removed lines.
Original line number Diff line number Diff line 
FROM ubuntu:16.04



MAINTAINER ETSI STF 583



LABEL description="SFT583 Robot Framework Docker Image"



ENV TERM=xterm

ENV HOSTNAME docker-robot-STF583



ARG ssh_prv_key



RUN DEBIAN_FRONTEND=noninteractive apt update \

	&& apt install python3 git -y \

	&& apt install python3-pip -y \

    && DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y \

    && DEBIAN_FRONTEND=noninteractive apt-get autoclean \

    && rm -rf /var/lib/apt/lists/*



RUN echo "docker-robot-STF583" > /etc/hostname \

    && echo "root:etsi" | chpasswd



RUN useradd --create-home --shell /bin/bash --user-group etsi --groups sudo \

    && echo "etsi:etsi" | chpasswd \

    && adduser etsi sudo \

    && echo "etsi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers



RUN DEBIAN_FRONTEND=noninteractive \

        && mkdir -p /home/etsi/dev/robot \

        && cd /home/etsi/dev/robot 



#RUN pip3 install robotframework



ADD requirements.txt /home/etsi/dev/robot/

ADD extensions /home/etsi/dev/robot/extensions



RUN ls /home/etsi/dev/robot





RUN DEBIAN_FRONTED=noninteractive \

	cd /home/etsi/dev/ \

	mkdir -p build \

	&& git clone https://forge.etsi.org/rep/forge-tools/robot2doc.git \

	&& cd robot2doc \

	&& pip3 install -r requirements.txt \

	&& python3 -m pip install -e .



RUN DEBIAN_FRONTEND=noninteractive \

	&& cd /home/etsi/dev/robot \

	&& pip3 install -r requirements.txt





ADD . /home/etsi/dev/robot



RUN	chmod +x /home/etsi/dev/robot/scripts/*



CMD tail -f /dev/null