git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed create_slice into CreateSliver on the managers side
[sfa.git]
/
sfa
/
managers
/
aggregate_manager_max.py
diff --git
a/sfa/managers/aggregate_manager_max.py
b/sfa/managers/aggregate_manager_max.py
index
6f4382b
..
f289e7d
100644
(file)
--- a/
sfa/managers/aggregate_manager_max.py
+++ b/
sfa/managers/aggregate_manager_max.py
@@
-254,7
+254,7
@@
def create_slice_max_aggregate(api, hrn, nodes):
return 1
return 1
-def
get_rspec
(api, creds, options, call_id):
+def
ListResources
(api, creds, options, call_id):
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
xrn = options.get('geni_slice_urn', '')
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
xrn = options.get('geni_slice_urn', '')
@@
-271,7
+271,7
@@
def get_rspec(api, creds, options, call_id):
return (ret_rspec)
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
if Callids().already_handled(call_id): return False
global topology
@@
-337,8
+337,8
@@
def main():
t = get_interface_map()
r = RSpec()
rspec_xml = open(sys.argv[1]).read()
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, 'call-id-sap0')
+ #
ListResources
(None,'foo')
+
CreateSliver
(None, "plc.princeton.sap0", rspec_xml, 'call-id-sap0')
if __name__ == "__main__":
main()
if __name__ == "__main__":
main()