Skip to content

remove: prefix/Community list sequences #14

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 2 commits into from
Aug 15, 2023
Merged

remove: prefix/Community list sequences #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c11943d
refactor(rp): remove prefix-list sequence
kpetremann Aug 11, 2023
5a15b22
refactor(rp): remove community-list sequence
kpetremann Aug 11, 2023
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: 0 additions & 4 deletions internal/convertor/routingpolicy/routing_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ func TestRoutingPolicyToOpenconfig(t *testing.T) {
},
Terms: []*cmdbRP.PrefixListTerm{
{
Sequence: 10,
Prefix: types.CIDR{
IP: net.IP{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 192, 0, 2, 0,
Expand All @@ -49,7 +48,6 @@ func TestRoutingPolicyToOpenconfig(t *testing.T) {
GreaterOrEqual: 0,
},
{
Sequence: 20,
Prefix: types.CIDR{
IP: net.IP{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 192, 0, 2, 16,
Expand All @@ -74,11 +72,9 @@ func TestRoutingPolicyToOpenconfig(t *testing.T) {
},
Terms: []*cmdbRP.CommunityListTerm{
{
Sequence: 10,
Community: "650..:999",
},
{
Sequence: 20,
Community: "650..:1000",
},
},
Expand Down
4 changes: 0 additions & 4 deletions internal/ingestor/cmdb/community_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@ func TestPrecomputeCommunityLists(t *testing.T) {
},
"terms": [
{
"sequence": 10,
"community": "650..:999"
},
{
"sequence": 20,
"community": "650..:1000"
}
],
Expand All @@ -52,11 +50,9 @@ func TestPrecomputeCommunityLists(t *testing.T) {
},
Terms: []*routingpolicy.CommunityListTerm{
{
Sequence: 10,
Community: "650..:999",
},
{
Sequence: 20,
Community: "650..:1000",
},
},
Expand Down
4 changes: 0 additions & 4 deletions internal/ingestor/cmdb/prefix_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@ func TestPrecomputePrefixLists(t *testing.T) {
"ip_version": "ipv4",
"terms": [
{
"sequence": 10,
"prefix": "192.0.2.0/28",
"le": null,
"ge": null
},
{
"sequence": 20,
"prefix": "192.0.2.16/28",
"le": 32,
"ge": 30
Expand All @@ -57,7 +55,6 @@ func TestPrecomputePrefixLists(t *testing.T) {
},
Terms: []*routingpolicy.PrefixListTerm{
{
Sequence: 10,
Prefix: types.CIDR{
IP: net.IP{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 192, 0, 2, 0,
Expand All @@ -68,7 +65,6 @@ func TestPrecomputePrefixLists(t *testing.T) {
GreaterOrEqual: 0,
},
{
Sequence: 20,
Prefix: types.CIDR{
IP: net.IP{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 192, 0, 2, 16,
Expand Down
1 change: 0 additions & 1 deletion internal/model/cmdb/routingpolicy/community_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package routingpolicy

type CommunityListTerm struct {
Community string `json:"community" validate:"required"`
Sequence int `json:"sequence" validate:"required"`
}

type CommunityList struct {
Expand Down
1 change: 0 additions & 1 deletion internal/model/cmdb/routingpolicy/prefix_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const (

type PrefixListTerm struct {
Prefix types.CIDR `json:"prefix" validate:"required"`
Sequence int `json:"sequence" validate:"required"`
LessOrEqual int `json:"le" validate:"omitempty"`
GreaterOrEqual int `json:"ge" validate:"omitempty"`
}
Expand Down