The configuration of compression in iproute version 2 requires one addition
parameter. This commit adds key to compression configuration if it is needed.
Signed-off-by: Kamil Jerabek <kjerabek(a)redhat.com>
---
recipes/regression_tests/phase3/ipsec_esp_ah_comp.py | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py
b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py
index 7286f60..0efff03 100644
--- a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py
+++ b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py
@@ -2,10 +2,9 @@ from lnst.Controller.Task import ctl
from lnst.Controller.PerfRepoUtils import perfrepo_baseline_to_dict
from lnst.Controller.PerfRepoUtils import netperf_result_template
-from lnst.RecipeCommon.ModuleWrap import ping, ping6, netperf
+from lnst.RecipeCommon.ModuleWrap import netperf
from lnst.RecipeCommon.IRQ import pin_dev_irqs
from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
-import re
# ---------------------------
# ALGORITHM AND CIPHER CONFIG
@@ -160,12 +159,12 @@ def configure_ipsec(ciph_alg, ciph_key, hash_alg, hash_key,
ip_version):
m1.run("ip xfrm state add "\
"src %s dst %s proto comp spi 4 mode %s "\
- "comp deflate"\
- % (m1_addr, m2_addr, ipsec_mode))
+ "comp deflate %s"\
+ % (m1_addr, m2_addr, ipsec_mode, m1_key))
m1.run("ip xfrm state add "\
"src %s dst %s proto comp spi 1 mode %s "\
- "comp deflate"\
- % (m2_addr, m1_addr, ipsec_mode))
+ "comp deflate %s"\
+ % (m2_addr, m1_addr, ipsec_mode, m1_key))
m1.run("ip xfrm state add "\
"src %s dst %s proto esp spi 2 mode %s "\
@@ -210,12 +209,12 @@ def configure_ipsec(ciph_alg, ciph_key, hash_alg, hash_key,
ip_version):
m2.run("ip xfrm state add "\
"src %s dst %s proto comp spi 4 mode %s "\
- "comp deflate"\
- % (m1_addr, m2_addr, ipsec_mode))
+ "comp deflate %s"\
+ % (m1_addr, m2_addr, ipsec_mode, m2_key))
m2.run("ip xfrm state add "\
"src %s dst %s proto comp spi 1 mode %s "\
- "comp deflate"\
- % (m2_addr, m1_addr, ipsec_mode))
+ "comp deflate %s"\
+ % (m2_addr, m1_addr, ipsec_mode, m2_key))
m2.run("ip xfrm state add "\
"src %s dst %s proto esp spi 2 mode %s "\
--
2.5.5
Show replies by thread