Merge "Add Global values to run healthcheck for DR"

diff --combined kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index 8173c56,4101a07..f2b50ce
--- 1/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
--- 2/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@@ -1,17 -1,3 +1,17 @@@
 +# Copyright © 2018 Amdocs, Bell Canada
 +#
 +# Licensed under the Apache License, Version 2.0 (the "License");
 +# you may not use this file except in compliance with the License.
 +# You may obtain a copy of the License at
 +#
 +#       http://www.apache.org/licenses/LICENSE-2.0
 +#
 +# Unless required by applicable law or agreed to in writing, software
 +# distributed under the License is distributed on an "AS IS" BASIS,
 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +# See the License for the specific language governing permissions and
 +# limitations under the License.
 +
  # 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"
@@@ -52,6 -38,11 +52,11 @@@ GLOBAL_DCAE_SERVER_PROTOCOL = "http
  GLOBAL_DCAE_HEALTH_SERVER_PORT = "80"
  GLOBAL_DCAE_USERNAME = "console"
  GLOBAL_DCAE_PASSWORD = "ZjJkYjllMjljMTI2M2Iz"
+ # 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"
+ 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 = "@1b3rt"

diff --combined kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 89e566d,fc3b3ec..d07f2e3
--- 1/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
--- 2/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@@ -1,17 -1,3 +1,17 @@@
 +# Copyright © 2018 Amdocs, Bell Canada
 +#
 +# Licensed under the Apache License, Version 2.0 (the "License");
 +# you may not use this file except in compliance with the License.
 +# You may obtain a copy of the License at
 +#
 +#       http://www.apache.org/licenses/LICENSE-2.0
 +#
 +# Unless required by applicable law or agreed to in writing, software
 +# distributed under the License is distributed on an "AS IS" BASIS,
 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +# See the License for the specific language governing permissions and
 +# limitations under the License.
 +
  # File generated from /opt/config
  #
  GLOBAL_INJECTED_AAF_IP_ADDR = "aaf-service.{{include "common.namespace" .}}"
@@@ -24,6 -10,8 +24,8 @@@ GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.
  GLOBAL_INJECTED_CLI_IP_ADDR = "cli.{{include "common.namespace" .}}"
  GLOBAL_INJECTED_CLOUD_ENV = "openstack"
  GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-healthcheck.{{include "common.namespace" .}}"
+ GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR = "dmaap-dr-prov.{{include "common.namespace" .}}"
+ GLOBAL_INJECTED_DMAAP_DR_NODE_IP_ADDR = "dmaap-dr-node.{{include "common.namespace" .}}"
  GLOBAL_INJECTED_DNS_IP_ADDR = "N/A"
  GLOBAL_INJECTED_DOCKER_VERSION = "1.2-STAGING-latest"
  GLOBAL_INJECTED_EXTERNAL_DNS = "N/A"
@@@ -78,6 -66,8 +80,8 @@@ GLOBAL_INJECTED_PROPERTIES = 
      "GLOBAL_INJECTED_CLI_IP_ADDR" : "cli.{{include "common.namespace" .}}",
      "GLOBAL_INJECTED_CLOUD_ENV" : "openstack",
      "GLOBAL_INJECTED_DCAE_IP_ADDR" : "dcae-healthcheck.{{include "common.namespace" .}}",
+     "GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR" : "dmaap-dr-prov.{{include "common.namespace" .}}",
+     "GLOBAL_INJECTED_DMAAP_DR_NODE_IP_ADDR": "dmaap-dr-node.{{include "common.namespace" .}}",
      "GLOBAL_INJECTED_DNS_IP_ADDR" : "N/A",
      "GLOBAL_INJECTED_DOCKER_VERSION" : "1.2-STAGING-latest",
      "GLOBAL_INJECTED_EXTERNAL_DNS" : "N/A",