Fixes for Robot Selenium & Keystone

Issue-ID: INT-680
Change-Id: I314b21c09b115f9bbb52dd827a7e5950d52318f7
Signed-off-by: Brian Freeman <bf1936@att.com>

1 files changed, 26 insertions, 26 deletions

diff --git a/resources/config/eteshare/config/integration_robot_properties.py b/resources/config/eteshare/config/integration_robot_properties.py
index f459e9d..38bfceb 100644
--- a/resources/config/eteshare/config/integration_robot_properties.py
+++ b/resources/config/eteshare/config/integration_robot_properties.py
@@ -14,18 +14,18 @@
 
 # aaf info - everything is from the private oam network (also called onap private network)
 GLOBAL_AAF_SERVER = "https://aaf-service.{{include "common.namespace" .}}:8100"
-GLOBAL_AAF_USERNAME = "demo@people.osaaf.org"
-GLOBAL_AAF_PASSWORD = "demo123456!"
+GLOBAL_AAF_USERNAME = "{{ .Values.aafUsername }}"
+GLOBAL_AAF_PASSWORD = "{{ .Values.aafPassword }}"
 # aai info - everything is from the private oam network (also called onap private network)
 GLOBAL_AAI_SERVER_PROTOCOL = "https"
 GLOBAL_AAI_SERVER_PORT = "8443"
-GLOBAL_AAI_USERNAME = "aai@aai.onap.org"
-GLOBAL_AAI_PASSWORD = "demo123456!"
+GLOBAL_AAI_USERNAME = "{{ .Values.aaiUsername }}"
+GLOBAL_AAI_PASSWORD = "{{ .Values.aaiPassword}}"
 # appc info - everything is from the private oam network (also called onap private network)
 GLOBAL_APPC_SERVER_PROTOCOL = "http"
 GLOBAL_APPC_SERVER_PORT = "8282"
-GLOBAL_APPC_USERNAME = "admin"
-GLOBAL_APPC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+GLOBAL_APPC_USERNAME = "{{ .Values.appcUsername }}"
+GLOBAL_APPC_PASSWORD = "{{ .Values.appcPassword }}"
 GLOBAL_APPC_CDT_SERVER_PROTOCOL = "http"
 GLOBAL_APPC_CDT_SERVER_PORT = "80"
 GLOBAL_APPC_CDT_USERNAME = "demo"
@@ -48,8 +48,8 @@ GLOBAL_CLI_SERVER_PORT = "8080"
 # dcae info - everything is from the private oam network (also called onap private network)
 GLOBAL_DCAE_SERVER_PROTOCOL = "http"
 GLOBAL_DCAE_HEALTH_SERVER_PORT = "80"
-GLOBAL_DCAE_USERNAME = "console"
-GLOBAL_DCAE_PASSWORD = "ZjJkYjllMjljMTI2M2Iz"
+GLOBAL_DCAE_USERNAME = "{{ .Values.dcaeUsername }}"
+GLOBAL_DCAE_PASSWORD = "{{ .Values.dcaePassword}}"
 # data router info - everything is from the private oam network (also called onap private network)
 GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = "http"
 GLOBAL_DMAAP_DR_PROV_SERVER_PORT = "8080"
@@ -57,8 +57,8 @@ GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "http"
 GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8080"
 # DROOL server port and credentials
 GLOBAL_DROOLS_SERVER_PORT = "9696"
-GLOBAL_DROOLS_USERNAME = "demo@people.osaaf.org"
-GLOBAL_DROOLS_PASSWORD = "demo123456!"
+GLOBAL_DROOLS_USERNAME = "{{ .Values.droolsUsername }}"
+GLOBAL_DROOLS_PASSWORD = "{{ .Values.droolsPassword }}"
 # log server config - NOTE: no log server is run in HEAT; only on OOM
 GLOBAL_LOG_SERVER_PROTOCOL = "http"
 GLOBAL_LOG_ELASTICSEARCH_PORT = "9200"
@@ -88,10 +88,10 @@ GLOBAL_MSO_REQDB_SERVER_PORT = "8083"
 GLOBAL_MSO_SDNC_SERVER_PORT =  "8086"
 GLOBAL_MSO_VFC_SERVER_PORT = "8084"
 
