diff options
| author |   Ritu Sood <ritu.sood@intel.com> | 2019-05-17 16:07:45 -0700 |
|---|---|---|
| committer | Ritu Sood <ritu.sood@intel.com> | 2019-05-22 18:21:20 -0700 |
| commit | 352080a39d582a767d5908ab3372ac10d59a2261 (patch) | |
| tree | 739d140efbf06396b655efa24ef47618e2463c08 /kud/tests/cFW/sink | |
| parent | 09433fb59e63a96a1e6d08fdd6061c59b3813e61 (diff) | |
vFW usecase update
Update vFw Uses case to use 1.5.0
artifacts. 1.3.1 artifacts were
removed from nexus this week.
Changed sink container to remove IP
addresses that are built in the image and
can't be changed or parametrized. Added
a configmap for sink container
Change-Id: Ib1aae1816de866889e93d61a77832680764acef6
Issue-ID: MULTICLOUD-623
Signed-off-by: Ritu Sood <ritu.sood@intel.com>
Diffstat (limited to 'kud/tests/cFW/sink')
| -rw-r--r-- | kud/tests/cFW/sink/Dockerfile | 30 | ||||
| -rw-r--r-- | kud/tests/cFW/sink/wrapper_v_sink_init.sh | 10 |
2 files changed, 20 insertions, 20 deletions
diff --git a/kud/tests/cFW/sink/Dockerfile b/kud/tests/cFW/sink/Dockerfile index 6b43ba61..5e3da088 100644 --- a/kud/tests/cFW/sink/Dockerfile +++ b/kud/tests/cFW/sink/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:16.04 -MAINTAINER Victor Morales <electrocucaracha@gmail.com> +MAINTAINER Ritu Sood <ritu.sood@intel.com> ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -7,28 +7,18 @@ ARG HTTPS_PROXY=${HTTPS_PROXY} ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY -ENV protected_net_cidr "192.168.20.0/24" -ENV fw_ipaddr "192.168.10.100" -ENV sink_ipaddr "192.168.20.250" -ENV demo_artifacts_version "1.3.0" -ENV protected_net_gw "192.168.20.100" -ENV unprotected_net "192.168.10.0/24" +ENV repo_url "https://nexus.onap.org/content/repositories/staging/org/onap/demo/vnf" +ENV demo_artifacts_version "1.5.0" -RUN apt-get update && apt-get install -y -qq wget net-tools +RUN apt-get update && apt-get install -y -qq wget net-tools unzip WORKDIR /opt -RUN wget "https://git.onap.org/demo/plain/vnfs/vFW/scripts/v_sink_init.sh" \ - && chmod +x v_sink_init.sh +RUN wget "${repo_url}/vfw/vfw-scripts/${demo_artifacts_version}/vfw-scripts-${demo_artifacts_version}.zip" \ + && unzip "vfw-scripts-${demo_artifacts_version}.zip" \ + && chmod +x v_sink_init.sh -RUN mkdir -p config/ \ - && echo $protected_net_cidr > config/protected_net_cidr.txt \ - && echo $fw_ipaddr > config/fw_ipaddr.txt \ - && echo $sink_ipaddr > config/sink_ipaddr.txt \ - && echo $demo_artifacts_version > config/demo_artifacts_version.txt \ - && echo $protected_net_gw > config/protected_net_gw.txt \ - && echo $unprotected_net > config/unprotected_net.txt +COPY wrapper_v_sink_init.sh . +RUN chmod +x wrapper_v_sink_init.sh -# NOTE: this script executes $ route add -net 192.168.10.0 netmask 255.255.255.0 gw 192.168.20.100 -# which results in this error if doesn't have all nics required -> SIOCADDRT: File exists -CMD ["./v_sink_init.sh"] +CMD ["./wrapper_v_sink_init.sh"] diff --git a/kud/tests/cFW/sink/wrapper_v_sink_init.sh b/kud/tests/cFW/sink/wrapper_v_sink_init.sh new file mode 100644 index 00000000..e3a3e35e --- /dev/null +++ b/kud/tests/cFW/sink/wrapper_v_sink_init.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +mkdir -p /opt/config/ +echo "$protected_net_gw" > /opt/config/protected_net_gw.txt +echo "$protected_private_net_cidr" > /opt/config/unprotected_net.txt + +# NOTE: this script executes $ route add -net 192.168.10.0 netmask 255.255.255.0 gw 192.168.20.100 +# which results in this error if doesn't have all nics required -> SIOCADDRT: File exists +./v_sink_init.sh +sleep infinity |