Merged icepack_refactoring2_branch, many IcePack changes.

1 files changed, 9 insertions, 10 deletions

diff --git a/cpp/config/IcePackAdmin.py b/cpp/config/IcePackAdmin.py
index 145bb4bc261..b78eb5735a6 100644
--- a/cpp/config/IcePackAdmin.py
+++ b/cpp/config/IcePackAdmin.py
@@ -151,7 +151,7 @@ def shutdownIcePackNode():
         sys.exit(1)
     print "ok"
         
-def addApplication(descriptor, targets):
+def addApplication(descriptor, options):
 
     global icePackPort
     icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
@@ -159,23 +159,23 @@ def addApplication(descriptor, targets):
     descriptor = descriptor.replace("\\", "/")
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "application add \"' + descriptor + '\\" ' + targets + ' \"' + " 2>&1"
+              r' -e "application add \"' + descriptor + '\\" ' + options + ' \"' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
+    TestUtil.printOutputFromPipe(icePackAdminPipe)
     icePackAdminStatus = icePackAdminPipe.close()
     if icePackAdminStatus:
         TestUtil.killServers()
         sys.exit(1)
 
-def removeApplication(descriptor):
+def removeApplication(name):
 
     global icePackPort
     icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
 
-    descriptor = descriptor.replace("\\", "/")
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "application remove \"' + descriptor + '\\" \"' + " 2>&1"
+              r' -e "application remove \"' + name + '\\" \"' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
     TestUtil.printOutputFromPipe(icePackAdminPipe)
@@ -184,20 +184,19 @@ def removeApplication(descriptor):
         TestUtil.killServers()
         sys.exit(1)
 
-def addServer(name, serverDescriptor, server, libpath, targets):
+def addServer(serverDescriptor, options):
 
     global icePackPort
     icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
 
     serverDescriptor = serverDescriptor.replace("\\", "/");
-    server = server.replace("\\", "/");
-    libpath = libpath.replace("\\", "/");
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "server add localnode \"' + name + '\\" \\"' + serverDescriptor + '\\" ' + \
-              r' \"' + server + '\\" \\"' + libpath + '\\" ' + targets + '\"' + " 2>&1"
+              r' -e "server add ' + serverDescriptor + ' localnode ' + \
+              r' ' + options + '\"' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
+    TestUtil.printOutputFromPipe(icePackAdminPipe)
     icePackAdminStatus = icePackAdminPipe.close()
     if icePackAdminStatus:
         print "bailing out"