From 9962c1c90ddb9a0986bb98f84f2d97685203fce0 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Thu, 10 Jul 2014 14:16:59 +0200 Subject: ICE-4612: first cut of the IceGrid discovery plugin and APIs --- scripts/IceGridAdmin.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'scripts/IceGridAdmin.py') 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) -- cgit v1.2.3