yang: replace dummy rmap-ref with actual route-map leafref

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2020-09-08 22:01:40 +03:00
parent 806defc8fe
commit 45c70d4aa3
4 changed files with 22 additions and 18 deletions

View File

@ -9,6 +9,10 @@ submodule frr-bgp-common-structure {
prefix inet; prefix inet;
} }
import frr-route-map {
prefix frr-route-map;
}
import frr-interface { import frr-interface {
prefix frr-interface; prefix frr-interface;
} }
@ -371,7 +375,7 @@ submodule frr-bgp-common-structure {
} }
leaf rmap-policy-export { leaf rmap-policy-export {
type frr-bt:rmap-ref; type frr-route-map:route-map-ref;
description description
"Route-map to specify criteria to originate default."; "Route-map to specify criteria to originate default.";
} }

View File

@ -17,6 +17,10 @@ submodule frr-bgp-common {
prefix frr-bt; prefix frr-bt;
} }
import frr-route-map {
prefix frr-route-map;
}
import frr-route-types { import frr-route-types {
prefix frr-rt-type; prefix frr-rt-type;
} }
@ -73,25 +77,25 @@ submodule frr-bgp-common {
grouping rmap-policy-import { grouping rmap-policy-import {
leaf rmap-import { leaf rmap-import {
type frr-bt:rmap-ref; type frr-route-map:route-map-ref;
} }
} }
grouping rmap-policy-export { grouping rmap-policy-export {
leaf rmap-export { leaf rmap-export {
type frr-bt:rmap-ref; type frr-route-map:route-map-ref;
} }
} }
grouping unsupress-map-policy-import { grouping unsupress-map-policy-import {
leaf unsupress-map-import { leaf unsupress-map-import {
type frr-bt:rmap-ref; type frr-route-map:route-map-ref;
} }
} }
grouping unsupress-map-policy-export { grouping unsupress-map-policy-export {
leaf unsupress-map-export { leaf unsupress-map-export {
type frr-bt:rmap-ref; type frr-route-map:route-map-ref;
} }
} }
@ -728,7 +732,7 @@ submodule frr-bgp-common {
} }
leaf rmap-policy-import { leaf rmap-policy-import {
type frr-bt:rmap-ref; type frr-route-map:route-map-ref;
description description
"Route-map to be applied for redistributed routes into the bgp."; "Route-map to be applied for redistributed routes into the bgp.";
} }
@ -743,7 +747,7 @@ submodule frr-bgp-common {
} }
leaf rmap-policy-export { leaf rmap-policy-export {
type frr-bt:rmap-ref; type frr-route-map:route-map-ref;
description description
"Route-map to modify the attributes for Routes going out "Route-map to modify the attributes for Routes going out
via BGP updates."; via BGP updates.";
@ -771,7 +775,7 @@ submodule frr-bgp-common {
} }
leaf rmap-policy-export { leaf rmap-policy-export {
type frr-bt:rmap-ref; type frr-route-map:route-map-ref;
description description
"Apply route map to aggregate network."; "Apply route map to aggregate network.";
} }
@ -1097,7 +1101,7 @@ submodule frr-bgp-common {
} }
leaf rmap-policy-export { leaf rmap-policy-export {
type frr-bt:rmap-ref; type frr-route-map:route-map-ref;
description description
"Route-map to modify the attributes for Routes going out "Route-map to modify the attributes for Routes going out
via BGP updates."; via BGP updates.";

View File

@ -41,10 +41,6 @@ module frr-bgp-types {
"Initial revision."; "Initial revision.";
} }
typedef rmap-ref {
type string;
}
typedef plist-ref { typedef plist-ref {
type string; type string;
} }

View File

@ -15,6 +15,10 @@ module frr-ospfd {
prefix frr-interface; prefix frr-interface;
} }
import frr-route-map {
prefix frr-route-map;
}
import frr-route-types { import frr-route-types {
prefix frr-route-types; prefix frr-route-types;
} }
@ -41,10 +45,6 @@ module frr-ospfd {
} }
/* Policy types to be removed later, once policy Yang finalized */ /* Policy types to be removed later, once policy Yang finalized */
typedef rmap-ref {
type string;
}
typedef plist-ref { typedef plist-ref {
type string; type string;
} }
@ -425,7 +425,7 @@ module frr-ospfd {
} }
leaf route-map { leaf route-map {
type rmap-ref; type frr-route-map:route-map-ref;
description description
"Route map reference."; "Route map reference.";
} }