Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix func. tests utils base URL generation issue
[transportpce.git]
/
tests
/
transportpce_tests
/
common
/
test_utils_rfc8040.py
diff --git
a/tests/transportpce_tests/common/test_utils_rfc8040.py
b/tests/transportpce_tests/common/test_utils_rfc8040.py
index f50897bd77d32f35b881aecff2bf6ba225436d50..c65c51ddd7af7eda3e26d853984105ea0ad17309 100644
(file)
--- a/
tests/transportpce_tests/common/test_utils_rfc8040.py
+++ b/
tests/transportpce_tests/common/test_utils_rfc8040.py
@@
-51,7
+51,7
@@
process_list = []
if 'USE_ODL_ALT_RESTCONF_PORT' in os.environ:
RESTCONF_PORT = os.environ['USE_ODL_ALT_RESTCONF_PORT']
else:
if 'USE_ODL_ALT_RESTCONF_PORT' in os.environ:
RESTCONF_PORT = os.environ['USE_ODL_ALT_RESTCONF_PORT']
else:
- RESTCONF_PORT =
str(8181)
+ RESTCONF_PORT =
8181
RESTCONF_PATH_PREFIX = {'rfc8040': '/rests',
'draft-bierman02': '/restconf'}
RESTCONF_PATH_PREFIX = {'rfc8040': '/rests',
'draft-bierman02': '/restconf'}
@@
-63,7
+63,7
@@
if 'USE_ODL_RESTCONF_VERSION' in os.environ:
else:
RESTCONF_VERSION = 'rfc8040'
else:
RESTCONF_VERSION = 'rfc8040'
-RESTCONF_BASE_URL = 'http://localhost:' +
RESTCONF_PORT
+ RESTCONF_PATH_PREFIX[RESTCONF_VERSION]
+RESTCONF_BASE_URL = 'http://localhost:' +
str(RESTCONF_PORT)
+ RESTCONF_PATH_PREFIX[RESTCONF_VERSION]
if 'USE_ODL_ALT_KARAF_INSTALL_DIR' in os.environ:
KARAF_INSTALLDIR = os.environ['USE_ODL_ALT_KARAF_INSTALL_DIR']
if 'USE_ODL_ALT_KARAF_INSTALL_DIR' in os.environ:
KARAF_INSTALLDIR = os.environ['USE_ODL_ALT_KARAF_INSTALL_DIR']