Skip to content

Commit b0fe2a0

Browse files
committed
config: remove unused InPolicy config
The InPolicy feature was removed long ago. Signed-off-by: FUJITA Tomonori <[email protected]>
1 parent 7a31432 commit b0fe2a0

File tree

6 files changed

+239
-324
lines changed

6 files changed

+239
-324
lines changed

api/gobgp.pb.go

Lines changed: 237 additions & 247 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/sources/configuration.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@
161161
default-import-policy = "reject-route"
162162
export-policy-list = ["policy2"]
163163
default-export-policy = "accept-route"
164-
in-policy-list = ["policy3"]
165-
default-in-policy = "reject-route"
166164
[neighbors.route-server.config]
167165
route-server-client = true
168166
# To enable TTL Security, uncomment the following.

pkg/config/oc/bgp_configs.go

Lines changed: 0 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/server/grpc_server.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -901,12 +901,6 @@ func readApplyPolicyFromAPIStruct(c *oc.ApplyPolicy, a *api.ApplyPolicy) {
901901
c.Config.ExportPolicyList = append(c.Config.ExportPolicyList, p.Name)
902902
}
903903
}
904-
if a.InPolicy != nil {
905-
c.Config.DefaultInPolicy = f(a.InPolicy.DefaultAction)
906-
for _, p := range a.InPolicy.Policies {
907-
c.Config.InPolicyList = append(c.Config.InPolicyList, p.Name)
908-
}
909-
}
910904
}
911905

912906
func readRouteSelectionOptionsFromAPIStruct(c *oc.RouteSelectionOptions, a *api.RouteSelectionOptions) {

proto/api/gobgp.proto

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -725,9 +725,8 @@ message DynamicNeighbor {
725725
}
726726

727727
message ApplyPolicy {
728-
PolicyAssignment in_policy = 1;
729-
PolicyAssignment export_policy = 2;
730-
PolicyAssignment import_policy = 3;
728+
PolicyAssignment export_policy = 1;
729+
PolicyAssignment import_policy = 2;
731730
}
732731

733732
message PrefixLimit {

tools/pyang_plugins/gobgp.yang

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -297,31 +297,6 @@ module gobgp {
297297
}
298298

299299

300-
grouping gobgp-in-policy {
301-
description
302-
"additional policy";
303-
304-
leaf-list in-policy {
305-
type leafref {
306-
path "/rpol:routing-policy/rpol:policy-definitions/" +
307-
"rpol:policy-definition/rpol:name";
308-
//require-instance true;
309-
}
310-
description
311-
"list of policy names in sequence to be applied on
312-
sending a routing update in the current context, e.g.,
313-
for the current other route server clients.";
314-
}
315-
316-
leaf default-in-policy {
317-
type rpol:default-policy-type;
318-
default REJECT-ROUTE;
319-
description
320-
"explicitly set a default policy if no policy definition
321-
in the in-policy chain is satisfied.";
322-
}
323-
}
324-
325300
grouping gobgp-route-server-config {
326301
description
327302
"Configuration parameter specifying whether
@@ -1045,18 +1020,6 @@ module gobgp {
10451020
uses gobgp-ttl-security-config-set;
10461021
}
10471022

1048-
augment "/bgp:bgp/bgp:global/bgp:apply-policy/bgp:config" {
1049-
description "addtional policy";
1050-
uses gobgp-in-policy;
1051-
1052-
}
1053-
1054-
augment "/bgp:bgp/bgp:global/bgp:apply-policy/bgp:state" {
1055-
description "additional policy";
1056-
uses gobgp-in-policy;
1057-
1058-
}
1059-
10601023
augment "/rpol:routing-policy/rpol:policy-definitions/" +
10611024
"rpol:policy-definition/rpol:statements/rpol:statement/" +
10621025
"rpol:actions/bgp-pol:bgp-actions/bgp-pol:set-as-path-prepend" {

0 commit comments

Comments
 (0)