Commit bd6d0b8e authored by Ondřej Kuzník's avatar Ondřej Kuzník Committed by Ondřej Kuzník
Browse files

ITS#9632 Fix lloadd monitor tests to honour BASEPORT

parent ff740a28
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment