switch from sa/ma to authority, fix update_membership_list

[sfa.git] / geni / util / misc.py

diff --git a/geni/util/misc.py b/geni/util/misc.py
index b2a917d..5913419 100644 (file)
--- a/geni/util/misc.py
+++ b/geni/util/misc.py
@@ -9,14 +9,6 @@ def get_authority(hrn):
     parts = hrn.split(".")
     return ".".join(parts[:-1])
 
-def get_auth_type(type):
-    if (type=="slice") or (type=="user") or (type=="sa"):
-        return "sa"
-    elif (type=="component") or (type=="ma"):
-        return "ma"
-    else:
-        raise UnknownGeniType(type)
-
 def hrn_to_pl_slicename(hrn):
     parts = hrn.split(".")
     return parts[-2] + "_" + parts[-1]
@@ -30,19 +22,19 @@ def 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("."))
-    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("_")
-    slice_hrn = ".".join([self.hrn, parts[0]]) + "." + "_".join(parts[1:])
+    slice_hrn = ".".join([auth_hrn, parts[0]]) + "." + "_".join(parts[1:])
 
     return slice_hrn