From 6e71cc78871dbf49349d46e8a219950b219229fa Mon Sep 17 00:00:00 2001 From: lguohan Date: Thu, 22 Nov 2018 12:09:21 -0800 Subject: [PATCH] [vs]: sync changes to disk and add e1000 driver to sonic vm (#2288) * syncd changes to disk and add e1000 driver to sonic vm * add pg_profile_lookup.ini Signed-off-by: Guohan Lu * update swss and sairedis sairedis: * d146572 2018-11-22 | Fix interface name used on link message using lane map (#386) swss: * c74dc60 2018-11-22 | [vstest]: use eth1~32 as physical interface name in vs docker (#700) (HEAD -> master, origin/master, origin/HEAD) [lguohan] * 6007e7f 2018-11-22 | [portmgrd]: Fix setting default port admin status and MTU (#691) [stepanblyschak] * 6c70f6d 2018-11-22 | [portsorch] Fix port queue index init bug (#505) [yangbashuang] * 70ac79b 2018-11-21 | [gitignore]: Update all binary names in the ignore list (#698) [Shuotian Cheng] * 2a3626c 2018-11-21 | [test]: Remove duplicate legacy ACL tests (#699) [Shuotian Cheng] * 8099811 2018-11-20 | [aclorch]: Remove unnecessary warning message (#696) [Shuotian Cheng] * 63d8ebc 2018-11-18 | [portsorch]: Remove duplicate local variables - port (#690) [Shuotian Cheng] * 28dc042 2018-11-18 | Remove default docker name value of swss. (#692) [Jipan Yang] Signed-off-by: Guohan Lu --- check_install.py | 4 ++++ .../Force10-S6000/pg_profile_lookup.ini | 17 +++++++++++++++++ platform/vs/sonic.xml | 4 +++- src/sonic-sairedis | 2 +- src/sonic-swss | 2 +- 5 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 device/virtual/x86_64-kvm_x86_64-r0/Force10-S6000/pg_profile_lookup.ini diff --git a/check_install.py b/check_install.py index c8d07003f44e..09979f61e4ba 100755 --- a/check_install.py +++ b/check_install.py @@ -49,6 +49,10 @@ def main(): time.sleep(5) p.sendline('show version') p.expect([cmd_prompt]) + p.sendline('show ip bgp sum') + p.expect([cmd_prompt]) + p.sendline('sync') + p.expect([cmd_prompt]) if __name__ == '__main__': main() diff --git a/device/virtual/x86_64-kvm_x86_64-r0/Force10-S6000/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64-r0/Force10-S6000/pg_profile_lookup.ini new file mode 100644 index 000000000000..3b2a417cebcd --- /dev/null +++ b/device/virtual/x86_64-kvm_x86_64-r0/Force10-S6000/pg_profile_lookup.ini @@ -0,0 +1,17 @@ +# PG lossless profiles. +# speed cable size xon xoff threshold xon_offset + 10000 5m 1248 2288 35776 -4 2288 + 25000 5m 1248 2288 53248 -4 2288 + 40000 5m 1248 2288 66560 -4 2288 + 50000 5m 1248 2288 90272 -4 2288 + 100000 5m 1248 2288 165568 -4 2288 + 10000 40m 1248 2288 37024 -4 2288 + 25000 40m 1248 2288 53248 -4 2288 + 40000 40m 1248 2288 71552 -4 2288 + 50000 40m 1248 2288 96096 -4 2288 + 100000 40m 1248 2288 177632 -4 2288 + 10000 300m 1248 2288 46176 -4 2288 + 25000 300m 1248 2288 79040 -4 2288 + 40000 300m 1248 2288 108160 -4 2288 + 50000 300m 1248 2288 141856 -4 2288 + 100000 300m 1248 2288 268736 -4 2288 diff --git a/platform/vs/sonic.xml b/platform/vs/sonic.xml index a359de6bd318..ebf9f542607f 100644 --- a/platform/vs/sonic.xml +++ b/platform/vs/sonic.xml @@ -30,7 +30,9 @@ - + + + diff --git a/src/sonic-sairedis b/src/sonic-sairedis index efdd86f6a947..d146572eab9b 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit efdd86f6a947c9dd975ee7d3c13faa38f9d6a6fc +Subproject commit d146572eab9b45110c39bae017759c766aa3d75f diff --git a/src/sonic-swss b/src/sonic-swss index 067928d69787..c74dc6079f49 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 067928d697879b5db019341260d93edfe5ad76eb +Subproject commit c74dc6079f49814ef290b65ed3e80b9cb27b310b