From: Thierry Parmentelat Date: Fri, 8 Apr 2011 11:51:06 +0000 (+0200) Subject: renamed create_slice into CreateSliver on the managers side X-Git-Tag: sfa-1.0-21-ckp1~74^2~11 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=4ff67c801ceeb1d0c7ca2863c2b7bf8152182b8f renamed create_slice into CreateSliver on the managers side --- diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py index 8dc604b3..e187a56d 100644 --- a/sfa/managers/aggregate_manager_eucalyptus.py +++ b/sfa/managers/aggregate_manager_eucalyptus.py @@ -490,7 +490,7 @@ def ListResources(api, creds, options, call_id): """ Hook called via 'sfi.py create' """ -def create_slice(api, xrn, creds, xml, users, call_id): +def CreateSliver(api, xrn, creds, xml, users, call_id): if Callids().already_handled(call_id): return False global cloud @@ -571,7 +571,7 @@ def main(): #theRSpec = None #with open(sys.argv[1]) as xml: # theRSpec = xml.read() - #create_slice(None, 'planetcloud.pc.test', theRSpec, 'call-id-cloudtest') + #CreateSliver(None, 'planetcloud.pc.test', theRSpec, 'call-id-cloudtest') #rspec = ListResources('euca', 'planetcloud.pc.test', 'planetcloud.pc.marcoy', 'test_euca') #print rspec diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py index ed18d858..f289e7d0 100644 --- a/sfa/managers/aggregate_manager_max.py +++ b/sfa/managers/aggregate_manager_max.py @@ -271,7 +271,7 @@ def ListResources(api, creds, options, call_id): return (ret_rspec) -def create_slice(api, xrn, creds, rspec_xml, users, call_id): +def CreateSliver(api, xrn, creds, rspec_xml, users, call_id): if Callids().already_handled(call_id): return False global topology @@ -338,7 +338,7 @@ def main(): r = RSpec() rspec_xml = open(sys.argv[1]).read() #ListResources(None,'foo') - create_slice(None, "plc.princeton.sap0", rspec_xml, 'call-id-sap0') + CreateSliver(None, "plc.princeton.sap0", rspec_xml, 'call-id-sap0') if __name__ == "__main__": main() diff --git a/sfa/managers/aggregate_manager_openflow.py b/sfa/managers/aggregate_manager_openflow.py index 8511f23c..7a965dc0 100755 --- a/sfa/managers/aggregate_manager_openflow.py +++ b/sfa/managers/aggregate_manager_openflow.py @@ -111,11 +111,11 @@ def reset_slices(cred, xrn): if DEBUG: print "Received reset_slices call" return msg_aggrMgr(SFA_RESET_SLICES) -def create_slice(cred, xrn, rspec, call_id): +def CreateSliver(cred, xrn, rspec, call_id): if Callids().already_handled(call_id): return False hrn = urn_to_hrn(xrn)[0] - if DEBUG: print "Received create_slice call" + if DEBUG: print "Received CreateSliver call" slice_id = generate_slide_id(cred, hrn) msg = struct.pack('> B%ds%ds' % (len(slice_id)+1, len(rspec)), SFA_CREATE_SLICE, slice_id, rspec) @@ -171,7 +171,7 @@ def main(): r = RSpec() r.parseFile(sys.argv[1]) rspec = r.toDict() - create_slice(None,'plc',rspec,'call-id-plc') + CreateSliver(None,'plc',rspec,'call-id-plc') if __name__ == "__main__": main() diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index 91d9a4d5..9e0aa27f 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -154,7 +154,7 @@ def slice_status(api, slice_xrn, creds): # XX remove me return result -def create_slice(api, slice_xrn, creds, rspec, users, call_id): +def CreateSliver(api, slice_xrn, creds, rspec, users, call_id): """ Create the sliver[s] (slice) at this aggregate. Verify HRN and initialize the slice record in PLC if necessary. @@ -336,7 +336,7 @@ def get_ticket(api, xrn, creds, rspec, users): credential = api.getCredential() records = registry.Resolve(xrn, credential) - # similar to create_slice, we must verify that the required records exist + # similar to CreateSliver, we must verify that the required records exist # at this aggregate before we can issue a ticket site_id, remote_site_id = slices.verify_site(registry, credential, slice_hrn, peer, sfa_peer, reg_objects) @@ -393,7 +393,7 @@ def main(): f = open(sys.argv[1]) xml = f.read() f.close() - create_slice(api, "plc.princeton.sapan", xml, 'create_slice_sapan') + CreateSliver(api, "plc.princeton.sapan", xml, 'CreateSliver_sapan') if __name__ == "__main__": main() diff --git a/sfa/managers/aggregate_manager_vini.py b/sfa/managers/aggregate_manager_vini.py index 08162c12..b1a7044e 100644 --- a/sfa/managers/aggregate_manager_vini.py +++ b/sfa/managers/aggregate_manager_vini.py @@ -47,7 +47,7 @@ def delete_slice(api, xrn, creds): api.plshell.DeleteSliceFromNodes(api.plauth, slicename, slice['node_ids']) return 1 -def create_slice(api, xrn, creds, xml, users, call_id): +def CreateSliver(api, xrn, creds, xml, users, call_id): """ Verify HRN and initialize the slice record in PLC if necessary. """ @@ -126,7 +126,7 @@ def main(): f = open(sys.argv[1]) xml = f.read() f.close() - create_slice(api, "plc.princeton.iias", xml, 'call-id-iias') + CreateSliver(api, "plc.princeton.iias", xml, 'call-id-iias') if __name__ == "__main__": main() diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index cfc2fbbb..c6531d29 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -54,7 +54,7 @@ def GetVersion(api): sm_version['peers'][api.hrn]=local_am_url.replace('localhost',sm_version['hostname']) return sm_version -def create_slice(api, xrn, creds, rspec, users, call_id): +def CreateSliver(api, xrn, creds, rspec, users, call_id): if Callids().already_handled(call_id): return "" @@ -387,7 +387,7 @@ def main(): r = RSpec() r.parseFile(sys.argv[1]) rspec = r.toDict() - create_slice(None,'plc.princeton.tmacktestslice',rspec,'create-slice-tmacktestslice') + CreateSliver(None,'plc.princeton.tmacktestslice',rspec,'create-slice-tmacktestslice') if __name__ == "__main__": main() diff --git a/sfa/methods/CreateSliver.py b/sfa/methods/CreateSliver.py index c221af58..96b535db 100644 --- a/sfa/methods/CreateSliver.py +++ b/sfa/methods/CreateSliver.py @@ -46,8 +46,8 @@ class CreateSliver(Method): chain_name = 'FORWARD-INCOMING' self.api.logger.debug("CreateSliver: sfatables on chain %s"%chain_name) rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec) - # the aggregate's create_slice returns false if call_id was already handled - if manager.create_slice(self.api, slice_xrn, creds, rspec, users, call_id): + # the aggregate's CreateSliver returns false if call_id was already handled + if manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id): return rspec else: return "" diff --git a/sfa/rspecs/aggregates/rspec_manager_max.py b/sfa/rspecs/aggregates/rspec_manager_max.py index 1c80edd9..c706ab14 100644 --- a/sfa/rspecs/aggregates/rspec_manager_max.py +++ b/sfa/rspecs/aggregates/rspec_manager_max.py @@ -261,7 +261,7 @@ def ListResources(api, hrn): return (ret_rspec) -def create_slice(api, hrn, rspec_xml): +def CreateSliver(api, hrn, rspec_xml): global topology topology = get_interface_map() @@ -325,7 +325,7 @@ def main(): r = RSpec() rspec_xml = open(sys.argv[1]).read() #ListResources(None,'foo') - create_slice(None, "plc.princeton.sap0", rspec_xml) + CreateSliver(None, "plc.princeton.sap0", rspec_xml) if __name__ == "__main__": main() diff --git a/sfa/rspecs/aggregates/rspec_manager_openflow.py b/sfa/rspecs/aggregates/rspec_manager_openflow.py index aea1861a..2eeeacc6 100755 --- a/sfa/rspecs/aggregates/rspec_manager_openflow.py +++ b/sfa/rspecs/aggregates/rspec_manager_openflow.py @@ -105,8 +105,8 @@ def reset_slices(cred, hrn): if DEBUG: print "Received reset_slices call" return msg_aggrMgr(SFA_RESET_SLICES) -def create_slice(cred, hrn, rspec): - if DEBUG: print "Received create_slice call" +def CreateSliver(cred, hrn, rspec): + if DEBUG: print "Received CreateSliver call" slice_id = generate_slide_id(cred, hrn) msg = struct.pack('> B%ds%ds' % (len(slice_id)+1, len(rspec)), SFA_CREATE_SLICE, slice_id, rspec) @@ -160,7 +160,7 @@ def main(): r = RSpec() r.parseFile(sys.argv[1]) rspec = r.toDict() - create_slice(None,'plc',rspec) + CreateSliver(None,'plc',rspec) if __name__ == "__main__": main() diff --git a/tests/client/testAggregate.py b/tests/client/testAggregate.py index 0f9e77e0..df95850d 100644 --- a/tests/client/testAggregate.py +++ b/tests/client/testAggregate.py @@ -26,7 +26,7 @@ pprint(tmack_components) print "adding %(slicehrn)s back to its original nodes" % locals() a.list_resources(cred, slicehrn) -a.create_slice(cred, slicehrn, components) +a.CreateSliver(cred, slicehrn, components) a.list_resources(cred, slicehrn) diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py index 2b358012..d0e72538 100755 --- a/tests/testInterfaces.py +++ b/tests/testInterfaces.py @@ -199,7 +199,7 @@ class AggregateTest(BasicTestCase): # get availabel resources rspec = self.aggregate.get_resources(self.credential) slice_credential = self.client.get_credential(self.slice['hrn'], 'slice') - self.aggregate.create_slice(slice_credential, self.slice['hrn'], rspec) + self.aggregate.CreateSliver(slice_credential, self.slice['hrn'], rspec) def testDeleteSlice(self): slice_credential = self.client.get_credential(self.slice['hrn'], 'slice') @@ -251,7 +251,7 @@ class ComponentTest(BasicTestCase): def test_names(testcase): return [name for name in dir(testcase) if name.startswith('test')] -def create_slice(client): +def CreateSliver(client): # register a slice that will be used for some test authority = get_authority(client.hrn) auth_cred = client.get_credential(authority, 'authority') @@ -296,7 +296,7 @@ if __name__ == '__main__': # create the test slice if necessary if options.all or options.slicemgr or options.aggregate \ or options.component: - test_slice = create_slice(client) + test_slice = CreateSliver(client) if options.registry or options.all: for name in test_names(RegistryTest):