Fix Thread 1.1 unitests (ARMmbed#2145)

Adjust HAVE_THREAD_V2 flags to get Thread 1.1 unit tests working

Author: Arto Kinnunen

source/6LoWPAN/Thread/thread_bootstrap.h

@@ -225,7 +225,6 @@ void thread_bootstrap_address_registration_timer(protocol_interface_info_entry_t
 #define thread_bootstrap_dua_address_generate(cur, domain_prefix, domain_prefix_len)
 #define thread_bootstrap_address_registration(interface, addr, child_mac64, refresh_child_entry, duplicate_child_detected)
 #define thread_bootstrap_child_address_registration_response_process(interface)
-
 #define thread_bootstrap_address_registration_timer_set(interface, dua_delay_seconds, mlr_refresh_seconds)
 #define thread_bootstrap_address_registration_timer(interface, seconds)
 

source/6LoWPAN/Thread/thread_common.c

@@ -2271,6 +2271,6 @@ int thread_common_primary_bbr_get(struct protocol_interface_info_entry *cur, uin
     return -1;
 }
 
-#endif
+#endif // HAVE_THREAD_V2
 #endif
 

test/nanostack/unittest/stub/thread_bbr_commercial_stub.c

@@ -56,7 +56,7 @@
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
 
-
+#if defined(HAVE_THREAD_V2) && defined(HAVE_THREAD_BORDER_ROUTER)
 int8_t thread_bbr_commercial_init(int8_t interface_id, int8_t backbone_interface_id)
 {
     return 0;
@@ -109,3 +109,4 @@ void thread_bbr_commercial_mcast_fwd_check(int8_t interface_id, bool *multicast_
 {
     return;
 }
+#endif

test/nanostack/unittest/stub/thread_bootstrap_stub.c

@@ -314,6 +314,7 @@ int thread_bootstrap_network_data_activate(protocol_interface_info_entry_t *cur)
 {
     return 0;
 }
+#ifdef HAVE_THREAD_V2
 void thread_bootstrap_address_registration_init(void)
 {
     return;
@@ -350,4 +351,5 @@ void thread_bootstrap_address_registration_timer(protocol_interface_info_entry_t
 {
     return;
 }
+#endif
 

test/nanostack/unittest/stub/thread_ccm_stub.c

@@ -48,6 +48,7 @@
 #include "6LoWPAN/Thread/thread_nvm_store.h"
 #include "6LoWPAN/Thread/thread_ccm.h"
 
+#ifdef HAVE_THREAD_V2
 void thread_ccm_free(protocol_interface_info_entry_t *cur)
 {
 }
@@ -95,3 +96,4 @@ int thread_ccm_network_certificate_enable(protocol_interface_info_entry_t *cur,
 int thread_ccm_reenrollment_start(protocol_interface_info_entry_t *cur, int8_t service_id, uint8_t *pbbr_addr)
 {
 }
+#endif

test/nanostack/unittest/stub/thread_common_stub.c

@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "nsconfig.h"
 #include <string.h>
 #include <ns_types.h>
@@ -421,6 +422,7 @@ bool thread_addresses_needs_to_be_registered(protocol_interface_info_entry_t *cu
 {
     return true;
 }
+#ifdef HAVE_THREAD_V2
 bool thread_common_ccm_enabled(protocol_interface_info_entry_t *cur)
 {
     return true;
@@ -429,3 +431,4 @@ int thread_common_primary_bbr_get(struct protocol_interface_info_entry *cur, uin
 {
     return true;
 }
+#endif

test/nanostack/unittest/stub/thread_management_client_stub.c

@@ -119,7 +119,7 @@ void thread_management_client_coap_message_delete(int8_t interface_id, uint16_t
 void thread_management_client_old_partition_data_clean(int8_t interface_id)
 {
 }
-
+#ifdef HAVE_THREAD_V2
 void thread_management_client_addr_ntf_send(int8_t interface_id, uint8_t *destination_address, const uint8_t *addr_data_ptr, uint8_t bbr_status)
 {
 }
@@ -128,4 +128,5 @@ int thread_management_client_mlr_req_send(int8_t interface_id, const uint8_t br_
 {
     return 0;
 }
+#endif
 

test/nanostack/unittest/stub/thread_management_server_stub.c

@@ -77,8 +77,9 @@ bool thread_management_server_source_address_check(int8_t interface_id, uint8_t
 {
     return false;
 }
-
+#ifdef HAVE_THREAD_V2
 int thread_management_server_ccm_service_init(int8_t interface_id)
 {
     return 0;
 }
+#endif