Merge pull request #592 from ericvaandering/rfc_dn

Add another DN for RFC comma separated form

docker/CMSRucioClient/scripts/syncaccounts.py

@@ -111,7 +111,7 @@ def _add_identity(self, account, dry=False):
                                        authtype=self.identity['type'], email=None)
                 logging.debug('added %s for account %s', self.identity, account)
             except Duplicate:  # Sometimes idmissing doesn't seem to work
-                logging.warn('identity %s for account %s existed', self.identity, account)
+                logging.warning('identity %s for account %s existed', self.identity, account)
                 return False
         return idmissing
 

docker/CMSRucioClient/scripts/user_to_site_mapping.py

@@ -60,6 +60,7 @@ def map_cric_users(country, option, dry_run):
         institute_country = user['institute_country']
         institute = user['institute']
         dns = {user['dn']}
+        dns.add(rfc2253dn(user['dn']))
         email = user['email']
         account_type = "USER"
         policy = ''
@@ -83,6 +84,7 @@ def map_cric_users(country, option, dry_run):
             for profile in profiles:
                 if 'dn' in profile:
                     dns.add(profile['dn'])
+                    dns.add(rfc2253dn(profile['dn']))
         except KeyError:
             continue
 
@@ -161,6 +163,21 @@ def usage():
     print("\t-d, --dry_run=\tt|f")
 
 
+def rfc2253dn(legacy_dn):
+    """
+    Convert a slash separated DN to a comma separated format
+    :param legacy_dn:
+    :return:
+    """
+    if not legacy_dn.startswith('/'):  # No op for things which aren't DNs
+        return legacy_dn
+    legacy_dn = legacy_dn.replace(',', r'\,')
+    parts = legacy_dn.split('/')[1:]  # Get rid of leading slash
+    new_dn = ','.join(parts)
+
+    return new_dn
+
+
 def main():
     option = 'set-new-only'
     dry_run = False