Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RR client support in minigraph for FRR #923

Merged
merged 8 commits into from
Sep 12, 2017
Merged

Conversation

nikos-github
Copy link
Collaborator

Changing minigraph.py to add RR client support that's needed for FRR.

Unit tested on my testbed (see below output).

Regards,

Nikos.-

router bgp 11
bgp router-id 11.11.11.11
bgp log-neighbor-changes
no bgp default ipv4-unicast
bgp bestpath as-path multipath-relax
neighbor 10.1.1.1 remote-as 10
neighbor 10.1.1.1 description CSW01
neighbor 10.2.1.1 remote-as 20
neighbor 10.2.1.1 description CSW02
neighbor 10.3.1.1 remote-as 30
neighbor 10.3.1.1 description CSW03
neighbor 10.4.1.1 remote-as 40
neighbor 10.4.1.1 description CSW04
neighbor 11.1.1.1 remote-as 111
neighbor 11.1.1.1 description IXIA
neighbor 111.111.111.111 remote-as 11
neighbor 111.111.111.111 description TEST
neighbor fc00:1:1::1 remote-as 10
neighbor fc00:1:1::1 description CSW01
neighbor fc00:2:1::1 remote-as 20
neighbor fc00:2:1::1 description CSW02
neighbor fc00:3:1::1 remote-as 30
neighbor fc00:3:1::1 description CSW03
neighbor fc00:4:1::1 remote-as 40
neighbor fc00:4:1::1 description CSW04
!
address-family ipv4 unicast
network 11.11.11.11/32
network 100.100.100.0/24
neighbor 10.1.1.1 activate
neighbor 10.2.1.1 activate
neighbor 10.3.1.1 activate
neighbor 10.4.1.1 activate
neighbor 11.1.1.1 activate
neighbor 111.111.111.111 activate
neighbor 111.111.111.111 route-reflector-client
maximum-paths 64
exit-address-family
!
address-family ipv6 unicast
network 2001:db8:bad:a55::/64
neighbor fc00:1:1::1 activate
neighbor fc00:2:1::1 activate
neighbor fc00:3:1::1 activate
neighbor fc00:4:1::1 activate
maximum-paths 64
exit-address-family

@msftclas
Copy link

@nikos-li,
Thanks for your contribution as a Microsoft full-time employee or intern. You do not need to sign a CLA.
Thanks,
Microsoft Pull Request Bot

@@ -274,6 +274,10 @@ def parse_cpg(cpg, hname):
for router in child.findall(str(QName(ns1, "BGPRouterDeclaration"))):
asn = router.find(str(QName(ns1, "ASN"))).text
hostname = router.find(str(QName(ns1, "Hostname"))).text
if router.find(str(QName(ns1, "RRClient"))):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add this in the sample minigraph and add unit test as well, to make sure later no one will break this feature.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok let me do that and repost.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still worth to add the sample configuration in the minigraph, so that later taoyu know how to move it to the config db.

@stcheng stcheng merged commit 686e227 into sonic-net:master Sep 12, 2017
@stcheng
Copy link
Contributor

stcheng commented Sep 12, 2017

Please add sample minigraphs and corresponding unit test cases afterward.

