From 69a5e67a588c3e4724f93e20792bb12c51595c2e Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Wed, 12 Aug 2009 16:46:00 +0000
Subject: [PATCH] Make replication func tests server-splittable + small fixes
---
opends/tests/staf-tests/shared/python/replication.py | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/opends/tests/staf-tests/shared/python/replication.py b/opends/tests/staf-tests/shared/python/replication.py
index 66531a6..2117455 100644
--- a/opends/tests/staf-tests/shared/python/replication.py
+++ b/opends/tests/staf-tests/shared/python/replication.py
@@ -90,7 +90,7 @@
self.synchronizedSuffixList = []
def __repr__(self):
- return "Server: hostname=%s, directory=%s" % (self.hostanme, self.dir)
+ return "Server: hostname=%s, directory=%s" % (self.hostname, self.dir)
def addChangelogServer(self, changelogServer):
self.changelogServer = changelogServer
@@ -132,7 +132,32 @@
return self.synchronizedSuffixList
def requiresSynchronization(self):
- return (self.changelogServer is not None) or (len(self.synchronizedSuffixList) > 0)
+ return (self.changelogServer is not None) or (len(self.synchronizedSuffixList) > 0)
+
+ def isOnlyLdapServer(self):
+ return (self.changelogServer is None) and (len(self.synchronizedSuffixList) > 0)
+
+ def isOnlyReplServer(self):
+ return (self.changelogServer is not None) and (len(self.synchronizedSuffixList) == 0)
+
+ def splitReplServer(self):
+ new_hostname = self.hostname
+ new_dir = '%s-repl-server' % self.dir
+ new_port = str( int(self.port) + 1 )
+ new_adminPort = str( int(self.adminPort) + 1 )
+ new_sslPort = str( int(self.sslPort) + 1 )
+ new_jmxPort = str( int(self.jmxPort) + 1 )
+ new_rootDn = self.rootDn
+ new_rootPwd = self.rootPwd
+ new_baseDn = self.baseDn
+ new_changelogServer = self.changelogServer
+ self.changelogServer = None
+
+ replServer = Server(new_hostname, new_dir, new_port, new_adminPort, new_sslPort,
+ new_jmxPort, new_rootDn, new_rootPwd, new_baseDn)
+ replServer.addChangelogServer(new_changelogServer)
+
+ return replServer
--
Gitblit v1.10.0