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
New plugin interface
[nodemanager-topo.git]
/
topo.py
diff --git
a/topo.py
b/topo.py
index
c895741
..
be68831
100755
(executable)
--- a/
topo.py
+++ b/
topo.py
@@
-135,13
+135,13
@@
def clean_up_old_virtual_links():
for iface in old_ifaces:
m = re.match(pattern1, iface)
if m:
for iface in old_ifaces:
m = re.match(pattern1, iface)
if m:
- key =
int(m.group(1)
)
- node =
int(m.group(2)
)
+ key =
m.group(1
)
+ node =
m.group(2
)
teardown_virtual_link(key, node)
m = re.match(pattern2, iface)
if m:
teardown_virtual_link(key, node)
m = re.match(pattern2, iface)
if m:
- key =
int(m.group(1)
)
+ key =
m.group(1
)
teardown_nat(key)
return
teardown_nat(key)
return
@@
-392,7
+392,7
@@
an 'egre_key' attribute, and a 'topo_rspec' attribute.
Creating the virtual link depends on the contents of
/etc/vservers/<slice>/spaces/net. Update this first.
"""
Creating the virtual link depends on the contents of
/etc/vservers/<slice>/spaces/net. Update this first.
"""
-def GetSlivers(data):
+def GetSlivers(data
, config = None, plc = None
):
global ifaces, old_ifaces
ifaces = old_ifaces = sioc.gifconf()
global ifaces, old_ifaces
ifaces = old_ifaces = sioc.gifconf()