git://git.onelab.eu
/
nodemanager-topo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep in line with schema.
[nodemanager-topo.git]
/
vinilinkspec.py
diff --git
a/vinilinkspec.py
b/vinilinkspec.py
index
5e8911b
..
1f47e26
100755
(executable)
--- a/
vinilinkspec.py
+++ b/
vinilinkspec.py
@@
-33,7
+33,7
@@
def ifSpecDict(nodedict):
# 'ip_spoof']
# Assume only 1 node network per node.
nodenetwork = GetNodeNetworks(nodedict['nodenetwork_ids'])[0]
# 'ip_spoof']
# Assume only 1 node network per node.
nodenetwork = GetNodeNetworks(nodedict['nodenetwork_ids'])[0]
- ifspec
s
= {'name': nodenetwork['hostname'],
+ ifspec = {'name': nodenetwork['hostname'],
'addr': nodenetwork['ip'],
'type': nodenetwork['type'],
'init_params': None,
'addr': nodenetwork['ip'],
'type': nodenetwork['type'],
'init_params': None,
@@
-41,7
+41,7
@@
def ifSpecDict(nodedict):
'min_alloc': 0,
'max_alloc': '1Gbps',
'ip_spoof': False}
'min_alloc': 0,
'max_alloc': '1Gbps',
'ip_spoof': False}
- return
ifspecs
+ return
{'IfSpec': ifspec}
def linkSpecDict():
def linkSpecDict():
@@
-74,10
+74,10
@@
def linkSpecDict():
'bw': '1Gbps',
'min_alloc': '0',
'bw': '1Gbps',
'bw': '1Gbps',
'min_alloc': '0',
'bw': '1Gbps',
- 'endpoint
s
': ifspecs,
+ 'endpoint': ifspecs,
'start_time': int(time()),
'duration': '-1'})
'start_time': int(time()),
'duration': '-1'})
- return
linkspecs
+ return
{'LinkSpec': linkspecs}
def main():
def main():