Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
110415d3
Commit
110415d3
authored
Dec 16, 2009
by
Leigh B. Stoller
Browse files
Minor tweak for version2 api (cm2).
parent
e8382c26
Changes
1
Hide whitespace changes
Inline
Side-by-side
protogeni/test/test-common.py
View file @
110415d3
...
...
@@ -96,7 +96,10 @@ for opt, arg in opts:
CMURI
=
arg
if
CMURI
[
-
2
:]
==
"cm"
:
CMURI
=
CMURI
[:
-
3
]
elif
CMURI
[
-
4
:]
==
"cmv2"
:
CMURI
=
CMURI
[:
-
5
]
pass
pass
elif
opt
in
(
"-p"
,
"--passphrase"
):
PASSPHRASEFILE
=
arg
elif
opt
in
(
"-r"
,
"--read-commands"
):
...
...
@@ -142,7 +145,7 @@ def do_method(module, method, params, URI=None, quiet=False):
from
M2Crypto.m2xmlrpclib
import
SSL_Transport
from
M2Crypto
import
SSL
if
URI
==
None
and
CMURI
and
module
==
"cm"
:
if
URI
==
None
and
CMURI
and
(
module
==
"cm"
or
module
==
"cmv2"
)
:
URI
=
CMURI
pass
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment