Merge "update vfc juju version"

diff --git a/kubernetes/aai b/kubernetes/aai
index dbd0483..459205f 160000 (submodule)
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit dbd0483dce3b68687b2df8f218780ec75242d9f8
+Subproject commit 459205f75a77711479daad529aa97e0de8d67b18

diff --git a/kubernetes/cds/charts/cds-sdc-listener/values.yaml b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
index 5add8a7..7e1c4c5 100644 (file)
--- a/kubernetes/cds/charts/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
@@ -37,7 +37,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-sdclistener:latest
+image: onap/ccsdk-sdclistener:0.4.2
 name: sdc-listener
 pullPolicy: Always
 

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 31b8643..8b76f64 100755 (executable)
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -41,6 +41,10 @@ function usage
        echo "       demo-k8s.sh <namespace> instantiateVFW"
        echo "               - Instantiate vFW module for the demo customer (DemoCust<uuid>)"
        echo " "
+       echo "       demo-k8s.sh <namespace> instantiateVFWdirectso  csar_filename"
+       echo "               - Instantiate vFW module using direct SO interface using previously distributed model "
+        echo "                 that is in /tmp/csar in robot container"
+       echo " "
        echo "       demo-k8s.sh <namespace> deleteVNF <module_name from instantiateVFW>"
        echo "               - Delete the module created by instantiateVFW"
        echo " "
@@ -134,6 +138,16 @@ do
                        VARIABLES="$VARIABLES -v GLOBAL_BUILD_NUMBER:$$"
                        shift
                        ;;
+        instantiateVFWdirectso)
+                        TAG="instantiateVFWdirectso"
+                        shift
+                        if [ $# -ne 1 ];then
+                                        echo "Usage: demo-k8s.sh <namespace> instantiateVFWdirectso <csar_filename>"
+                                        exit
+                                fi
+                        VARIABLES="$VARIABLES -v CSAR_FILE:$1 -v GLOBAL_BUILD_NUMBER:$$"
+                        shift
+                        ;;
        deleteVNF)
                        TAG="deleteVNF"
                        shift

diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh
index aaa3bc8..a59e3b6 100755 (executable)
--- a/kubernetes/robot/ete-k8s.sh
+++ b/kubernetes/robot/ete-k8s.sh
@@ -21,6 +21,39 @@
 #
 if [ "$1" == "" ] || [ "$2" == "" ]; then
    echo "Usage: ete-k8s.sh [namespace] [ health | healthdist | distribute | instantiate | instantiateVFWCL | instantiateDemoVFWCL |  | portal ]"
+   echo ""
+   echo "  List of test case tags (filename for intent: tag) "
+   echo " "
+   echo "  cds.robot: cds "
+   echo " "
+   echo "  clamp.robot: clamp "
+   echo " "
+   echo "  demo.robot: InitDemo, InitCustomer , APPCCDTPreloadDemo, APPCMountPointDemo, DistributeDemoVFWDT, DistributeVFWNG,  "
+   echo "              InitDistribution, PreloadDemo, deleteVNF, heatbridge, instantiateDemoVFWCL, instantiateVFW, instantiateVFWCL, instantiateVFWDT "
+   echo " "
+   echo "  health-check.robot: health , core, small, medium, 3rdparty, api,  datarouter, externalapi, health-aaf, health-aai, health-appc, "
+   echo "                      health-clamp, health-cli, health-dcae, health-dmaap, health-log, health-modeling, health-msb, "
+   echo "                      health-multicloud, health-oof, health-policy, health-pomba, health-portal, health-sdc, health-sdnc, "
+   echo "                      health-so, health-uui, health-vfc, health-vid, health-vnfsdk, healthdist, healthlogin, healthmr, "
+   echo "                      healthportalapp, multicloud, oom "
+   echo " "
+   echo " hvves.robot: :HVVES, ete "
+   echo " "
+   echo " model-distribution-vcpe.robot: distributevCPEResCust "
+   echo " "
+   echo " model-distribution.robot: distribute, distributeVFWDT, distributeVLB "
+   echo " "
+   echo " oof-*.robot: cmso , has, homing "
+   echo " "
+   echo " pnf-registration.robot: ete, pnf_registrate "
+   echo " "
+   echo " post-install-tests.robot dmaapacl, postinstall"
+   echo " "
+   echo " update_onap_page.robot: UpdateWebPage "
+   echo " "
+   echo " vnf-orchestration-direct-so.robot:  instantiateVFWdirectso "
+   echo " "
+   echo " vnf-orchestration.robot: instantiate, instantiateNoDelete, stability72hr"
    exit
 fi
 

diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 7d42fd5..8758e7d 100644 (file)
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@ -77,6 +77,11 @@ GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX = "{{ .Values.openStackOamNetw
 GLOBAL_INJECTED_POLICY_IP_ADDR = "pdp.{{include "common.namespace" .}}"
 GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.{{include "common.namespace" .}}"
 GLOBAL_INJECTED_PORTAL_IP_ADDR = "portal-app.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POLICY_API_IP_ADDR = "policy-api.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POLICY_PAP_IP_ADDR = "policy-pap.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POLICY_DISTRIBUTION_IP_ADDR = "policy-distribution.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POLICY_PDPX_IP_ADDR = "policy-xacml-pdp.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR = "policy-apex-pdp.{{include "common.namespace" .}}"
 GLOBAL_INJECTED_PUBLIC_NET_ID = "{{ .Values.openStackPublicNetId }}"
 GLOBAL_INJECTED_REGION = "{{ .Values.openStackRegion }}"
 GLOBAL_INJECTED_SCRIPT_VERSION = "{{ .Values.scriptVersion }}"
@@ -162,6 +167,11 @@ GLOBAL_INJECTED_PROPERTIES = {
     "GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX" : "{{ .Values.openStackOamNetworkCidrPrefix }}",
     "GLOBAL_INJECTED_POLICY_IP_ADDR" : "pdp.{{include "common.namespace" .}}",
     "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : "drools.{{include "common.namespace" .}}",
+    "GLOBAL_INJECTED_POLICY_API_IP_ADDR" : "policy-api.{{include "common.namespace" .}}",
+    "GLOBAL_INJECTED_POLICY_PAP_IP_ADDR" : "policy-pap.{{include "common.namespace" .}}",
+    "GLOBAL_INJECTED_POLICY_DISTRIBUTION_IP_ADDR" : "policy-distribution.{{include "common.namespace" .}}",
+    "GLOBAL_INJECTED_POLICY_PDPX_IP_ADDR" :  "policy-xacml-pdp.{{include "common.namespace" .}}",
+    "GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR" : "policy-apex-pdp.{{include "common.namespace" .}}",
     "GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portal-app.{{include "common.namespace" .}}",
     "GLOBAL_INJECTED_PUBLIC_NET_ID" : "{{ .Values.openStackPublicNetId }}",
     "GLOBAL_INJECTED_REGION" : "{{ .Values.openStackRegion }}",