merge to master
authorHanoh Haim <[email protected]>
Mon, 9 May 2016 10:20:05 +0000 (13:20 +0300)
committerHanoh Haim <[email protected]>
Mon, 9 May 2016 10:20:05 +0000 (13:20 +0300)
1  2 
trex_book.asciidoc
trex_stateless.asciidoc
ws_main.py

@@@ -127,43 -125,36 +128,43 @@@ TRex curretly works on x86 architectur
  | Bandwidth | Chipset |  Example
  | 1Gb/sec  | Intel I350 | Intel 4x1GE 350-T4 NIC
  | 10Gb/sec | Intel 82599| Intel x520-D2 Cisco Order tool 2X Intel N2XX-AIPCI01, Intel X520 Dual Port 10Gb SFP+ Adapter
 -| 10Gb/sec | Intel X710   | SFP+, *Preferred* support per stream stats in hardware link:http://www.silicom-usa.com/PE310G4i71L_Quad_Port_Fiber_SFP+_10_Gigabit_Ethernet_PCI_Express_Server_Adapter_49[PE310G4i71L]
 -| 40Gb/sec | Intel XL710  | QSFP+ (copper/optical)
 -| 100Gb/sec | Intel Intel FM10420  | QSFP28,  by Silicom link:http://www.silicom-usa.com/100_Gigabit_Dual_Port_Fiber_Ethernet_PCI_Express_PE3100G2DQiR_96[PE3100G2DQiR_96] *under dev*
 +| 10Gb/sec | Intel X710   | link:https://en.wikipedia.org/wiki/Small_form-factor_pluggable_transceiver[SFP+], *Preferred* support per stream stats in hardware link:http://www.silicom-usa.com/PE310G4i71L_Quad_Port_Fiber_SFP+_10_Gigabit_Ethernet_PCI_Express_Server_Adapter_49[Silicom PE310G4i71L]
 +| 40Gb/sec | Intel XL710  | link:https://en.wikipedia.org/wiki/QSFP[QSFP+] (copper/optical)
 +| 100Gb/sec | Intel Intel FM10420  | QSFP28,  by Silicom link:http://www.silicom-usa.com/100_Gigabit_Dual_Port_Fiber_Ethernet_PCI_Express_PE3100G2DQiR_96[Silicom PE3100G2DQiR_96] (*in development*)
  | VMXNET / +
 -VMXNET3 (read notes) | VMware paravirtualize  | connect using vmWare vSwitch
 -| E1000    | paravirtualize  | vmWare/KVM/VirtualBox 
 +VMXNET3 (see notes) | VMware paravirtualized  | Connect using VMware vSwitch
 +| E1000    | paravirtualized  | VMware/KVM/VirtualBox 
  |=================
  
 -.X710 SFP+ support (*for Silicom PE310G4i71L with Open Optic*)
 +// in table above, is it correct to list "paravirtualized" as chipset? Also, what is QSFP28? It does not appear on the lined URL. Clarify: is Intel X710 the preferred NIC?
 +
 +.Intel X710 SFP+ support (for link:http://www.silicom-usa.com/PE310G4i71L_Quad_Port_Fiber_SFP+_10_Gigabit_Ethernet_PCI_Express_Server_Adapter_49[Silicom PE310G4i71L] with Open Optic)
  [options="header",cols="1,1",width="70%"]
  |=================
 -| SFP+  | Example 
 -| Cisco SFP-10G-SR  |   see link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-455693.html[here]
 -| Cisco SFP-10G-LR  |  see link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-455693.html[here]
 -| Cisco SFP-H10GB-CU1M | see link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-455693.html[here]
 -| Cisco SFP-10G-AOC1M |  see link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-455693.html[here]
 +| link:https://en.wikipedia.org/wiki/Small_form-factor_pluggable_transceiver[SFP+]  | Notes 
 +| Cisco SFP-10G-SR  | link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-455693.html[Info]
 +| Cisco SFP-10G-LR  | link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-455693.html[Info]
 +| Cisco SFP-H10GB-CU1M | link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-455693.html[Info]
 +| Cisco SFP-10G-AOC1M | link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-455693.html[Info]
  |=================
  
 -WARNING: Intel X710 NIC for example FH X710DA4FHBLK will work *only* with Intel SFP+. In case you like an open optic buy Silicom PE310G4i71L NIC
 +[NOTE]
 +=====================================
 + Intel X710 NIC (example: FH X710DA4FHBLK) operates *only* with Intel SFP+. For open optic, use the link:http://www.silicom-usa.com/PE310G4i71L_Quad_Port_Fiber_SFP+_10_Gigabit_Ethernet_PCI_Express_Server_Adapter_49[Silicom PE310G4i71L] NIC.
 +=====================================
 +
 +// clarify above table and note
  
 -.XL710 QSFP+ support 
 +.Intel XL710 QSFP+ support 
  [options="header",cols="1,1",width="70%"]
  |=================
- | link:https://en.wikipedia.org/wiki/QSFP[QSFP+] | Notes 
- | QSFP+ SR4 optics  | APPROVED OPTICS For Intel NICS,  Cisco QSFP-40G-SR4-S does *not* work   link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-660083.html[here]
- | QSFP+ LR-4 Optics | APPROVED OPTICS For Intel NICS , Cisco QSFP-40G-LR4-S does *not* work link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-660083.html[here]
- | QSFP Active Optical Cables (AoC) | QSFP-H40G-AOC  link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-660083.html[here]
 -| QSFP+             | Example 
++| link:https://en.wikipedia.org/wiki/QSFP[QSFP+]             | Notes 
+ | QSFP+ SR4 optics  |  APPROVED OPTICS For Intel NICS,  Cisco QSFP-40G-SR4-S will work *only* with XL710 NIC vendors with Open Optic like Silicom   link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-660083.html[here]
+ | QSFP+ LR-4 Optics |   APPROVED OPTICS For Intel NICS , Cisco QSFP-40G-LR4-S will work *only* with XL710 NIC vendors with Open Optic like Silicom link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-660083.html[here]
+ | QSFP Active Optical Cables (AoC) |   QSFP-H40G-AOC  link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-660083.html[here]
  | QSFP+ Intel Ethernet Modular Optics | 
  | QSFP+ DA twin-ax cables |
 -| Active QSFP+ Copper Cables |  Cisco QSFP-4SFP10G-CU link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-660083.html[here]
 +| Active QSFP+ Copper Cables | Cisco QSFP-4SFP10G-CU link:http://www.cisco.com/c/en/us/products/collateral/interfaces-modules/transceiver-modules/data_sheet_c78-660083.html[here]
  |=================
  
  [NOTE]
Simple merge
diff --cc ws_main.py
index 5d9fd8c,11cca9f..11cca9f
mode 100755,100644..100755