[FRR][sonic-cfggen] Support T2 chassis frontend#3019

Closed

baiwei0427 wants to merge 12 commits intosonic-net:masterfrom

baiwei0427:master

Collaborator

baiwei0427 commented Jun 16, 2019 •

edited

Loading

- What I did

Support new role: T2 chassis frontend switch (SpineChassisFrontendRouter). The chassis frontend switch needs BGP-EVPN, Vxlan and Vnet support.

- How I did it

Modify minigraph parser to add Vnet and Vxlan informration for T2 chassis frontend
Add new frr, bgpd and zebra j2 templates to support BGP-EVPN
Add new tests to sonic-cfggen unit test scripts

- How to verify it

Run load_minigraph and verify entries in config DB and FRR configuration.

In config DB, you should be able to see the following entries:

"VNET|VnetFE"
"VXLAN_TUNNEL|TunnelInt"

In FRR docker, you should be able to see BGP-EVPN configuration as follows:

hostname SpineFront01
password zebra
log syslog informational
log facility local4
! enable password !
! Vnet BGP instance
vrf VnetFE
vni 8000
router bgp 4000 vrf VnetFE
  no bgp default ipv4-unicast
  bgp log-neighbor-changes
  bgp bestpath as-path multipath-relax
  no bgp default ipv4-unicast
  bgp graceful-restart restart-time 240
  bgp graceful-restart
  bgp router-id 4.0.0.0
  neighbor 192.168.0.1 remote-as 3000
  neighbor 192.168.0.1 description Leaf01
  neighbor 192.168.0.1 timers 3 10
  address-family ipv4 unicast
    neighbor 192.168.0.1 activate
    neighbor 192.168.0.1 soft-reconfiguration inbound
    maximum-paths 64
  exit-address-family
  address-family l2vpn evpn
    advertise ipv4 unicast
  exit-address-family

!
! bgp multiple-instance
!
route-map FROM_BGP_SPEAKER_V4 permit 10
!
route-map TO_BGP_SPEAKER_V4 deny 10
!
router bgp 4000
  bgp log-neighbor-changes
  bgp bestpath as-path multipath-relax
  no bgp default ipv4-unicast
  bgp graceful-restart restart-time 240
  bgp graceful-restart
  bgp router-id 4.0.0.0
  network 4.0.0.0/32
  neighbor 4.0.0.1 remote-as 4000
  neighbor 4.0.0.1 description SpineFront02
  neighbor 4.0.0.1 timers 3 10
  address-family l2vpn evpn
    neighbor 4.0.0.1 activate
    advertise-all-vni
  exit-address-family
  neighbor 172.16.0.2 remote-as 5000
  neighbor 172.16.0.2 description SpineBack01
  neighbor 172.16.0.2 timers 3 10
  address-family ipv4 unicast
    neighbor 172.16.0.2 allowas-in 1
    neighbor 172.16.0.2 activate
    neighbor 172.16.0.2 soft-reconfiguration inbound
    maximum-paths 64
  exit-address-family
  neighbor 172.16.0.10 remote-as 5000
  neighbor 172.16.0.10 description SpineBack02
  neighbor 172.16.0.10 timers 3 10
  address-family ipv4 unicast
    neighbor 172.16.0.10 allowas-in 1
    neighbor 172.16.0.10 activate
    neighbor 172.16.0.10 soft-reconfiguration inbound
    maximum-paths 64
  exit-address-family
!
maximum-paths 64
!
route-map ISOLATE permit 10
set as-path prepend 4000
!

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Wei Bai baiwei0427@gmail.com and Ze Gan ganze718@gmail.com

baiwei0427 and others added 10 commits

June 11, 2019 17:13


          Add special parsing for spine chassis frontend

e71798b


          Add EVPN j2 template in frr

894a2cc

Signed-off-by: Ze Gan <ganze718@gmail.com>


          Add a minigraph sample for spine chassis frontend

88c3979


          Add new tests for spine chassis frontend

8668d98


          Add new tests for FRR templates

ff8f4d9


          T2 chassis frontend only supports separated configuration mode now

a12c628


          Add t2 chassis frontend port configuration

1290d06


          Rmoeve useless command in bgpd

0da5c8d

Signed-off-by: Ze Gan <ganze718@gmail.com>


          Remove vrf and vni in sample bgpd.conf

