diff options
Diffstat (limited to 'dhcp/dhcp-api')
| -rw-r--r-- | dhcp/dhcp-api/pom.xml | 5 | ||||
| -rw-r--r-- | dhcp/dhcp-api/src/main/yang/dhcp@2018-06-29.yang (renamed from dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang) | 47 |
2 files changed, 23 insertions, 29 deletions
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 @@ <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>yang-ext</artifactId> </dependency> + <dependency> + <groupId>io.fd.hc2vpp.fib.management</groupId> + <artifactId>fib-management-api</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> diff --git a/dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang b/dhcp/dhcp-api/src/main/yang/dhcp@2018-06-29.yang index 8ce48edc9..a6bd4e3da 100644 --- a/dhcp/dhcp-api/src/main/yang/dhcp@2018-01-03.yang +++ b/dhcp/dhcp-api/src/main/yang/dhcp@2018-06-29.yang @@ -7,6 +7,12 @@ module dhcp { prefix inet; } + import vpp-fib-table-management { + prefix fib-management; + revision-date 2018-05-21; + } + + organization "FD.io - The Fast Data Project"; @@ -32,6 +38,13 @@ module dhcp { 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."; @@ -44,30 +57,6 @@ module dhcp { "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"; @@ -95,14 +84,14 @@ module dhcp { grouping dhcp-attributes { container relays { list relay { - key "address-type rx-vrf-id"; - leaf address-type { - type address-type; + key "address-family rx-vrf-id"; + leaf address-family { + type fib-management:address-family-type; } leaf rx-vrf-id { - type uint32; + type fib-management:fib-table-list-ref; description - "Used to receive DHCP messages from clients."; + "VRF used to receive DHCP messages from clients."; } uses relay-attributes; } |