1 files changed, 34 insertions, 15 deletions
diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py
index bc4f993a241..8d84dba5be7 100755
--- a/cpp/demo/IceGrid/secure/expect.py
+++ b/cpp/demo/IceGrid/secure/expect.py
@@ -50,26 +50,14 @@ makecerts.expect("Sign the certificate?")
 makecerts.sendline("y")
 makecerts.expect("1 out of 1 certificate requests certified, commit?")
 makecerts.sendline("y")
-makecerts.expect("Enter the node name:")
-makecerts.sendline("All")
 makecerts.expect("Sign the certificate?")
 makecerts.sendline("y")
 makecerts.expect("1 out of 1 certificate requests certified, commit?")
 makecerts.sendline("y")
-makecerts.expect("Enter the server name:")
-makecerts.sendline("Glacier2 Admin")
 makecerts.expect("Sign the certificate?")
 makecerts.sendline("y")
 makecerts.expect("1 out of 1 certificate requests certified, commit?")
 makecerts.sendline("y")
-makecerts.expect("Enter the server name:")
-makecerts.sendline("All")
-makecerts.expect("Sign the certificate?")
-makecerts.sendline("y")
-makecerts.expect("1 out of 1 certificate requests certified, commit?")
-makecerts.sendline("y")
-makecerts.expect("Enter the server name:")
-makecerts.sendline("IceGrid Admin")
 makecerts.expect("Sign the certificate?")
 makecerts.sendline("y")
 makecerts.expect("1 out of 1 certificate requests certified, commit?")
@@ -82,7 +70,9 @@ print "ok"
 
 print "starting icegrid...",
 sys.stdout.flush()
-registry = demoscript.Util.spawn('icegridregistry --Ice.Config=config.registry --Ice.PrintAdapterReady')
+registryProps = " --Ice.PrintAdapterReady" + \
+                " --IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier"
+registry = demoscript.Util.spawn('icegridregistry --Ice.Config=config.registry' + registryProps)
 registry.expect('IceGrid.Registry.Internal ready\r{1,2}\nIceGrid.Registry.Server ready\r{1,2}\nIceGrid.Registry.Client ready')
 node = demoscript.Util.spawn('icegridnode --Ice.Config=config.node --Ice.PrintAdapterReady %s' % (args))
 node.expect('IceGrid.Node ready')
@@ -91,7 +81,10 @@ print "ok"
 print "starting glacier2...",
 sys.stdout.flush()
 
-glacier2 = demoscript.Util.spawn('glacier2router --Ice.Config=config.glacier2 --Ice.PrintAdapterReady --Glacier2.SessionTimeout=5')
+glacier2Props = " --Ice.PrintAdapterReady --Glacier2.SessionTimeout=5" + \
+                " --Glacier2.SSLSessionManager=DemoIceGrid/AdminSSLSessionManager" + \
+                " --Glacier2.SSLPermissionsVerifier=DemoGlacier2/NullSSLPermissionsVerifier"
+glacier2 = demoscript.Util.spawn('glacier2router --Ice.Config=config.glacier2' + glacier2Props)
 glacier2.expect('Glacier2.Client ready')
 glacier2.expect('Glacier2.Server ready')
 print "ok"
@@ -102,6 +95,8 @@ admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin')
 admin.expect('>>>')
 admin.sendline("application add application.xml")
 admin.expect('>>>')
+admin.sendline('exit')
+admin.waitTestSuccess(timeout=120)
 print "ok"
 
 def runtest():
@@ -122,17 +117,41 @@ sys.stdout.flush()
 runtest()
 print "ok"
 
-print "testing icegridadmin with router...",
+print "testing icegridadmin...",
 sys.stdout.flush()
+
 admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin --Ice.Default.Router="DemoGlacier2/router:ssl -p 4064"')
 admin.expect('>>>')
 admin.sendline("server list")
 admin.expect('SimpleServer')
 admin.expect('>>>')
+admin.sendline('exit')
+admin.waitTestSuccess(timeout=120)
+
+admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin --ssl')
+admin.expect('>>>')
+admin.sendline("server list")
+admin.expect('SimpleServer')
+admin.expect('>>>')
+admin.sendline('exit')
+admin.waitTestSuccess(timeout=120)
+
+admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin --ssl --Ice.Default.Router="DemoGlacier2/router:ssl -p 4064"')
+admin.expect('>>>')
+admin.sendline("server list")
+admin.expect('SimpleServer')
+admin.expect('>>>')
+admin.sendline('exit')
+admin.waitTestSuccess(timeout=120)
+
 print "ok"
 
 print "completing shutdown...", 
 sys.stdout.flush()
+
+admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin')
+admin.expect('>>>')
+
 admin.sendline('node shutdown Node')
 admin.expect('>>>')
 node.waitTestSuccess(timeout=120)