ITS#9632 Fix lloadd monitor tests to honour BASEPORT

diff --git a/tests/data/lloadd/monitor.ldif b/tests/data/lloadd/monitor.ldif
index 9650285df85114822edd82ee27a72de77502276c..0811d22a3c911f780c6c4be23ff82b3f7f339c96 100644 (file)
--- a/tests/data/lloadd/monitor.ldif
+++ b/tests/data/lloadd/monitor.ldif
@@ -67,7 +67,7 @@ objectClass: monitorContainer
 dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
  or
 objectClass: olmBalancerServer
-olmServerURI: ldap://localhost:9012/
+olmServerURI: @URI2@
 olmActiveConnections: 4
 olmPendingConnections: 0
 olmPendingOps: 0
@@ -153,7 +153,7 @@ objectClass: monitorContainer
 dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
  or
 objectClass: olmBalancerServer
-olmServerURI: ldap://localhost:9012/
+olmServerURI: @URI2@
 olmActiveConnections: 4
 olmPendingConnections: 0
 olmPendingOps: 0
@@ -204,7 +204,7 @@ olmFailedOps: 0
 dn: cn=server 2,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Moni
  tor
 objectClass: olmBalancerServer
-olmServerURI: ldap://localhost:9013/
+olmServerURI: @URI3@
 olmActiveConnections: 9
 olmPendingConnections: 0
 olmPendingOps: 0

diff --git a/tests/data/lloadd/test007-monitor.ldif b/tests/data/lloadd/test007-monitor.ldif
index aff5697a1969c8823bb0f433e2f0bd1769d62169..52c2c966e9c0e4c2c55bc683a3bfae82b6f69c88 100644 (file)
--- a/tests/data/lloadd/test007-monitor.ldif
+++ b/tests/data/lloadd/test007-monitor.ldif
@@ -35,7 +35,7 @@ objectClass: monitorContainer
 dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
  or
 objectClass: olmBalancerServer
-olmServerURI: ldap://localhost:9012/
+olmServerURI: @URI2@
 olmActiveConnections: 4
 olmPendingConnections: 0
 olmPendingOps: 0
@@ -121,7 +121,7 @@ objectClass: monitorContainer
 dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
  or
 objectClass: olmBalancerServer
-olmServerURI: ldap://localhost:9012/
+olmServerURI: @URI2@
 olmActiveConnections: 4
 olmPendingConnections: 0
 olmPendingOps: 0
@@ -172,7 +172,7 @@ olmFailedOps: 0
 dn: cn=server 2,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Moni
  tor
 objectClass: olmBalancerServer
-olmServerURI: ldap://localhost:9013/
+olmServerURI: @URI3@
 olmActiveConnections: 9
 olmPendingConnections: 0
 olmPendingOps: 0
@@ -308,7 +308,7 @@ objectClass: monitorContainer
 dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
  or
 objectClass: olmBalancerServer
-olmServerURI: ldap://localhost:9012/
+olmServerURI: @URI2@
 olmActiveConnections: 4
 olmPendingConnections: 0
 olmPendingOps: 0
@@ -359,7 +359,7 @@ olmFailedOps: 0
 dn: cn=server 2,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Moni
  tor
 objectClass: olmBalancerServer
-olmServerURI: ldap://localhost:9013/
+olmServerURI: @URI3@
 olmActiveConnections: 9
 olmPendingConnections: 0
 olmPendingOps: 0

diff --git a/tests/scripts/lloadd/test004-monitor b/tests/scripts/lloadd/test004-monitor
index bc6d33ad954eda2ba22adcd3942139b910ece75c..8d89234c9dd5b1889de62ff3b6fa57b6b3abd945 100755 (executable)
--- a/tests/scripts/lloadd/test004-monitor
+++ b/tests/scripts/lloadd/test004-monitor
@@ -345,7 +345,10 @@ LDIF=$DATADIR/lloadd/monitor.ldif
 echo "Filtering ldapsearch results..."
 $LDIFFILTER -s e < $SEARCHOUT > $SEARCHFLT
 echo "Filtering original ldif used to create database..."
-$LDIFFILTER -s e < $LDIF > $LDIFFLT
+$LDIFFILTER -s e < $LDIF | sed \
+    -e "s|@URI2@|$URI2|g" \
+    -e "s|@URI3@|$URI3|g" \
+    > $LDIFFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 

diff --git a/tests/scripts/lloadd/test007-coherence b/tests/scripts/lloadd/test007-coherence
index 4a42085e1213318d61c010e3c69d0ac94d0bc3fc..6dff7ed71f99e87a695954fd5080e3661cd3e502 100755 (executable)
--- a/tests/scripts/lloadd/test007-coherence
+++ b/tests/scripts/lloadd/test007-coherence
@@ -485,7 +485,10 @@ LDIF=$DATADIR/lloadd/test007-monitor.ldif
 echo "Filtering ldapsearch results..."
 $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
 echo "Filtering original ldif used to create database..."
-$LDIFFILTER < $LDIF > $LDIFFLT
+$LDIFFILTER < $LDIF | sed \
+    -e "s|@URI2@|$URI2|g" \
+    -e "s|@URI3@|$URI3|g" \
+    > $LDIFFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT