From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sat, 30 Jun 2012 01:54:57 +0000 (-0400)
Subject: fix bugs
X-Git-Tag: sfa-2.1-12~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=63fcfdb37c843eda1970a92f45bdd3ba4543d1ae;p=sfa.git

fix bugs
---

diff --git a/sfa/importer/openstackimporter.py b/sfa/importer/openstackimporter.py
index dd28728f..45941fcc 100644
--- a/sfa/importer/openstackimporter.py
+++ b/sfa/importer/openstackimporter.py
@@ -62,8 +62,8 @@ class OpenstackImporter:
             auth_hrn = config.SFA_INTERFACE_HRN 
             if user.tenantId is not None:
                 tenant = shell.auth_manager.tenants.find(id=user.tenantId)
-                auth_hrn = OSXrn(name=tenant.name, auth=config.SFA_INTERFACE_HRN).get_hrn()
-            hrn = OSXrn(name=user.name, auth=auth_hrn).get_hrn() 
+                auth_hrn = OSXrn(name=tenant.name, auth=config.SFA_INTERFACE_HRN, type='authority').get_hrn()
+            hrn = OSXrn(name=user.name, auth=auth_hrn, type='user').get_hrn() 
             users_dict[hrn] = user
             old_keys = old_user_keys.get(hrn, [])
             keys = [k.public_key for k in shell.nova_manager.keypairs.findall(name=hrn)]
@@ -103,7 +103,7 @@ class OpenstackImporter:
         for tenant in tenants:
             hrn = config.SFA_INTERFACE_HRN + '.' + tenant.name
             tenants_dict[hrn] = tenant
-            authority_hrn = OSXrn(xrn=hrn).get_authority_hrn()
+            authority_hrn = OSXrn(xrn=hrn, type='authority').get_authority_hrn()
 
             if hrn in existing_hrns:
                 continue
diff --git a/sfa/openstack/osxrn.py b/sfa/openstack/osxrn.py
index 830ee9ac..c1f783ba 100644
--- a/sfa/openstack/osxrn.py
+++ b/sfa/openstack/osxrn.py
@@ -10,11 +10,12 @@ def cleanup_name(name):
 
 class OSXrn(Xrn):
 
-    def __init__(self, name=None, type=None, auth=None, **kwds):
+    def __init__(self, name=None, auth=None, **kwds):
         
         config = Config()
         if name is not None:
-            self.type = type
+            if 'type' in kwds:
+                self.type = kwds['type']
             if auth is not None:
                 self.hrn='.'.join([auth, cleanup_name(name)]) 
             else: