From: Thierry Parmentelat Date: Thu, 22 Mar 2007 08:48:38 +0000 (+0000) Subject: merge from head - 1.21 X-Git-Tag: planetlab-4_0-rc3~9 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a4b9f5d6a624c5d5b9c459bba26d07c7fe196094;p=plcapi.git merge from head - 1.21 --- diff --git a/PLC/Methods/RefreshPeer.py b/PLC/Methods/RefreshPeer.py index 515bf9b..0bb71c9 100644 --- a/PLC/Methods/RefreshPeer.py +++ b/PLC/Methods/RefreshPeer.py @@ -72,7 +72,7 @@ class RefreshPeer(Method): for peer_object_id, object in objects.iteritems(): if peer_object_id not in peer_objects: object.delete(commit = False) - print classobj, "object %d deleted" % object[object.primary_key] + print classobj(self.api).__class__.__name__, "object %s deleted" % object[object.class_key] # Add/update new/existing objects for peer_object_id, peer_object in peer_objects.iteritems(): @@ -121,7 +121,8 @@ class RefreshPeer(Method): synced[peer_object_id] = object if dbg: - print >> log, peer['peername'], classobj(self.api).__class__.__name__, object[object.primary_key], dbg + print >> log, peer['peername'], classobj(self.api).__class__.__name__, \ + object[object.class_key], object[object.primary_key], dbg return synced @@ -218,7 +219,8 @@ class RefreshPeer(Method): peer_persons = sync(old_peer_persons, persons_at_peer, Person) # transcoder : retrieve a local key_id from a peer_key_id - key_transcoder = dict ( [ (key['key_id'],key['peer_key_id']) for key in peer_keys.values()]) + key_transcoder = dict ( [ (key['key_id'],peer_key_id) \ + for peer_key_id,key in peer_keys.iteritems()]) for peer_person_id, person in peer_persons.iteritems(): # Bind any newly cached users to peer @@ -232,20 +234,23 @@ class RefreshPeer(Method): peer_person = persons_at_peer[peer_person_id] # Foreign keys currently belonging to the user - old_person_key_ids = [key_transcoder[key_id] for key_id in person['key_ids']] + old_person_key_ids = [key_transcoder[key_id] for key_id in person['key_ids'] \ + if key_transcoder[key_id] in peer_keys] # Foreign keys that should belong to the user # this is basically peer_person['key_ids'], we just check it makes sense # (e.g. we might have failed importing it) - person_key_ids = [ x for x in peer_person['key_ids'] if x in peer_keys] + person_key_ids = [ key_id for key_id in peer_person['key_ids'] if key_id in peer_keys] # Remove stale keys from user - for peer_key_id in (set(old_person_key_ids) - set(person_key_ids)): - person.remove_key(peer_keys[peer_key_id], commit = False) + for key_id in (set(old_person_key_ids) - set(person_key_ids)): + person.remove_key(peer_keys[key_id], commit = False) + print >> log, peer['peername'], 'Key', key_id, 'removed from', person['email'] # Add new keys to user - for peer_key_id in (set(person_key_ids) - set(old_person_key_ids)): - person.add_key(peer_keys[peer_key_id], commit = False) + for key_id in (set(person_key_ids) - set(old_person_key_ids)): + person.add_key(peer_keys[key_id], commit = False) + print >> log, peer['peername'], 'Key', key_id, 'added into', person['email'] timers['persons'] = time.time() - start @@ -368,8 +373,10 @@ class RefreshPeer(Method): peer_slices = sync(old_peer_slices, slices_at_peer, Slice) # transcoder : retrieve a local node_id from a peer_node_id - node_transcoder = dict ( [ (node['node_id'],node['peer_node_id']) for node in peer_nodes.values()]) - person_transcoder = dict ( [ (person['person_id'],person['peer_person_id']) for person in peer_persons.values()]) + node_transcoder = dict ( [ (node['node_id'],peer_node_id) \ + for peer_node_id,node in peer_nodes.iteritems()]) + person_transcoder = dict ( [ (person['person_id'],peer_person_id) \ + for peer_person_id,person in peer_persons.iteritems()]) for peer_slice_id, slice in peer_slices.iteritems(): # Bind any newly cached foreign slices to peer @@ -384,35 +391,41 @@ class RefreshPeer(Method): peer_slice = slices_at_peer[peer_slice_id] # Nodes that are currently part of the slice - old_slice_node_ids = [ node_transcoder[node_id] for node_id in slice['node_ids']] + old_slice_node_ids = [ node_transcoder[node_id] for node_id in slice['node_ids'] \ + if node_transcoder[node_id] in peer_nodes] # Nodes that should be part of the slice - slice_node_ids = [ x for x in peer_slice['node_ids'] if x in peer_nodes] + slice_node_ids = [ node_id for node_id in peer_slice['node_ids'] if node_id in peer_nodes] # Remove stale nodes from slice for node_id in (set(old_slice_node_ids) - set(slice_node_ids)): slice.remove_node(peer_nodes[node_id], commit = False) + print >> log, peer['peername'], 'Node', peer_nodes[node_id]['hostname'], 'removed from', slice['name'] # Add new nodes to slice for node_id in (set(slice_node_ids) - set(old_slice_node_ids)): slice.add_node(peer_nodes[node_id], commit = False) + print >> log, peer['peername'], 'Node', peer_nodes[node_id]['hostname'], 'added into', slice['name'] # N.B.: Local nodes that may have been added to the slice # by hand, are removed. In other words, don't do this. # Foreign users that are currently part of the slice - old_slice_person_ids = [ person_transcoder[person_id] for person_id in slice['person_ids']] + old_slice_person_ids = [ person_transcoder[person_id] for person_id in slice['person_ids'] \ + if person_transcoder[person_id] in peer_persons] # Foreign users that should be part of the slice - slice_person_ids = [ x for x in peer_slice['person_ids'] if x in peer_persons] + slice_person_ids = [ person_id for person_id in peer_slice['person_ids'] if person_id in peer_persons ] # Remove stale users from slice - for peer_person_id in (set(old_slice_person_ids) - set(slice_person_ids)): - slice.remove_person(peer_persons[peer_person_id], commit = False) + for person_id in (set(old_slice_person_ids) - set(slice_person_ids)): + slice.remove_person(peer_persons[person_id], commit = False) + print >> log, peer['peername'], 'User', peer_persons[person_id]['email'], 'removed from', slice['name'] # Add new users to slice - for peer_person_id in (set(slice_person_ids) - set(old_slice_person_ids)): - slice.add_person(peer_persons[peer_person_id], commit = False) + for person_id in (set(slice_person_ids) - set(old_slice_person_ids)): + slice.add_person(peer_persons[person_id], commit = False) + print >> log, peer['peername'], 'User', peer_persons[person_id]['email'], 'added into', slice['name'] # N.B.: Local users that may have been added to the slice # by hand, are not touched.