-### $Id: slices.py 15842 2009-11-22 09:56:13Z anil $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/plc/slices.py $
-
import datetime
import time
import traceback
import sys
from types import StringTypes
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
+from sfa.util.plxrn import hrn_to_pl_slicename
from sfa.util.rspec import *
from sfa.util.specdict import *
from sfa.util.faults import *
from sfa.util.record import *
from sfa.util.sfaticket import SfaTicket
from sfa.server.registry import Registries
-from sfa.util.debug import log
from sfa.plc.slices import Slices
import sfa.plc.peers as peers
from sfa.managers.vini.vini_network import *
return 1
slice = slices[0]
- # determine if this is a peer slice
- peer = peers.get_peer(api, hrn)
- if peer:
- api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer)
api.plshell.DeleteSliceFromNodes(api.plauth, slicename, slice['node_ids'])
- if peer:
- api.plshell.BindObjectToPeer(api.plauth, 'slice', slice['slice_id'], peer, slice['peer_slice_id'])
return 1
def create_slice(api, xrn, creds, xml, users):
hrn, type = urn_to_hrn(xrn)
peer = None
- reg_objects = __get_registry_objects(slice_xrn, creds, users)
+ reg_objects = __get_registry_objects(xrn, creds, users)
slices = Slices(api)
peer = slices.get_peer(hrn)
sfa_peer = slices.get_sfa_peer(hrn)
# add nodes from rspec
added_nodes = list(set(request).difference(current))
- if peer:
- api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice.id, peer)
-
api.plshell.AddSliceToNodes(api.plauth, slice.name, added_nodes)
api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes)
-
network.updateSliceTags()
- if peer:
- api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer,
- slice.peer_id)
-
# print network.toxml()
return True
-def get_rspec(api, xrn=None, origin_hrn=None):
+def get_rspec(api, creds, options):
+ # get slice's hrn from options
+ xrn = options.get('geni_slice_urn', '')
hrn, type = urn_to_hrn(xrn)
+
+ # look in cache first
+ if api.cache and not xrn:
+ rspec = api.cache.get('nodes')
+ if rspec:
+ return rspec
+
network = ViniNetwork(api)
if (hrn):
if network.get_slice(api, hrn):
network.addSlice()
- return network.toxml()
+ rspec = network.toxml()
+
+ # cache the result
+ if api.cache and not xrn:
+ api.cache.add('nodes', rspec)
+
+ return rspec
def main():
api = SfaAPI()