Merge pull request #797 from haozturk/loadtest-sync-gitlab

Make loadtests be synced from gitlab

docker/rucio_client/scripts/CMSRSE.py

@@ -62,6 +62,8 @@ def __init__(self, json, dry=False, cms_type='real', deterministic=True):
         self.settings['deterministic'] = deterministic
         self.rucio_rse_type = json['type'].upper()
 
+        xattrs = {}
+
         # If we are building a _Test or _Temp instance add the special prefix
         if cms_type == "test":
             self.rse_name = json['rse']+"_Test"
@@ -70,11 +72,10 @@ def __init__(self, json, dry=False, cms_type='real', deterministic=True):
         else:
             self.rse_name = json['rse']
             if json.get('loadtest', None) is not None:
-                self.attrs['loadtest'] = json['loadtest']
-
-        self._get_attributes()
-        self.attrs['fts'] = ','.join(json['fts'])
+                xattrs['loadtest'] = json['loadtest']
 
+        xattrs['fts'] = ','.join(json['fts'])
+        self._get_attributes(xattrs=xattrs)
 
     """
     Parses either a prefix or a pfn within a rule in the storage.json
@@ -246,7 +247,7 @@ def _get_attributes(self, tier=None, country=None, xattrs=None):
         if self.rse_name in APPROVAL_REQUIRED:
             attrs['requires_approval'] = 'True'
 
-        for (key, value) in xattrs:
+        for key, value in xattrs.items():
             attrs[key] = value
 
         self.attrs = attrs
@@ -278,7 +279,6 @@ def _set_attributes(self):
                                  key, value, self.rse_name)
                 else:
                     self.rcli.add_rse_attribute(rse=self.rse_name, key=key, value=value)
-
         return changed
 
     def _get_protocol(self, proto_json, protos_json):