Skip to content

fix(bgp): peers cannot be shutdown #13

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 17, 2023
Merged

fix(bgp): peers cannot be shutdown #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/convertor/bgp/bgp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func TestBGPToOpenConfig(t *testing.T) {
Description: "TO:SPINE01-01",
MaximumPrefixes: 128,
EnforceFirstAs: true,
Enabled: true,
Enabled: &flagTrue,
},
PeerB: cmdbBGP.DeviceSession{
Device: struct {
Expand Down Expand Up @@ -135,7 +135,7 @@ func TestBGPToOpenConfig(t *testing.T) {
Description: "TO:TOR01-01",
MaximumPrefixes: 10,
EnforceFirstAs: true,
Enabled: true,
Enabled: &flagTrue,
},
Password: awesomePassword,
},
Expand Down
2 changes: 1 addition & 1 deletion internal/convertor/bgp/neighbor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func NeighborsToOpenconfig(hostname string, sessions []*bgp.Session) (map[string
NeighborAddress: &neighborAddress,
ApplyPolicy: &policy,
AfiSafi: safis,
Enabled: &localInfo.Enabled,
Enabled: localInfo.Enabled,
PeerAs: remoteInfo.LocalAsn.Number,
LocalAs: localInfo.LocalAsn.Number,
AuthPassword: &session.Password,
Expand Down
18 changes: 10 additions & 8 deletions internal/ingestor/cmdb/bgp_session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import (

var as65000 uint32 = 65000
var as65001 uint32 = 65001
var flagTrue = true
var flagFalse = false

/*
BGP session - IPv4
Expand Down Expand Up @@ -175,7 +177,7 @@ var ipv4Ingested = map[string][]*bgp.Session{
Description: "TO:SPINE01-01",
MaximumPrefixes: 128,
EnforceFirstAs: true,
Enabled: true,
Enabled: &flagTrue,
},
PeerB: bgp.DeviceSession{
Device: struct {
Expand Down Expand Up @@ -213,7 +215,7 @@ var ipv4Ingested = map[string][]*bgp.Session{
Description: "TO:TOR01-01",
MaximumPrefixes: 10,
EnforceFirstAs: true,
Enabled: false,
Enabled: &flagFalse,
},
Password: "awesomepassword",
},
Expand Down Expand Up @@ -262,7 +264,7 @@ var ipv4Ingested = map[string][]*bgp.Session{
Description: "TO:SPINE01-01",
MaximumPrefixes: 128,
EnforceFirstAs: true,
Enabled: true,
Enabled: &flagTrue,
},
PeerB: bgp.DeviceSession{
Device: struct {
Expand Down Expand Up @@ -300,7 +302,7 @@ var ipv4Ingested = map[string][]*bgp.Session{
Description: "TO:TOR01-01",
MaximumPrefixes: 10,
EnforceFirstAs: true,
Enabled: false,
Enabled: &flagFalse,
},
Password: "awesomepassword",
},
Expand Down Expand Up @@ -454,7 +456,7 @@ var ipv6Ingested = map[string][]*bgp.Session{
Description: "TO:SPINE01-01:V6",
MaximumPrefixes: 0,
EnforceFirstAs: true,
Enabled: true,
Enabled: &flagTrue,
},
PeerB: bgp.DeviceSession{
Device: struct {
Expand Down Expand Up @@ -494,7 +496,7 @@ var ipv6Ingested = map[string][]*bgp.Session{
Description: "TO:TOR01-01:V6",
MaximumPrefixes: 0,
EnforceFirstAs: true,
Enabled: true,
Enabled: &flagTrue,
},
Password: "awesomepassword",
},
Expand Down Expand Up @@ -539,7 +541,7 @@ var ipv6Ingested = map[string][]*bgp.Session{
Description: "TO:SPINE01-01:V6",
MaximumPrefixes: 0,
EnforceFirstAs: true,
Enabled: true,
Enabled: &flagTrue,
},
PeerB: bgp.DeviceSession{
Device: struct {
Expand Down Expand Up @@ -579,7 +581,7 @@ var ipv6Ingested = map[string][]*bgp.Session{
Description: "TO:TOR01-01:V6",
MaximumPrefixes: 0,
EnforceFirstAs: true,
Enabled: true,
Enabled: &flagTrue,
},
Password: "awesomepassword",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/model/cmdb/bgp/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ type DeviceSession struct {
RoutePolicyIn *routingpolicy.RoutePolicyLite `json:"route_policy_in" validate:"omitempty"`
RoutePolicyOut *routingpolicy.RoutePolicyLite `json:"route_policy_out" validate:"omitempty"`
AfiSafis []*AfiSafi `json:"afi_safis" validate:"required"`
Enabled *bool `json:"enabled" validate:"required"`
Description string `json:"description" validate:"omitempty"`
LocalAddress Address `json:"local_address" validate:"required"`
MaximumPrefixes uint32 `json:"maximum_prefixes" validate:"omitempty"`
EnforceFirstAs bool `json:"enforce_first_as" validate:"omitempty"`
Enabled bool `json:"enabled" validate:"required"`
}

type Session struct {
Expand Down