Merge "Fix tag explanations in usage and comments"

2 files changed, 37 insertions, 38 deletions

diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh
index a59e3b6a33..897628cda0 100755
--- a/kubernetes/robot/ete-k8s.sh
+++ b/kubernetes/robot/ete-k8s.sh
@@ -15,44 +15,44 @@
 #!/bin/bash
 
 #
-# Run the testsuite for the passed tag. Valid tags are ete, health, closedloop, instantiate
+# Run the testsuite for the passed tag. Valid tags are listed in usage help
 # Please clean up logs when you are done...
-# Note: Do not run multiple concurrent ete.sh as the --display is not parameterized and tests will collide
+# Note: Do not run multiple concurrent ete-k8s.sh as the --display is not parameterized and tests will collide
 #
 if [ "$1" == "" ] || [ "$2" == "" ]; then
-   echo "Usage: ete-k8s.sh [namespace] [ health | healthdist | distribute | instantiate | instantiateVFWCL | instantiateDemoVFWCL |  | portal ]"
+   echo "Usage: ete-k8s.sh [namespace] [tag]"
+   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 "  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 ""
+   echo " update_onap_page.robot: UpdateWebPage"
+   echo ""
+   echo " vnf-orchestration-direct-so.robot: instantiateVFWdirectso"
+   echo ""
    echo " vnf-orchestration.robot: instantiate, instantiateNoDelete, stability72hr"
    exit
 fi
@@ -63,7 +63,6 @@ export NAMESPACE="$1"
 
 POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot)
 
-
 TAGS="-i $2"
 
 ETEHOME=/var/opt/ONAP
diff --git a/kubernetes/robot/eteHelm-k8s.sh b/kubernetes/robot/eteHelm-k8s.sh
index 02b79f35d6..6fcf984c3f 100755
--- a/kubernetes/robot/eteHelm-k8s.sh
+++ b/kubernetes/robot/eteHelm-k8s.sh
@@ -15,13 +15,13 @@
 #!/bin/bash
 
 #
-# Run the testsuite for the passed tag. Valid tags are ete, health, closedloop, instantiate
+# Run the health-check testsuites for the tags discovered by helm list 
 # Please clean up logs when you are done...
-# Note: Do not run multiple concurrent ete.sh as the --display is not parameterized and tests will collide
+# Note: Do not run multiple concurrent eteHelm-k8s.sh as the --display is not parameterized and tests will collide
 #
 if [ "$1" == "" ] ;  then
-   echo "Usage: eteHelm-k8s.sh namespace  "
-   echo " list projects via helm list and runs health-check with those tags except dev and dev-consul "
+   echo "Usage: eteHelm-k8s.sh namespace"
+   echo " list projects via helm list and runs health-check with those tags except dev and dev-consul"
    exit
 fi