Commit 89eac76e authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Add --path= argument to bypass current problem with devel server

loading emulabserver.py from the main tree.
parent 2bdd9c8b
...@@ -47,6 +47,9 @@ xmlrpc_port = XMLRPC_PORT ...@@ -47,6 +47,9 @@ xmlrpc_port = XMLRPC_PORT
# The default RPC module to invoke. # The default RPC module to invoke.
module = "experiment" module = "experiment"
# The default path
path = TBROOT
# Where to find the default certificate in the users home dir. # Where to find the default certificate in the users home dir.
default_cert = "/.ssl/emulab.pem" default_cert = "/.ssl/emulab.pem"
certificate = None; certificate = None;
...@@ -170,7 +173,7 @@ try: ...@@ -170,7 +173,7 @@ try:
opts, req_args = getopt.getopt(sys.argv[1:], opts, req_args = getopt.getopt(sys.argv[1:],
"dhVc:s:m:p:r", "dhVc:s:m:p:r",
[ "help", "version", "rawmode", "server=", "module=", [ "help", "version", "rawmode", "server=", "module=",
"cert=", "port="]) "cert=", "port=", "path="])
# ... act on them appropriately, and # ... act on them appropriately, and
for opt, val in opts: for opt, val in opts:
if opt in ("-h", "--help"): if opt in ("-h", "--help"):
...@@ -202,6 +205,9 @@ try: ...@@ -202,6 +205,9 @@ try:
elif opt in ("-d", "--debug"): elif opt in ("-d", "--debug"):
debug = 1 debug = 1
pass pass
elif opt in ("--path",):
path = val
pass
elif opt in ("-r", "--rawmode"): elif opt in ("-r", "--rawmode"):
rawmode = 1 rawmode = 1
pass pass
...@@ -268,7 +274,7 @@ ctx.set_verify(SSL.verify_none, 16) ...@@ -268,7 +274,7 @@ ctx.set_verify(SSL.verify_none, 16)
ctx.set_allow_unknown_ca(0) ctx.set_allow_unknown_ca(0)
# This is parsed by the Proxy object. # This is parsed by the Proxy object.
URI = "https://" + xmlrpc_server + ":" + str(xmlrpc_port) + TBROOT URI = "https://" + xmlrpc_server + ":" + str(xmlrpc_port) + path
if debug: if debug:
print >>sys.stderr, URI print >>sys.stderr, URI
pass pass
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment