summaryrefslogtreecommitdiff
path: root/java/config/IcePackAdmin.py
diff options
context:
space:
mode:
Diffstat (limited to 'java/config/IcePackAdmin.py')
-rw-r--r--java/config/IcePackAdmin.py103
1 files changed, 44 insertions, 59 deletions
diff --git a/java/config/IcePackAdmin.py b/java/config/IcePackAdmin.py
index 3b8d5d9764b..913dc67827e 100644
--- a/java/config/IcePackAdmin.py
+++ b/java/config/IcePackAdmin.py
@@ -15,32 +15,35 @@
import sys, os, TestUtil
+if not os.environ.has_key('ICE_HOME'):
+ print "ICE_HOME is not defined."
+ sys.exit(0)
+
+ice_home = os.environ['ICE_HOME']
+
icePackPort = "0";
-def startIcePackRegistry(toplevel, port, testdir):
+def startIcePackRegistry(port, testdir):
global icePackPort
- options = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel)
-
icePackPort = port
- icePack = os.path.join(toplevel, "bin", "icepackregistry")
+ icePack = os.path.join(ice_home, "bin", "icepackregistry")
dataDir = os.path.join(testdir, "db", "registry")
if not os.path.exists(dataDir):
os.mkdir(dataDir)
print "starting icepack registry...",
- command = icePack + options + ' --nowarn ' + \
- r' --IcePack.Registry.Locator.Endpoints="default -p ' + icePackPort + ' -t 5000" ' + \
- r' --IcePack.Registry.LocatorRegistry.Endpoints=default' + \
- r' --IcePack.Registry.Internal.Endpoints=default' + \
- r' --IcePack.Registry.Admin.Endpoints=default' + \
- r' --IcePack.Registry.Data=' + dataDir + \
- r' --IcePack.Registry.DynamicRegistration' + \
- r' --IcePack.Registry.Trace.AdapterRegistry=0' + \
- r' --Ice.ProgramName=icepackregistry'
+ command = icePack + TestUtil.clientServerOptions + ' --nowarn ' + \
+ r' --IcePack.Registry.Locator.Endpoints="default -p ' + icePackPort + ' -t 5000" ' + \
+ r' --IcePack.Registry.LocatorRegistry.Endpoints=default' + \
+ r' --IcePack.Registry.Internal.Endpoints=default' + \
+ r' --IcePack.Registry.Admin.Endpoints=default' + \
+ r' --IcePack.Registry.Data=' + dataDir + \
+ r' --IcePack.Registry.DynamicRegistration' + \
+ r' --Ice.ProgramName=icepackregistry'
icePackPipe = os.popen(command)
TestUtil.getAdapterReady(icePackPipe)
@@ -51,20 +54,18 @@ def startIcePackRegistry(toplevel, port, testdir):
return icePackPipe
-def startIcePackNode(toplevel, testdir):
+def startIcePackNode(testdir):
- options = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel)
-
- icePack = os.path.join(toplevel, "bin", "icepacknode")
+ icePack = os.path.join(ice_home, "bin", "icepacknode")
dataDir = os.path.join(testdir, "db", "node")
if not os.path.exists(dataDir):
os.mkdir(dataDir)
- overrideOptions = '"' + options.replace("--", "") + '"'
+ overrideOptions = '"' + TestUtil.clientServerOptions.replace("--", "") + '"'
print "starting icepack node...",
- command = icePack + options + ' --nowarn ' + \
+ command = icePack + TestUtil.clientServerOptions + ' --nowarn ' + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' --IcePack.Node.Endpoints=default' + \
r' --IcePack.Node.Data=' + dataDir + \
@@ -80,15 +81,13 @@ def startIcePackNode(toplevel, testdir):
print "ok"
return icePackPipe
-def shutdownIcePackRegistry(toplevel, icePackPipe):
+def shutdownIcePackRegistry(icePackPipe):
global icePackPort
- icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
-
- options = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
+ icePackAdmin = os.path.join(ice_home, "bin", "icepackadmin")
print "shutting down icepack registry...",
- command = icePackAdmin + options + \
+ command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "shutdown" '
@@ -101,15 +100,13 @@ def shutdownIcePackRegistry(toplevel, icePackPipe):
TestUtil.killServers()
sys.exit(1)
-def shutdownIcePackNode(toplevel, icePackPipe):
+def shutdownIcePackNode(icePackPipe):
global icePackPort
- icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
-
- options = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
+ icePackAdmin = os.path.join(ice_home, "bin", "icepackadmin")
print "shutting down icepack node...",
- command = icePackAdmin + options + \
+ command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "node shutdown localnode" '
@@ -122,14 +119,12 @@ def shutdownIcePackNode(toplevel, icePackPipe):
TestUtil.killServers()
sys.exit(1)
-def addApplication(toplevel, descriptor, targets):
+def addApplication(descriptor, targets):
global icePackPort
- icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
+ icePackAdmin = os.path.join(ice_home, "bin", "icepackadmin")
- options = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-
- command = icePackAdmin + options + \
+ command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "application add \"' + descriptor + '\\" ' + targets + ' \"'
@@ -139,14 +134,12 @@ def addApplication(toplevel, descriptor, targets):
TestUtil.killServers()
sys.exit(1)
-def removeApplication(toplevel, descriptor):
+def removeApplication(descriptor):
global icePackPort
- icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
+ icePackAdmin = os.path.join(ice_home, "bin", "icepackadmin")
- options = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-
- command = icePackAdmin + options + \
+ command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "application remove \"' + descriptor + '\\" \"'
@@ -156,14 +149,12 @@ def removeApplication(toplevel, descriptor):
TestUtil.killServers()
sys.exit(1)
-def addServer(toplevel, name, serverDescriptor, server, libpath, targets):
+def addServer(name, serverDescriptor, server, libpath, targets):
global icePackPort
- icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
+ icePackAdmin = os.path.join(ice_home, "bin", "icepackadmin")
- options = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-
- command = icePackAdmin + options + \
+ command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "server add localnode \"' + name + '\\" \\"' + serverDescriptor + '\\" ' + \
r' \"' + server + '\\" \\"' + libpath + '\\" ' + targets + '\"'
@@ -174,14 +165,12 @@ def addServer(toplevel, name, serverDescriptor, server, libpath, targets):
TestUtil.killServers()
sys.exit(1)
-def removeServer(toplevel, name):
+def removeServer(name):
global icePackPort
- icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
+ icePackAdmin = os.path.join(ice_home, "bin", "icepackadmin")
- options = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-
- command = icePackAdmin + options + \
+ command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "server remove \"' + name + '\\" \"'
@@ -191,13 +180,11 @@ def removeServer(toplevel, name):
TestUtil.killServers()
sys.exit(1)
-def startServer(toplevel, name):
+def startServer(name):
global icePackPort
- icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
-
- options = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
+ icePackAdmin = os.path.join(ice_home, "bin", "icepackadmin")
- command = icePackAdmin + options + \
+ command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "server start \"' + name + '\\""'
@@ -207,13 +194,11 @@ def startServer(toplevel, name):
TestUtil.killServers()
sys.exit(1)
-def listAdapters(toplevel):
+def listAdapters():
global icePackPort
- icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
-
- options = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
+ icePackAdmin = os.path.join(ice_home, "bin", "icepackadmin")
- command = icePackAdmin + options + \
+ command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "adapter list"'
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:43:11 +0000