From: Brian Freeman Date: Sat, 27 Apr 2019 12:38:30 +0000 (+0000) Subject: Merge "Add missing parameters" X-Git-Tag: 4.0.0-ONAP~184 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=67d3815417cd56d6d67760f7c65a85c516bb4467;hp=f5653372e8a59f86eccde9045ad467d380a5496e;p=oom.git Merge "Add missing parameters" --- diff --git a/kubernetes/robot/eteHelm-k8s.sh b/kubernetes/robot/eteHelm-k8s.sh old mode 100644 new mode 100755 index f63c98ee25..02b79f35d6 --- a/kubernetes/robot/eteHelm-k8s.sh +++ b/kubernetes/robot/eteHelm-k8s.sh @@ -31,7 +31,7 @@ export NAMESPACE="$1" POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot) -PROJECTS=$(helm list | cut -d ' ' -f 1 | grep "-" | grep -v consul ) +PROJECTS=$(helm list | tail +3 | grep '-' | cut -d' ' -f1 | sed -E 's/\w+-(\w+)/health-\1/g' | grep -v consul | grep -v nfs-provision) TAGS="" for project in $PROJECTS ; diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py index aa97252f09..d58e1389cd 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py @@ -87,8 +87,9 @@ GLOBAL_PRELOAD_PARAMETERS = { "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", }, "vpkg_preload.template": { - "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", + # vFWSNK_ prepended to vpkg since the default behoir for vFWSNK tempalte is to concatenate vnf_name and network_name + "unprotected_private_net_id" : "vFWSNK_vofwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id" : "vFWSNK_vofwlsnk_unprotected_sub${hostid}", "unprotected_private_net_cidr" : "192.168.10.0/24", "protected_private_net_cidr" : "192.168.20.0/24", "vfw_private_ip_0" : "192.168.10.100",