X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fiotlab%2Fiotlabdriver.py;h=a820fc697259dcd376dd68c6d93c902e1ff681f8;hb=HEAD;hp=d43395c390a1f2c03ca4e1e9edf5c74fd4a28976;hpb=cb225b4c35d84d89f9318f210fb65ef3b08da9d6;p=sfa.git diff --git a/sfa/iotlab/iotlabdriver.py b/sfa/iotlab/iotlabdriver.py index d43395c3..a820fc69 100644 --- a/sfa/iotlab/iotlabdriver.py +++ b/sfa/iotlab/iotlabdriver.py @@ -111,7 +111,7 @@ class IotLabDriver(Driver): email = caller_user['email'] # ensure user exist in LDAP tree users = self._get_users(email) - if users and email not in users: + if email not in users: self.shell.add_user(caller_user) users = self._get_users(email) if users and email in users: @@ -194,6 +194,7 @@ class IotLabDriver(Driver): # parse rspec rspec = RSpec(rspec_string) + logger.warning(options) caller_hrn = options.get('actual_caller_hrn', []) geni_users = options.get('geni_users', []) caller_user = [user for user in geni_users if @@ -206,11 +207,12 @@ class IotLabDriver(Driver): if login: nodes_list, start_time, duration = \ self._get_experiment(rspec) + # [0-9A-Za-z_] with onelab.inria.test_iotlab + exp_name = '_'.join((xrn.hrn.replace('\\.','')).split('.')) logger.warning("iotlabdriver allocate submit OAR job :" " %s %s %s %s" % - (xrn.hrn, start_time, duration, nodes_list)) - # [0-9A-Za-z_] with onelab.inria.test_iotlab - exp_name = '_'.join((xrn.hrn).split('.')) + (exp_name, start_time, duration, nodes_list)) + # submit OAR job ret = self.shell.reserve_nodes(login, exp_name,