RSpecVersion.todict() needs to turn values() into a list()

[sfa.git] / sfa / nitos / nitosxrn.py

diff --git a/sfa/nitos/nitosxrn.py b/sfa/nitos/nitosxrn.py
index 442e48b..9722ffe 100644 (file)
--- a/sfa/nitos/nitosxrn.py
+++ b/sfa/nitos/nitosxrn.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 # specialized Xrn class for NITOS
 import re
 from sfa.util.xrn import Xrn
@@ -23,6 +25,12 @@ def hrn_to_nitos_authname (hrn):
     return NitosXrn(xrn=hrn,type='any').nitos_authname()
 def xrn_to_hostname(hrn):
     return Xrn.unescape(NitosXrn(xrn=hrn, type='node').get_leaf())
+def channel_to_hrn (auth, login_base, channel):
+    return NitosXrn(auth=auth+'.'+login_base, channel=channel).get_hrn()
+def channel_to_urn (auth, login_base, channel):
+    return NitosXrn(auth=auth+'.'+login_base, channel=channel).get_urn()
+def xrn_to_channel(hrn):
+    return Xrn.unescape(NitosXrn(xrn=hrn, type='channel').get_leaf())
 
 class NitosXrn (Xrn):
 
@@ -30,7 +38,7 @@ class NitosXrn (Xrn):
     def site_hrn (auth, login_base):
         return '.'.join([auth,login_base])
 
-    def __init__ (self, auth=None, hostname=None, slicename=None, email=None, interface=None, **kwargs):
+    def __init__ (self, auth=None, hostname=None, slicename=None, email=None, interface=None, channel=None, **kwargs):
         #def hostname_to_hrn(auth_hrn, login_base, hostname):
         if hostname is not None:
             self.type='node'
@@ -54,6 +62,10 @@ class NitosXrn (Xrn):
             self.type = 'interface'
             self.hrn = auth + '.' + interface
             self.hrn_to_urn()
+        elif channel is not None:
+            self.type='channel'
+            self.hrn=".".join([auth] + [channel])
+            self.hrn_to_urn()
         else:
             Xrn.__init__ (self,**kwargs)
 
@@ -100,4 +112,4 @@ if __name__ == '__main__':
         #slice_name = NitosXrn(xrn="omf.nitos.aminesl",type='slice').nitos_slicename()
         slicename = "giorgos_n"
         hrn = slicename_to_hrn("pla", "nitos", slicename)
-        print hrn  
+        print(hrn)