From c127a6e1f1f7c37864bf9e11887cb7b84dfad826 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 3 Jan 2018 08:37:30 +0100 Subject: HC2VPP-274(dhcp.yang): use inet:ip-address-no-zone instead of inet:ip-address The zone index is not needed in case of dhcp.yang. It was introduced due to ODL bug: https://bugs.opendaylight.org/show_bug.cgi?id=6413 Change-Id: Ia32a2e6cc0c4ec31bd9b30392a3a558b28568fb2 Signed-off-by: Marek Gradzki --- dhcp/dhcp-api/src/main/yang/dhcp@2017-03-15.yang | 90 ---------------------- dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang | 95 ++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 90 deletions(-) delete mode 100644 dhcp/dhcp-api/src/main/yang/dhcp@2017-03-15.yang create mode 100644 dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang (limited to 'dhcp/dhcp-api') diff --git a/dhcp/dhcp-api/src/main/yang/dhcp@2017-03-15.yang b/dhcp/dhcp-api/src/main/yang/dhcp@2017-03-15.yang deleted file mode 100644 index 4fa0a61f8..000000000 --- a/dhcp/dhcp-api/src/main/yang/dhcp@2017-03-15.yang +++ /dev/null @@ -1,90 +0,0 @@ -module dhcp { - - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:vpp:dhcp"; - prefix "dhcp"; - - description - "This YANG module defines the generic configuration and - operational data for dhcp in VPP"; - - revision "2017-03-15" { - description - "Initial revision of dhcp model"; - } - - import ietf-inet-types { - prefix inet; - } - - 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 { - // FIXME(HC2VPP-79): change to ip-address-no-zone after https://bugs.opendaylight.org/show_bug.cgi?id=6413 is resolved - type inet:ip-address; - 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 { - // FIXME(HC2VPP-79): change to ip-address-no-zone after https://bugs.opendaylight.org/show_bug.cgi?id=6413 is resolved - type inet:ip-address; - 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-01-03.yang b/dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang new file mode 100644 index 000000000..7c88b6d0d --- /dev/null +++ b/dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang @@ -0,0 +1,95 @@ +module dhcp { + + yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:vpp:dhcp"; + prefix "dhcp"; + + description + "This YANG module defines the generic configuration and + operational data for dhcp in VPP"; + + 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"; + } + + import ietf-inet-types { + prefix inet; + } + + 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 -- cgit 1.2.3-korg