Skip to content

Commit bc7fcf0

Browse files
authored
Improve pc and vlan test Doc (#35)
* fix typo Signed-off-by: zhoudongxu <[email protected]> * remove some unnecessary comments Signed-off-by: zhoudongxu <[email protected]>
1 parent 7fd1819 commit bc7fcf0

3 files changed

Lines changed: 17 additions & 25 deletions

File tree

doc/sai-ptf/config_data/config_t0.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
- [VLAN Interfaces](#vlan-interfaces)
77
- [Json config data](#json-config-data)
88
- [Route Configuration](#route-configuration)
9-
- [rotue entries](#rotue-entries)
9+
- [VLAN interfaces route entries](#vlan-interfaces-route-entries)
10+
- [VLAN Neighbors](#vlan-neighbors)
11+
- [LAG Route entry](#lag-route-entry)
12+
- [LAG Neighbors](#lag-neighbors)
1013
- [LAG configuration](#lag-configuration)
1114
- [LAG and LAG members](#lag-and-lag-members)
1215
- [FDB Configuration](#fdb-configuration)
@@ -89,30 +92,29 @@ Below is the sample config data in config_db.json
8992

9093
## Route Configuration
9194

92-
### rotue entries
9395

94-
VLAN interfaces route entries
95-
|VLAN ID | VLAN Member | NH IP | NH MAC|
96-
|-|-|-|-|
97-
|1000| Ethernet4-32 | 192.168.10.11 ~ 192.168.10.18 | 10:00:11:11:11:11 - 10:00:88:88:88:88 |
98-
|2000| Ethernet36-72 | 192.168.20.21 ~ 192.168.20.28 | 20:00:11:11:11:11 - 20:00:88:88:88:88 |
96+
### VLAN interfaces route entries
97+
|VLAN ID | VLAN Member | NH IP |
98+
|-|-|-|
99+
|1000| Ethernet4-32 | 192.168.10.11 ~ 192.168.10.18 |
100+
|2000| Ethernet36-72 | 192.168.20.21 ~ 192.168.20.28 |
99101

100-
VLAN Neighbors
102+
### VLAN Neighbors
101103
|Name|IP|dest_mac|
102104
|-|-|-|
103105
|vlan1000_nb1-nb8| 192.168.10.11 ~ 192.168.10.18 | 10:00:11:11:11:11 - 10:00:88:88:88:88|
104106
|vlan2000_nb1-nb8|192.168.20.21 ~ 192.168.20.28 |20:00:11:11:11:11 - 20:00:88:88:88:88 |
105107

106108

107-
LAG Route entry
109+
### LAG Route entry
108110

109111
|DestIp|Next Hop |Next Hop ip|
110112
|-|-|-|
111113
|192.168.0.11-192.168.0.18|lag1:port17-18|192.168.0.11-192.168.0.18|
112114
|192.168.0.19|lag2:port19-20|192.168.0.19|
113115
|192.168.0.20|lag3:port21-22|192.168.0.20|
114116

115-
LAG Neighbors
117+
### LAG Neighbors
116118

117119
|Name|IP|dest_mac|
118120
|-|-|-|
@@ -139,4 +141,4 @@ The MAC Table for VLAN L2 forwarding as below
139141
|mac0|mac0-00:00:00:00:00:11|Port0||Ethernet0|
140142
|mac1-8 |00:11:11:11:11:11 - 00:88:88:88:88:88|Port1-8|1000|Ethernet4-Ethernet32|
141143
|mac9-16 |00:99:99:99:99:99 - 01:00:00:00:00:00|Port9-16|2000|Ethernet36-Ethernet64|
142-
|mac17-mac31 |01:11:11:11:11:11 - 03:11:11:11:11:11|Port17-31||Ethernet68-Ethernet124|
144+
|mac17-mac31 |01:11:11:11:11:11 - 01:ff:ff:ff:ff:ff|Port17-31||Ethernet68-Ethernet124|

doc/sai-ptf/lag_test_plan.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@
1010
- [Case3: Change source_ip](#case3-change-source_ip)
1111
- [Case4: Change destinstion_ip](#case4-change-destinstion_ip)
1212
- [Case5: Change protocol](#case5-change-protocol)
13-
- [Testing Objective](#testing-objective)
1413
- [Test Group: Disable Egress/Ingress](#test-group-disable-egressingress)
1514
- [Case6: Disable_egress](#case6-disable_egress)
1615
- [Case7: Disable_ingress](#case7-disable_ingress)
17-
- [Testing Objective](#testing-objective-1)
1816
- [Test Case: Remove lag member](#test-case-remove-lag-member)
19-
- [Testing Objective](#testing-objective-2)
2017
# Overriew
2118
The purpose of this test plan is to test the LAG/PortChannel function from SAI.
2219

@@ -81,7 +78,7 @@ These cases will cover five scenarios: src/dst ip, src/dst port , protocol. cons
8178
### Case5: Change protocol
8279

8380

84-
### Testing Objective
81+
### Testing Objective <!-- omit in toc -->
8582
For load balancing, expecting the ports in a lag should receive the packet equally. Traffic direction: from server side to T1 side.
8683
### Test steps: <!-- omit in toc -->
8784
Test steps:
@@ -102,7 +99,7 @@ Test steps:
10299
### Case6: Disable_egress
103100
### Case7: Disable_ingress
104101

105-
### Testing Objective
102+
### Testing Objective <!-- omit in toc -->
106103
These cases will cover two scenarios: disable egress and ingress. We can disable ingress or egress on a lag member, then we expect traffic drop on the disabled lag member.
107104

108105
### Test steps: <!-- omit in toc -->
@@ -113,7 +110,7 @@ Test steps:
113110
- Check if Packet drop on port20
114111

115112
## Test Case: Remove lag member
116-
### Testing Objective
113+
### Testing Objective <!-- omit in toc -->
117114
These cases will cover lag memeber removement. We can remove a lag member, then expect traffic drop on the lag member.
118115

119116
### Test steps: <!-- omit in toc -->

doc/sai-ptf/vlan_test_plan.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ In this VLAN test, most of test case will be tested with Tagged or Untagged pack
6363
### Testing Objective <!-- omit in toc -->
6464
This test verifies the VLAN function around untag and access ports.
6565

66-
**This test will cover tagged and untagged mode respectivily.**
67-
6866
*p.s. This test will not check function with the native VLAN scenario. Please make sure the native VLAN will not impact the result.*
6967

7068
With an untagged packet, on the access port, when ingress and egress happen, the behavior as below
@@ -97,7 +95,6 @@ Test Steps:
9795

9896
Drop packet when the destination port from MAC table search is the port which packet come into the switch.
9997

100-
**This test will cover tagged and untagged mode respectivily.**
10198

10299
```
103100
Test example(Untag):
@@ -124,7 +121,6 @@ Flooding
124121
| Port8|
125122
```
126123

127-
**This test will cover tagged and untagged mode respectivily.**
128124

129125
### Test Steps: <!-- omit in toc -->
130126
- Create ``Untagged``/``Tagged VLAN1000`` packet, with ``mac1`` as source MAC and a un-existing ``MacX`` as dest MAC
@@ -142,7 +138,6 @@ For mac learning in VLAN scenario, after learning the mac address from the packe
142138
pkt(Untag:DMAC=MAC1) -> Port2:Access:VLAN1000-> Port1:Access:VLAN1000 -> pkt(Untag:DMAC=MAC1)
143139
144140
```
145-
**This test will cover tagged and untagged mode respectivily.**
146141
### Test Steps: <!-- omit in toc -->
147142
- Create ``Untagged``/``Tagged VLAN1000`` packet, with a un-existing ``MacX`` as src MAC and ``mac2`` as dest MAC
148143
- Send packet on a VLAN source port1.
@@ -180,7 +175,6 @@ When add a VLAN member to a non-exist VLAN, it will fail.
180175
### Testing Objective <!-- omit in toc -->
181176

182177
For VLAN-related counters, SAI should be able to get the counter and clear them.
183-
**This test will cover tagged and untagged mode respectivily.**
184178

185179
### Test Steps: <!-- omit in toc -->
186180
Steps:
@@ -198,7 +192,6 @@ Steps:
198192
### Testing Objective <!-- omit in toc -->
199193
Test the function when disabling VLAN MAC learning.
200194
When disabled, no new MAC will be learned in the MAC table.
201-
**This test will cover tagged and untagged mode respectivily.**
202195

203196
### Additional config: <!-- omit in toc -->
204197
- Do not config the MAC table
@@ -222,7 +215,7 @@ Server To Server
222215
|L3| <-> |Virtual Switch|
223216
PC2 <- pkt(Untag) <- |DUT|Port9:Access:VLAN2000
224217
```
225-
*All the layer 3 router tables are created as the basic config, not MAC and ARP learning in this test process.*
218+
226219
The process is as below:
227220
1. PC1 sends a untag packet to port1, which is a VLAN1000 access port
228221
2. Based on packet dest IP, derive the route to the dest IP, Dest MAC and Port derived from L3 table. Then SRC MAC change to Switch MAC, Dest MAC change to PORT MAC, forwarding to PORT9

0 commit comments

Comments
 (0)