setting peer_id of remote key object

[sfa.git] / sfa / plc / slices.py

diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py
index bcdfc29..a74687e 100644 (file)
--- a/sfa/plc/slices.py
+++ b/sfa/plc/slices.py
@@ -6,6 +6,7 @@ import time
 import traceback
 import sys
 
+from types import StringTypes
 from sfa.util.misc import *
 from sfa.util.rspec import *
 from sfa.util.specdict import *
@@ -31,6 +32,27 @@ class Slices(SimpleStorage):
         self.load()
 
 
+    def get_peer(self, hrn):
+        # Becaues of myplc federation,  we first need to determine if this
+        # slice belongs to out local plc or a myplc peer. We will assume it 
+        # is a local site, unless we find out otherwise  
+        peer = None
+
+        # get this slice's authority (site)
+        slice_authority = get_authority(hrn)
+
+        # get this site's authority (sfa root authority or sub authority)
+        site_authority = get_authority(slice_authority).lower()
+
+        # check if we are already peered with this site_authority, if so
+        peers = self.api.plshell.GetPeers(self.api.plauth, {}, ['peer_id', 'peername', 'shortname', 'hrn_root'])
+        for peer_record in peers:
+            names = [name.lower() for name in peer_record.values() if isinstance(name, StringTypes)]
+            if site_authority in names:
+                peer = peer_record['shortname']
+
+        return peer
+
     def refresh(self):
         """
         Update the cached list of slices
@@ -95,13 +117,20 @@ class Slices(SimpleStorage):
             self.delete_slice_smgr(hrn)
         
     def delete_slice_aggregate(self, hrn):
+
         slicename = hrn_to_pl_slicename(hrn)
-        slices = self.api.plshell.GetSlices(self.api.plauth, {'peer_id': None, 'name': slicename})
+        slices = self.api.plshell.GetSlices(self.api.plauth, {'name': slicename})
         if not slices:
             return 1        
         slice = slices[0]
 
+        # determine if this is a peer slice
+        peer = self.get_peer(hrn)
+        if peer:
+            self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice', slice['slice_id'], peer)
         self.api.plshell.DeleteSliceFromNodes(self.api.plauth, slicename, slice['node_ids'])
+        if peer:
+            self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', slice['slice_id'], peer, slice['peer_slice_id'])
         return 1
 
     def delete_slice_smgr(self, hrn):
@@ -134,22 +163,9 @@ class Slices(SimpleStorage):
             self.create_slice_smgr(hrn, rspec)
 
     def create_slice_aggregate(self, hrn, rspec):
-        # Becaues of myplc federation,  we first need to determine if this
-        # slice belongs to out local plc or a myplc peer. We will assume it 
-        # is a local site, unless we find out otherwise  
-        peer = None
-        
-        # get this slice's authority (site)
-        slice_authority = get_authority(hrn)
-        
-        # get this site's authority (sfa root authority or sub authority)
-        site_authority = get_authority(slice_authority)
-        
-        # check if we are already peered with this site_authority, if so
-        peers = self.api.plshell.GetPeers(self.api.plauth, {}, ['peer_id', 'peername', 'shortname', 'hrn_root'])
-        for peer_record in peers:
-            if site_authority in peer_record.values():
-                peer = peer_record['shortname']                                            
+
+        # Determine if this is a peer slice
+        peer = self.get_peer(hrn)
 
         spec = Rspec(rspec)
         # Get the slice record from geni
@@ -167,7 +183,7 @@ class Slices(SimpleStorage):
 
         # Make sure slice exists at plc, if it doesnt add it
         slicename = hrn_to_pl_slicename(hrn)
-        slices = self.api.plshell.GetSlices(self.api.plauth, [slicename], ['node_ids'])
+        slices = self.api.plshell.GetSlices(self.api.plauth, [slicename], ['slice_id', 'node_ids'])
         if not slices:
             parts = slicename.split("_")
             login_base = parts[0]
@@ -239,7 +255,7 @@ class Slices(SimpleStorage):
                     self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer'])
                 key_ids = []
             else:
-                preson_id = person[0]['person_id'] 
+                person_id = persons[0]['person_id'] 
                 key_ids = persons[0]['key_ids']
 
             # if this is a peer person, we must unbind them from the peer or PLCAPI will throw
@@ -255,14 +271,16 @@ class Slices(SimpleStorage):
             keys = [key['key'] for key in keylist]
 
             # add keys that arent already there 
+           key_ids=person_record['key_ids']
             for personkey in person_dict['keys']:
                 if personkey not in keys:
                     key = {'key_type': 'ssh', 'key': personkey}
                     if peer:
-                        self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer'])
-                    self.api.plshell.AddPersonKey(self.api.plauth, person_dict['email'], key)
+                        self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'person', person_id, peer)
+                    key_id=self.api.plshell.AddPersonKey(self.api.plauth, person_dict['email'], key)
                     if peer:
-                        self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer'])
+                        self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer'])
+                        self.api.plshell.BindObjectToPeer(self.api.plauth, 'key', key_id, peer, key_ids.pop(0))
 
         # find out where this slice is currently running
         nodelist = self.api.plshell.GetNodes(self.api.plauth, slice['node_ids'], ['hostname'])
@@ -326,6 +344,7 @@ class Slices(SimpleStorage):
                     aggregates[aggregate].create_slice(credential, hrn, rspecs[aggregate])
             except:
                 print >> log, "Error creating slice %(hrn)s at aggregate %(aggregate)s" % locals()
+                traceback.print_exc()
         return 1