From c428881044008b3865c8e934dd53240b43c084f1 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 29 Jun 2018 14:36:59 +0200 Subject: HC2VPP-348: use vpp-fib-management module instead of FIB table index Change-Id: Iba1f6d4c556c8ef839eb309b990f32945e6494fb Signed-off-by: Marek Gradzki --- dhcp/dhcp-api/pom.xml | 5 + dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang | 115 ----------------------- dhcp/dhcp-api/src/main/yang/dhcp@2018-06-29.yang | 104 ++++++++++++++++++++ 3 files changed, 109 insertions(+), 115 deletions(-) delete mode 100644 dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang create mode 100644 dhcp/dhcp-api/src/main/yang/dhcp@2018-06-29.yang (limited to 'dhcp/dhcp-api') diff --git a/dhcp/dhcp-api/pom.xml b/dhcp/dhcp-api/pom.xml index dce4cf1ab..c9c1668b3 100644 --- a/dhcp/dhcp-api/pom.xml +++ b/dhcp/dhcp-api/pom.xml @@ -48,5 +48,10 @@ org.opendaylight.mdsal.model yang-ext + + io.fd.hc2vpp.fib.management + fib-management-api + ${project.version} + diff --git a/dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang b/dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang deleted file mode 100644 index 8ce48edc9..000000000 --- a/dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang +++ /dev/null @@ -1,115 +0,0 @@ -module dhcp { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:vpp:dhcp"; - prefix "dhcp"; - - import ietf-inet-types { - prefix inet; - } - - organization - "FD.io - The Fast Data Project"; - - contact - "Hc2vpp Wiki - Mailing List "; - - description - "This module contains a collection of YANG definitions for - managing DHCP in VPP. - - Copyright (c) 2017-2018 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-01-03" { - description - "Changes type of ip-addresses from inet:ip-address to inet:ip-address-no-zone."; - reference - "https://jira.fd.io/browse/HC2VPP-79"; - } - - revision "2017-03-15" { - description - "Initial revision of dhcp model"; - } - - identity address-family { - description - "Base identity from which identities describing address - families are derived."; - } - - identity ipv4 { - base address-family; - description - "This identity represents IPv4 address family."; - } - - identity ipv6 { - base address-family; - description - "This identity represents IPv6 address family."; - } - - typedef address-type { - type identityref { - base address-family; - } - } - - grouping relay-attributes { - list server { - key "vrf-id address"; - leaf address { - type inet:ip-address-no-zone; - description - "IP address of the server DHCP packets will be forwarded to."; - } - leaf vrf-id { - type uint32; - description - "Used to send DHCP messages to the server"; - } - } - - leaf gateway-address { - type inet:ip-address-no-zone; - mandatory true; - description - "IP address of the relay agent."; - } - // TODO(HC2VPP-44): add configurable circut-id (option-82/remote-id) - } - - grouping dhcp-attributes { - container relays { - list relay { - key "address-type rx-vrf-id"; - leaf address-type { - type address-type; - } - leaf rx-vrf-id { - type uint32; - description - "Used to receive DHCP messages from clients."; - } - uses relay-attributes; - } - } - } - - container dhcp { - uses dhcp-attributes; - } -} \ No newline at end of file diff --git a/dhcp/dhcp-api/src/main/yang/dhcp@2018-06-29.yang b/dhcp/dhcp-api/src/main/yang/dhcp@2018-06-29.yang new file mode 100644 index 000000000..a6bd4e3da --- /dev/null +++ b/dhcp/dhcp-api/src/main/yang/dhcp@2018-06-29.yang @@ -0,0 +1,104 @@ +module dhcp { + yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:vpp:dhcp"; + prefix "dhcp"; + + import ietf-inet-types { + prefix inet; + } + + 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 DHCP in VPP. + + Copyright (c) 2017-2018 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-06-29" { + description + "Uses references to vrf-management module insted of table identifiers."; + reference + "https://jira.fd.io/browse/HC2VPP-317"; + } + + revision "2018-01-03" { + description + "Changes type of ip-addresses from inet:ip-address to inet:ip-address-no-zone."; + reference + "https://jira.fd.io/browse/HC2VPP-79"; + } + + revision "2017-03-15" { + description + "Initial revision of dhcp model"; + } + + grouping relay-attributes { + list server { + key "vrf-id address"; + leaf address { + type inet:ip-address-no-zone; + description + "IP address of the server DHCP packets will be forwarded to."; + } + leaf vrf-id { + type uint32; + description + "Used to send DHCP messages to the server"; + } + } + + leaf gateway-address { + type inet:ip-address-no-zone; + mandatory true; + description + "IP address of the relay agent."; + } + // TODO(HC2VPP-44): add configurable circut-id (option-82/remote-id) + } + + grouping dhcp-attributes { + container relays { + list relay { + key "address-family rx-vrf-id"; + leaf address-family { + type fib-management:address-family-type; + } + leaf rx-vrf-id { + type fib-management:fib-table-list-ref; + description + "VRF used to receive DHCP messages from clients."; + } + uses relay-attributes; + } + } + } + + container dhcp { + uses dhcp-attributes; + } +} \ No newline at end of file -- cgit 1.2.3-korg