Inherit software version capability from peer-group

Fixes: 15f9d5c ("Add SoftwareVersion capability") Fixes: #2767 Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
osrg · May 21, 2024 · 0dfa367 · 0dfa367
1 parent 44e77cc
commit 0dfa367
Show file tree

Hide file tree

Showing 7 changed files with 1,077 additions and 1,050 deletions.
diff --git a/api/gobgp.pb.go b/api/gobgp.pb.go
diff --git a/api/gobgp.proto b/api/gobgp.proto
@@ -633,6 +633,7 @@ message PeerGroupConf {
   RemovePrivate remove_private = 7;
   bool route_flap_damping = 8;
   uint32 send_community = 9;
+  bool send_software_version = 10;
 }
 
 message PeerGroupState {

diff --git a/docs/sources/configuration.md b/docs/sources/configuration.md
@@ -176,6 +176,7 @@
   [peer-groups.config]
     peer-group-name = "my-peer-group"
     peer-as = 65000
+    #send-software-version = true
   [[peer-groups.afi-safis]]
     [peer-groups.afi-safis.config]
       afi-safi-name = "ipv4-unicast"

diff --git a/pkg/config/oc/bgp_configs.go b/pkg/config/oc/bgp_configs.go
diff --git a/pkg/config/oc/util.go b/pkg/config/oc/util.go
@@ -584,13 +584,14 @@ func NewPeerGroupFromConfigStruct(pconf *PeerGroup) *api.PeerGroup {
 	return &api.PeerGroup{
 		ApplyPolicy: newApplyPolicyFromConfigStruct(&pconf.ApplyPolicy),
 		Conf: &api.PeerGroupConf{
-			PeerAsn:          pconf.Config.PeerAs,
-			LocalAsn:         pconf.Config.LocalAs,
-			Type:             api.PeerType(pconf.Config.PeerType.ToInt()),
-			AuthPassword:     pconf.Config.AuthPassword,
-			RouteFlapDamping: pconf.Config.RouteFlapDamping,
-			Description:      pconf.Config.Description,
-			PeerGroupName:    pconf.Config.PeerGroupName,
+			PeerAsn:             pconf.Config.PeerAs,
+			LocalAsn:            pconf.Config.LocalAs,
+			Type:                api.PeerType(pconf.Config.PeerType.ToInt()),
+			AuthPassword:        pconf.Config.AuthPassword,
+			RouteFlapDamping:    pconf.Config.RouteFlapDamping,
+			Description:         pconf.Config.Description,
+			PeerGroupName:       pconf.Config.PeerGroupName,
+			SendSoftwareVersion: pconf.Config.SendSoftwareVersion,
 		},
 		Info: &api.PeerGroupState{
 			PeerAsn:       s.PeerAs,

diff --git a/pkg/server/grpc_server.go b/pkg/server/grpc_server.go
@@ -818,6 +818,7 @@ func newPeerGroupFromAPIStruct(a *api.PeerGroup) (*oc.PeerGroup, error) {
 		pconf.Config.RouteFlapDamping = a.Conf.RouteFlapDamping
 		pconf.Config.Description = a.Conf.Description
 		pconf.Config.PeerGroupName = a.Conf.PeerGroupName
+		pconf.Config.SendSoftwareVersion = a.Conf.SendSoftwareVersion
 
 		switch a.Conf.RemovePrivate {
 		case api.RemovePrivate_REMOVE_ALL:

diff --git a/tools/pyang_plugins/gobgp.yang b/tools/pyang_plugins/gobgp.yang
@@ -1013,6 +1013,12 @@ module gobgp {
     }
   }
 
+  augment "/bgp:bgp/bgp:peer-groups/bgp:peer-group/bgp:config" {
+    leaf send-software-version {
+      type boolean;
+    }
+  }
+
   augment "/bgp:bgp/bgp:peer-groups/bgp:peer-group" {
     description "route server configuration for peer-group";
     uses gobgp-route-server-config-set;