Merge branch 'master' into senslab2

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

diff --git a/sfa/nitos/nitosslices.py b/sfa/nitos/nitosslices.py
index 84ca86c..2edd209 100644 (file)
--- a/sfa/nitos/nitosslices.py
+++ b/sfa/nitos/nitosslices.py
@@ -73,7 +73,6 @@ class NitosSlices:
                  requested_nodes.remove(reserved_nodes_by_id[reservation_id])
         added_nodes = requested_nodes
 
-        print "NODES: \nAdded: %s \nDeleted: %s\nKept: %s" %(added_nodes,deleted_nodes_id,kept_nodes_id)
 
         try:
             deleted=self.driver.shell.releaseNodes({'reservation_ids': deleted_nodes_id})
@@ -126,7 +125,6 @@ class NitosSlices:
                  requested_channels.remove(reserved_channels_by_id[reservation_id])
         added_channels = requested_channels
 
-        print "CHANNELS: \nAdded: %s \nDeleted: %s\nKept: %s" %(added_channels,deleted_channels_id,kept_channels_id)
         
         try:
             deleted=self.driver.shell.releaseChannels({'reservation_ids': deleted_channels_id})
@@ -175,8 +173,7 @@ class NitosSlices:
         slicename = hrn_to_nitos_slicename(slice_hrn)
         slices = self.driver.shell.getSlices({}, [])
         slice = self.driver.filter_nitos_results(slices, {'slice_name': slicename})[0]
-        print slices
-
+        added_users = []
         #get users info
         users_info = []
         for user in users:
@@ -191,12 +188,11 @@ class NitosSlices:
 
              if not nitos_users:
                  # create the user
-                 added_users = []
-                 user_id = self.driver.shell.addUsers({'username': email.split('@')[0], 'email': email})
+                 user_id = self.driver.shell.addUser({'username': email.split('@')[0], 'email': email})
                  added_users.append(user_id)
                  # add user keys
                  for key in user['keys']:
-                      self.driver.shell.addUserKey({'user_id': user_id, 'key': key})
+                      self.driver.shell.addUserKey({'user_id': user_id, 'key': key, 'slice_id': slice['slice_id']})
                  # add the user to the slice
                  self.driver.shell.addUserToSlice({'slice_id': slice['slice_id'], 'user_id': user_id})
              else: