Skip to content

Commit 2632a7d

Browse files
authored
Merge branch 'master' into improve_look_of_yaml_listings
2 parents bb79a17 + e653648 commit 2632a7d

File tree

3 files changed

+66
-30
lines changed

3 files changed

+66
-30
lines changed

.github/workflows/commitlint.yaml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Make sure commit subject and description follow the Conventional Commits spec.
2+
# See https://www.conventionalcommits.org/
3+
4+
name: "commitlint"
5+
6+
on:
7+
pull_request: {}
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
11+
cancel-in-progress: true
12+
13+
permissions:
14+
pull-requests: read
15+
16+
jobs:
17+
commitlint:
18+
runs-on: lab
19+
20+
steps:
21+
- name: Checkout repository
22+
uses: "actions/checkout@v4"
23+
with:
24+
fetch-depth: 0
25+
persist-credentials: "false"
26+
27+
- name: Run commitlint on Pull Request's commits
28+
uses: opensource-nepal/commitlint@v1
29+
with:
30+
verbose: true
31+
32+
- name: Block Merge Commits
33+
if: ${{ always() }}
34+
uses: Morishiri/[email protected]
35+
with:
36+
repo-token: ${{ secrets.GITHUB_TOKEN }}

docs/user-guide/connections.md

+25-25
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
server:
3131
port: server-4/enp2s1
3232
switch:
33-
port: s5248-02/Ethernet3
33+
port: s5248-02/E1/1
3434
```
3535
3636
### Bundled
@@ -49,11 +49,11 @@ spec:
4949
- server:
5050
port: server-3/enp2s1
5151
switch:
52-
port: s5248-01/Ethernet3
52+
port: s5248-01/E1/1
5353
- server:
5454
port: server-3/enp2s2
5555
switch:
56-
port: s5248-01/Ethernet4
56+
port: s5248-01/E1/2
5757
```
5858
5959
### MCLAG
@@ -75,11 +75,11 @@ spec:
7575
- server:
7676
port: server-1/enp2s1
7777
switch:
78-
port: s5248-01/Ethernet1
78+
port: s5248-01/E1/1
7979
- server:
8080
port: server-1/enp2s2
8181
switch:
82-
port: s5248-02/Ethernet1
82+
port: s5248-02/E1/1
8383
```
8484

8585
### ESLAG
@@ -100,11 +100,11 @@ spec:
100100
- server:
101101
port: server-1/enp2s1
102102
switch:
103-
port: s5248-01/Ethernet1
103+
port: s5248-01/E1/1
104104
- server:
105105
port: server-1/enp2s2
106106
switch:
107-
port: s5248-02/Ethernet1
107+
port: s5248-02/E1/1
108108
```
109109

110110
## Switch connections (fabric-facing)
@@ -127,16 +127,16 @@ spec:
127127
links: # Defines multiple links between a spine-leaf pair of switches with IP addresses
128128
- leaf:
129129
ip: 172.30.30.1/31
130-
port: s5248-01/Ethernet48
130+
port: s5248-01/E1/18
131131
spine:
132132
ip: 172.30.30.0/31
133-
port: s5232-01/Ethernet0
133+
port: s5232-01/E1/1
134134
- leaf:
135135
ip: 172.30.30.3/31
136-
port: s5248-01/Ethernet56
136+
port: s5248-01/E1/16
137137
spine:
138138
ip: 172.30.30.2/31
139-
port: s5232-01/Ethernet4
139+
port: s5232-01/E1/2
140140
```
141141

142142
### MCLAG-Domain
@@ -155,22 +155,22 @@ spec:
155155
mclagDomain:
156156
peerLinks: # Defines multiple links between a pair of MCLAG switches for Peer link
157157
- switch1:
158-
port: s5248-01/Ethernet72
158+
port: s5248-01/E1/12
159159
switch2:
160-
port: s5248-02/Ethernet72
160+
port: s5248-02/E1/12
161161
- switch1:
162-
port: s5248-01/Ethernet73
162+
port: s5248-01/E1/13
163163
switch2:
164-
port: s5248-02/Ethernet73
164+
port: s5248-02/E1/13
165165
sessionLinks: # Defines multiple links between a pair of MCLAG switches for Session link
166166
- switch1:
167-
port: s5248-01/Ethernet74
167+
port: s5248-01/E1/14
168168
switch2:
169-
port: s5248-02/Ethernet74
169+
port: s5248-02/E1/14
170170
- switch1:
171-
port: s5248-01/Ethernet75
171+
port: s5248-01/E1/15
172172
switch2:
173-
port: s5248-02/Ethernet75
173+
port: s5248-02/E1/15
174174
```
175175

176176
### VPC-Loopback
@@ -188,13 +188,13 @@ spec:
188188
vpcLoopback:
189189
links: # Defines multiple loopbacks on a single switch
190190
- switch1:
191-
port: s5248-01/Ethernet16
191+
port: s5248-01/E1/16
192192
switch2:
193-
port: s5248-01/Ethernet17
193+
port: s5248-01/E1/17
194194
- switch1:
195-
port: s5248-01/Ethernet18
195+
port: s5248-01/E1/18
196196
switch2:
197-
port: s5248-01/Ethernet19
197+
port: s5248-01/E1/19
198198
```
199199

200200
## Connecting Fabric to the outside world
@@ -217,7 +217,7 @@ spec:
217217
staticExternal:
218218
link:
219219
switch:
220-
port: s5248-04/Ethernet1 # Switch port to use
220+
port: s5248-04/E1/1 # Switch port to use
221221
ip: 172.30.50.5/24 # IP address that will be assigned to the switch port
222222
vlan: 1005 # Optional VLAN ID to use for the switch port; if 0, no VLAN is configured
223223
subnets: # List of subnets to route to the switch port using static routes and next hop
@@ -253,5 +253,5 @@ spec:
253253
external:
254254
link: # Defines a single link between a switch and an external system
255255
switch:
256-
port: s5248-03/Ethernet3
256+
port: s5248-03/E1/3
257257
```

docs/user-guide/external.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ spec:
8080
external:
8181
link:
8282
switch:
83-
port: # SwitchName/EthernetXXX
83+
port: ds3000/E1/1
8484
```
8585

8686
### External Attachment
@@ -159,8 +159,8 @@ spec:
159159
## Examples
160160

161161
This example shows how to peer with the `External` object with name `HedgeEdge`, given a Fabric VPC with name `vpc-1` on
162-
the Border Leaf `switchBorder` that has a cable connecting it to an Edge device on the port `Ethernet42`. Specifying
163-
`vpc-1` is required to receive any prefixes advertised from the `External`.
162+
the Border Leaf `switchBorder` that has a cable connecting it to an Edge device
163+
on the port `E1/2`. Specifying `vpc-1` is required to receive any prefixes advertised from the `External`.
164164

165165
### Fabric API configuration
166166

@@ -204,7 +204,7 @@ spec:
204204
external:
205205
link:
206206
switch:
207-
port: switchBorder/Ethernet42
207+
port: switchBorder/E1/2
208208
```
209209

210210
#### ExternalAttachment
@@ -257,7 +257,7 @@ Interface configuration:
257257
```yaml
258258
interface Ethernet2.100
259259
encapsulation dot1q vlan-id 100
260-
description switchBorder--Ethernet42
260+
description switchBorder--E1/2
261261
no shutdown
262262
ip vrf forwarding VrfHedge
263263
ip address 100.100.0.6/24

0 commit comments

Comments
 (0)