diff options
| author | Russ White <russ@riw.us> | 2021-12-02 14:33:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 14:33:05 +0100 |
| commit | 90f88bbc94f319941c46a8897ad6ba232ca24026 (patch) | |
| tree | 8ed8f0d10bbdd33f6b1e07837a4bd35e28d00b09 /yang | |
| parent | Merge pull request #9940 from pguibert6WIND/misc_topotests (diff) | |
| parent | lib, yang: remove vrf from the interface list key (diff) | |
| download | frr-90f88bbc94f319941c46a8897ad6ba232ca24026.tar.xz frr-90f88bbc94f319941c46a8897ad6ba232ca24026.zip | |
Merge pull request #10110 from idryzhov/if-yang-remove-vrf
lib, yang: remove vrf from the interface list key
Diffstat (limited to 'yang')
| -rw-r--r-- | yang/frr-interface.yang | 7 | ||||
| -rw-r--r-- | yang/ietf/frr-ietf-translator.json | 16 |
2 files changed, 4 insertions, 19 deletions
diff --git a/yang/frr-interface.yang b/yang/frr-interface.yang index 46c03a1d1..4a152aadd 100644 --- a/yang/frr-interface.yang +++ b/yang/frr-interface.yang @@ -288,13 +288,11 @@ module frr-interface { container lib { list interface { - key "name vrf"; + key "name"; description "Interface."; leaf name { - type string { - length "1..16"; - } + type string; description "Interface name."; } @@ -303,6 +301,7 @@ module frr-interface { type frr-vrf:vrf-ref; description "VRF this interface is associated with."; + config false; } leaf description { diff --git a/yang/ietf/frr-ietf-translator.json b/yang/ietf/frr-ietf-translator.json index 38a609982..36d6ddc8a 100644 --- a/yang/ietf/frr-ietf-translator.json +++ b/yang/ietf/frr-ietf-translator.json @@ -3,20 +3,6 @@ "family": "ietf", "module": [ { - "name": "ietf-interfaces@2018-01-09", - "deviations": "frr-deviations-ietf-interfaces", - "mappings": [ - { - "custom": "/ietf-interfaces:interfaces/interface[name='KEY1']", - "native": "/frr-interface:lib/interface[name='KEY1'][vrf='default']" - }, - { - "custom": "/ietf-interfaces:interfaces/interface[name='KEY1']/description", - "native": "/frr-interface:lib/interface[name='KEY1'][vrf='default']/description" - } - ] - }, - { "name": "ietf-routing@2018-01-25", "deviations": "frr-deviations-ietf-routing", "mappings": [ @@ -60,7 +46,7 @@ }, { "custom": "/ietf-routing:routing/control-plane-protocols/control-plane-protocol[type='ietf-rip:ripv2'][name='main']/ietf-rip:rip/interfaces/interface[interface='KEY1']/split-horizon", - "native": "/frr-interface:lib/interface[name='KEY1'][vrf='default']/frr-ripd:rip/split-horizon" + "native": "/frr-interface:lib/interface[name='KEY1']/frr-ripd:rip/split-horizon" }, { "custom": "/ietf-routing:routing/control-plane-protocols/control-plane-protocol[type='ietf-rip:ripv2'][name='main']/ietf-rip:rip/ipv4/neighbors/neighbor[ipv4-address='KEY1']", |