stcheng pushed a commit to stcheng/sonic-buildimage that referenced this pull request Jul 19, 2019
swss:
[vxlanorch]: Allow ipv6 src ip for Vxlan tunnel creation (sonic-net#896)
[aclorch]: Allow DTEL drop actions in DTEL flow watchlist (sonic-net#915)
Fix typo in orchagent_restart_check from fasle to false. (sonic-net#923)
[sonic-swss]: Fix for FPM accept call failure in ARM arch (sonic-net#925)
Add retryCount option for orchagent_restart_check program. (sonic-net#833)
[vlan] Add pytest cases to validate nonexistent vlan behavior. (sonic-net#874)
[intfsorch] Wait for interface prior to prefix (sonic-net#796)
Set timer only when interval changes. Not in each firing of the timer. (sonic-net#945)
[test]: Fix set interface in configuration database (sonic-net#956)
[copporch]: Fix polymorphic type error (sonic-net#946)
[AclOrch]: Fix the acl mirror counter doubled by inactive mirror and active again (sonic-net#952)
[MirrorOrch]: Init the next hop ip with 0 instead of default constructor (sonic-net#953)
[portsorch]: Add reference count of port (sonic-net#962)
[mock_test]: Move mock tests into a separate folder to separate them from vs tests (sonic-net#950)
remove crm acl_counters when acl_table removed (sonic-net#918)
[aclorch]: Fix matching MIRROR_DSCP throws unnecessary errors (sonic-net#966)
[policerorch]: Fix return code comparison error (sonic-net#968)
[gitignore]: Add swss-dbg related files (sonic-net#967)
[vxlanmgrd]: Fix for vxlanmgrd cannot correctly work after config reload (sonic-net#934)
[vxlanorch]: Add extra info into NOTICE logs (sonic-net#891)
[test]: Add a neighbor entry with BCAST MAC and verify its ignored (sonic-net#955)
[copporch]: Fix copporch in DEL command (sonic-net#972)
[orchagent]: Fix crash during orchagent process exit (sonic-net#974)
[vnetorch]: Fix VNET orchagents order for warm-reboot flow (sonic-net#958)
[test]: Skip unstable test test_vnet_orch_1 (sonic-net#976)
[intfsorch]: Fix rif flex counter removal error (sonic-net#975)
Update tests README.md file
[aclorch]: Change CFG_ACL_TABLE_NAME to CFG_ACL_TABLE_TABLE_NAME (sonic-net#978)
[test]: Skip test_watermark.py::TestWatermark::test_lua_plugins (sonic-net#981)
[teamsyncd]: Add information for LAG membership changes (sonic-net#982)

common:
Add an assert to logger, which will log a message and abort. (sonic-net#286)
[test]: Add IpAddress::isZero() unit test (sonic-net#289)
do not abort when read timerfd return 0 and errno = 0 (sonic-net#291)
Add BGP_STATE_TABLE in stateDB (sonic-net#273)
[IpAddress]: add mcast scope on address and isFullMask method on prefix (sonic-net#285)
Add ignore Wshadow pragma to json.hpp (sonic-net#292)
[executor]: Fix Executor does not get correct priority saved in m_selectable (sonic-net#290)
[schema]: Remove duplicate STATE_MIRROR_SESSION_TABLE_NAME (sonic-net#294)
timerfd:read failure - Record in logs as error. (sonic-net#295)
[schema]: Change CFG_ACL_TABLE_NAME to CFG_ACL_TABLE_TABLE_NAME (sonic-net#296)
[schema]: Add PASS_THROUGH_ROUTE_TABLE to config and application db (sonic-net#297)

sairedis:
ARM32 bit fixes, for 64bit printf format specifier (sonic-net#468)
Reduce the timeout (GET_RESPONSE_TIMEOUT) from 6 minutes to 1 minute. (sonic-net#472)
Fixed config_syncd_barefoot function (sonic-net#474)
[syncd_init_common.sh] fix fast reboot backwards compatibility (sonic-net#480)
Add default bridge id for bridge port id of type PORT in virtual switch (sonic-net#473)
Fix a bug in parsing kernel argument of fast-reboot (sonic-net#482)
Add TimerWatchdog for monitoring long execution apis (sonic-net#469)
Add specific comparison logic for tunnel map (sonic-net#475)
[vslib] add ACL action capabilities support (sonic-net#481)
Per buffer pool watermark polling mode (sonic-net#485)
Add specific comparison logic for ACL counter (sonic-net#484)
Process flex counters requests in separate thread (sonic-net#483)
Make sairedis/syncd synchronous (sonic-net#476)
Fixed conditional operator. (sonic-net#487)

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
lguohan pushed a commit that referenced this pull request Jul 20, 2019
swss:
[vxlanorch]: Allow ipv6 src ip for Vxlan tunnel creation (#896)
[aclorch]: Allow DTEL drop actions in DTEL flow watchlist (#915)
Fix typo in orchagent_restart_check from fasle to false. (#923)
[sonic-swss]: Fix for FPM accept call failure in ARM arch (#925)
Add retryCount option for orchagent_restart_check program. (#833)
[vlan] Add pytest cases to validate nonexistent vlan behavior. (#874)
[intfsorch] Wait for interface prior to prefix (#796)
Set timer only when interval changes. Not in each firing of the timer. (#945)
[test]: Fix set interface in configuration database (#956)
[copporch]: Fix polymorphic type error (#946)
[AclOrch]: Fix the acl mirror counter doubled by inactive mirror and active again (#952)
[MirrorOrch]: Init the next hop ip with 0 instead of default constructor (#953)
[portsorch]: Add reference count of port (#962)
[mock_test]: Move mock tests into a separate folder to separate them from vs tests (#950)
remove crm acl_counters when acl_table removed (#918)
[aclorch]: Fix matching MIRROR_DSCP throws unnecessary errors (#966)
[policerorch]: Fix return code comparison error (#968)
[gitignore]: Add swss-dbg related files (#967)
[vxlanmgrd]: Fix for vxlanmgrd cannot correctly work after config reload (#934)
[vxlanorch]: Add extra info into NOTICE logs (#891)
[test]: Add a neighbor entry with BCAST MAC and verify its ignored (#955)
[copporch]: Fix copporch in DEL command (#972)
[orchagent]: Fix crash during orchagent process exit (#974)
[vnetorch]: Fix VNET orchagents order for warm-reboot flow (#958)
[test]: Skip unstable test test_vnet_orch_1 (#976)
[intfsorch]: Fix rif flex counter removal error (#975)
Update tests README.md file
[aclorch]: Change CFG_ACL_TABLE_NAME to CFG_ACL_TABLE_TABLE_NAME (#978)
[test]: Skip test_watermark.py::TestWatermark::test_lua_plugins (#981)
[teamsyncd]: Add information for LAG membership changes (#982)

common:
Add an assert to logger, which will log a message and abort. (#286)
[test]: Add IpAddress::isZero() unit test (#289)
do not abort when read timerfd return 0 and errno = 0 (#291)
Add BGP_STATE_TABLE in stateDB (#273)
[IpAddress]: add mcast scope on address and isFullMask method on prefix (#285)
Add ignore Wshadow pragma to json.hpp (#292)
[executor]: Fix Executor does not get correct priority saved in m_selectable (#290)
[schema]: Remove duplicate STATE_MIRROR_SESSION_TABLE_NAME (#294)
timerfd:read failure - Record in logs as error. (#295)
[schema]: Change CFG_ACL_TABLE_NAME to CFG_ACL_TABLE_TABLE_NAME (#296)
[schema]: Add PASS_THROUGH_ROUTE_TABLE to config and application db (#297)

sairedis:
ARM32 bit fixes, for 64bit printf format specifier (#468)
Reduce the timeout (GET_RESPONSE_TIMEOUT) from 6 minutes to 1 minute. (#472)
Fixed config_syncd_barefoot function (#474)
[syncd_init_common.sh] fix fast reboot backwards compatibility (#480)
Add default bridge id for bridge port id of type PORT in virtual switch (#473)
Fix a bug in parsing kernel argument of fast-reboot (#482)
Add TimerWatchdog for monitoring long execution apis (#469)
Add specific comparison logic for tunnel map (#475)
[vslib] add ACL action capabilities support (#481)
Per buffer pool watermark polling mode (#485)
Add specific comparison logic for ACL counter (#484)
Process flex counters requests in separate thread (#483)
Make sairedis/syncd synchronous (#476)
Fixed conditional operator. (#487)

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
zhenggen-xu pushed a commit to zhenggen-xu/sonic-buildimage that referenced this pull request Oct 17, 2019
* msft_github/master:
  [snmpagent]: Update sonic-snmpagent submodule (sonic-net#1004)
  [swss]: Update the ipinip.j2 template to specify the IPv4 loopback address (sonic-net#998)
  Change all port_config.ini column headers from 'port' to 'index' (sonic-net#1001)
  [docker-platform-monitor]: Remove stale fancontrol.pid file (if exists) before starting fancontrol (sonic-net#1002)
  [swss]: Update swss/common submodules (sonic-net#988)
  [snmp]: Update py-swsssdk/snmpagent submodules (sonic-net#996)
  [Broadcom]: Update SAI version to 3.0.3.2-5 (sonic-net#997)
  [Mellanox]: Update outdated MSN2410 minigraph (sonic-net#995)
  Add time stamp suffix to the dirty images version string (sonic-net#958)
  [Mellanox]: Remove FW upgrade procedure in docker (sonic-net#989)
  [snmp]: Update sonic-snmpagent submodule (sonic-net#986)
  [Broadcom]: Update SAI version to 3.0.3.2-4 (sonic-net#983)
  [Ingrasys]: Add Ingrasys S8900-64XC sfputil function and update submodule (sonic-net#984)
  [mellanox]: Update Mellanox SAI version (sonic-net#979)
  [Ingrasys]: Change hwmon kernel modules installation order (sonic-net#980)
  [Makefile] Allowing interactive session with the slave docker-container (sonic-net#903)
  [snmp]: Update sonic-snmpagent submodule (sonic-net#978)
  Disable snmpd module disk_hw, so no syslog messages about unavailable disks (sonic-net#977)
  [teamd]: Remove deprecated blocking logic before starting teamd (sonic-net#976)
  [Broadcom]: Update libsai version to 3.0.3.2-2 (sonic-net#973)
  [device/accton]: Add a new supported device, AS7312-54X (sonic-net#955)
  [sairedis]: update sairedis submodule (sonic-net#974)
  lacp runner will send lacp update right after it received SIGINT (sonic-net#969)
  [config]: Fix management interface configuration (sonic-net#966)
  [Broadcom]: Update OpenNSL modules (sonic-net#970)
  [utilities]: Update sonic-utilities (sonic-net#968)
  [interfaces]: Change MTU value to 9100  (sonic-net#967)
  Framework to plugin Organization specific scripts during ONIE Image build  (sonic-net#951)
  Always start with Forwarding State flag set for bgpd (sonic-net#963)
  Update sonic-utilities to be compatible with sonic-net#942 (sonic-net#965)
  [swss]: Fix the command to get HWSKU with sonic-cfggen (sonic-net#964)
  [bgp]: Fix the deployment_id with DEVICE_METADATA (sonic-net#962)
  [Ingrasys] Update Ingrasys submodule for S8900-54XC (sonic-net#954)
  [build/onie installer] Install grub for SONiC post migration from another NOS (sonic-net#949)
  [syncd]: Comment out unused docker-ptf-brcm.mk
  [Broadcom]: Update OpenNSL/SAI version (sonic-net#959)
  [swss]: Move swss/common/sairedis submodule to 201709 tag
  [sairedis]: update sairedis submodule head (sonic-net#956)
  [service template] Starting new docker when HWSKU change is detected (sonic-net#946)
  [config] Fix an issue that bgp asn data type is not consistent (sonic-net#953)
  [mellanox]: Update Mellanox SAI version ansd SDK version
  [Ingrasys] update port_config.ini and sfputil for ingrasys platforms (sonic-net#952)
  [frr]: RR client support in minigraph for FRR (sonic-net#923)
  [configdb] Migrate minigraph configurations to DB (sonic-net#942)
  [devices]: Add led plugin for Arista 7060CX-32S and 7260CX3-64 (sonic-net#945)
  [sonic-slave]: SLAVE_TAG should be for both Dockerfile and Dockerfile.user (sonic-net#950)
  [github]: add templates for submitting issues and PR (sonic-net#947)
  [rsyslog]: Use timegenerated instead of timestamp (sonic-net#944)
  [dell]: remove nos_to_sonic_grub.cfg (sonic-net#943)
  [slave.mk]: Apply series of patches to SONIC_PYTHON_STDEB_DEBS targets if they exist (sonic-net#941)
  [rsyslog]: Use SONiC template in containers (sonic-net#940)
  [Broadcom]: Remove BRCM_OPENNSL library and upgrade BRCM_SAI to 3.0.3.2 (sonic-net#938)
  [baseimage]: allocate varlog disk in the initramfs stage (sonic-net#936)
  [sairedis]: revert deadlock fix in sonic-sairedis submodule (sonic-net#934)
  Replace CRLF line endings with LF (sonic-net#932)
  Fix confusing comment (sonic-net#931)
  Update sfputil support for Ingrasys S9100 (sonic-net#929)
  [quagga]: Disable ipv4 over ipv6 and enable ipv6 over ipv4 peer group (sonic-net#922)
  [quagga] enable core dump for bgpd and zebra (sonic-net#927)
  [devices]: Update Dell s6100/z9100 platform modules (sonic-net#925)
  Revert "Migrate DEVICE_METADATA to db (sonic-net#919)" (sonic-net#928)
  Migrate DEVICE_METADATA to db (sonic-net#919)
  [devices]: Bump sonic-platform-modules-arista submodule (sonic-net#924)
  [image]: build sonic-broadcom.raw image for sonic conversion from ftos (sonic-net#901)
  [sonic-slave] Force pyangbind version to 0.5.10 (sonic-net#918)
  [Arista-7260CX3] Rename hwSKU Arista-7260CX3-64 to Arista-7260CX3-C64, introducing new hwSKU Arista-7260CX3-D108C8 (sonic-net#920)
  [devices]: modify sfputil plugins for mellanox devices for new platform API (sonic-net#916)
  [cavm]Update sai revision and packet driver (sonic-net#914)
  [translate-acl] Specify pyangbind version to not introduce new dependency (sonic-net#915)
  Update sfputil support for Arista platforms (sonic-net#912)
  Port speed (sonic-net#879)
  [Accton]: Add a new supported device AS5712-54X (sonic-net#898)
  [kernel]: update kernel submodule (sonic-net#910)
  [device]: Updated dell s6100 submodule to 5ab014 (sonic-net#909)
  [broadcom]: update broadcom sai package to 2.1.5.1-17 (sonic-net#908)
  IPv4 prefixes shouldn't be sent by default over IPv6 session with FRR. (sonic-net#905)
  [submodule]: update sonic linux kernel (sonic-net#906)
  [sonic-sairedis] update sairedis submodule (sonic-net#211, sonic-net#212) (sonic-net#904)
  [mlnx-fw-upgrade]: Define required FW version in build time. (sonic-net#902)
  [SAI]: Remove the SAI submodule from buildimage repo (sonic-net#893)
  [Submodule update]: sonic-utilities (sonic-net#888)
  Revert "[mellanox]: Update Mellanox SAI version"
  [mellanox]: Update Mellanox SAI version
  [utilities]: Update sonic-utilities submodule
  [swss-common]: Update sonic-swss-common submodule
  [mellanox]: Disable fsat boot mode for SX kernel
  [quagga]: Update sonic-quagga submodule
  [Broadcom]: Update Broadcom SAI/SDK version (sonic-net#883)
  Squash merge v1.0.3 branch onto master
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
lguohan pushed a commit that referenced this pull request May 29, 2020
Add 'hw-management-generate-dump.sh' to 'show techsupport' command (#923)
Add common PCIe diag tool (#771)
Multi-asic changes for config bgp commands and utilities. (#910)
Loopback interface configuration CLIs (#879)

Signed-off-by: Shlomi Bitton <shlomibi@mellanox.com>
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
AidanCopeland pushed a commit to Metaswitch/sonic-buildimage that referenced this pull request Apr 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants