Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: IPsec naming creation
[csit.git]
/
resources
/
libraries
/
python
/
IPsecUtil.py
diff --git
a/resources/libraries/python/IPsecUtil.py
b/resources/libraries/python/IPsecUtil.py
index
9237769
..
e08b320
100644
(file)
--- a/
resources/libraries/python/IPsecUtil.py
+++ b/
resources/libraries/python/IPsecUtil.py
@@
-844,7
+844,8
@@
class IPsecUtil:
f"local_crypto_key {ckey} remote_crypto_key {ckey} "
f"{integ} "
f"local_ip {if1_ip + i * addr_incr} "
f"local_crypto_key {ckey} remote_crypto_key {ckey} "
f"{integ} "
f"local_ip {if1_ip + i * addr_incr} "
- f"remote_ip {if2_ip}\n"
+ f"remote_ip {if2_ip} "
+ f"instance {i}\n"
)
tmp_f2.write(
f"ipsec_tunnel_if_add_del "
)
tmp_f2.write(
f"ipsec_tunnel_if_add_del "
@@
-853,7
+854,8
@@
class IPsecUtil:
f"local_crypto_key {ckey} remote_crypto_key {ckey} "
f"{integ} "
f"local_ip {if2_ip} "
f"local_crypto_key {ckey} remote_crypto_key {ckey} "
f"{integ} "
f"local_ip {if2_ip} "
- f"remote_ip {if1_ip + i * addr_incr}\n"
+ f"remote_ip {if1_ip + i * addr_incr} "
+ f"instance {i}\n"
)
vat.execute_script(
tmp_fn1, nodes[u"DUT1"], timeout=1800, json_out=False,
)
vat.execute_script(
tmp_fn1, nodes[u"DUT1"], timeout=1800, json_out=False,
@@
-875,16
+877,16
@@
class IPsecUtil:
)
for i in range(n_tunnels):
tmp_f1.write(
)
for i in range(n_tunnels):
tmp_f1.write(
- f"exec set interface unnumbered ip
sec
{i} use {if1_n}\n"
- f"exec set interface state ip
sec
{i} up\n"
+ f"exec set interface unnumbered ip
ip
{i} use {if1_n}\n"
+ f"exec set interface state ip
ip
{i} up\n"
f"exec ip route add {raddr_ip2 + i}/{mask2} "
f"exec ip route add {raddr_ip2 + i}/{mask2} "
- f"via ip
sec
{i}\n"
+ f"via ip
ip
{i}\n"
)
tmp_f2.write(
)
tmp_f2.write(
- f"exec set interface unnumbered ip
sec
{i} use {if2_n}\n"
- f"exec set interface state ip
sec
{i} up\n"
+ f"exec set interface unnumbered ip
ip
{i} use {if2_n}\n"
+ f"exec set interface state ip
ip
{i} up\n"
f"exec ip route add {raddr_ip1 + i}/{mask2} "
f"exec ip route add {raddr_ip1 + i}/{mask2} "
- f"via ip
sec
{i}\n"
+ f"via ip
ip
{i}\n"
)
vat.execute_script(
tmp_fn1, nodes[u"DUT1"], timeout=1800, json_out=False,
)
vat.execute_script(
tmp_fn1, nodes[u"DUT1"], timeout=1800, json_out=False,