From 2dea42cea6318a8db4781f9408ee7a9a00db7d54 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@nestlabs.com>
Date: Mon, 8 Oct 2018 15:42:11 -0700
Subject: [PATCH] [dhcp6] add dhcp6 server support to NCP (#3128)

---
 src/ncp/ncp_base_mtd.cpp              | 7 +++++++
 tests/scripts/thread-cert/Makefile.am | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ncp/ncp_base_mtd.cpp b/src/ncp/ncp_base_mtd.cpp
index f904b7baf..a5bb95fd4 100644
--- a/src/ncp/ncp_base_mtd.cpp
+++ b/src/ncp/ncp_base_mtd.cpp
@@ -43,6 +43,9 @@
 #if OPENTHREAD_ENABLE_CHILD_SUPERVISION
 #include <openthread/child_supervision.h>
 #endif
+#if OPENTHREAD_ENABLE_DHCP6_SERVER
+#include <openthread/dhcp6_server.h>
+#endif
 #include <openthread/diag.h>
 #include <openthread/icmp6.h>
 #if OPENTHREAD_ENABLE_JAM_DETECTION
@@ -3017,6 +3020,10 @@ void NcpBase::ProcessThreadChangedFlags(void)
 #if OPENTHREAD_ENABLE_DHCP6_CLIENT
                 otDhcp6ClientUpdate(mInstance, mDhcpAddresses, OT_ARRAY_LENGTH(mDhcpAddresses), NULL);
 #endif
+
+#if OPENTHREAD_ENABLE_DHCP6_SERVER
+                otDhcp6ServerUpdate(mInstance);
+#endif
             }
 
             mThreadChangedFlags &= ~threadFlag;
diff --git a/tests/scripts/thread-cert/Makefile.am b/tests/scripts/thread-cert/Makefile.am
index c134dadd4..a12b1c325 100644
--- a/tests/scripts/thread-cert/Makefile.am
+++ b/tests/scripts/thread-cert/Makefile.am
@@ -279,9 +279,6 @@ XFAIL_NCP_TESTS                                                    = \
     test_coaps.py                                                    \
     test_diag.py                                                     \
     test_service.py                                                  \
-    Cert_5_2_05_AddressQuery.py                                      \
-    Cert_5_3_08_ChildAddressSet.py                                   \
-    Cert_5_3_09_AddressQuery.py                                      \
     Cert_5_3_10_AddressQuery.py                                      \
     Cert_8_1_01_Commissioning.py                                     \
     Cert_8_1_02_Commissioning.py                                     \