- #users = slices.verify_users(slice_hrn, slice, users, sfa_peer, options=options)
-
- # add/remove slice from nodes
- #requested_slivers = []
- #for node in rspec.version.get_nodes_with_slivers():
- # hostname = None
- # if node.get('component_name'):
- # hostname = node.get('component_name').strip()
- # elif node.get('component_id'):
- # hostname = xrn_to_hostname(node.get('component_id').strip())
- # if hostname:
- # requested_slivers.append(hostname)
- #nodes = slices.verify_slice_nodes(slice, requested_slivers, peer)
-
- # add/remove channels
-
-
- # add/remove leases
- # a lease in Nitos RSpec case is a reservation of nodes and channels grouped by (slice,timeslot)
- rspec_requested_nodes, rspec_requested_channels = rspec.version.get_leases()
- print rspec_requested_nodes, rspec_requested_channels
-
+ users = slices.verify_users(
+ slice_hrn, slice, users, sfa_peer, options=options)
+
+ # add/remove leases (nodes and channels)
+ # a lease in Nitos RSpec case is a reservation of nodes and channels
+ # grouped by (slice,timeslot)
+ rspec_requested_leases = rspec.version.get_leases()
+ rspec_requested_nodes = []
+ rspec_requested_channels = []
+ for lease in rspec_requested_leases:
+ if lease['type'] == 'node':
+ lease.pop('type', None)
+ rspec_requested_nodes.append(lease)
+ else:
+ lease.pop('type', None)
+ rspec_requested_channels.append(lease)
+