Skip to content

Commit

Permalink
[202012] [minigraph] Remove SLB and bgp monitor peers for storage bac…
Browse files Browse the repository at this point in the history
…kend (#12262)

Why I did it
This is to backport #12251 to 202012

Signed-off-by: Neetha John <nejo@microsoft.com>
  • Loading branch information
neethajohn authored Oct 10, 2022
1 parent 3d8fbf4 commit 1b99c60
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/sonic-config-engine/minigraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -1595,6 +1595,11 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
if is_storage_device:
results['DEVICE_METADATA']['localhost']['storage_device'] = "true"

# remove bgp monitor and slb peers for storage backend
if is_storage_device and 'BackEnd' in current_device['type']:
results['BGP_MONITORS'] = {}
results['BGP_PEER_RANGE'] = {}

results['VLAN'] = vlans
results['VLAN_MEMBER'] = vlan_members

Expand Down
8 changes: 8 additions & 0 deletions src/sonic-config-engine/tests/test_cfggen.py
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,14 @@ def verify_sub_intf(self, **kwargs):
output = self.run_script(argument)
self.assertEqual(output.strip(), "")

# SLB and BGP Monitor table does not exist
argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "BGP_PEER_RANGE"'
output = self.run_script(argument)
self.assertEqual(output.strip(), "{}")
argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "BGP_MONITORS"'
output = self.run_script(argument)
self.assertEqual(output.strip(), "{}")

# ACL_TABLE should not contain EVERFLOW related entries
argument = '-m "' + graph_file + '" -p "' + self.port_config + '" -v "ACL_TABLE"'
output = self.run_script(argument)
Expand Down

0 comments on commit 1b99c60

Please sign in to comment.