diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-10 14:16:59 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-10 14:16:59 +0200 |
| commit | 9962c1c90ddb9a0986bb98f84f2d97685203fce0 (patch) | |
| tree | fef7973a98850f43f7118f65b8e8b8586286d987 /scripts/IceGridAdmin.py | |
| parent | Fix background test. (diff) | |
| download | ice-9962c1c90ddb9a0986bb98f84f2d97685203fce0.tar.bz2 ice-9962c1c90ddb9a0986bb98f84f2d97685203fce0.tar.xz ice-9962c1c90ddb9a0986bb98f84f2d97685203fce0.zip | |
ICE-4612: first cut of the IceGrid discovery plugin and APIs
Diffstat (limited to 'scripts/IceGridAdmin.py')
| -rw-r--r-- | scripts/IceGridAdmin.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index d43452dda19..bca62817559 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -14,12 +14,13 @@ from threading import Thread # # Set nreplicas to a number N to test replication with N replicas. # -#nreplicas=0 -nreplicas=1 +nreplicas=0 +#nreplicas=1 iceGridPort = 12010; nodeOptions = r' --Ice.Warn.Connections=0' + \ + r' --IceGrid.InstanceName=TestIceGrid' + \ r' --IceGrid.Node.Endpoints=default' + \ r' --IceGrid.Node.WaitTime=240' + \ r' --Ice.ProgramName=icegridnode' + \ @@ -34,10 +35,11 @@ nodeOptions = r' --Ice.Warn.Connections=0' + \ r' --Ice.ServerIdleTime=0' registryOptions = r' --Ice.Warn.Connections=0' + \ - r' --IceGrid.Registry.PermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ - r' --IceGrid.Registry.AdminPermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ - r' --IceGrid.Registry.SSLPermissionsVerifier=IceGrid/NullSSLPermissionsVerifier' + \ - r' --IceGrid.Registry.AdminSSLPermissionsVerifier=IceGrid/NullSSLPermissionsVerifier' + \ + r' --IceGrid.InstanceName=TestIceGrid' + \ + r' --IceGrid.Registry.PermissionsVerifier=TestIceGrid/NullPermissionsVerifier' + \ + r' --IceGrid.Registry.AdminPermissionsVerifier=TestIceGrid/NullPermissionsVerifier' + \ + r' --IceGrid.Registry.SSLPermissionsVerifier=TestIceGrid/NullSSLPermissionsVerifier' + \ + r' --IceGrid.Registry.AdminSSLPermissionsVerifier=TestIceGrid/NullSSLPermissionsVerifier' + \ r' --IceGrid.Registry.Server.Endpoints=default' + \ r' --IceGrid.Registry.Internal.Endpoints=default' + \ r' --IceGrid.Registry.SessionManager.Endpoints=default' + \ @@ -60,7 +62,7 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ def getDefaultLocatorProperty(): i = 0 - property = '--Ice.Default.Locator="IceGrid/Locator'; + property = '--Ice.Default.Locator="TestIceGrid/Locator'; objrefs = "" while i < nreplicas + 1: objrefs = objrefs + ':default -p ' + str(iceGridPort + i) |