git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bugs in slicename_to_hrn and hostname_to_hrn
[sfa.git]
/
geni
/
util
/
misc.py
diff --git
a/geni/util/misc.py
b/geni/util/misc.py
index
b2a917d
..
614ea12
100644
(file)
--- a/
geni/util/misc.py
+++ b/
geni/util/misc.py
@@
-30,19
+30,19
@@
def hrn_to_pl_authname(hrn):
def hrn_to_pl_login_base(hrn):
return hrn_to_pl_authname(hrn)
def hrn_to_pl_login_base(hrn):
return hrn_to_pl_authname(hrn)
-def hostname_to_hrn(
self
, login_base, hostname):
+def hostname_to_hrn(
auth_hrn
, login_base, hostname):
"""
Convert hrn to plantelab name.
"""
genihostname = "_".join(hostname.split("."))
"""
Convert hrn to plantelab name.
"""
genihostname = "_".join(hostname.split("."))
- return ".".join([
self.
hrn, login_base, genihostname])
+ return ".".join([
auth_
hrn, login_base, genihostname])
-def slicename_to_hrn(
self
, slicename):
+def slicename_to_hrn(
auth_hrn
, slicename):
"""
Convert hrn to planetlab name.
"""
parts = slicename.split("_")
"""
Convert hrn to planetlab name.
"""
parts = slicename.split("_")
- slice_hrn = ".".join([
self.
hrn, parts[0]]) + "." + "_".join(parts[1:])
+ slice_hrn = ".".join([
auth_
hrn, parts[0]]) + "." + "_".join(parts[1:])
return slice_hrn
return slice_hrn