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/_common.sh | |
| 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/_common.sh')
| -rwxr-xr-x | kud/tests/_common.sh | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/kud/tests/_common.sh b/kud/tests/_common.sh index 77818dcf..3120dad7 100755 --- a/kud/tests/_common.sh +++ b/kud/tests/_common.sh @@ -33,7 +33,7 @@ rbp_instance=rbp_instance.json rbp_content_tarball=profile.tar # vFirewall vars -demo_artifacts_version=1.3.1 +demo_artifacts_version=1.5.0 vfw_private_ip_0='192.168.10.3' vfw_private_ip_1='192.168.20.2' vfw_private_ip_2='10.10.100.3' @@ -47,6 +47,7 @@ protected_net_gw='192.168.20.100' protected_net_cidr='192.168.20.0/24' protected_private_net_cidr='192.168.10.0/24' onap_private_net_cidr='10.10.0.0/16' +sink_ipaddr='192.168.20.250' # populate_CSAR_containers_vFW() - This function creates the content of CSAR file # required for vFirewal using only containers @@ -323,6 +324,7 @@ NET - export dcae_collector_port=$dcae_collector_port - export protected_net_gw=$protected_net_gw - export protected_private_net_cidr=$protected_private_net_cidr + - export sink_ipaddr=$sink_ipaddr " if [[ -n "${http_proxy+x}" ]]; then proxy+=" @@ -476,6 +478,16 @@ spec: memory: 4Gi DEPLOYMENT + cat << CONFIGMAP > sink_configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: sink-configmap +data: + protected_net_gw: $protected_net_gw + protected_private_net_cidr: $protected_private_net_cidr +CONFIGMAP + cat << DEPLOYMENT > $sink_deployment_name.yaml apiVersion: apps/v1 kind: Deployment @@ -503,12 +515,16 @@ spec: spec: containers: - name: $sink_deployment_name - image: electrocucaracha/sink - imagePullPolicy: IfNotPresent + image: rtsood/onap-vfw-demo-sink:0.2.0 + envFrom: + - configMapRef: + name: sink-configmap + imagePullPolicy: Always tty: true stdin: true securityContext: privileged: true + - name: darkstat image: electrocucaracha/darkstat imagePullPolicy: IfNotPresent |