-GLOBAL_MSO_USERNAME = "InfraPortalClient"
-GLOBAL_MSO_CATDB_USERNAME = "bpel"
-GLOBAL_MSO_PASSWORD = "password1$"
-
+GLOBAL_MSO_USERNAME = "{{ .Values.soUsername }}"
+GLOBAL_MSO_CATDB_USERNAME = "{{ .Values.soCatdbUsername }}"
+GLOBAL_MSO_PASSWORD = "{{ .Values.soPassword }}"
+# robot uses MSO_PASSWORD for both SO and CATDB
 # music info - everything is from the private oam network (also called onap private network)
 GLOBAL_MUSIC_SERVER_PROTOCOL = "http"
 GLOBAL_MUSIC_SERVER_PORT = "8080"
@@ -111,21 +111,21 @@ GLOBAL_PGN_PORT = "2831"
 GLOBAL_POLICY_SERVER_PROTOCOL = "https"
 GLOBAL_POLICY_SERVER_PORT = "8081"
 GLOBAL_POLICY_HEALTHCHECK_PORT = "6969"
-GLOBAL_POLICY_AUTH = "dGVzdHBkcDphbHBoYTEyMw=="
-GLOBAL_POLICY_CLIENTAUTH = "cHl0aG9uOnRlc3Q="
-GLOBAL_POLICY_USERNAME = "demo@people.osaaf.org"
-GLOBAL_POLICY_PASSWORD = "demo123456!"
+GLOBAL_POLICY_AUTH = "{{ .Values.policyAuth}}"
+GLOBAL_POLICY_CLIENTAUTH = "{{ .Values.policyClientAuth}}"
+GLOBAL_POLICY_USERNAME = "{{ .Values.policyUsername }}"
+GLOBAL_POLICY_PASSWORD = "{{ .Values.policyPassword }}"
 # portal info - everything is from the private oam network (also called onap private network)
 GLOBAL_PORTAL_SERVER_PROTOCOL = "http"
 GLOBAL_PORTAL_SERVER_PORT = "8989"
-GLOBAL_PORTAL_USERNAME = "demo"
-GLOBAL_PORTAL_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse"
+GLOBAL_PORTAL_USERNAME = "{{ .Values.portalUsername }}"
+GLOBAL_PORTAL_PASSWORD = "{{ .Values.portalPassword }}"
 # sdngc info - everything is from the private oam network (also called onap private network)
 GLOBAL_SDNGC_SERVER_PROTOCOL = "http"
 GLOBAL_SDNGC_REST_PORT = "8282"
 GLOBAL_SDNGC_ADMIN_PORT = "8843"
-GLOBAL_SDNGC_USERNAME = "admin"
-GLOBAL_SDNGC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+GLOBAL_SDNGC_USERNAME = "{{ .Values.sdncUsername }}"
+GLOBAL_SDNGC_PASSWORD = "{{ .Values.sdncPassword }}"
 # sms (AAF)  info
 GLOBAL_SMS_SERVER_PROTOCOL = "https"
 GLOBAL_SMS_SERVER_NAME = "aaf-sms.{{include "common.namespace" .}}"
@@ -133,10 +133,10 @@ GLOBAL_SMS_SERVER_PORT = "10443"
 # vid info - everything is from the private oam network (also called onap private network)
 GLOBAL_VID_SERVER_PROTOCOL = "https"
 GLOBAL_VID_SERVER_PORT = "8443"
-GLOBAL_VID_USERNAME = "demo"
-GLOBAL_VID_PASSWORD = "Kp8bJ4SXszM0WX"
-GLOBAL_VID_HEALTH_USERNAME = "Default"
-GLOBAL_VID_HEALTH_PASSWORD = "AppPassword!1"
+GLOBAL_VID_USERNAME = "{{ .Values.vidUsername }}"
+GLOBAL_VID_PASSWORD = "{{ .Values.vidPassword}}"
+GLOBAL_VID_HEALTH_USERNAME = "{{ .Values.vidHealthUsername }}"
+GLOBAL_VID_HEALTH_PASSWORD = "{{ .Values.vidHealthPassword }}"
 # vnfsdk info - everything is from the private oam network (also called onap private network)
 GLOBAL_VNFSDK_SERVER_PROTOCOL = "http"
 GLOBAL_VNFSDK_SERVER_PORT = "8702"