X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Faggregates%2Frspec_manager_max.py;h=c706ab140b16b39edcf04b8325d69211fd3efd03;hb=4ff67c801ceeb1d0c7ca2863c2b7bf8152182b8f;hp=51d7d14c9aec45828b12255c132a7d0e1100c9c2;hpb=b1775bb47ea5e242d337dbd34f5d58d10a57a028;p=sfa.git diff --git a/sfa/rspecs/aggregates/rspec_manager_max.py b/sfa/rspecs/aggregates/rspec_manager_max.py index 51d7d14c..c706ab14 100644 --- a/sfa/rspecs/aggregates/rspec_manager_max.py +++ b/sfa/rspecs/aggregates/rspec_manager_max.py @@ -3,7 +3,8 @@ from sfa.util.rspec import RSpec import sys import pdb -from sfa.util.namespace import * +from sfa.util.xrn import get_authority +from sfa.util.plxrn import hrn_to_pl_slicename from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * @@ -247,7 +248,7 @@ def create_slice_max_aggregate(api, hrn, nodes): return 1 -def get_rspec(api, hrn): +def ListResources(api, hrn): # Eg. config line: # plc.princeton.sapan vlan23,vlan45 @@ -260,7 +261,7 @@ def get_rspec(api, hrn): return (ret_rspec) -def create_slice(api, hrn, rspec_xml): +def CreateSliver(api, hrn, rspec_xml): global topology topology = get_interface_map() @@ -323,8 +324,8 @@ def main(): t = get_interface_map() r = RSpec() rspec_xml = open(sys.argv[1]).read() - #get_rspec(None,'foo') - create_slice(None, "plc.princeton.sap0", rspec_xml) + #ListResources(None,'foo') + CreateSliver(None, "plc.princeton.sap0", rspec_xml) if __name__ == "__main__": main()