d44ebb7


          Update Broadcom SAI version to pass test

e8d9124

lguohan reviewed

View reviewed changes

src/sonic-config-engine/minigraph.py Outdated

+                  if current_device['type'] == spine_chassis_frontend_role:
+                      chassis_vnet ='Vnet1'
+                      chassis_vxlan_tunnel = 'tunnel1'
+                      chassis_vni = 8000

Collaborator

lguohan Jun 21, 2019 •

edited

Loading

I think we should not hard code here. We can hardcode in the template. The same applies to Vnet1, tunnel1. name.

Collaborator Author

baiwei0427 Jun 21, 2019

This information (Vnet name, Vxlan tunnel name and vni) will be inserted to config DB. I don't know which template you refer to.

Collaborator

lguohan Jun 21, 2019

bgpd.j2

Collaborator Author

baiwei0427 Jun 21, 2019 •

edited

Loading

@lguohan I think this information is also necessary for vxlanmgrd

lguohan reviewed

View reviewed changes

src/sonic-config-engine/minigraph.py Outdated

+                      results['VXLAN_TUNNEL'] = {chassis_vxlan_tunnel: {
+                          'source_ip': lo_addr
+                      }}

Collaborator

lguohan Jun 21, 2019

can we use the lo_addr directly in the bgpd.conf j2 template?

lguohan reviewed

View reviewed changes

src/sonic-config-engine/minigraph.py Outdated

+                              # Enslave the interface to a Vnet
+                              if intf_name in phyport_intfs:
+                                  phyport_intfs[intf_name] = {'vnet_name': chassis_vnet}

Collaborator

lguohan Jun 21, 2019

should we move this enslave logic into the template as well?

lguohan reviewed

View reviewed changes

src/sonic-config-engine/minigraph.py

+                              else:
+                                  print >> sys.stderr, 'Warning: cannot find the key %s' % (intf_name)
                   return results

Collaborator

lguohan Jun 21, 2019 •

edited

Loading

all the extra logics you add in this file seem unnecessary, we should move all of them to template.

lguohan reviewed

View reviewed changes

src/sonic-config-engine/minigraph.py Outdated

+                  # Special parsing for spine chassis frontend routers
+                  if current_device['type'] == spine_chassis_frontend_role:
+                      chassis_vnet ='Vnet1'

Collaborator

lguohan Jun 22, 2019

VnetFE

lguohan reviewed

View reviewed changes

src/sonic-config-engine/minigraph.py Outdated

+                  # Special parsing for spine chassis frontend routers
+                  if current_device['type'] == spine_chassis_frontend_role:
+                      chassis_vnet ='Vnet1'
+                      chassis_vxlan_tunnel = 'tunnel1'

Collaborator

lguohan Jun 22, 2019

TunnelInt

lguohan reviewed

View reviewed changes

src/sonic-config-engine/minigraph.py Outdated

+                          'vni': chassis_vni
+                      }}
+                      for intf in phyport_intfs:

Collaborator

lguohan Jun 22, 2019

what if the front panel port channel belong to vnet?

lguohan requested changes

View reviewed changes

Collaborator

lguohan left a comment

as comments

baiwei0427 added 2 commits

June 27, 2019 15:22


          Add function parse_spine_chassis_fe

806fbc7


          Update test

502552a

Collaborator Author

baiwei0427 commented Jun 28, 2019

retest this please

Collaborator

lguohan commented Jun 28, 2019

can you resolve conflict?

lguohan reviewed

View reviewed changes

src/sonic-config-engine/tests/test_minigraph_case.py

+                      self.assertEqual(output.strip(),
+                                       "{'Ethernet8': {}, "
+                                       "('Ethernet8', '172.16.0.9/30'): {}, "
+                                       "'Ethernet0': {'vnet_name': 'VnetFE'}, "

Collaborator

lguohan Jun 28, 2019

need port channel example.

baiwei0427 closed this

Collaborator Author

baiwei0427 commented Jun 29, 2019

New PR: #3100

mssonicbld added a commit that referenced this pull request


          [submodule] Update submodule sonic-swss to the latest HEAD automatica…

001668e

…lly (#17889)

#### Why I did it
src/sonic-swss
```
* 41330ab - (HEAD -> master, origin/master, origin/HEAD) [Build] Support to collect the test coverage in cobertura format (#3019) (33 hours ago) [xumia]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet