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
/
rspecs
/
aggregates
/
rspec_manager_max.py
diff --git
a/sfa/rspecs/aggregates/rspec_manager_max.py
b/sfa/rspecs/aggregates/rspec_manager_max.py
index
51d7d14
..
c706ab1
100644
(file)
--- 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.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 *
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
return 1
-def
get_rspec
(api, hrn):
+def
ListResources
(api, hrn):
# Eg. config line:
# plc.princeton.sapan vlan23,vlan45
# Eg. config line:
# plc.princeton.sapan vlan23,vlan45
@@
-260,7
+261,7
@@
def get_rspec(api, hrn):
return (ret_rspec)
return (ret_rspec)
-def
create_slice
(api, hrn, rspec_xml):
+def
CreateSliver
(api, hrn, rspec_xml):
global topology
topology = get_interface_map()
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()
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()
if __name__ == "__main__":
main()