From b4581d183065af6b82026003959b96fbe6850dd1 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 16 Jun 2017 14:36:52 +0200 Subject: Rename yang files to match model revision Also order of revisions was sorted starting from most current. Change-Id: I21fd35cfdb1cc5601b3fb40c9f3755bd3b995b14 Signed-off-by: Marek Gradzki --- .../routing-api/src/main/yang/vpp-routing-ra.yang | 107 --------------------- .../src/main/yang/vpp-routing-ra@2017-05-02.yang | 107 +++++++++++++++++++++ routing/routing-api/src/main/yang/vpp-routing.yang | 66 ------------- .../src/main/yang/vpp-routing@2016-12-14.yang | 66 +++++++++++++ 4 files changed, 173 insertions(+), 173 deletions(-) delete mode 100644 routing/routing-api/src/main/yang/vpp-routing-ra.yang create mode 100644 routing/routing-api/src/main/yang/vpp-routing-ra@2017-05-02.yang delete mode 100644 routing/routing-api/src/main/yang/vpp-routing.yang create mode 100644 routing/routing-api/src/main/yang/vpp-routing@2016-12-14.yang (limited to 'routing') diff --git a/routing/routing-api/src/main/yang/vpp-routing-ra.yang b/routing/routing-api/src/main/yang/vpp-routing-ra.yang deleted file mode 100644 index 7f396feaa..000000000 --- a/routing/routing-api/src/main/yang/vpp-routing-ra.yang +++ /dev/null @@ -1,107 +0,0 @@ -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"; - } - - import hc2vpp-ietf-routing { - prefix "ietf-r"; - } - - import hc2vpp-ietf-ipv6-unicast-routing { - prefix "v6ur"; - } - - grouping ipv6-router-advertisements-vpp-attributes { - leaf suppress-link-layer { - type boolean; - default false; - description - "Dicates not to include the optional source link-layer address - in the ICMPv6 router-advertisement messages."; - } - leaf send-unicast { - type boolean; - default false; - description - "Use the source address of the router-solicitation message if availiable."; - } - leaf cease { - type boolean; - default false; - description - "Cease sending ICMPv6 router-advertisement messages."; - } - leaf initial-count { - type uint8 { - range "1..3"; - } - default 3; - description - "Number of initial ICMPv6 router-advertisement messages sent."; - } - leaf initial-interval { - type uint8 { - range "1..16"; - } - units "seconds"; - default 16; - description - "Interval between initial ICMPv6 router-advertisement messages."; - } - - description - "VPP specific configuration of RA messages. Mapped to sw_interface_ip6nd_ra_config API: - https://git.fd.io/vpp/tree/src/vnet/ip/ip.api#n196"; - - reference - "https://docs.fd.io/vpp/17.04/clicmd_src_vnet_ip.html#clicmd_ip6_nd"; - } - - grouping control-adv-prefixes-vpp-attributes { - leaf advertise-router-address { - type boolean; - default true; - description - "Send full router address in prefix advertisement."; - } - leaf vpp-default { - type boolean; - default false; - description - "Use VPP default values for prefix advertisment."; - } - - description - "VPP specific configuration of prefixes in RA messages. Mapped to sw_interface_ip6nd_ra_prefix API: - https://git.fd.io/vpp/tree/src/vnet/ip/ip.api#n243"; - - reference - "https://docs.fd.io/vpp/17.04/clicmd_src_vnet_ip.html#clicmd_ip6_nd"; - } - - augment "/ietf-r:routing/ietf-r:routing-instance/ietf-r:interfaces/ietf-r:interface/" - + "v6ur:ipv6-router-advertisements" { - ext:augment-identifier "ipv6-router-advertisements-vpp-augmentation"; - uses ipv6-router-advertisements-vpp-attributes; - } - - augment "/ietf-r:routing/ietf-r:routing-instance/ietf-r:interfaces/ietf-r:interface/" - + "v6ur:ipv6-router-advertisements/v6ur:prefix-list/v6ur:prefix" { - // TODO control-adv-prefixes/advertise case should be target node (change after yangtools issues are solved) - ext:augment-identifier "control-adv-prefixes-vpp-augmentation"; - uses control-adv-prefixes-vpp-attributes; - } -} \ No newline at end of file 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 new file mode 100644 index 000000000..7f396feaa --- /dev/null +++ b/routing/routing-api/src/main/yang/vpp-routing-ra@2017-05-02.yang @@ -0,0 +1,107 @@ +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"; + } + + import hc2vpp-ietf-routing { + prefix "ietf-r"; + } + + import hc2vpp-ietf-ipv6-unicast-routing { + prefix "v6ur"; + } + + grouping ipv6-router-advertisements-vpp-attributes { + leaf suppress-link-layer { + type boolean; + default false; + description + "Dicates not to include the optional source link-layer address + in the ICMPv6 router-advertisement messages."; + } + leaf send-unicast { + type boolean; + default false; + description + "Use the source address of the router-solicitation message if availiable."; + } + leaf cease { + type boolean; + default false; + description + "Cease sending ICMPv6 router-advertisement messages."; + } + leaf initial-count { + type uint8 { + range "1..3"; + } + default 3; + description + "Number of initial ICMPv6 router-advertisement messages sent."; + } + leaf initial-interval { + type uint8 { + range "1..16"; + } + units "seconds"; + default 16; + description + "Interval between initial ICMPv6 router-advertisement messages."; + } + + description + "VPP specific configuration of RA messages. Mapped to sw_interface_ip6nd_ra_config API: + https://git.fd.io/vpp/tree/src/vnet/ip/ip.api#n196"; + + reference + "https://docs.fd.io/vpp/17.04/clicmd_src_vnet_ip.html#clicmd_ip6_nd"; + } + + grouping control-adv-prefixes-vpp-attributes { + leaf advertise-router-address { + type boolean; + default true; + description + "Send full router address in prefix advertisement."; + } + leaf vpp-default { + type boolean; + default false; + description + "Use VPP default values for prefix advertisment."; + } + + description + "VPP specific configuration of prefixes in RA messages. Mapped to sw_interface_ip6nd_ra_prefix API: + https://git.fd.io/vpp/tree/src/vnet/ip/ip.api#n243"; + + reference + "https://docs.fd.io/vpp/17.04/clicmd_src_vnet_ip.html#clicmd_ip6_nd"; + } + + augment "/ietf-r:routing/ietf-r:routing-instance/ietf-r:interfaces/ietf-r:interface/" + + "v6ur:ipv6-router-advertisements" { + ext:augment-identifier "ipv6-router-advertisements-vpp-augmentation"; + uses ipv6-router-advertisements-vpp-attributes; + } + + augment "/ietf-r:routing/ietf-r:routing-instance/ietf-r:interfaces/ietf-r:interface/" + + "v6ur:ipv6-router-advertisements/v6ur:prefix-list/v6ur:prefix" { + // TODO control-adv-prefixes/advertise case should be target node (change after yangtools issues are solved) + ext:augment-identifier "control-adv-prefixes-vpp-augmentation"; + uses control-adv-prefixes-vpp-attributes; + } +} \ No newline at end of file diff --git a/routing/routing-api/src/main/yang/vpp-routing.yang b/routing/routing-api/src/main/yang/vpp-routing.yang deleted file mode 100644 index 5acda3976..000000000 --- a/routing/routing-api/src/main/yang/vpp-routing.yang +++ /dev/null @@ -1,66 +0,0 @@ -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 2016-12-14 { - description "Initial revision."; - } - - import yang-ext { - prefix "ext"; - } - - import vpp-classifier { - prefix "classifier"; - } - - import hc2vpp-ietf-routing { - prefix "ietf-r"; - } - - typedef vni-reference{ - type uint32; - description "Vrf index reference"; - } - - grouping vpp-route-attributes { - //lookup_in_vrf - leaf secondary-vrf{ - type vni-reference; - description "Optional secondary vrf used to lookup in"; - } - - leaf classify-table{ - // classify_table_index + is_classify flag - type classifier:classify-table-ref; - description "Optional reference to classify table"; - } - } - - grouping vpp-routing-protocol-attributes{ - //vrf_id - leaf primary-vrf{ - type vni-reference; - mandatory true; - description "Main vrf associated to route"; - } - } - - augment /ietf-r:routing/ietf-r:routing-instance/ietf-r:routing-protocols/ietf-r:routing-protocol{ - ext:augment-identifier "routing-protocol-vpp-attr"; - container vpp-protocol-attributes { - presence "Config attributes"; - uses vpp-routing-protocol-attributes; - } - } - - augment /ietf-r:routing-state/ietf-r:routing-instance/ietf-r:routing-protocols/ietf-r:routing-protocol{ - ext:augment-identifier "routing-protocol-state-vpp-attr"; - container vpp-protocol-state-attributes { - presence "Operational attributes"; - uses vpp-routing-protocol-attributes; - } - } -} \ No newline at end of file diff --git a/routing/routing-api/src/main/yang/vpp-routing@2016-12-14.yang b/routing/routing-api/src/main/yang/vpp-routing@2016-12-14.yang new file mode 100644 index 000000000..5acda3976 --- /dev/null +++ b/routing/routing-api/src/main/yang/vpp-routing@2016-12-14.yang @@ -0,0 +1,66 @@ +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 2016-12-14 { + description "Initial revision."; + } + + import yang-ext { + prefix "ext"; + } + + import vpp-classifier { + prefix "classifier"; + } + + import hc2vpp-ietf-routing { + prefix "ietf-r"; + } + + typedef vni-reference{ + type uint32; + description "Vrf index reference"; + } + + grouping vpp-route-attributes { + //lookup_in_vrf + leaf secondary-vrf{ + type vni-reference; + description "Optional secondary vrf used to lookup in"; + } + + leaf classify-table{ + // classify_table_index + is_classify flag + type classifier:classify-table-ref; + description "Optional reference to classify table"; + } + } + + grouping vpp-routing-protocol-attributes{ + //vrf_id + leaf primary-vrf{ + type vni-reference; + mandatory true; + description "Main vrf associated to route"; + } + } + + augment /ietf-r:routing/ietf-r:routing-instance/ietf-r:routing-protocols/ietf-r:routing-protocol{ + ext:augment-identifier "routing-protocol-vpp-attr"; + container vpp-protocol-attributes { + presence "Config attributes"; + uses vpp-routing-protocol-attributes; + } + } + + augment /ietf-r:routing-state/ietf-r:routing-instance/ietf-r:routing-protocols/ietf-r:routing-protocol{ + ext:augment-identifier "routing-protocol-state-vpp-attr"; + container vpp-protocol-state-attributes { + presence "Operational attributes"; + uses vpp-routing-protocol-attributes; + } + } +} \ No newline at end of file -- cgit 1.2.3-korg