From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 10 Aug 2018 14:56:31 +0000 (+0200)
Subject: [gitlab3] Imported models from IETF Hackathon
X-Git-Tag: gitlab29-base~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffd2ad47b690b05fe997ca6a3abd20574a6173df;p=thirdparty%2Fkea.git

[gitlab3] Imported models from IETF Hackathon
---

diff --git a/src/lib/yang/models/ietf-dhcpv6-client.yang b/src/lib/yang/models/ietf-dhcpv6-client.yang
new file mode 100644
index 0000000000..85d05d55fa
--- /dev/null
+++ b/src/lib/yang/models/ietf-dhcpv6-client.yang
@@ -0,0 +1,342 @@
+module ietf-dhcpv6-client {
+  yang-version 1.1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-dhcpv6-client";
+  prefix "dhcpv6-client";
+
+  import ietf-dhcpv6-options {
+    prefix dhcpv6-options;
+  }
+  import ietf-dhcpv6-types {
+    prefix dhcpv6-types;
+  }
+  import ietf-interfaces {
+    prefix if;
+  }
+
+  organization "DHC WG";
+  contact
+   "cuiyong@tsinghua.edu.cn
+    wangh13@mails.tsinghua.edu.cn
+    lh.sunlinh@gmail.com
+    ian.farrer@telekom.de
+    sladjana.zechlin@telekom.de
+    hezihao9512@gmail.com  ";
+
+  description "This model defines a YANG data model that can be
+    used to configure and manage a DHCPv6 client.";
+
+  revision 2018-03-04 {
+    description "Resolved most issues on the DHC official
+    github";
+    reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  revision 2017-12-22 {
+    description "Resolve most issues on Ian's github.";
+    reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  revision 2017-11-24 {
+      description "First version of the separated client specific
+        YANG model.";
+      reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  /*
+   * Data Nodes
+   */
+
+  container client {
+    presence "Enables the client";
+    description "dhcpv6 client portion";
+
+    container client-config {
+      description "configuration tree of client";
+      container duid {
+        description "Sets the DUID";
+        uses dhcpv6-types:duid;
+      }
+      list client-if {
+        key if-name;
+        description "A client may have several interfaces, it is more reasonable to
+          configure and manage parameters on the interface-level. The list defines
+          specific client interfaces and their data. Different interfaces are
+          distinguished by the key which is a configurable string value.";
+        leaf if-name {
+          type if:interface-ref;
+          mandatory true;
+          description "interface name";
+        }
+
+        leaf cli-id {
+          type uint32;
+          mandatory true;
+          description "client id";
+        }
+
+        /*
+        leaf description {
+          type string;
+          description "description of the client interface";
+        }
+        */
+
+        leaf pd-function {
+          type boolean;
+          mandatory true;
+          description "Whether the client can act as a requesting router
+            to request prefixes using prefix delegation ([RFC3633]).";
+        }
+        leaf rapid-commit {
+          type boolean;
+          mandatory true;
+          description "'1' indicates a client can initiate a Solicit-Reply message
+            exchange by adding a Rapid Commit option in Solicit message. '0' means
+            the client is not allowed to add a Rapid Commit option to request
+            addresses in a two-message exchange pattern.";
+        }
+
+        /*
+        container mo-tab {
+          description "The management tab label indicates the operation mode of the
+            DHCPv6 client.
+            'm'=1 and 'o'=1 indicate the client will use DHCPv6 to  obtain all the configuration
+            data.
+            'm'=1 and 'o'=0 are a meaningless combination.
+            'm'=0 and 'o'=1 indicate the client will use stateless DHCPv6 to obtain configuration
+            data apart from addresses/prefixes data.
+            'm'=0 and 'o'=0 represent the client will not use DHCPv6 but use SLAAC to
+            achieve configuration.";
+
+            // if - not sure about the intended use here as it seems
+            // to be redfining what will be received in the PIO. Is
+            // the intention to be whether they PIO options will be
+            // obeyed as received or overridden?
+          leaf m-tab {
+            type boolean;
+            mandatory true;
+            description "m tab";
+          }
+          leaf o-tab {
+            type boolean;
+            mandatory true;
+            description "o tab";
+          }
+        }
+        */
+
+        container client-configured-options {
+          description "client configured options";
+          uses dhcpv6-options:client-option-definitions;
+        }
+      }
+    }
+
+    container client-state {
+      config "false";
+      description "state tree of client";
+      container if-other-paras {
+        description "A client can obtain extra configuration
+          data other than address and prefix information through
+          DHCPv6. This container describes such data the client
+          was configured. The potential configuration data may
+          include DNS server addresses, SIP server domain names, etc.";
+        uses dhcpv6-options:server-option-definitions;
+      }
+     container packet-stats {
+        config "false";
+        description "A container records
+          all the packet status information
+          of a specific interface.";
+        leaf solicit-count {
+          type uint32;
+          mandatory true;
+          description "solicit counter";
+        }
+        leaf request-count {
+          type uint32;
+          mandatory true;
+          description "request counter";
+        }
+        leaf renew-count {
+          type uint32;
+          mandatory true;
+          description "renew counter";
+        }
+        leaf rebind-count {
+          type uint32;
+          mandatory true;
+          description "rebind counter";
+        }
+        leaf decline-count {
+          type uint32;
+          mandatory true;
+          description "decline counter";
+        }
+        leaf release-count {
+          type uint32;
+          mandatory true;
+          description "release counter";
+        }
+        leaf info-req-count {
+          type uint32;
+          mandatory true;
+          description "information request counter";
+        }
+        leaf advertise-count {
+          type uint32;
+          mandatory true;
+          description "advertise counter";
+        }
+        leaf confirm-count {
+          type uint32;
+          mandatory true;
+          description "confirm counter";
+        }
+        leaf reply-count {
+          type uint32;
+          mandatory true;
+          description "reply counter";
+        }
+        leaf reconfigure-count {
+          type uint32;
+          mandatory true;
+          description "recofigure counter";
+        }
+      }
+    }
+
+  }
+
+  /*
+   * Notifications
+   */
+
+  notification notifications {
+    description "dhcpv6 client notification module";
+    container dhcpv6-client-event {
+      description "dhcpv6 client event";
+
+      container ia-lease-event {
+        description "raised when the client was allocated
+          a new IA from the server or it renew/rebind/release
+          its current IA";
+        leaf event-type {
+          type enumeration {
+            enum "allocation" {
+              description "allocate";
+            }
+            enum "rebind" {
+              description "rebind";
+            }
+            enum "renew" {
+              description "renew";
+            }
+            enum "release" {
+              description "release";
+            }
+          }
+          mandatory true;
+          description "event type";
+        }
+        container duid {
+          description "Sets the DUID";
+          uses dhcpv6-types:duid;
+        }
+        leaf iaid {
+          type uint32;
+          mandatory true;
+          description "IAID";
+        }
+        leaf serv-name {
+          type string;
+          description "server name";
+        }
+        leaf description {
+          type string;
+          description "description of event";
+        }
+      }
+
+      container invalid-ia-detected {
+        description "raised when the identity association of the
+          client can be proved to be invalid.  Possible condition
+          includes duplicated address, illegal address, etc.";
+        container duid {
+          description "Sets the DUID";
+          uses dhcpv6-types:duid;
+        }
+        leaf cli-duid {
+          type uint32;
+          mandatory true;
+          description "duid of client";
+        }
+        leaf iaid {
+          type uint32;
+          mandatory true;
+          description "IAID";
+        }
+        leaf serv-name {
+          type string;
+          description "server name";
+        }
+        leaf description {
+          type string;
+          description "description of the event";
+        }
+      }
+
+      container retransmission-failed {
+        description "raised when the retransmission mechanism defined
+          in [RFC3315] is failed.";
+        container duid {
+          description "Sets the DUID";
+          uses dhcpv6-types:duid;
+        }
+        leaf description {
+          type enumeration {
+            enum "MRC failed" {
+              description "MRC failed";
+            }
+            enum "MRD failed" {
+              description "MRD failed";
+            }
+          }
+          mandatory true;
+          description "description of failure";
+        }
+      }
+
+      container failed-status-turn-up {
+        description "raised when the client receives a message includes
+          an unsuccessful Status Code option.";
+        container duid {
+          description "Sets the DUID";
+          uses dhcpv6-types:duid;
+        }
+        leaf status-code {
+          type enumeration {
+            enum "1" {
+              description "UnspecFail";
+            }
+            enum "2" {
+              description "NoAddrAvail";
+            }
+            enum "3" {
+              description "NoBinding";
+            }
+            enum "4" {
+              description "NotOnLink";
+            }
+            enum "5" {
+              description "UseMulticast";
+            }
+          }
+          mandatory true;
+          description "employed status code";
+        }
+      }
+
+    }
+  }
+}
diff --git a/src/lib/yang/models/ietf-dhcpv6-options.yang b/src/lib/yang/models/ietf-dhcpv6-options.yang
new file mode 100644
index 0000000000..6731942cd5
--- /dev/null
+++ b/src/lib/yang/models/ietf-dhcpv6-options.yang
@@ -0,0 +1,1383 @@
+module ietf-dhcpv6-options {
+  yang-version 1.1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-dhcpv6-options";
+  prefix "dhcpv6-options";
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import ietf-dhcpv6-types {
+    prefix dhcpv6-types;
+  }
+
+  organization "DHC WG";
+  contact
+   "cuiyong@tsinghua.edu.cn
+    wangh13@mails.tsinghua.edu.cn
+    lh.sunlinh@gmail.com
+    ian.farrer@telekom.de
+    sladjana.zechlin@telekom.de
+    hezihao9512@gmail.com";
+  description "This model defines a YANG data model that can be
+    used to configure DHCPv6 options.";
+
+  revision 2018-03-04 {
+    description "Resolved most issues on the DHC official
+    github";
+    reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  revision 2017-12-22 {
+    description "Resolve most issues on Ian's github.";
+    reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  revision 2017-11-24 {
+    description "First version of the separated DHCPv6 options
+      YANG model.";
+    reference "I-D:draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  /*
+   * Features
+   */
+
+  //  features for server options
+  feature server-unicast-op {
+    description "Support for Server Unicast option";
+  }
+  feature sip-server-domain-name-list-op {
+    description "Support for SIP Server Domain Name List option";
+  }
+  feature sip-server-address-list-op {
+    description "Support for SIP Server Address List option";
+  }
+  feature dns-servers-op {
+    description "Support for DNS Servers Option";
+  }
+  feature domain-searchlist-op {
+    description "Support for Domain Search List Option";
+  }
+  feature nis-config-op {
+    description "Support for Network Information Service (NIS)
+      Servers option";
+  }
+  feature nis-plus-config-op {
+    description "Support for Network Information Service V2 (NIS+)
+      Servers option";
+  }
+  feature nis-domain-name-op {
+    description "Support for Network Information Service (NIS)
+      Domain Name option";
+  }
+  feature nis-plus-domain-name-op {
+    description "Support for Network Information Service V2 (NIS+)
+      Server option";
+  }
+  feature sntp-server-op {
+    description "Support for Simple Network Protocol Configuration
+      (SNTP) Servers option";
+  }
+  feature info-refresh-time-op {
+    description "Support for Information Refresh Time option";
+  }
+  feature client-fqdn-op {
+    description "Support for Client FQDN option";
+  }
+  feature posix-timezone-op {
+    description "Support for New POIX Timezone option";
+  }
+  feature tzdb-timezone-op {
+    description "Support for New TZDB Timezone option";
+  }
+  feature ntp-server-op {
+    description "Support for Network Time Protocol (NTP)
+      Server option";
+  }
+  feature boot-file-url-op {
+    description "Support for Boot File URL option";
+  }
+  feature boot-file-param-op {
+    description "Support for Boot File Parameters option";
+  }
+  feature aftr-name-op {
+    description "Support for Address Family Transition
+      Router (AFTR) option";
+  }
+  feature kbr-default-name-op {
+    description "Support for Kerberos Default Name
+      Option";
+  }
+  feature kbr-kdc-op {
+    description "Support for Kerberos KDC option";
+  }
+  feature sol-max-rt-op {
+    description "Support for SOL_MAX_RT option";
+  }
+  feature inf-max-rt-op {
+    description "Support for INF_MAX_RT option";
+  }
+  feature addr-selection-op {
+    description "Support for Address Selection opiton";
+  }
+  feature pcp-server-op {
+    description "Support for Port Control Protocol (PCP)
+      option";
+  }
+  feature s46-rule-op {
+    description "Support for S46 Rule option";
+  }
+  feature s46-br-op {
+    description "Support for S46 Border Relay (BR) option";
+  }
+  feature s46-dmr-op {
+    description "Support for S46 Default Mapping Rule
+      (DMR) option";
+  }
+  feature s46-v4-v6-binding-op {
+    description "Support for S46 IPv4/IPv6 Address
+      Bind option";
+  }
+
+  // features for relay-supplied options
+  feature erp-local-domain-name-op {
+    description "Support for ERP Local Domain Name option";
+  }
+
+  // features for client options
+  feature option-request-op {
+    description "Support for Option Request option";
+  }
+  feature rapid-commit-op {
+    description "Support for Rapid Commit option";
+  }
+  feature user-class-op {
+    description "Support for User Class option";
+  }
+  feature vendor-class-op {
+    description "Support for Vendor Class option";
+  }
+  feature client-arch-type-op {
+    description "Support for Client System Architecture
+      Type option";
+  }
+  feature client-network-interface-identifier-op {
+    description "Support for Client Network Interface
+      Identifier option";
+  }
+  feature kbr-principal-name-op {
+    description "Support for Kerberos Principal
+      Name option";
+  }
+  feature kbr-realm-name-op {
+    description "Support Kerberos Realm Name option";
+  }
+  feature client-link-layer-addr-op {
+    description "Support for Client Link-Layer Address
+      Option";
+  }
+
+  // features for custom options
+  feature operator-op-ipv6-address {
+    description "Support for Option with IPv6 Addresses";
+  }
+  feature operator-op-single-flag {
+    description "Support for Option with Single Flag";
+  }
+  feature operator-op-ipv6-prefix {
+    description "Support for Option with IPv6 Prefix";
+  }
+  feature operator-op-int32 {
+    description "Support for Opion with 32-bit
+      Integer Value";
+  }
+  feature operator-op-int16 {
+    description "Support for Opion with 16-bit Integer Value";
+  }
+  feature operator-op-int8 {
+    description "Support for Opion with 8-bit Integer Value";
+  }
+  feature operator-op-uri {
+    description "Support for Opion with URI";
+  }
+  feature operator-op-textstring {
+    description "Support for Opion with Text String";
+  }
+  feature operator-op-var-data {
+    description "Support for Opion with Variable-Length Data";
+  }
+  feature operator-op-dns-wire {
+    description "Support for Opion with DNS Wire
+      Format Domain Name List";
+  }
+  /*
+   * Groupings
+   */
+
+  grouping server-option-definitions {
+    description "Contains definitions for options configured on the
+      DHCPv6 server which will be supplied to clients.";
+
+    container server-unicast-option {
+      if-feature server-unicast-op;
+      presence "Enable this option";
+      description "OPTION_UNICAST (12) Server Unicast Option";
+      reference "RFC3315: Dynamic Host Configuration Protocol for
+        IPv6 (DHCPv6)";
+      leaf server-address {
+        type inet:ipv6-address;
+        description "server ipv6 address";
+      }
+    }
+
+    container sip-server-domain-name-list-option {
+      // if-feature sip-server-domain-name-list-op;
+      // presence "Enable this option";
+      description "OPTION_SIP_SERVER_D (21) SIP Servers Domain Name List";
+      reference "RFC3319: Dynamic Host Configuration Protocol
+        (DHCPv6) Options for Session Initiation Protocol (SIP) Servers";
+      leaf sip-serv-domain-name {
+        type string;
+        mandatory true;
+        description "sip server domain name";
+      }
+    }
+
+    container sip-server-address-list-option {
+      // if-feature sip-server-address-list-op;
+      // presence "Enable this option";
+      description "OPTION_SIP_SERVER_A (22) SIP Servers IPv6 Address List";
+      reference "RFC3319: Dynamic Host Configuration Protocol (DHCPv6)
+        Options for Session Initiation Protocol (SIP) Servers";
+      list sip-server {
+        key sip-serv-id;
+        description "sip server info";
+        leaf sip-serv-id {
+          type uint8;
+          mandatory true;
+          description "sip server id";
+        }
+        leaf sip-serv-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description "sip server addr";
+        }
+      }
+    }
+
+    container dns-servers-option {
+      // if-feature dns-servers-op;
+      // presence "Enable this option";
+      description "OPTION_DNS_SERVERS (23) DNS recursive Name Server option";
+      reference "RFC3646: DNS Configuration options for Dynamic Host Configuration
+        Protocol for IPv6 (DHCPv6)";
+      list dns-server {
+        key dns-serv-id;
+        description "dns server info";
+        leaf dns-serv-id {
+          type uint8;
+          mandatory true;
+          description "DNS server list entry ID.";
+        }
+        leaf dns-serv-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description "DNS server address.";
+        }
+      }
+    }
+
+    container domain-searchlist-option {
+      // if-feature domain-searchlist-op;
+      // presence "Enable this option";
+      description "OPTION_DOMAIN_LIST (24) Domain Search List Option";
+      reference "RFC3646: DNS Configuration options for Dynamic
+        Host Configuration Protocol for IPv6 (DHCPv6)";
+      list domain-searchlist {
+        key domain-searchlist-id;
+        description "dns server info";
+        leaf domain-searchlist-id {
+          type uint8;
+          mandatory true;
+          description "Domain seachlist entry ID.";
+        }
+        leaf domain-search-list-entry {
+          type string;
+          mandatory true;
+          description "Domain search list entry.";
+        }
+      }
+    }
+
+    container nis-config-option {
+      // if-feature nis-config-op;
+      // presence "Enable this option";
+      description "OPTION_NIS_SERVERS (27) Network Information Service (NIS)
+        Servers Option.";
+      reference "RFC3898: Network Information Service (NIS) Configuration
+        Options for Dynamic Host Configuration Protocol for IPv6 (DHCPv6)";
+      list nis-server {
+        key nis-serv-id;
+        description "nis server info";
+        leaf nis-serv-id {
+          type uint8;
+          mandatory true;
+          description "nis server id";
+        }
+        leaf nis-serv-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description "nis server addr";
+        }
+      }
+    }
+
+    container nis-plus-config-option {
+      // if-feature nis-plus-config-op;
+      // presence "Enable this option";
+      description "OPTION_NISP_SERVERS (28): Network Information Service V2
+        (NIS+) Servers Option.";
+      reference "RFC3989: Network Information Service (NIS) Configuration
+        Options for Dynamic Host Configuration Protocol for IPv6 (DHCPv6)";
+      list nis-plus-server {
+        key nis-plus-serv-id;
+        description "NIS+ server information.";
+        leaf nis-plus-serv-id {
+          type uint8;
+          mandatory true;
+          description "nisp server id";
+        }
+        leaf nis-plus-serv-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description "nisp server addr";
+        }
+      }
+    }
+    container nis-domain-name-option {
+      if-feature nis-domain-name-op;
+      presence "Enable this option";
+      description "OPTION_NIS_DOMAIN_NAME (29) Network Information
+        Service (NIS) Domain Name Option";
+      reference "RFC3989: Network Information Service (NIS)
+        Configuration Options for Dynamic Host Configuration Protocol
+        for IPv6 (DHCPv6)";
+      leaf nis-domain-name {
+        type string;
+        description "The Network Information Service (NIS) Domain Name
+          option is used by the server to convey client's NIS Domain Name
+          info to the client.";
+      }
+    }
+
+    container nis-plus-domain-name-option {
+      if-feature nis-plus-domain-name-op;
+      presence "Enable this option";
+      description "OPTION_NISP_DOMAIN_NAME (30) Network Information
+        Service V2 (NIS+) Domain Name Option";
+      reference "RFC3989: Network Information Service (NIS)
+        Configuration Options for Dynamic Host Configuration Protocol
+        for IPv6 (DHCPv6)";
+      leaf nis-plus-domain-name {
+        type string;
+        description "The Network Information Service V2 (NIS+) Domain Name
+        option is used by the server to convey client's NIS+ Domain Name
+        info to the client.";
+      }
+    }
+
+
+    container sntp-server-option {
+      // if-feature sntp-server-op;
+      presence "Enable this option";
+      description "OPTION_SNTP_SERVERS (31) Simple Network Time Protocol
+        (SNTP) Servers Option";
+      reference "RFC4075: Simple Network Time Protocol (SNTP) Configuration
+        Option for DHCPv6";
+      list sntp-server {
+        key sntp-serv-id;
+        description "sntp server info";
+        leaf sntp-serv-id {
+          type uint8;
+          mandatory true;
+          description "sntp server id";
+        }
+        leaf sntp-serv-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description "sntp server addr";
+        }
+      }
+    }
+
+    container info-refresh-time-option {
+    //if-feature info-refresh-time-op;
+      presence "Enable this option";
+      description "OPTION_INFORMATION_REFRESH_TIME (32) Information Refresh
+        Time option.";
+      reference "RFC4242: Information Refresh Time Option for Dynamic Host
+        Configuration Protocol for IPv6 (DHCPv6";
+      leaf info-refresh-time {
+        type yang:timeticks;
+        mandatory true;
+        description "The refresh time.";
+      }
+    }
+
+    container client-fqdn-option {
+    //if-feature client-fqdn-op;
+      presence "Enable this option";
+      description "OPTION_CLIENT_FQDN (39) DHCPv6 Client FQDN Option";
+      reference "RFC4704: The Dynamic Host Configuration Protocol for IPv6
+        (DHCPv6) Client Fully Qualified Domain Name (FQDN) Option";
+      leaf server-initiate-update {
+        type boolean;
+        mandatory true;
+        description "server initiate";
+      }
+      leaf client-initiate-update {
+        type boolean;
+        mandatory true;
+        description "client initiate";
+      }
+      leaf modify-name-from-cli {
+        type boolean;
+        mandatory true;
+        description "modify by client";
+      }
+    }
+
+    container posix-timezone-option {
+    //if-feature posix-timezone-op;
+      presence "Enable this option";
+      description "OPTION_NEW_POSIX_TIMEZONE (41) Posix Timezone option";
+      reference "RFC4833: Timezone Options for DHCP";
+      leaf tz-posix {
+        type string;
+        mandatory true;
+        description "TZ Posix IEEE 1003.1 String";
+      }
+    }
+
+    container tzdb-timezone-option {
+    //if-feature tzdb-timezone-op;
+      presence "Enable this option";
+      description "OPTION_NEW_TZDB_TIMEZONE (42) Timezone Database option";
+      reference "RFC4822: Timezone Options for DHCP";
+      leaf tz-database {
+        type string;
+        mandatory true;
+        description "Reference to the TZ Database";
+      }
+    }
+
+    container ntp-server-option {
+      //This option looks like it needs work to correctly model the
+      //option as defined in the RFC.
+
+      // Zihao - Re-modelled so it only contains one time source suboption
+
+    //if-feature ntp-server-op;
+      presence "Enable this option";
+      description "OPTION_NTP_SERVER (56) NTP Server Option for DHCPv6";
+      reference "RFC5908: Network Time Protocol (NTP) Server Option for
+        DHCPv6";
+      list ntp-server {
+        key ntp-serv-id;
+        description "ntp server info";
+        leaf ntp-serv-id {
+          type uint8;
+          mandatory true;
+          description "NTP server id";
+        }
+        choice ntp-time-source-suboption {
+          description "Select a NTP time source suboption.";
+          case server-address {
+            leaf-list ntp-serv-addr-suboption {
+                type inet:ipv6-address;
+                description "NTP server addr";
+            }
+          }
+          case server-multicast-address {
+            leaf-list ntp-serv-mul-addr-suboption {
+              type inet:ipv6-address;
+              description "NTP server multicast addr";
+            }
+          }
+          case server-fqdn {
+            leaf-list ntp-serv-fqdn-suboption {
+              type string;
+              description "NTP server fqdn";
+            }
+          }
+        }
+      }
+    }
+
+    container boot-file-url-option {
+    //if-feature boot-file-url-op;
+      presence "Enable this option";
+      description "OPT_BOOTFILE_URL (59) Boot File URL option";
+      reference "RFC5970: DHCPv6 Options for Network Boot";
+      list boot-file {
+        key boot-file-id;
+        description "boot file info";
+        leaf boot-file-id {
+          type uint8;
+          mandatory true;
+          description "boot file id";
+        }
+        leaf-list suitable-arch-type {
+          type uint16;
+          description "architecture type";
+        }
+        leaf-list suitable-net-if {
+          type uint32;
+          description "network interface";
+        }
+        leaf boot-file-url {
+          type string;
+          mandatory true;
+          description "url for boot file";
+        }
+      }
+    }
+
+    container boot-file-param-option {
+    //if-feature boot-file-param-op;
+      presence "Enable this option";
+      description "OPT_BOOTFiLE_PARAM (60) Boot File Parameters Option";
+      reference "RFC5970: DHCPv6 Options for Network Boot";
+      list boot-file-paras {
+        key para-id;
+        description "boot file parameters";
+        leaf para-id {
+          type uint8;
+          mandatory true;
+          description "parameter id";
+        }
+        leaf parameter {
+          type string;
+          mandatory true;
+          description "parameter value";
+        }
+      }
+    }
+
+    container aftr-name-option {
+    //if-feature aftr-name-op;
+      presence "Enable this option";
+      description "OPTION_AFTR_NAME (64) AFTR-Name DHCPv6 Option";
+      reference "RFC6334: Dynamic Host Configuration Protocol for IPv6
+        (DHCPv6) Option for Dual-Stack Lite";
+      leaf tunnel-endpoint-name {
+        type string;
+        mandatory true;
+        description "aftr name";
+      }
+    }
+
+    container kbr-default-name-option {
+    //if-feature kbr-default-name-op;
+      presence "Enable this option";
+      description "OPTION_KRB_DEFAULT_REALM_NAME (77) Kerberos Default Realm Name Option";
+      reference "RFC6784: Kerberos Options for DHCPv6";
+      leaf default-realm-name {
+        type string;
+        mandatory true;
+        description "default realm name";
+      }
+    }
+
+    container kbr-kdc-option {
+    //if-feature kbr-kdc-op;
+      presence "Enable this option";
+      description "OPTION_KRB_KDC (78) Kerberos KDB Option";
+      reference "RFC6784: Kerberos Options for DHCPv6";
+      list kdc-info {
+        key kdc-id;
+        description "kdc info";
+        leaf kdc-id {
+          type uint8;
+          mandatory true;
+          description "kdc id";
+        }
+        leaf priority {
+          type uint16;
+          mandatory true;
+          description "priority";
+        }
+        leaf weight {
+          type uint16;
+          mandatory true;
+          description "weight";
+        }
+        leaf transport-type {
+          type uint8;
+          mandatory true;
+          description "transport type";
+        }
+        leaf port-number {
+          type uint16;
+          mandatory true;
+          description "port number";
+        }
+        leaf kdc-ipv6-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description "kdc ipv6 addr";
+        }
+        leaf realm-name {
+          type string;
+          mandatory true;
+          description "realm name";
+        }
+      }
+    }
+
+    container sol-max-rt-option {
+    //if-feature sol-max-rt-op;
+      presence "Enable this option";
+      description "OPTION_SOL_MAX_RT (82) sol max rt option";
+      reference "RFC7083: Modification to Default Values of
+        SOL_MAX_RT and INF_MAX_RT";
+        leaf sol-max-rt-value {
+          type yang:timeticks;
+          mandatory true;
+          description "sol max rt value";
+        }
+    }
+
+    container inf-max-rt-option {
+    //if-feature inf-max-rt-op;
+      presence "Enable this option";
+      description "OPTION_INF_MAX_RT (83) inf max rt option";
+      reference "RFC7083: Modification to Default Values of
+        SOL_MAX_RT and INF_MAX_RT";
+      leaf inf-max-rt-value {
+        type yang:timeticks;
+        mandatory true;
+        description "inf max rt value";
+      }
+    }
+
+    container addr-selection-option {
+    //if-feature addr-selection-op;
+      presence "Enable this option";
+      description "OPTION_ADDRSEL (84) and OPTION_ADDRSEL_TABLE (85)";
+      reference "RFC7078: Distributing Address Selection Policy Using
+        DHCPv6";
+      // if - Needs checking to see if this matches the RFC - there
+      // are two options here.
+      // Zihao - I think this matches RFC7078
+      leaf a-bit-set {
+        type boolean;
+        mandatory true;
+        description "a bit";
+      }
+      leaf p-bit-set {
+        type boolean;
+        mandatory true;
+        description "p bit";
+      }
+      list policy-table {
+        key policy-id;
+        description "policy table";
+        leaf policy-id {
+          type uint8;
+          mandatory true;
+          description "policy id";
+        }
+        leaf label {
+          type uint8;
+          mandatory true;
+          description "label";
+        }
+        leaf precedence {
+          type uint8;
+          mandatory true;
+          description "precedence";
+        }
+        leaf prefix-len {
+          type uint8;
+          mandatory true;
+          description "prefix length";
+        }
+        leaf prefix {
+          type inet:ipv6-prefix;
+          mandatory true;
+          description "prefix";
+        }
+      }
+    }
+
+    container pcp-server-option {
+    //if-feature pcp-server-op;
+      presence "Enable this option";
+      description "OPTION_V6_PCP_SERVER (86) pcp server option";
+      reference "RFC7291: DHCP Options for the Port Control
+        Protocol (PCP)";
+      list pcp-server {
+        key pcp-serv-id;
+        description "pcp server info";
+        leaf pcp-serv-id {
+          type uint8;
+          mandatory true;
+          description "pcp server id";
+        }
+        leaf pcp-serv-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description "pcp server addr";
+        }
+      }
+    }
+
+    container s46-rule-option {
+    //if-feature s46-rule-op;
+      presence "Enable this option";
+      description "OPTION_S46_RULE (89) S46 rule option";
+      reference "RFC7598: DHCPv6 Options for Configuration of
+        Softwire Address and Port-Mapped Clients";
+      list s46-rule {
+        key rule-id;
+        description "s46 rule";
+        leaf rule-id {
+          type uint8;
+          mandatory true;
+          description "rule id";
+        }
+        leaf rule-type {
+          type enumeration {
+            enum "BMR" {
+              description "BMR";
+            }
+            enum "FMR" {
+              description "FMR";
+            }
+          }
+          mandatory true;
+          description "rule type";
+        }
+        leaf prefix4-len {
+          type uint8;
+          mandatory true;
+          description "ipv4 prefix length";
+        }
+        leaf ipv4-prefix {
+          type inet:ipv4-prefix;
+          mandatory true;
+          description "ipv4 prefix";
+        }
+        leaf prefix6-len {
+          type uint8;
+          mandatory true;
+          description "ipv6 prefix length";
+        }
+        leaf ipv6-prefix {
+          type inet:ipv6-prefix;
+          mandatory true;
+          description "ipv6 prefix";
+        }
+        uses dhcpv6-types:portset-para;
+      }
+    }
+
+    container s46-br-option {
+    //if-feature s46-br-op;
+      presence "Enable this option";
+      description "OPTION_S46_BR (90) S46 BR Option";
+      reference "RFC7598: DHCPv6 Options for Configuration of
+        Softwire Address and Port-Mapped Clients";
+      list br {
+        key br-id;
+        description "br info";
+        leaf br-id {
+          type uint8;
+          mandatory true;
+          description "br id";
+        }
+        leaf br-ipv6-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description "br ipv6 addr";
+        }
+      }
+    }
+
+    container s46-dmr-option {
+    //if-feature s46-dmr-op;
+      presence "Enable this option";
+      description "OPTION_S46_DMR (91) S46 DMR Option";
+      reference "RFC7598: DHCPv6 Options for Configuration of
+        Softwire Address and Port-Mapped Clients";
+      list dmr {
+        key dmr-id;
+        description "dmr info";
+        leaf dmr-id {
+          type uint8;
+          mandatory true;
+          description "dmr id";
+        }
+        leaf dmr-prefix-len {
+          type uint8;
+          mandatory true;
+          description "dmr prefix length";
+        }
+        leaf dmr-ipv6-prefix {
+          type inet:ipv6-prefix;
+          mandatory true;
+          description "dmr ipv6 prefix";
+        }
+      }
+    }
+
+    container s46-v4-v6-binding-option {
+    //if-feature s46-v4-v6-binding-op;
+      presence "Enable this option";
+      description "OPTION_S46_V4V6BIND (92) S46 IPv4/IPv6 Address
+        Binding option";
+      reference "RFC7598: DHCPv6 Options for Configuration of
+        Softwire Address and Port-Mapped Clients";
+      list ce {
+        key ce-id;
+        description "ce info";
+        leaf ce-id {
+          type uint8;
+          mandatory true;
+          description "ce id";
+        }
+        leaf ipv4-addr {
+          type inet:ipv4-address;
+          mandatory true;
+          description "ce ipv4 addr";
+        }
+        leaf bind-prefix6-len {
+          type uint8;
+          mandatory true;
+          description "bind ipv6 prefix length";
+        }
+        leaf bind-ipv6-prefix {
+          type inet:ipv6-address;
+          mandatory true;
+          description "bind ipv6 prefix";
+        }
+        uses dhcpv6-types:portset-para;
+      }
+    }
+
+  }
+  //if - NB - The list of options needs to be updated.
+
+
+  grouping relay-supplied-option-definitions {
+    // if - The structure here needs to be checked and probably reworked.
+    description "OPTION_RSOO (66) Relay-Supplied Options option";
+    reference "RFC6422: Relay-Supplied DHCP Options";
+    container erp-local-domain-name-option {
+    //if-feature erp-local-domain-name-op;
+      presence "Enable this option";
+      description "OPTION_ERP_LOCAL_DOMAIN_NAME (65) DHCPv6 ERP Local
+        Domain Name Option";
+      reference "RFC6440: The EAP Re-authentication Protocol (ERP)
+        Local Domain Name DHCPv6 Option";
+      list erp-for-client {
+        key cli-id;
+        description "erp for client";
+        leaf cli-id {
+          type uint32;
+          mandatory true;
+          description "client id";
+        }
+        container duid {
+          description "Sets the DUID";
+          // uses duid;
+          // if - Maybe DUID definition needs to be moved to this module.
+          uses dhcpv6-types:duid;
+        }
+        leaf erp-name {
+          type string;
+          mandatory true;
+          description "erp name";
+        }
+      }
+    }
+  }
+
+  grouping client-option-definitions {
+    description "Contains definitions for options configured on the
+      DHCPv6 client which will be sent to the server.";
+
+    list new-or-standard-cli-option {
+      key option-code;
+      description "new or standard client option";
+      leaf option-code {
+        type uint16;
+        mandatory true;
+        description "option code";
+      }
+      leaf option-name {
+        type string;
+        mandatory true;
+        description "option name";
+      }
+      leaf option-description {
+        type string;
+        mandatory true;
+        description "description of client
+          option";
+      }
+      leaf option-reference {
+        type string;
+        description "the reference of option";
+      }
+      leaf option-value {
+        type string;
+        mandatory true;
+        description "the option value";
+      }
+    }
+
+    container option-request-option {
+    //if-feature option-request-op;
+      presence "Enable this option";
+      description "OPTION_ORO (6) Option Request Option";
+      reference "RFC3315: Dynamic Host Configuration Protocol for
+      IPv6 (DHCPv6)";
+      list oro-option {
+        key option-code;
+        description "oro option";
+        leaf option-code {
+          type uint16;
+          mandatory true;
+          description "option code";
+        }
+        leaf description {
+          type string;
+          mandatory true;
+          description "description of oro
+            options";
+        }
+      }
+    }
+
+    container user-class-option {
+    //if-feature user-class-op;
+      presence "Enable this option";
+      description "OPTION_USER_CLASS (15) User Class Option";
+      reference "RFC3315: Dynamic Host Configuration Protocol
+        for IPv6 (DHCPv6)";
+      list user-class {
+        key user-class-id;
+        description "user class";
+        leaf user-class-id {
+          type uint8;
+          mandatory true;
+          description "user class id";
+        }
+        leaf user-class-data {
+          type string;
+          mandatory true;
+          description "The information contained in the data area
+            of this option is contained in one or more opaque
+            fields that represent the user class or classes of
+            which the client is a member. ";
+        }
+      }
+    }
+
+    container vendor-class-option {
+    //if-feature vendor-class-op;
+      presence "Enable this option";
+      description "OPTION_VENDOR_CLASS (16) Vendor Class Option";
+      reference "RFC3315: Dynamic Host Configuration Protocol
+        for IPv6 (DHCPv6)";
+      leaf enterprise-number {
+        type uint32;
+        mandatory true;
+        description "enterprise number";
+      }
+      list vendor-class {
+        key vendor-class-id;
+        description "vendor class";
+        leaf vendor-class-id {
+          type uint8;
+          mandatory true;
+          description "vendor class id";
+        }
+        leaf vendor-class-data {
+          type string;
+          mandatory true;
+          description "The vendor-class-data is composed of a series of
+            separate items, each of which describes some characteristic
+            of the client's hardware configuration. Examples of
+            vendor-class-data instances might include the version of the
+            operating system the client is running or the amount of memory
+            installed on the client.";
+        }
+      }
+    }
+
+    container client-fqdn-option {
+    //if-feature client-fqdn-op;
+      presence "Enable this option";
+      description "OPTION_CLIENT_FQDN (39) The Dynamic Host
+        Configuration Protocol for IPv6 (DHCPv6) Client Fully
+        Qualified Domain Name (FQDN) Option";
+      reference "RFC4704: The Dynamic Host Configuration Protocol
+        for IPv6 (DHCPv6) Client Fully Qualified Domain Name (FQDN)
+        Option";
+      leaf fqdn {
+        type string;
+        mandatory true;
+        description "fqdn";
+      }
+      leaf server-initiate-update {
+        type boolean;
+        mandatory true;
+        description "whether server initiate";
+      }
+      leaf client-initiate-update {
+        type boolean;
+        mandatory true;
+        description "whether client initiate";
+      }
+    }
+
+    container client-arch-type-option {
+    //if-feature client-arch-type-op;
+      presence "Enable this option";
+      description "OPTION_CLIENT_ARCH_TYPE (61) Client System
+        Architecture Type Option";
+      reference "RFC5970: DHCPv6 Options for Network Boot";
+      list architecture-types {
+        key type-id;
+        description "architecture types";
+        leaf type-id {
+          type uint16;
+          mandatory true;
+          description "type id";
+        }
+        leaf most-preferred {
+          type boolean;
+          mandatory true;
+          description "most preferred flag";
+        }
+      }
+    }
+
+    container client-network-interface-identifier-option {
+    //if-feature client-network-interface-identifier-op;
+      presence "Enable this option";
+      description "OPTION_NII (62) Client Network Interface
+        Identifier Option";
+      reference "RFC5970: DHCPv6 Options for Network Boot";
+      leaf type {
+        type uint8;
+        mandatory true;
+        description "type";
+      }
+      leaf major {
+        type uint8;
+        mandatory true;
+        description "major";
+      }
+      leaf minor {
+        type uint8;
+        mandatory true;
+        description "minor";
+      }
+    }
+
+    container kbr-principal-name-option {
+    //if-feature kbr-principal-name-op;
+      presence "Enable this option";
+      description "OPTION_KRB_PRINCIPAL_NAME (75) Kerberos
+        Principal Name Option";
+      reference "RFC6784: Kerberos Options for DHCPv6";
+      list principle-name {
+        key principle-name-id;
+        description "principle name";
+        leaf principle-name-id {
+          type uint8;
+          mandatory true;
+          description "principle name id";
+        }
+        leaf name-type {
+          type int32;
+          mandatory true;
+          description "This field specifies the type of name that follows.";
+        }
+        leaf name-string {
+          type string;
+          mandatory true;
+          description "This field encodes a sequence of components that form
+            a name, each component encoded as a KerberoString";
+        }
+      }
+    }
+
+    container kbr-realm-name-option {
+    //if-feature kbr-realm-name-op;
+      presence "Enable this option";
+      description "OPTION_KRB_REALM_NAME (76) Kerberos Realm Name Option";
+      reference "RFC6784: Kerberos Options for DHCPv6";
+      leaf realm-name {
+        type string;
+        mandatory true;
+        description "realm name";
+      }
+    }
+
+    container client-link-layer-addr-option {
+    //if-feature client-link-layer-addr-op;
+      presence "Enable this option";
+      description "OPTION_CLIENT_LINKLAYER_ADDR (79) DHCPv6 Client
+        Link-Layer Address Option";
+      reference "RFC6939: Client Link-Layer Address Option in
+        DHCPv6";
+      leaf link-layer-type {
+        type uint16;
+        mandatory true;
+        description "Client link-layer address type. The link-layer
+          type MUST be a valid hardware type assigned by the IANA,
+          as described in [RFC0826]";
+      }
+      leaf link-layer-addr {
+        type string;
+        mandatory true;
+        description "Client link-layer address";
+      }
+    }
+
+  }
+
+
+  grouping custom-option-definitions {
+    description "operator customized options";
+
+    container operator-option-ipv6-address {
+    //if-feature operator-op-ipv6-address;
+      presence "Enable this option";
+      description "operator ipv6 address option";
+      reference "RFC7227: Guidelines for Creating New DHCPv6 Options";
+      list operator-ipv6-addr {
+        key operator-ipv6-addr-id;
+        description "operator ipv6 address info";
+        leaf operator-ipv6-addr-id {
+          type uint8;
+          mandatory true;
+          description "operator ipv6 address id";
+        }
+        leaf operator-ipv6-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description "operator ipv6 address id";
+        }
+      }
+    }
+
+    container operator-option-single-flag {
+    //if-feature operator-op-single-flag;
+      presence "Enable this option";
+      description "operator single flag";
+      reference "RFC7227: Guidelines for Creating New DHCPv6
+        Options";
+      list flag {
+        key flag-id;
+        description "operator single flag info";
+        leaf flag-id {
+          type uint8;
+          mandatory true;
+          description "operator single flag id";
+        }
+        leaf flag-value{
+          type boolean;
+          mandatory true;
+          description "operator single flag value";
+        }
+      }
+    }
+
+    container operator-option-ipv6-prefix {
+    //if-feature operator-op-ipv6-prefix;
+      presence "Enable this option";
+      description "operator ipv6 prefix option";
+      reference "RFC7227: Guidelines for Creating New DHCPv6
+        Options";
+      list operator-ipv6-prefix {
+        key operator-ipv6-prefix-id;
+        description "operator ipv6 prefix info";
+        leaf operator-ipv6-prefix-id {
+          type uint8;
+          mandatory true;
+          description "operator ipv6 prefix id";
+        }
+        leaf operator-ipv6-prefix6-len {
+          type uint8;
+          mandatory true;
+          description "operator ipv6 prefix length";
+        }
+        leaf operator-ipv6-prefix {
+          type inet:ipv6-prefix;
+          mandatory true;
+          description "operator ipv6 prefix";
+        }
+      }
+    }
+
+    container operator-option-int32 {
+    //if-feature operator-op-int32;
+      presence "Enable this option";
+      description "operator integer 32 option";
+      reference "RFC7227: Guidelines for Creating New DHCPv6
+        Options";
+      list int32val {
+        key int32val-id;
+        description "operator integer 32 info";
+        leaf int32val-id {
+          type uint8;
+          mandatory true;
+          description "operator integer 32 id";
+        }
+        leaf int32val {
+          type uint32;
+          mandatory true;
+          description "operator integer 32 value";
+        }
+      }
+    }
+
+    container operator-option-int16 {
+    //if-feature operator-op-int16;
+      presence "Enable this option";
+      description "operator integer 16 option";
+      reference "RFC7227: Guidelines for Creating New DHCPv6
+        Options";
+      list int16val {
+        key int16val-id;
+        description "operator integer 16 info";
+        leaf int16val-id {
+          type uint8;
+          mandatory true;
+          description "operator integer 16 id";
+        }
+        leaf int16val {
+          type uint16;
+          mandatory true;
+          description "operator integer 16 value";
+        }
+      }
+    }
+
+    container operator-option-int8 {
+    //if-feature operator-op-int8;
+      presence "Enable this option";
+      description "operator integer 8 option";
+      reference "RFC7227: Guidelines for Creating New DHCPv6
+        Options";
+      list int8val {
+        key int8val-id;
+        description "operator integer 8 info";
+        leaf int8val-id {
+          type uint8;
+          mandatory true;
+          description "operator integer 8 id";
+        }
+        leaf int8val {
+          type uint8;
+          mandatory true;
+          description "operator integer 8 value";
+        }
+      }
+    }
+
+    container operator-option-uri {
+    //if-feature operator-op-uri;
+      presence "Enable this option";
+      description "operator uri option";
+      reference "RFC7227: Guidelines for Creating New DHCPv6 Options";
+      list uri{
+        key uri-id;
+        description "operator uri info";
+        leaf uri-id {
+          type uint8;
+          mandatory true;
+          description "operator uri id";
+        }
+        leaf uri {
+          type string;
+          mandatory true;
+          description "operator uri value";
+        }
+      }
+    }
+
+    container operator-option-textstring {
+    //if-feature operator-op-textstring;
+      presence "Enable this option";
+      description "operator itext string option";
+      reference "RFC7227: Guidelines for Creating New DHCPv6 Options";
+      list textstring{
+        key textstring-id;
+        description "operator text string info";
+        leaf textstring-id {
+          type uint8;
+          mandatory true;
+          description "operator text string id";
+        }
+        leaf textstring {
+          type string;
+          mandatory true;
+          description "operator text string value";
+        }
+      }
+    }
+
+    container operator-option-var-data {
+    //if-feature operator-op-var-data;
+      presence "Enable this option";
+      description "operator variable length data option";
+      reference "RFC7227: Guidelines for Creating New DHCPv6 Options";
+      list int32val {
+        key var-data-id;
+        description "operator ivariable length data info";
+        leaf var-data-id {
+          type uint8;
+          mandatory true;
+          description "operator variable length id";
+        }
+        leaf var-data {
+          type binary;
+          mandatory true;
+          description "operator variable length value";
+        }
+      }
+    }
+
+    container operator-option-dns-wire {
+    //if-feature operator-op-dns-wire;
+      presence "Enable this option";
+      description "operator dns wire format domain name list option";
+      reference "RFC7227: Guidelines for Creating New DHCPv6
+        Options";
+      list operator-option-dns-wire {
+        key operator-option-dns-wire-id;
+        description "operator dns wire format info";
+        leaf operator-option-dns-wire-id {
+          type uint8;
+          mandatory true;
+          description "operator dns wire format id";
+        }
+        leaf operator-option-dns-wire{
+          type binary;
+          mandatory true;
+          description "operator dns wire format value";
+        }
+      }
+    }
+  }
+}
diff --git a/src/lib/yang/models/ietf-dhcpv6-relay.yang b/src/lib/yang/models/ietf-dhcpv6-relay.yang
new file mode 100644
index 0000000000..f884e4a6ab
--- /dev/null
+++ b/src/lib/yang/models/ietf-dhcpv6-relay.yang
@@ -0,0 +1,470 @@
+module ietf-dhcpv6-relay {
+  yang-version 1.1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-dhcpv6-relay";
+  prefix "dhcpv6-relay";
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+  import ietf-dhcpv6-options {
+    prefix dhcpv6-options;
+  }
+  import ietf-dhcpv6-types {
+    prefix dhcpv6-types;
+  }
+  import ietf-interfaces {
+    prefix if;
+  }
+
+  organization
+    "IETF DHC (Dynamic Host Configuration) Working group";
+
+  contact
+    "cuiyong@tsinghua.edu.cn
+     lh.sunlinh@gmail.com
+     ian.farrer@telekom.de
+     sladjana.zechlin@telekom.de
+     hezihao9512@gmail.com";
+
+  description
+    "This model defines a YANG data model that can be
+     used to configure and manage a DHCPv6 relay.";
+
+  revision 2018-03-04 {
+    description "Resolved most issues on the DHC official
+    github";
+    reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  revision 2017-12-22 {
+    description
+      "Resolve most issues on Ian's github.";
+    reference
+      "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  revision 2017-11-24 {
+    description
+      "First version of the separated relay specific
+       YANG model.";
+    reference
+      "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  /*
+   * Data Nodes
+   */
+
+  container relay {
+    presence
+      "Enables the relay";
+    description
+      "DHCPv6 relay portion";
+
+    container relay-config {
+      description
+        "This container contains the configuration data
+        of the relay.";
+      container relay-attributes {
+        description
+          "A container describes some basic attributes of the relay
+           agent including some relay agent specific options data that
+           need to be configured previously.
+           Such options include Remote-Id option and Subscriber-Id
+           option.";
+        leaf name {
+          type string;
+          description
+            "Relay agent name";
+        }
+        leaf description {
+          type string;
+          description
+            "Textual description of the relay agent";
+        }
+        leaf-list dest-addrs {
+          type inet:ipv6-address;
+          description
+            "Each DHCPv6 relay agent may be configured with a list
+             of destination addresses.
+             This node defines such a list of IPv6 addresses that
+             may include unicast addresses, multicast addresses or
+             other addresses.";
+        }
+        list subscribers {
+          key subscriber;
+          description
+            "Subscribers";
+          leaf subscriber {
+            type uint8;
+            mandatory true;
+            description
+              "Subscriber";
+          }
+          leaf subscriber-id {
+            type string;
+            mandatory true;
+            description
+              "Subscriber id";
+          }
+        }
+        list remote-host {
+          key ent-num;
+          description
+            "Remote host";
+          leaf ent-num {
+            type uint32;
+            mandatory true;
+            description
+              "Enterprise number";
+          }
+          leaf remote-id {
+            type string;
+            mandatory true;
+            description
+              "Remote id";
+          }
+        }
+        uses dhcpv6-types:vendor-infor;
+      }
+      container rsoo-option-sets {
+        description
+         "DHCPv6 relay agent could provide some information that would
+          be useful to DHCPv6 client.
+          Since relay agent cannot provide options directly to the
+          client, RSOO-enabled options are defined to propose options
+          for the server to send to the client.
+          This container models such RSOO-enabled options.";
+        reference
+          "RFC6422";
+        list option-set {
+          key option-set-id;
+          description
+            "This list under the 'rsoo-option-sets' container is similar
+             to the that defined in server module.
+             It allows the relay to implement several sets of RSOO-enabled
+             options for different interfaces.
+             The list only includes the EAP Re-authentication Protocol
+             (ERP) Local Domain Name DHCPv6 Option defined in RFC6440,
+             since it is the only one RSOO-enabled options accepted by
+             IANA so far.";
+          leaf option-set-id {
+            type uint32;
+            description "Option sed id";
+          }
+          uses dhcpv6-options:relay-supplied-option-definitions;
+        }
+      }
+
+      list relay-if {
+        // if - This should reference an entry in ietf-interfaces
+        key if-name;
+        description
+        "A relay agent may have several interfaces, we should provide
+         a way to configure and manage parameters on the interface-level.
+         A list that describes specific interfaces and their corresponding
+         parameters is employed to fulfil the configfuration. Here we use
+         a string called 'if-name' as the key of list.";
+        leaf if-name {
+          type if:interface-ref;
+          mandatory true;
+          description
+            "Interface name";
+        }
+        leaf interface-id {
+          type string;
+          description
+            "Interface id";
+        }
+
+        /*
+        leaf enable {
+          type boolean;
+          mandatory true;
+          description "whether this interface is enabled";
+        }
+        */
+
+        leaf ipv6-address {
+          type inet:ipv6-address;
+          description
+            "IPv6 address for this interface";
+        }
+
+        leaf rsoo-option-set-id {
+          type leafref {
+            path "/relay/relay-config/rsoo-option-sets/option-set/option-set-id";
+          }
+          description "Configured Relay Supplied Option set";
+        }
+
+        list next-entity {
+          key dest-addr;
+          description
+            "This node defines a list that is used to describe the
+             next hop entity of this relay distinguished by their
+             addresses.";
+          leaf dest-addr {
+            type inet:ipv6-address;
+            mandatory true;
+            description
+              "Destination addr";
+          }
+          leaf available {
+            type boolean;
+            mandatory true;
+            description
+              "Whether the next entity is available or not";
+          }
+          leaf multicast {
+            type boolean;
+            mandatory true;
+            description
+              "Whether the address is multicast or not";
+          }
+          leaf server {
+            type boolean;
+            mandatory true;
+            description
+              "Whether the next entity is a server";
+          }
+        }
+      }
+    }
+
+
+    container relay-state {
+      config "false";
+      description
+        "State data of relay";
+      list relay-if {
+        key if-name;
+        description
+        "A relay agent may have several interfaces, we should provide
+         a way to configure and manage parameters on the interface-level.
+         A list that describes specific interfaces and their corresponding
+         parameters is employed to fulfil the configfuration. Here we use
+         a string called 'if-name' as the key of list.";
+        leaf if-name{
+          type string;
+          mandatory true;
+          description
+            "Interface name";
+        }
+        list pd-route {
+          // if - need to look at if/how we model these. If they are
+          // going to be modelled, then they should be ro state
+          // entries (we're not trying to configure routes here)
+          key pd-route-id;
+          description "pd route";
+          leaf pd-route-id {
+            type uint8;
+            mandatory true;
+            description
+              "PD route id";
+          }
+          leaf requesting-router-id {
+            type uint32;
+            mandatory true;
+            description
+              "Requesting router id";
+          }
+          leaf delegating-router-id {
+            type uint32;
+            mandatory true;
+            description
+              "Delegating router id";
+          }
+          leaf next-router {
+            type inet:ipv6-address;
+            mandatory true;
+            description
+              "Next router";
+          }
+          leaf last-router {
+            type inet:ipv6-address;
+            mandatory true;
+            description
+              "Previous router";
+          }
+        }
+        list next-entity {
+          key dest-addr;
+          description "This node defines a list that is used to
+            describe the next hop entity of this relay agent.
+            Different entities are distinguished by their
+            addresses.";
+          leaf dest-addr {
+            type inet:ipv6-address;
+            mandatory true;
+            description "destination addr";
+          }
+          container packet-stats {
+            description "packet statistics";
+            leaf solicit-rvd-count {
+              type uint32;
+              mandatory true;
+              description "solicit received counter";
+            }
+            leaf request-rvd-count {
+              type uint32;
+              mandatory true;
+              description "request received counter";
+            }
+            leaf renew-rvd-count {
+              type uint32;
+              mandatory true;
+              description "renew received counter";
+            }
+            leaf rebind-rvd-count {
+              type uint32;
+              mandatory true;
+              description "rebind recevied counter";
+            }
+            leaf decline-rvd-count {
+              type uint32;
+              mandatory true;
+              description "decline received counter";
+            }
+            leaf release-rvd-count {
+              type uint32;
+              mandatory true;
+              description "release received counter";
+            }
+            leaf info-req-rvd-count {
+              type uint32;
+              mandatory true;
+              description "information request counter";
+            }
+            leaf relay-for-rvd-count {
+              type uint32;
+              mandatory true;
+              description "relay forward received counter";
+            }
+            leaf relay-rep-rvd-count {
+              type uint32;
+              mandatory true;
+              description "relay reply received counter";
+            }
+            leaf packet-to-cli-count {
+              type uint32;
+              mandatory true;
+              description "packet to client counter";
+            }
+            leaf adver-sent-count {
+              type uint32;
+              mandatory true;
+              description "advertisement sent counter";
+            }
+            leaf confirm-sent-count {
+              type uint32;
+              mandatory true;
+              description "confirm sent counter";
+            }
+            leaf reply-sent-count {
+              type uint32;
+              mandatory true;
+              description "reply sent counter";
+            }
+            leaf reconfig-sent-count {
+              type uint32;
+              mandatory true;
+              description "reconfigure sent counter";
+            }
+            leaf relay-for-sent-count {
+              type uint32;
+              mandatory true;
+              description "relay forward sent counter";
+            }
+            leaf relay-rep-sent-count {
+              type uint32;
+              mandatory true;
+              description "relay reply sent counter";
+            }
+          }
+        }
+      }
+      container relay-stats {
+        config "false";
+        description
+          "Relay statistics";
+        leaf cli-packet-rvd-count {
+          type uint32;
+          mandatory true;
+          description
+            "Client packet received counter";
+        }
+        leaf relay-for-rvd-count {
+          type uint32;
+          mandatory true;
+          description
+            "Relay forward received counter";
+        }
+        leaf relay-rep-rvd-count {
+          type uint32;
+          mandatory true;
+          description
+            "Relay reply recevied counter";
+        }
+        leaf packet-to-cli-count {
+          type uint32;
+          mandatory true;
+          description
+            "Packet to client counter";
+        }
+        leaf relay-for-sent-count {
+          type uint32;
+          mandatory true;
+          description
+            "Relay forward sent counter";
+        }
+        leaf relay-rep-sent-count {
+          type uint32;
+          mandatory true;
+          description
+            "Relay reply sent counter";
+        }
+        leaf discarded-packet-count {
+          type uint32;
+          mandatory true;
+          description
+            "Discarded packet counter";
+        }
+      }
+    }
+  }
+
+  /*
+   * Notifications
+   */
+
+  notification notifications {
+    description "DHCPv6 relay notification module";
+    container dhcpv6-relay-event {
+      description
+        "DHCPv6 relay event";
+      container topo-changed {
+        description
+        "Raised when the topology of the relay agent is changed.";
+        leaf relay-if-name {
+          type string;
+          mandatory true;
+          description
+            "Relay interface name";
+        }
+        leaf first-hop {
+          type boolean;
+          mandatory true;
+          description
+            "First hop";
+        }
+        leaf last-entity-addr {
+          type inet:ipv6-address;
+          mandatory true;
+          description
+            "Last entity address";
+        }
+      }
+    }
+  }
+}
diff --git a/src/lib/yang/models/ietf-dhcpv6-server.yang b/src/lib/yang/models/ietf-dhcpv6-server.yang
new file mode 100644
index 0000000000..4c5fafaeea
--- /dev/null
+++ b/src/lib/yang/models/ietf-dhcpv6-server.yang
@@ -0,0 +1,852 @@
+module ietf-dhcpv6-server {
+  yang-version 1.1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-dhcpv6-server";
+  prefix "dhcpv6-server";
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import ietf-dhcpv6-options {
+    prefix dhcpv6-options;
+  }
+  import ietf-dhcpv6-types {
+    prefix dhcpv6-types;
+  }
+  import ietf-interfaces {
+    prefix if;
+  }
+
+  organization "DHC WG";
+  contact
+    "cuiyong@tsinghua.edu.cn
+     lh.sunlinh@gmail.com
+     ian.farrer@telekom.de
+     sladjana.zechlin@telekom.de
+     hezihao9512@gmail.com";
+  description "This model defines a YANG data model that can be
+      used to configure and manage a DHCPv6 server.";
+
+  revision 2018-03-04 {
+    description "Resolved most issues on the DHC official
+    github";
+    reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  revision 2017-12-22 {
+    description "Resolve most issues on Ian's github.";
+    reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  revision 2017-11-24 {
+    description "First version of the separated server specific
+        YANG model.";
+    reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  /*
+  * Typedef
+  */
+  typedef threshold {
+    type union {
+      type uint16 {
+        range 0..100;
+      }
+      type enumeration {
+        enum "disabled" {
+            description "No threshold";
+        }
+      }
+    }
+    description "Threshold value in percent";
+  }
+
+  /*
+  * Data Nodes
+  */
+  container server {
+    presence "Enables the server";
+    description "DHCPv6 server portion";
+
+    /*
+     * Configuration data
+     */
+    container server-config {
+      description "This container contains the configuration data
+            of a server.";
+      container serv-attributes {
+        description
+         "This container contains basic attributes of a DHCPv6 server
+         such as IPv6 address, server name  and so on. Some optional
+         functions that can be provided  by the server is also included.";
+        container duid {
+          description "Sets the DUID of server";
+          uses dhcpv6-types:duid;
+        }
+        leaf name {
+          type string;
+          description "server's name";
+        }
+        leaf description {
+          type string;
+          description "description of the server.";
+        }
+        leaf-list ipv6-address {
+          type inet:ipv6-address;
+          description "server's IPv6 address.";
+        }
+        leaf-list interfaces-config {
+          // Note - this should probably be references to
+          // entries in the ietf-interfaces model
+          type if:interface-ref;
+          description "A leaf list to denote which one or more interfaces
+            the server should listen on. The default value is to listen
+            on all the interfaces. This node is also used to set a unicast
+            address for the server to listen with a specific interface.
+            For example, if people want the server to listen on a unicast
+            address with a specific interface, he can use the format like
+            'eth1/2001:db8::1'.";
+        }
+        uses dhcpv6-types:vendor-infor;
+      }
+
+      container option-sets {
+        description "DHCPv6 employs various options to carry additional
+          information and parameters in DHCP messages. This container defines
+          all the possible options that need to be configured at the server
+          side. ";
+        list option-set {
+            key option-set-id;
+            description "A server may allow different option sets to be
+              configured for different conditions (i.e. different networks,
+              clients and etc). This 'option-set' list enables various sets of
+              options being defined and configured in a single server. Different
+              sets are distinguished by the key called 'option-set-id'. All the
+              possible options discussed above are defined in the list and each
+              option is corresponding to a container. Since all the options in
+              the list are optional, each container in this list has a 'presence'
+              statement to indicate whether this option (container) will be
+              included in the current option set or not. In addition, each container
+              also has a 'if-feature' statement to indicate whether the server
+              supports this option (container).";
+            leaf option-set-id {
+              type uint32;
+              description "option set id";
+            }
+          uses dhcpv6-options:server-option-definitions;
+          uses dhcpv6-options:custom-option-definitions;
+        }
+      }
+
+      container network-ranges {
+        description "This model supports a hierarchy
+          to achieve dynamic configuration. That is to say we could configure the
+          server at different levels through this model. The top level is a global
+          level which is defined as the container 'network-ranges'. The following
+          levels are defined as sub-containers under it. The 'network-ranges'
+          contains the parameters (e.g. option-sets) that would be allocated to
+          all the clients served by this server.";
+
+        leaf option-set-id {
+          type leafref {
+            path "/server/server-config/option-sets/option-set/option-set-id";
+          }
+          description
+            "The ID field of relevant global option-set to be provisioned to
+            clients.";
+        }
+        list network-range {
+          key network-range-id;
+          description
+          "Under the 'network-ranges' container, a 'network-range' list
+           is defined to configure the server at a network level which is also
+           considered as the second level. Different network are identified by the
+           key 'network-range-id'. This is because a server may have different
+           configuration parameters (e.g. option sets) for different networks.";
+          leaf network-range-id {
+            type uint32;
+            mandatory true;
+            description "equivalent to subnet id";
+          }
+          leaf network-description {
+            type string;
+            mandatory true;
+            description "description of the subnet";
+          }
+          leaf network-prefix {
+            type inet:ipv6-prefix;
+            mandatory true;
+            description "subnet prefix";
+          }
+          leaf option-set-id {
+            type leafref {
+              path "/server/server-config/option-sets/option-set/option-set-id";
+            }
+            description "The ID field of relevant option-set to be provisioned to
+            clients of this network-range.";
+          }
+
+          container address-pools {
+            description
+            "A container that describes the DHCPv6 server's
+             address pools.";
+            list address-pool {
+              key pool-id;
+              description "A DHCPv6 server can be configured with
+              several address pools. This list defines such address pools
+              which are distinguished by the key called 'pool-id'.";
+              leaf pool-id {
+                type uint32;
+                mandatory true;
+                description "pool id";
+              }
+              leaf pool-prefix {
+                type inet:ipv6-prefix;
+                mandatory true;
+                description "pool prefix";
+              }
+              leaf start-address {
+                type inet:ipv6-address-no-zone;
+                mandatory true;
+                description "start address";
+              }
+              leaf end-address {
+                type inet:ipv6-address-no-zone;
+                mandatory true;
+                description "end address";
+              }
+              leaf valid-lifetime {
+                type yang:timeticks;
+                mandatory true;
+                description "valid liftime for IA";
+              }
+              leaf renew-time {
+                type yang:timeticks;
+                mandatory true;
+                description "renew time";
+              }
+              leaf rebind-time {
+                type yang:timeticks;
+                mandatory true;
+                description "rebind time";
+              }
+              leaf preferred-lifetime {
+                type yang:timeticks;
+                mandatory true;
+                description "preferred lifetime for IA";
+              }
+              leaf rapid-commit {
+                type boolean;
+                mandatory false;
+                description "A boolean value specifies whether the pool
+                supports client-server exchanges involving two messages.";
+              }
+              leaf client-class {
+                type string;
+                description
+                "If this leaf is specified, this pool will only serve
+                the clients belonging to this class.";
+              }
+              leaf max-address-count {
+                type threshold;
+                mandatory true;
+                description "maximum count of addresses that can
+                  be allocated in this pool. This value may be
+                  less than count of total addresses.";
+              }
+              leaf option-set-id {
+                type leafref {
+                  path "/server/server-config/option-sets/option-set/option-set-id";
+                }
+                mandatory true;
+                description "The ID field of relevant option-set to be
+                    provisioned to clients of this address-pool.";
+              }
+            }
+          }
+          container pd-pools {
+            description "If a server supports prefix delegation function, this
+              container will be used to define  the delegating router's prefix
+              pools.";
+            list pd-pool {
+              key pool-id;
+              description "Similar to server's address pools, a delegating
+                router can also be configured with multiple prefix pools
+                specified by a list called 'prefix-pool'.";
+              leaf pool-id {
+                type uint32;
+                mandatory true;
+                description "pool id";
+              }
+              leaf prefix {
+                  type inet:ipv6-prefix;
+                  mandatory true;
+                  description "ipv6 prefix";
+              }
+              leaf prefix-length {
+                  type uint8;
+                  mandatory true;
+                  description "prefix length";
+              }
+              leaf valid-lifetime {
+                type yang:timeticks;
+                mandatory true;
+                description "valid lifetime for IA";
+              }
+              leaf renew-time {
+                type yang:timeticks;
+                mandatory true;
+                description "renew time";
+              }
+              leaf rebind-time {
+                type yang:timeticks;
+                mandatory true;
+                description "rebind time";
+              }
+              leaf preferred-lifetime {
+                type yang:timeticks;
+                mandatory true;
+                description "preferred lifetime for IA";
+              }
+              leaf rapid-commit {
+                type boolean;
+                mandatory false;
+                description "A boolean value specifies whether the server
+                support client-server exchanges involving two messages defined.";
+              }
+              leaf client-class {
+                type string;
+                description "client class";
+              }
+              leaf max-pd-space-utilization {
+                type threshold;
+                mandatory false;
+                description "Maximum utilization of pd space in this pool";
+              }
+              leaf option-set-id {
+                type leafref {
+                    path "/server/server-config/option-sets/option-set/option-set-id";
+                  }
+                  mandatory false;
+                  description "The ID field of relevant option-set to be
+                    provisioned to clients of this prefix-pool.";
+              }
+            }
+          }
+
+          container host-reservations {
+            description
+              "This container allows the server to make reservations at host level.";
+            list host-reservation {
+              key cli-id;
+              description "This list allows the server to reserve addresses,
+              prefixes, hostname and options for different clients.";
+              leaf cli-id {
+                type uint32;
+                mandatory true;
+                description "client id";
+              }
+
+              choice client-identifier {
+                description "When making reservations, the server needs to choose a
+                identifier to identify the server. Currently 'DUID' and 'hardware
+                address' are supported.";
+                case duid {
+                  description "DUID";
+                  uses dhcpv6-types:duid;
+                }
+                case hw-address {
+                  description "hardware address";
+                  leaf hardware-address {
+                  type yang:mac-address;
+                  description "MAC address of client";
+                  }
+                }
+              }
+
+              leaf-list reserv-addr {
+                type inet:ipv6-address;
+                description "reserved addr";
+              }
+
+              list prefix-reservation {
+                key reserv-prefix-id;
+                description "reserved prefix reservation";
+                leaf reserv-prefix-id {
+                  type uint32;
+                  mandatory true;
+                  description "reserved prefix id";
+                }
+                leaf reserv-prefix {
+                  type inet:ipv6-prefix;
+                  mandatory true;
+                  description "reserved prefix";
+                }
+                leaf reserv-prefix-len {
+                  type uint8;
+                  mandatory true;
+                  description "reserved prefix length";
+                }
+              }
+
+              leaf hostname {
+                type string;
+                description "reserved hostname";
+              }
+
+              leaf option-set-id {
+                type leafref {
+                  path "/server/server-config/option-sets/option-set/option-set-id";
+                }
+                description "The ID field of relevant option-set to be provisioned
+                  in the host reservation.";
+              }
+            }
+          }
+
+        }
+      }
+
+      container relay-opaque-paras {
+        description "This container contains some opaque values in Relay Agent
+          options that need to be configured on the server side only for value
+          match. Such Relay Agent options include Interface-Id option,
+          Remote-Id option and Subscriber-Id option.";
+        list relays {
+          key relay-name;
+          description "relay agents";
+          leaf relay-name {
+            type string;
+            mandatory true;
+            description "relay agent name";
+          }
+          list interface-info {
+            key if-name;
+            description "interface info";
+            leaf if-name {
+              type string;
+              mandatory true;
+              description "interface name";
+            }
+            leaf interface-id {
+              type string;
+              mandatory true;
+              description "interface id";
+            }
+          }
+          list subscribers {
+            key subscriber;
+            description "subscribers";
+            leaf subscriber {
+              type uint32;
+              mandatory true;
+              description "subscriber";
+            }
+            leaf subscriber-id {
+              type string;
+              mandatory true;
+              description "subscriber id";
+            }
+          }
+          list remote-host {
+            key ent-num;
+            description "remote host";
+            leaf ent-num {
+              type uint32;
+              mandatory true;
+              description "enterprise number";
+            }
+            leaf remote-id {
+              type string;
+              mandatory true;
+              description "remote id";
+            }
+          }
+        }
+      }
+
+      container rsoo-enabled-options {
+        description "rsoo enabled options";
+        list rsoo-enabled-option {
+          key option-code;
+          description "rsoo enabled option";
+          leaf option-code {
+            type uint16;
+            mandatory true;
+            description "option code";
+          }
+          leaf description {
+            type string;
+            mandatory true;
+            description "description of the option";
+          }
+        }
+      }
+
+    }
+
+    /*
+     * State data
+     */
+    container server-state {
+      config "false";
+      description "states of server";
+      container network-ranges {
+        description "This model supports a hierarchy to achieve dynamic configuration.
+          That is to say we could configure the server  at different levels through
+          this model. The top level is a global level which is defined as the container
+          'network-ranges'. The following levels are defined as sub-containers under it.
+          The 'network-ranges' contains the parameters (e.g. option-sets) that  would be
+          allocated to all the clients served by this server.";
+        list network-range {
+          key network-range-id;
+          description "The ID field of relevant option-set to be provisioned
+            to clients of this network-range.";
+          leaf network-range-id {
+            type uint32;
+            mandatory true;
+            description "equivalent to subnet id";
+          }
+          container address-pools {
+            description "A container that describes the DHCPv6 server's address pools";
+              list address-pool {
+                key pool-id;
+                description "A DHCPv6 server can be configured with
+                several address pools. This list defines such address pools
+                which are distinguished by the key called 'pool-id'.";
+                leaf pool-id {
+                  type uint32;
+                  mandatory true;
+                  description "pool id";
+                }
+                leaf total-address-count {
+                  type uint64;
+                  mandatory true;
+                  description "count of total addresses in the pool";
+                }
+                leaf allocated-address-conut {
+                  type uint64;
+                  mandatory true;
+                  description "count of allocated addresses in the pool";
+                }
+              }
+              list binding-info {
+                key cli-id;
+                description "A list that records a binding information for each DHCPv6
+                  client that has already been allocated IPv6 addresses.";
+                leaf cli-id {
+                  type uint32;
+                  mandatory true;
+                  description "client id";
+                }
+                container duid {
+                  description "Read the DUID";
+                  uses dhcpv6-types:duid;
+                }
+                list cli-ia {
+                  key iaid;
+                  description "client IA";
+                  leaf ia-type {
+                    type string;
+                    mandatory true;
+                    description "IA type";
+                  }
+                  leaf iaid {
+                    type uint32;
+                    mandatory true;
+                    description "IAID";
+                  }
+                  leaf-list cli-addr {
+                    type inet:ipv6-address;
+                    description "client addr";
+                  }
+                  leaf pool-id {
+                    type uint32;
+                    mandatory true;
+                    description "pool id";
+                  }
+                }
+              }
+            }
+            container pd-pools {
+              description "If a server supports prefix delegation function,
+                this container will be used to define the delegating
+                router's prefix pools.";
+              list prefix-pool {
+                key pool-id;
+                description "Similar to server's address pools, a delegating
+                  router can also be configured with multiple prefix pools
+                  specified by a list called 'prefix-pool'.";
+                leaf pool-id {
+                  type uint32;
+                  mandatory true;
+                  description "pool id";
+                }
+                leaf pd-space-utilization {
+                  type threshold;
+                  mandatory true;
+                  description "current PD space utilization";
+                }
+              }
+              list binding-info {
+                key cli-id;
+                description "A list records a binding information for each DHCPv6
+                  client that has already been alloated IPv6 prefixes.";
+                leaf cli-id {
+                  type uint32;
+                  mandatory true;
+                  description "client id";
+                }
+                container duid {
+                  description "Reads the DUID";
+                  uses dhcpv6-types:duid;
+                }
+                list cli-iapd {
+                  key iaid;
+                  description "client IAPD";
+                  leaf iaid {
+                    type uint32;
+                    mandatory true;
+                    description "IAID";
+                  }
+                  leaf-list cli-prefix {
+                    type inet:ipv6-prefix;
+                    description "client ipv6 prefix";
+                  }
+                  leaf-list cli-prefix-len {
+                    type uint8;
+                    description "client prefix length";
+                  }
+                  leaf pool-id {
+                    type uint32;
+                    mandatory true;
+                    description "pool id";
+                  }
+                }
+              }
+            }
+
+          container host-reservations {
+            description "This container provides host reservations in the host level.";
+            list binding-info {
+              key cli-id;
+              description
+                "A list records a binding information for each DHCPv6
+                client that has already been alloated IPv6 addresses or prefixes
+                by host reservations.";
+              leaf cli-id {
+                type uint32;
+                mandatory true;
+                description "client id";
+              }
+              container duid {
+                description "Reads the DUID";
+                uses dhcpv6-types:duid;
+              }
+              list cli-ia {
+                key iaid;
+                description "client IA";
+                leaf ia-type {
+                  type string;
+                  mandatory true;
+                  description "IA type, IA_NA or IA_TA";
+                }
+                leaf iaid {
+                  type uint32;
+                  mandatory true;
+                  description "IAID";
+                }
+                leaf-list cli-addr {
+                  type inet:ipv6-address;
+                  description "client addr";
+                }
+              }
+
+              list cli-iapd {
+                key iaid;
+                description "client IAPD";
+                leaf iaid {
+                  type uint32;
+                  mandatory true;
+                  description "IAID";
+                }
+                leaf-list cli-prefix {
+                  type inet:ipv6-prefix;
+                  description "client ipv6 prefix";
+                }
+                leaf-list cli-prefix-len {
+                  type uint8;
+                  description "client prefix length";
+                }
+              }
+            }
+          }
+
+          }
+        }
+
+        container packet-stats {
+          description "A container presents the packet statistics related to
+            the DHCPv6 server.";
+          leaf solicit-count {
+            type uint32;
+            mandatory true;
+            description "solicit counter";
+          }
+          leaf request-count {
+            type uint32;
+            mandatory true;
+            description "request counter";
+          }
+          leaf renew-count {
+            type uint32;
+            mandatory true;
+            description "renew counter";
+          }
+          leaf rebind-count {
+            type uint32;
+            mandatory true;
+            description "rebind counter";
+          }
+          leaf decline-count {
+            type uint32;
+            mandatory true;
+            description "decline count";
+          }
+          leaf release-count {
+            type uint32;
+            mandatory true;
+            description "release counter";
+          }
+          leaf info-req-count {
+            type uint32;
+            mandatory true;
+            description "information request counter";
+          }
+          leaf advertise-count {
+            type uint32;
+            mandatory true;
+            description "advertise counter";
+          }
+          leaf confirm-count {
+            type uint32;
+            mandatory true;
+            description "confirm counter";
+          }
+          leaf reply-count {
+            type uint32;
+            mandatory true;
+            description "reply counter";
+          }
+          leaf reconfigure-count {
+            type uint32;
+            mandatory true;
+            description "reconfigure counter";
+          }
+          leaf relay-forward-count {
+            type uint32;
+            mandatory true;
+            description "relay forward counter";
+          }
+          leaf relay-reply-count {
+            type uint32;
+            mandatory true;
+            description "relay reply counter";
+          }
+        }
+      }
+    }
+
+  /*
+  * Notifications
+  */
+
+  notification notifications {
+    description "dhcpv6 server notification module";
+    container dhcpv6-server-event {
+      description "dhcpv6 server event";
+      container address-pool-running-out {
+        description "raised when the address pool is going to
+          run out.  A threshold for utilization ratio of the pool has
+          been defined in the server feature so that it will notify the
+          administrator when the utilization ratio reaches the
+          threshold, and such threshold is a settable parameter";
+        leaf total-address-count {
+          type uint64;
+          mandatory true;
+          description "count of total addresses in the pool";
+        }
+        leaf max-address-count {
+          type uint64;
+          mandatory true;
+          description "maximum count of addresses that can be allocated
+            in the pool. This value may be less than count of total
+            addresses";
+        }
+        leaf allocated-address-conut {
+          type uint64;
+          mandatory true;
+          description "count of allocated addresses in the pool";
+        }
+        container duid {
+          description "server duid";
+          uses dhcpv6-types:duid;
+        }
+        leaf serv-name {
+          type string;
+          description "server name";
+        }
+        leaf pool-name {
+          type string;
+          mandatory true;
+          description "pool name";
+        }
+      }
+      container pd-pool-running-out {
+        description "raised when the address/prefix pool is going to
+          run out.  A threshold for utilization ratio of the pool has
+          been defined in the server feature so that it will notify the
+          administrator when the utilization ratio reaches the
+          threshold, and such threshold is a settable parameter";
+        leaf max-pd-space-utilization {
+          type threshold;
+          mandatory true;
+          description "maximum pd space utilization";
+        }
+        leaf pd-space-utilization {
+          type threshold;
+          mandatory true;
+          description "current pd space utilization";
+        }
+        container duid {
+          description "Sets the DUID";
+          uses dhcpv6-types:duid;
+        }
+        leaf serv-name {
+          type string;
+          description "server name";
+        }
+        leaf pool-name {
+          type string;
+          mandatory true;
+          description "pool name";
+        }
+      }
+      container invalid-client-detected {
+        description "raised when the server has found a client which
+          can be regarded as a potential attacker. Some description
+          could also be included.";
+        container duid {
+          description "Sets the DUID";
+          uses dhcpv6-types:duid;
+        }
+        leaf description {
+          type string;
+          description "description of the event";
+        }
+      }
+    }
+  }
+}
diff --git a/src/lib/yang/models/ietf-dhcpv6-types.yang b/src/lib/yang/models/ietf-dhcpv6-types.yang
new file mode 100644
index 0000000000..7614adab0b
--- /dev/null
+++ b/src/lib/yang/models/ietf-dhcpv6-types.yang
@@ -0,0 +1,206 @@
+module ietf-dhcpv6-types {
+  yang-version 1.1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-dhcpv6-types";
+  prefix "dhcpv6-types";
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+  import ietf-yang-types {
+    prefix yang;
+  }
+
+  organization "DHC WG";
+  contact
+   "cuiyong@tsinghua.edu.cn
+    lh.sunlinh@gmail.com
+    ian.farrer@telekom.de
+    sladjana.zechlin@telekom.de
+    hezihao9512@gmail.com";
+
+  description "This model defines a YANG data model that can be
+    used to define some commonly used DHCPv6 types";
+
+  revision 2018-01-30 {
+    description "Initial revision";
+    reference "I-D: draft-ietf-dhc-dhcpv6-yang";
+  }
+
+  /*
+  * Grouping
+  */
+  grouping vendor-infor {
+    description "Vendor information.";
+    container vendor-info {
+      description "";
+      leaf ent-num {
+        type uint32;
+        mandatory true;
+        description "enterprise number";
+      }
+      leaf-list data {
+        type string;
+        description "specific vendor info";
+      }
+    }
+  }
+
+  grouping duid {
+    description
+      "Each server and client has only one DUID (DHCP Unique Identifier).
+      The DUID here identifies a unique DHCPv6 server for clients. DUID
+      consists of a two-octet type field and an arbitrary length (no more
+      than 128 bytes) content field. Currently there are four defined types
+      of DUIDs in RFC3315 and RFC6355 - DUID-LLT, DUID-EN, DUID-LL and
+      DUID-UUID. DUID-Uknown represents those unconventional DUIDs.";
+    reference "RFC3315: Section 9 and RFC6355: Section 4";
+    leaf type-code {
+      type uint16;
+      default 65535;
+      description "Type code of this DUID";
+    }
+    choice duid-type {
+    default duid-unknown;
+      description "Selects the format for the DUID.";
+      case duid-llt {
+        description "DUID Based on Link-layer Address Plus Time
+          (Type 1 - DUID-LLT)";
+        reference "RFC3315 Section 9.2";
+        leaf duid-llt-hardware-type {
+          type uint16;
+          description "Hardware type as assigned by IANA (RFC826).";
+        }
+        leaf duid-llt-time {
+          type yang:timeticks;
+          description "The time value is the time that the DUID is
+          generated represented in seconds since midnight (UTC),
+          January 1, 2000, modulo 2^32.";
+        }
+        leaf duid-llt-link-layer-addr {
+          type yang:mac-address;
+          description "Link-layer address as described in RFC2464";
+        }
+      }
+      case duid-en {
+        description "DUID Assigned by Vendor Based on Enterprise Number
+          (Type 2 - DUID-EN)";
+        reference "RFC3315 Section 9.3";
+        leaf duid-en-enterprise-number {
+          type uint32;
+          description "Vendor's registered Private Enterprise Number as
+            maintained by IANA";
+        }
+        leaf duid-en-identifier {
+          type string;
+          description "Indentifier, unique to the device that is
+          using it";
+        }
+      }
+      case duid-ll {
+          description "DUID Based on Link-layer Address (Type 3 - DUID-LL)";
+          reference "RFC3315 Section 9.4";
+          leaf duid-ll-hardware-type {
+            type uint16;
+            description "Hardware type as assigned by IANA (RFC826).";
+          }
+          leaf duid-ll-link-layer-addr {
+            type yang:mac-address;
+            description "Link-layer address as described in RFC2464";
+        }
+      }
+      case duid-uuid {
+        description "DUID Based on Universally Unique Identifier
+          (Type 4 - DUID-UUID)";
+        reference "RFC6335 Defination of the UUID-Based Unique Identifier";
+        leaf uuid {
+          type yang:uuid;
+          description "A Universally Unique IDentifier in the string
+            representation defined in RFC 4122. The canonical
+            representation uses lowercase characters";
+        }
+      }
+      case duid-unknown {
+        description "DUID based on free raw bytes";
+        leaf data {
+          type binary;
+          description "The bits to be used as the identifier";
+        }
+      }
+    }
+  }
+
+  grouping portset-para {
+    description "portset parameters";
+    container port-parameter {
+      description "port parameter";
+      leaf offset {
+        type uint8;
+        mandatory true;
+        description "offset in a port set";
+      }
+      leaf psid-len {
+        type uint8;
+        mandatory true;
+        description "length of a psid";
+      }
+      leaf psid {
+        type uint16;
+        mandatory true;
+        description "psid value";
+      }
+    }
+  }
+
+  grouping iaid {
+    description "IA is a construct through which a server and a
+        client can identify, group, and manage a set of related IPv6
+        addresses. The key of the list is a 4-byte number IAID defined
+        in [RFC3315].";
+    list identity-association {
+      config "false";
+      description "IA";
+      leaf iaid {
+        type uint32;
+        mandatory true;
+        description "IAID";
+      }
+      leaf ia-type {
+        type string;
+        mandatory true;
+        description "IA type";
+      }
+      leaf-list ipv6-addr {
+        type inet:ipv6-address;
+        description "ipv6 address";
+      }
+      leaf-list ipv6-prefix {
+        type inet:ipv6-prefix;
+        description "ipv6 prefix";
+      }
+      leaf-list prefix-length {
+        type uint8;
+        description "ipv6 prefix length";
+      }
+      leaf t1-time {
+        type yang:timeticks;
+        mandatory true;
+        description "t1 time";
+      }
+      leaf t2-time {
+        type yang:timeticks;
+        mandatory true;
+        description "t2 time";
+      }
+      leaf preferred-lifetime {
+        type yang:timeticks;
+        mandatory true;
+        description "preferred lifetime";
+      }
+      leaf valid-lifetime {
+        type yang:timeticks;
+        mandatory true;
+        description "valid lifetime";
+      }
+    }
+  }
+}