X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=df6f1ce7e84901be46c104dff20aeffb18e78cfd;hb=9d434b4200b3676cf416ca79bc07021549dd427b;hp=887d2f308d6cded3cce293bcd5131e0da0f68eac;hpb=5f4f788db1dd59e8a5968e9118ff1feda89389dc;p=sfa.git

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index 887d2f30..df6f1ce7 100644
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -19,8 +19,10 @@ from sfa.trust.credential import Credential
 import sfa.plc.peers as peers
 from sfa.plc.network import *
 from sfa.plc.api import SfaAPI
+from sfa.plc.aggregate import Aggregate
 from sfa.plc.slices import *
 from sfa.util.version import version_core
+from sfa.rspecs.rspec_version import RSpecVersion 
 from sfa.util.sfatime import utcparse
 from sfa.util.callids import Callids
 
@@ -29,6 +31,9 @@ def GetVersion(api):
     return version_core({'interface':'aggregate',
                          'testbed':'myplc',
                          'hrn':xrn.get_hrn(),
+                         'input_rspec' : ['PG 2', 'SFA 1'],
+                         'output_rspec' : ["SFA 1"],
+                         'ad_rspec' : ["PG 2", "SFA 1"],
                          })
 
 def __get_registry_objects(slice_xrn, creds, users):
@@ -149,7 +154,7 @@ def SliverStatus(api, slice_xrn, creds, call_id):
     # XX remove me
     return result
 
-def CreateSliver(api, slice_xrn, creds, rspec, users, call_id):
+def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id):
     """
     Create the sliver[s] (slice) at this aggregate.    
     Verify HRN and initialize the slice record in PLC if necessary.
@@ -160,6 +165,7 @@ def CreateSliver(api, slice_xrn, creds, rspec, users, call_id):
 
     (hrn, type) = urn_to_hrn(slice_xrn)
     peer = None
+    aggregate = Aggregate(api)
     slices = Slices(api)
     peer = slices.get_peer(hrn)
     sfa_peer = slices.get_sfa_peer(hrn)
@@ -168,40 +174,36 @@ def CreateSliver(api, slice_xrn, creds, rspec, users, call_id):
     (site_id, remote_site_id) = slices.verify_site(registry, credential, hrn, 
                                                    peer, sfa_peer, reg_objects)
 
-    slice_record = slices.verify_slice(registry, credential, hrn, site_id, 
+    slice = slices.verify_slice(registry, credential, hrn, site_id, 
                                        remote_site_id, peer, sfa_peer, reg_objects)
      
-    network = Network(api)
-
-    slice = network.get_slice(api, hrn)
-    slice.peer_id = slice_record['peer_slice_id']
-    current = __get_hostnames(slice.get_nodes())
-    
-    network.addRSpec(rspec, api.config.SFA_AGGREGATE_RSPEC_SCHEMA)
-    request = __get_hostnames(network.nodesWithSlivers())
-    
+    nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'], ['hostname'])
+    current_slivers = [node['hostname'] for node in nodes] 
+    rspec = parse_rspec(rspec_string)
+    requested_slivers = rspec.get_nodes_with_slivers()
+     
     # remove nodes not in rspec
-    deleted_nodes = list(set(current).difference(request))
+    deleted_nodes = list(set(current_slivers).difference(requested_slivers))
 
     # add nodes from rspec
-    added_nodes = list(set(request).difference(current))
+    added_nodes = list(set(requested_slivers).difference(current_slivers))
 
     try:
         if peer:
-            api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice.id, peer)
+            api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer)
 
-        api.plshell.AddSliceToNodes(api.plauth, slice.name, added_nodes) 
-        api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes)
+        api.plshell.AddSliceToNodes(api.plauth, slice['name'], added_nodes) 
+        api.plshell.DeleteSliceFromNodes(api.plauth, slice['slice'], deleted_nodes)
 
-        network.updateSliceTags()
+        # TODO: update slice tags
+        #network.updateSliceTags()
 
     finally:
         if peer:
             api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer, 
                                          slice.peer_id)
 
-    # xxx - check this holds enough data for the client to understand what's happened
-    return network.toxml()
+    return aggregate.get_rspec(slice_xrn=slice_xrn)
 
 
 def RenewSliver(api, xrn, creds, expiration_time, call_id):
@@ -301,23 +303,29 @@ def ListResources(api, creds, options,call_id):
     xrn = options.get('geni_slice_urn', '')
     (hrn, type) = urn_to_hrn(xrn)
 
+    # get the rspec's return format from options
+    rspec_version = RSpecVersion(options.get('rspec_version', 'SFA 1'))
+    version_string = "rspec_%s_%s" % (rspec_version.format, rspec_version.version)
+    
     # look in cache first
     if caching and api.cache and not xrn:
-        rspec = api.cache.get('nodes')
+        rspec = api.cache.get(version_string)
         if rspec:
             api.logger.info("aggregate.ListResources: returning cached value for hrn %s"%hrn)
             return rspec 
 
-    network = Network(api)
-    if (hrn):
-        if network.get_slice(api, hrn):
-            network.addSlice()
+    aggregate = Aggregate(api)
 
-    rspec = network.toxml()
+    if xrn:
+        # get this rspec for the specified slice 
+        rspec =  aggregate.get_rspec(slice_xrn=hrn, version=rspec_version)
+    else:
+        # generate rspec in both pg and sfa formats
+        rspec = aggregate.get_rspec(version=rspec_version)
 
     # cache the result
     if caching and api.cache and not xrn:
-        api.cache.add('nodes', rspec)
+        api.cache.add(version_string, rspec)
 
     return rspec