From ae927860249b060ed4f9a8e0f3df8df7ec2e269c Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 2 Jul 2018 08:36:39 +0200 Subject: HC2VPP-349: use fib-table-list-ref in the proxy-arp model User is now required to explicitly configure FIB tables using vpp-fib-management module. The patch also adds non-default vrf configuration example to the proxy-arp postman collection. Change-Id: I8cbdf0add8992bfb0a6a8fe0a38d6a466d5951f0 Signed-off-by: Marek Gradzki --- l3/api/src/main/yang/proxy-arp@2017-03-15.yang | 71 ---------------------- l3/api/src/main/yang/proxy-arp@2018-07-02.yang | 82 ++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 71 deletions(-) delete mode 100644 l3/api/src/main/yang/proxy-arp@2017-03-15.yang create mode 100644 l3/api/src/main/yang/proxy-arp@2018-07-02.yang (limited to 'l3/api/src/main') diff --git a/l3/api/src/main/yang/proxy-arp@2017-03-15.yang b/l3/api/src/main/yang/proxy-arp@2017-03-15.yang deleted file mode 100644 index 3fa15955f..000000000 --- a/l3/api/src/main/yang/proxy-arp@2017-03-15.yang +++ /dev/null @@ -1,71 +0,0 @@ -module proxy-arp { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:vpp:proxy:arp"; - prefix "proxy-arp"; - - import ietf-inet-types { - prefix "inet"; - } - import ietf-interfaces { - prefix "if"; - } - import yang-ext { - prefix "ext"; - } - - organization - "FD.io - The Fast Data Project"; - - contact - "Hc2vpp Wiki - Mailing List "; - - description - "This module contains a collection of YANG definitions for - managing Proxy ARP in VPP. - - Copyright (c) 2017 Cisco and/or its affiliates. - - Licensed under the Apache License, Version 2.0 (the 'License'); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at: - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an 'AS IS' BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License."; - - revision "2017-03-15" { - description "Initial revision of proxy ARP model for VPP"; - } - - container proxy-ranges { - list proxy-range { - key "vrf-id low-addr high-addr"; - leaf vrf-id { - type uint32; - } - leaf low-addr { - type inet:ipv4-address; - } - leaf high-addr { - type inet:ipv4-address; - } - description - "Parameters for configuring Proxy ARP on interfaces."; - } - } - - augment /if:interfaces/if:interface { - ext:augment-identifier "proxy-arp-interface-augmentation"; - - container proxy-arp { - presence "Enables proxy ARP on given interface"; - } - } - - // TODO(HC2VPP-86): add interfaces-state augmentation once VPP supports ARP proxy read (VPP-225) -} \ No newline at end of file diff --git a/l3/api/src/main/yang/proxy-arp@2018-07-02.yang b/l3/api/src/main/yang/proxy-arp@2018-07-02.yang new file mode 100644 index 000000000..dc4caf2c8 --- /dev/null +++ b/l3/api/src/main/yang/proxy-arp@2018-07-02.yang @@ -0,0 +1,82 @@ +module proxy-arp { + yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:vpp:proxy:arp"; + prefix "proxy-arp"; + + import ietf-inet-types { + prefix "inet"; + } + import ietf-interfaces { + prefix "if"; + } + import yang-ext { + prefix "ext"; + } + import vpp-fib-table-management { + prefix fib-management; + revision-date 2018-05-21; + } + + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This module contains a collection of YANG definitions for + managing Proxy ARP in VPP. + + Copyright (c) 2017 Cisco and/or its affiliates. + + Licensed under the Apache License, Version 2.0 (the 'License'); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an 'AS IS' BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License."; + + revision "2018-07-02" { + description + "Uses references to vrf-management module insted of table identifiers."; + reference + "https://jira.fd.io/browse/HC2VPP-317"; + } + + revision "2017-03-15" { + description "Initial revision of proxy ARP model for VPP"; + } + + container proxy-ranges { + list proxy-range { + key "vrf-id low-addr high-addr"; + leaf vrf-id { + type fib-management:fib-table-list-ref; + } + leaf low-addr { + type inet:ipv4-address; + } + leaf high-addr { + type inet:ipv4-address; + } + description + "Parameters for configuring Proxy ARP on interfaces."; + } + } + + augment /if:interfaces/if:interface { + ext:augment-identifier "proxy-arp-interface-augmentation"; + + container proxy-arp { + presence "Enables proxy ARP on given interface"; + } + } + + // TODO(HC2VPP-86): add interfaces-state augmentation once VPP supports ARP proxy read (VPP-225) +} \ No newline at end of file -- cgit 1.2.3-korg