From 61f81319bb14f08094488e8a2478ff4e0d6d661a Mon Sep 17 00:00:00 2001
From: Eduardo Ramos Testillano <eduardo.ramos.testillano@ericsson.com>
Date: Sun, 25 Jun 2017 21:28:20 +0200
Subject: [PATCH] RPATH skipped. Added testing so library. Improve support for
 default CCR configuration in st client

---
 dynamic/launcher/gx/00001/services/cerGx.xml           |  4 ++++
 dynamic/launcher/gx/00001/services/services.msk        |  4 +++-
 .../launcher/deployments/st-client/checkStatus.sh      | 10 ++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/dynamic/launcher/gx/00001/services/cerGx.xml b/dynamic/launcher/gx/00001/services/cerGx.xml
index 6afbdfa..308154a 100644
--- a/dynamic/launcher/gx/00001/services/cerGx.xml
+++ b/dynamic/launcher/gx/00001/services/cerGx.xml
@@ -1,6 +1,10 @@
 <message version="1" name="CER" application-id="0" hop-by-hop-id="1" end-to-end-id="120858368">
+   <avp name="Origin-Host" data="ggsnNodeHostname.nodeHostRealm.com"/>
+   <avp name="Origin-Realm" data="nodeHostRealm.com"/>
+<!--
    <avp name="Origin-Host" data="esmdx0900.gxrel10plusrealm.com"/>
    <avp name="Origin-Realm" data="gxrel10plusrealm.com"/>
+-->
    <avp name="Host-IP-Address" data="1|10.1.27.231"/>
    <avp name="Vendor-Id" data="0"/>
    <avp name="Product-Name" data="SAPC"/>
diff --git a/dynamic/launcher/gx/00001/services/services.msk b/dynamic/launcher/gx/00001/services/services.msk
index 11728cc..9537e5b 100644
--- a/dynamic/launcher/gx/00001/services/services.msk
+++ b/dynamic/launcher/gx/00001/services/services.msk
@@ -4,6 +4,8 @@
   <stack id="0" dictionary="dictionaryBase.xml"/>
 
   <!-- Nodes -->
-  <node originHost="esmdx0900.gxrel10plusrealm.com" applicationId="16777238" entity="ebs511dvipt:3868" cer="cerGx.xml" entityServerSessions="__CLIENT_CONNECTIONS__"/>
+  <node originHost="ggsnNodeHostname.nodeHostRealm.com" applicationId="16777238" entity="localhost:3869" cer="cerGx.xml" entityServerSessions="__CLIENT_CONNECTIONS__"/>
+  <!--  <node originHost="esmdx0900.gxrel10plusrealm.com" applicationId="16777238" entity="ebs511dvipt:3868" cer="cerGx.xml" entityServerSessions="__CLIENT_CONNECTIONS__"/> -->
+
 </services>
 
diff --git a/example/diameter/launcher/deployments/st-client/checkStatus.sh b/example/diameter/launcher/deployments/st-client/checkStatus.sh
index 7bbdb3b..3106b86 100755
--- a/example/diameter/launcher/deployments/st-client/checkStatus.sh
+++ b/example/diameter/launcher/deployments/st-client/checkStatus.sh
@@ -5,10 +5,16 @@ ADML_INSTANCES=`cat .st_conf_adml_instances 2>/dev/null`
 RESULT_CODE=0
 
 cd $(dirname $0)
-#[ -z "$ADML_CONNECTIONS" -o -z "$ADML_INSTANCES" ] && { echo "Miss configuration. Run ./configure.sh" ; exit 3 ; }
+if [ -z "$ADML_CONNECTIONS" -o -z "$ADML_INSTANCES" ]
+then
+  echo
+  echo "Run './configure.sh' first !"
+  echo
+  exit 3
+fi
 
 echo -n "Checking instances ... "
-ADML_INSTANCES_ALIVE=$(pgrep ADML- | wc -l)
+ADML_INSTANCES_ALIVE=$(pgrep "ADML-[0-9]" | wc -l)
 echo -n "$ADML_INSTANCES_ALIVE instances alive"
 if [ $ADML_INSTANCES_ALIVE -lt $ADML_INSTANCES ]
 then
-- 
2.20.1