Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update MSB annotations SO helm chart service"
[oom.git]
/
kubernetes
/
robot
/
resources
/
config
/
eteshare
/
config
/
integration_robot_properties.py
diff --git
a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index
9111644
..
f459e9d
100644
(file)
--- a/
kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/
kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@
-1,4
+1,4
@@
-# Copyright (c) 2018 Amdocs, Bell Canada
+# Copyright (c) 2018 Amdocs, Bell Canada
, and others
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-19,17
+19,15
@@
GLOBAL_AAF_PASSWORD = "demo123456!"
# aai info - everything is from the private oam network (also called onap private network)
GLOBAL_AAI_SERVER_PROTOCOL = "https"
GLOBAL_AAI_SERVER_PORT = "8443"
# 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
"
-GLOBAL_AAI_PASSWORD = "
AAI
"
+GLOBAL_AAI_USERNAME = "
aai@aai.onap.org
"
+GLOBAL_AAI_PASSWORD = "
demo123456!
"
# appc info - everything is from the private oam network (also called onap private network)
GLOBAL_APPC_SERVER_PROTOCOL = "http"
GLOBAL_APPC_SERVER_PORT = "8282"
# 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_SERVER = "http://appc.{{include "common.namespace" .}}:"
GLOBAL_APPC_USERNAME = "admin"
GLOBAL_APPC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
GLOBAL_APPC_CDT_SERVER_PROTOCOL = "http"
GLOBAL_APPC_CDT_SERVER_PORT = "80"
GLOBAL_APPC_USERNAME = "admin"
GLOBAL_APPC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
GLOBAL_APPC_CDT_SERVER_PROTOCOL = "http"
GLOBAL_APPC_CDT_SERVER_PORT = "80"
-GLOBAL_APPC_CDT_SERVER = "http://appc-cdt.{{include "common.namespace" .}}:"
GLOBAL_APPC_CDT_USERNAME = "demo"
# sdc info - everything is from the private oam network (also called onap private network)
GLOBAL_ASDC_SERVER_PROTOCOL = "http"
GLOBAL_APPC_CDT_USERNAME = "demo"
# sdc info - everything is from the private oam network (also called onap private network)
GLOBAL_ASDC_SERVER_PROTOCOL = "http"
@@
-39,8
+37,8
@@
GLOBAL_ASDC_BE_ONBOARD_PORT = "8081"
GLOBAL_ASDC_BE_USERNAME = "beep"
GLOBAL_ASDC_BE_PASSWORD = "boop"
# clamp info - everything is from the private oam network (also called onap private network)
GLOBAL_ASDC_BE_USERNAME = "beep"
GLOBAL_ASDC_BE_PASSWORD = "boop"
# clamp info - everything is from the private oam network (also called onap private network)
-GLOBAL_CLAMP_SERVER_PROTOCOL = "http"
-GLOBAL_CLAMP_SERVER_PORT = "8
080
"
+GLOBAL_CLAMP_SERVER_PROTOCOL = "http
s
"
+GLOBAL_CLAMP_SERVER_PORT = "8
443
"
# nbi info - everything is from the private oam network (also called onap private network)
GLOBAL_NBI_SERVER_PROTOCOL = "http"
GLOBAL_NBI_SERVER_PORT = "8080"
# nbi info - everything is from the private oam network (also called onap private network)
GLOBAL_NBI_SERVER_PROTOCOL = "http"
GLOBAL_NBI_SERVER_PORT = "8080"
@@
-59,13
+57,18
@@
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_DMAAP_DR_NODE_SERVER_PORT = "8080"
# DROOL server port and credentials
GLOBAL_DROOLS_SERVER_PORT = "9696"
-GLOBAL_DROOLS_USERNAME = "
@1b3rt
"
-GLOBAL_DROOLS_PASSWORD = "
31nst31n
"
-#
Log info
+GLOBAL_DROOLS_USERNAME = "
demo@people.osaaf.org
"
+GLOBAL_DROOLS_PASSWORD = "
demo123456!
"
+#
log server config - NOTE: no log server is run in HEAT; only on OOM
GLOBAL_LOG_SERVER_PROTOCOL = "http"
GLOBAL_LOG_ELASTICSEARCH_PORT = "9200"
GLOBAL_LOG_LOGSTASH_PORT = "9600"
GLOBAL_LOG_KIBANA_PORT = "5601"
GLOBAL_LOG_SERVER_PROTOCOL = "http"
GLOBAL_LOG_ELASTICSEARCH_PORT = "9200"
GLOBAL_LOG_LOGSTASH_PORT = "9600"
GLOBAL_LOG_KIBANA_PORT = "5601"
+# pomba info - NOTE: no pomba is run in HEAT; only on OOM
+GLOBAL_POMBA_SERVER_PROTOCOL = "http"
+GLOBAL_POMBA_AAICONTEXTBUILDER_PORT = "9530"
+GLOBAL_POMBA_SDCCONTEXTBUILDER_PORT = "9530"
+GLOBAL_POMBA_NETWORKDISCCONTEXTBUILDER_PORT = "9530"
# microservice bus info - everything is from the private oam network (also called onap private network)
GLOBAL_MSB_SERVER_PROTOCOL = "http"
GLOBAL_MSB_SERVER_PORT = "80"
# microservice bus info - everything is from the private oam network (also called onap private network)
GLOBAL_MSB_SERVER_PROTOCOL = "http"
GLOBAL_MSB_SERVER_PORT = "80"
@@
-75,7
+78,7
@@
GLOBAL_MR_SERVER_PORT = "3904"
# mso info - everything is from the private oam network (also called onap private network)
GLOBAL_MSO_SERVER_PROTOCOL = "http"
GLOBAL_MSO_SERVER_PORT = "8080"
# mso info - everything is from the private oam network (also called onap private network)
GLOBAL_MSO_SERVER_PROTOCOL = "http"
GLOBAL_MSO_SERVER_PORT = "8080"
-
+# SO containers
GLOBAL_MSO_APIHAND_SERVER_PORT = "8080"
GLOBAL_MSO_ASDCHAND_SERVER_PORT = "8085"
GLOBAL_MSO_BPMN_SERVER_PORT = "8081"
GLOBAL_MSO_APIHAND_SERVER_PORT = "8080"
GLOBAL_MSO_ASDCHAND_SERVER_PORT = "8085"
GLOBAL_MSO_BPMN_SERVER_PORT = "8081"
@@
-110,8
+113,8
@@
GLOBAL_POLICY_SERVER_PORT = "8081"
GLOBAL_POLICY_HEALTHCHECK_PORT = "6969"
GLOBAL_POLICY_AUTH = "dGVzdHBkcDphbHBoYTEyMw=="
GLOBAL_POLICY_CLIENTAUTH = "cHl0aG9uOnRlc3Q="
GLOBAL_POLICY_HEALTHCHECK_PORT = "6969"
GLOBAL_POLICY_AUTH = "dGVzdHBkcDphbHBoYTEyMw=="
GLOBAL_POLICY_CLIENTAUTH = "cHl0aG9uOnRlc3Q="
-GLOBAL_POLICY_USERNAME = "
healthcheck
"
-GLOBAL_POLICY_PASSWORD = "
zb!XztG34
"
+GLOBAL_POLICY_USERNAME = "
demo@people.osaaf.org
"
+GLOBAL_POLICY_PASSWORD = "
demo123456!
"
# portal info - everything is from the private oam network (also called onap private network)
GLOBAL_PORTAL_SERVER_PROTOCOL = "http"
GLOBAL_PORTAL_SERVER_PORT = "8989"
# portal info - everything is from the private oam network (also called onap private network)
GLOBAL_PORTAL_SERVER_PROTOCOL = "http"
GLOBAL_PORTAL_SERVER_PORT = "8989"
@@
-144,4
+147,3
@@
GLOBAL_PROXY_WARNING_CONTINUE_XPATH=""
GLOBAL_DNS_TRAFFIC_DURATION = "600"
# location where heat templates are loaded from
GLOBAL_HEAT_TEMPLATES_FOLDER = "/var/opt/OpenECOMP_ETE/demo/heat"
GLOBAL_DNS_TRAFFIC_DURATION = "600"
# location where heat templates are loaded from
GLOBAL_HEAT_TEMPLATES_FOLDER = "/var/opt/OpenECOMP_ETE/demo/heat"
-