From b2e274eb37000f6114436ee8cd02bf05b4d12641 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Thu, 22 Mar 2018 12:30:30 +0100 Subject: routing: fix issues found by pyang Change-Id: If6db0aa4d02b15c4997d9552e678d6d9f58a756a Signed-off-by: Marek Gradzki --- .../src/main/yang/vpp-routing-ra@2017-05-02.yang | 19 ++++++++++--------- .../yang/vpp-routing-table-lookup@2017-09-17.yang | 9 +++++---- .../src/main/yang/vpp-routing@2017-09-17.yang | 19 ++++++++++--------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/routing/routing-api/src/main/yang/vpp-routing-ra@2017-05-02.yang b/routing/routing-api/src/main/yang/vpp-routing-ra@2017-05-02.yang index 7f396feaa..342fbc07a 100644 --- a/routing/routing-api/src/main/yang/vpp-routing-ra@2017-05-02.yang +++ b/routing/routing-api/src/main/yang/vpp-routing-ra@2017-05-02.yang @@ -2,15 +2,6 @@ module vpp-routing-ra { namespace "urn:ietf:params:xml:ns:yang:vpp-routing-ra"; prefix "vpp-routing"; - description "General extensions for routing advertisments message configuration provided by VPP APIs"; - - revision 2017-05-02 { - description "Changed namespace"; - } - - revision 2017-03-15 { - description "Initial revision."; - } import yang-ext { prefix "ext"; @@ -24,6 +15,16 @@ module vpp-routing-ra { prefix "v6ur"; } + description "General extensions for routing advertisments message configuration provided by VPP APIs"; + + revision 2017-05-02 { + description "Changed namespace"; + } + + revision 2017-03-15 { + description "Initial revision."; + } + grouping ipv6-router-advertisements-vpp-attributes { leaf suppress-link-layer { type boolean; diff --git a/routing/routing-api/src/main/yang/vpp-routing-table-lookup@2017-09-17.yang b/routing/routing-api/src/main/yang/vpp-routing-table-lookup@2017-09-17.yang index 9ae77501b..aaef97bd1 100644 --- a/routing/routing-api/src/main/yang/vpp-routing-table-lookup@2017-09-17.yang +++ b/routing/routing-api/src/main/yang/vpp-routing-table-lookup@2017-09-17.yang @@ -2,16 +2,17 @@ module vpp-routing-table-lookup { namespace "urn:ietf:params:xml:ns:yang:vpp-routing-table-lookup"; prefix "vpp-routing"; + + import vpp-routing { + prefix "vpp-r"; + } + description "General extensions for routes to be able to use VPP table lookup option"; revision 2017-09-17 { description "Initial revision"; } - import vpp-routing { - prefix "vpp-r"; - } - grouping table-lookup-case-params { leaf secondary-vrf{ type vpp-r:vni-reference; diff --git a/routing/routing-api/src/main/yang/vpp-routing@2017-09-17.yang b/routing/routing-api/src/main/yang/vpp-routing@2017-09-17.yang index c5594ff32..807d6aab9 100644 --- a/routing/routing-api/src/main/yang/vpp-routing@2017-09-17.yang +++ b/routing/routing-api/src/main/yang/vpp-routing@2017-09-17.yang @@ -2,15 +2,6 @@ module vpp-routing{ namespace "urn:ietf:params:xml:ns:yang:vpp-routing"; prefix "vpp-routing"; - description "General extensions for routes to be able to use VPP route defining apis"; - - revision 2017-09-17 { - description "Support for table lookup option moved to separate model."; - } - - revision 2016-12-14 { - description "Initial revision."; - } import yang-ext { prefix "ext"; @@ -24,6 +15,16 @@ module vpp-routing{ prefix "ietf-r"; } + description "General extensions for routes to be able to use VPP route defining apis"; + + revision 2017-09-17 { + description "Support for table lookup option moved to separate model."; + } + + revision 2016-12-14 { + description "Initial revision."; + } + typedef vni-reference{ type uint32; description "Vrf index reference"; -- cgit 1.2.3-korg