summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Glacier2/attack/Client.cpp10
-rwxr-xr-xcpp/test/Glacier2/attack/run.py3
-rwxr-xr-xcpp/test/Glacier2/dynamicFiltering/Client.cpp10
-rwxr-xr-xcpp/test/Glacier2/dynamicFiltering/run.py3
-rw-r--r--cpp/test/Glacier2/sessionControl/Client.cpp10
-rwxr-xr-xcpp/test/Glacier2/sessionControl/run.py3
-rwxr-xr-xcpp/test/Glacier2/ssl/Client.cpp6
-rwxr-xr-xcpp/test/Glacier2/ssl/run.py3
-rwxr-xr-xcpp/test/Glacier2/staticFiltering/Client.cpp20
-rwxr-xr-xcpp/test/Glacier2/staticFiltering/run.py3
-rw-r--r--cpp/test/IceGrid/allocation/application.xml3
-rw-r--r--cpp/test/IceGrid/distribution/application.xml1
-rw-r--r--cpp/test/IceGrid/session/application.xml3
13 files changed, 37 insertions, 41 deletions
diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp
index 113df36526c..02f2041afcb 100644
--- a/cpp/test/Glacier2/attack/Client.cpp
+++ b/cpp/test/Glacier2/attack/Client.cpp
@@ -114,13 +114,13 @@ AttackClient::run(int argc, char* argv[])
cout << "testing server and router shutdown... " << flush;
backend->shutdown();
communicator()->setDefaultRouter(0);
- ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
- Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(adminBase);
- test(admin);
- admin->shutdown();
+ ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+ Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(adminBase);
+ test(process);
+ process->shutdown();
try
{
- admin->ice_ping();
+ process->ice_ping();
test(false);
}
catch(const Ice::LocalException&)
diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py
index 37031621fb2..651dbde6d91 100755
--- a/cpp/test/Glacier2/attack/run.py
+++ b/cpp/test/Glacier2/attack/run.py
@@ -25,7 +25,8 @@ router = os.path.join(toplevel, "bin", "glacier2router")
command = router + TestUtil.clientServerOptions + \
r' --Glacier2.RoutingTable.MaxSize=10' + \
r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
- r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.InstanceName=Glacier2' + \
r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/attack/passwords"'
print "starting router...",
diff --git a/cpp/test/Glacier2/dynamicFiltering/Client.cpp b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
index ee19c221a6e..e9c438a532e 100755
--- a/cpp/test/Glacier2/dynamicFiltering/Client.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
@@ -164,13 +164,13 @@ SessionControlClient::run(int argc, char* argv[])
// Shut down the router.
//
communicator()->setDefaultRouter(0);
- ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
- Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(adminBase);
- test(admin);
- admin->shutdown();
+ ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+ Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
+ test(process);
+ process->shutdown();
try
{
- admin->ice_ping();
+ process->ice_ping();
test(false);
}
catch(const Ice::LocalException&)
diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py
index daa7efd396a..4a08f0479a7 100755
--- a/cpp/test/Glacier2/dynamicFiltering/run.py
+++ b/cpp/test/Glacier2/dynamicFiltering/run.py
@@ -35,7 +35,8 @@ router = os.path.join(toplevel, "bin", "glacier2router")
command = router + TestUtil.clientServerOptions + \
r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
- r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.InstanceName=Glacier2' + \
r' --Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \
r' --Glacier2.SessionManager="SessionManager:tcp -h 127.0.0.1 -p 12010 -t 10000"' + \
r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \
diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp
index e80822b6731..04b3fa4bb8c 100644
--- a/cpp/test/Glacier2/sessionControl/Client.cpp
+++ b/cpp/test/Glacier2/sessionControl/Client.cpp
@@ -99,13 +99,13 @@ SessionControlClient::run(int argc, char* argv[])
session = Test::SessionPrx::uncheckedCast(router->createSession("userid", "abc123"));
session->shutdown();
communicator()->setDefaultRouter(0);
- ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
- Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(adminBase);
- test(admin);
- admin->shutdown();
+ ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+ Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
+ test(process);
+ process->shutdown();
try
{
- admin->ice_ping();
+ process->ice_ping();
test(false);
}
catch(const Ice::LocalException&)
diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py
index bac9cd799c0..8c62f569b44 100755
--- a/cpp/test/Glacier2/sessionControl/run.py
+++ b/cpp/test/Glacier2/sessionControl/run.py
@@ -35,7 +35,8 @@ router = os.path.join(toplevel, "bin", "glacier2router")
command = router + TestUtil.clientServerOptions + \
r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
- r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' \
+ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.InstanceName=Glacier2' + \
r' --Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \
r' --Glacier2.SessionManager="SessionManager:tcp -h 127.0.0.1 -p 12010 -t 10000"' \
r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"'
diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp
index 3c3e2f24b24..39858be2ee2 100755
--- a/cpp/test/Glacier2/ssl/Client.cpp
+++ b/cpp/test/Glacier2/ssl/Client.cpp
@@ -120,9 +120,9 @@ CallbackClient::run(int argc, char* argv[])
cout << "ok" << endl;
communicator()->setDefaultRouter(0);
- Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(
- communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12349 -t 10000"));
- admin->shutdown();
+ Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(
+ communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12349 -t 10000"));
+ process->shutdown();
return EXIT_SUCCESS;
}
diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py
index 93b9e4ea635..d25504b6741 100755
--- a/cpp/test/Glacier2/ssl/run.py
+++ b/cpp/test/Glacier2/ssl/run.py
@@ -38,7 +38,8 @@ command = router + TestUtil.clientServerOptions + \
r' --Glacier2.AddSSLContext=1' + \
r' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -t 10000"' + \
r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \
- r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \
+ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \
+ r' --Ice.Admin.InstanceName=Glacier2' + \
r' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \
r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \
r' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \
diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp
index d6990d801e5..e733eddb7a0 100755
--- a/cpp/test/Glacier2/staticFiltering/Client.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Client.cpp
@@ -152,25 +152,19 @@ AttackClient::run(int argc, char* argv[])
test(false);
}
+ ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+ Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
+ test(process);
+ process->shutdown();
try
{
- ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
- Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(adminBase);
- test(admin);
- admin->shutdown();
- try
- {
- admin->ice_ping();
- test(false);
- }
- catch(const Ice::LocalException&)
- {
- }
+ process->ice_ping();
+ test(false);
}
catch(const Ice::LocalException&)
{
+ cout << "ok" << endl;
}
- cout << "ok" << endl;
return EXIT_SUCCESS;
}
diff --git a/cpp/test/Glacier2/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py
index fea6ee0badb..d4ef8407ed3 100755
--- a/cpp/test/Glacier2/staticFiltering/run.py
+++ b/cpp/test/Glacier2/staticFiltering/run.py
@@ -259,7 +259,8 @@ for testcase in testcases:
routerCmd = router + serverOptions + " --Ice.Config=%s" % os.path.join(testdir, "router.cfg") + \
r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
- r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.InstanceName=Glacier2' + \
r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/staticFiltering/passwords"'
routerConfig = file(os.path.join(testdir, "router.cfg"), "w")
diff --git a/cpp/test/IceGrid/allocation/application.xml b/cpp/test/IceGrid/allocation/application.xml
index e48545892b6..26bac40a540 100644
--- a/cpp/test/IceGrid/allocation/application.xml
+++ b/cpp/test/IceGrid/allocation/application.xml
@@ -10,8 +10,7 @@
<server id="${id}" exe="${ice.dir}/bin/glacier2router">
<property name="Glacier2.Client.Endpoints" value="${endpoints}"/>
- <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/>
- <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
+ <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/>
<property name="Glacier2.SessionManager" value="${manager}"/>
<property name="Glacier2.SSLSessionManager" value="IceGrid/SSLSessionManager"/>
<property name="Glacier2.PermissionsVerifier" value="${verifier}"/>
diff --git a/cpp/test/IceGrid/distribution/application.xml b/cpp/test/IceGrid/distribution/application.xml
index dcdd5da7028..1a1b629b390 100644
--- a/cpp/test/IceGrid/distribution/application.xml
+++ b/cpp/test/IceGrid/distribution/application.xml
@@ -15,7 +15,6 @@
<adapter name="IcePatch2" endpoints="${endpoints}">
<object identity="${instance-name}/server" type="::IcePatch2::FileServer"/>
</adapter>
- <adapter name="IcePatch2.Admin" endpoints="tcp -h 127.0.0.1"/>
<properties>
<property name="IcePatch2.InstanceName" value="${instance-name}"/>
<property name="IcePatch2.Directory" value="${directory}"/>
diff --git a/cpp/test/IceGrid/session/application.xml b/cpp/test/IceGrid/session/application.xml
index 119151cc9ee..ce63ed705bc 100644
--- a/cpp/test/IceGrid/session/application.xml
+++ b/cpp/test/IceGrid/session/application.xml
@@ -12,8 +12,7 @@
<server id="${id}" exe="${ice.dir}/bin/glacier2router">
<property name="Glacier2.Client.Endpoints" value="${endpoints}"/>
<property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/>
- <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
-
+
<property name="Glacier2.SessionManager" value="${manager}"/>
<property name="Glacier2.SSLSessionManager" value="${ssl-manager}"/>
<property name="Glacier2.PermissionsVerifier" value="${verifier}"/>
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 16:38:01 +0000