From 0b5622f3fd73b51a56605f90857ed8a0638fd22f Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Tue, 3 Apr 2018 07:17:42 +0000 Subject: Update git submodules * Update docs/submodules/vswitchperf from branch 'master' - Merge "scapy: Fix conflict of scapy libraries" - scapy: Fix conflict of scapy libraries T-Rex requires a modified version of SCAPY library for python3 to function properly. It doesn't work with vanilla version of scapy-python3 module, which is installed within vsperf environment by pip for Xena. Currently vanilla scapy is imported by Xena and enforced to T-Rex too, which causes following issues: * missing implementation of Dot1AD causes failures * broken multistream feature in T-Rex VSPERF loads all Traffic Generator classes and thus all imports performed at module level are performed. The solution would be to import SCAPY module by Xena only in case, that Xena traffic generator is really used. Please see JIRA for additional information. JIRA: VSPERF-566 Change-Id: I8018bc0126e752cc9f966252d17dadb6a5554b37 Signed-off-by: Martin Klozik Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Sridhar Rao --- docs/submodules/vswitchperf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/submodules/vswitchperf b/docs/submodules/vswitchperf index e1c33f598..2814e7132 160000 --- a/docs/submodules/vswitchperf +++ b/docs/submodules/vswitchperf @@ -1 +1 @@ -Subproject commit e1c33f5984089d32ff6615df5c993187d6c132e2 +Subproject commit 2814e71322f7da9dd6ad9988b2648316cc7bd034 -- cgit 1.2.3-korg