+RSpecs
+- RSpecConverter should convert sliver tags
+- SM should cache result of Aggregte GetVersion call when CreateSliver is executed
+- CreateSlivers should update SliverTags/attributes
+
Registry
- Verify that sub authority certificates still work
-SM
-- Slice Manager methods should return real result instead of just 1 (Renew
- Sliver, etc)
-
-- connect SM to ProtoGeni Aggregates
Stop invalid users
* a recently disabled/deleted user may still have a valid cred. Keep a list of valid/invalid users on the aggregate and check callers against this list
api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer,
slice.peer_id)
- return aggregate.get_rspec(slice_xrn=slice_xrn, version=RSpecVersion("protogeni"))
+ return aggregate.get_rspec(slice_xrn=slice_xrn, version=rspec.type)
def RenewSliver(api, xrn, creds, expiration_time, call_id):
from sfa.rspecs.sfa_rspec import SfaRSpec
from sfa.rspecs.rspec_converter import RSpecConverter
from sfa.rspecs.rspec_parser import parse_rspec
+from sfa.rspecs.rspec_version import RSpecVersion
+from sfa.rspecs.pl_rspec_version import supported_rspecs
from sfa.util.policy import Policy
from sfa.util.prefixTree import prefixTree
from sfa.util.sfaticket import *
import sfa.util.xmlrpcprotocol as xmlrpcprotocol
import sfa.plc.peers as peers
from sfa.util.version import version_core
-from sfa.rspecs.rspec_version import RSpecVersion
-from sfa.rspecs.pl_rspec_version import supported_rspecs
from sfa.util.callids import Callids
# we have specialized xmlrpclib.ServerProxy to remember the input url
def CreateSliver(api, xrn, creds, rspec_str, users, call_id):
def _CreateSliver(server, xrn, credentail, rspec, users, call_id):
+ # should check the cache first
# get aggregate version
version = server.GetVersion()
- if 'sfa' in version:
- # just send the whole rspec to SFA AM/SM
- server.CreateSliver(xrn, credential, rspec, users, call_id)
- elif 'geni_api' in version:
- pass
- # convert to pg rspec
+ if 'sfa' not in version and 'geni_api' in version:
+ # sfa aggregtes support both sfa and pg rspecs, no need to convert
+ # if aggregate supports sfa rspecs. othewise convert to pg rspec
+ rspec = RSpecConverter.to_pg_rspec(rspec)
+
+ return server.CreateSliver(xrn, credential, rspec, users, call_id)
if Callids().already_handled(call_id): return ""
from sfa.util.plxrn import *
from sfa.rspecs.sfa_rspec import SfaRSpec
from sfa.rspecs.pg_rspec import PGRSpec
+from sfa.rspecs.rspec_version import RSpecVersion
class Aggregate:
def get_rspec(self, slice_xrn=None, version = None):
self.prepare()
rspec = None
- if version:
- if version['type'].lower() == 'protogeni':
- rspec = PGRSpec()
- elif version['type'].lower() == 'sfa':
- rspec = SfaRSpec()
- else:
- rspec = SfaRSpec()
- else:
+ rspec_version = RSpecVersion(version)
+ if rspec_version['type'].lower() == 'protogeni':
+ rspec = PGRSpec()
+ elif rspec_version['type'].lower() == 'sfa':
+ rspec = SfaRSpec()
+ else:
rspec = SfaRSpec()
rspec.add_nodes(self.nodes.values())