Signed-off-by: zhangfeng <hw.zhangfeng@huawei.com>

Change-Id: I00efb8805c8b6217e4f93f64fea9198e92a45ef3

OAT.xml

@@ -21,8 +21,8 @@
     <oatconfig>
         <licensefile></licensefile>
         <policylist>
-			<policy name="projectPolicy" desc="">
-                <policyitem type="copyright" name="Copyright (c) 2022 Shenzhen Kaihong Digital" path=".*" rule="may" group="defaultGroup" filefilter="copyrightPolicyFilter" desc=""/>
+            <policy name="projectPolicy" desc="">
+                <policyitem type="copyright" name="Shenzhen Kaihong Digital" path=".*" rule="may" group="defaultGroup" filefilter="copyrightPolicyFilter" desc=""/>
             </policy>
         </policylist>
         <filefilterlist>
@@ -45,7 +45,6 @@
             <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
                 <filteritem type="filename" name="*.png" desc="Image for markdown doc"/>
             </filefilter>
-
         </filefilterlist>
         <licensematcherlist>
         </licensematcherlist>

bundle.json

@@ -1,131 +0,0 @@
-{
-    "name": "@ohos/communication_wifi",
-    "version": "3.1.0",
-    "description": "The WLAN module provides basic WLAN functions, peer-to-peer (P2P) connection, and WLAN notification, enabling your application to communicate with other devices through a WLAN.",
-    "homePage": "https://gitee.com/openharmony",
-    "license": "Apache License 2.0",
-    "repository": "https://gitee.com/openharmony/communication_wifi",
-    "domain": "os",
-    "language": "",
-    "publishAs": "code-segment",
-    "private": false,
-    "scripts": {},
-    "tags": [
-        "foundation"
-    ],
-    "keywords": [
-        "communication",
-        "wifi"
-    ],
-    "envs": [],
-    "dirs": [],
-    "author": {
-        "name": "",
-        "email": "",
-        "url": ""
-    },
-    "contributors": [
-        {
-            "name": "",
-            "email": "",
-            "url": ""
-        }
-    ],
-    "segment": {
-        "destPath": "foundation/communication/wifi"
-    },
-    "component": {
-        "name": "wifi_standard",
-        "subsystem": "communication",
-        "syscap": [
-            "SystemCapability.Communication.WiFi.STA",
-            "SystemCapability.Communication.WiFi.AP",
-            "SystemCapability.Communication.WiFi.P2P",
-            "SystemCapability.Communication.WiFi.Core",
-            "SystemCapability.Communication.WiFi.HotspotExt"
-        ],
-        "features": [
-            "wifi_standard_feature_with_p2p",
-            "wifi_standard_feature_with_ap_intf"
-        ],
-        "adapted_system_type": [
-            "standard"
-        ],
-        "rom": "",
-        "ram": "",
-        "deps": {
-            "components": [
-                "ipc",
-                "ces_standard",
-                "hiviewdfx_hilog_native",
-                "hisysevent_native",
-                "netmanager_base"
-            ],
-            "third_party": [
-                "wpa_supplicant",
-                "node",
-                "bounds_checking_function",
-                "googletest",
-                "openssl"
-            ]
-        },
-        "build": {
-            "sub_component": [
-                "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework:wifi_manage",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework:dhcp_manage",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_hal:wifi_hal",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework:wifi_system_ability",
-                "//foundation/communication/wifi/services/wifi_standard/sa_profile:wifi_standard_sa_profile",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client:dhcp_client_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server:dhcp_server",
-                "//foundation/communication/wifi/utils/src:wifi_utils",
-                "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi_native_js",
-                "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi"
-            ],
-            "inner_kits": [
-                {
-                    "header" : {
-                        "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_c",
-                        "header_files": [
-                            "wifi_device.h",
-                            "wifi_hotspot.h",
-                            "wifi_p2p.h",
-                            "wifi_hid2d.h"
-                        ]
-                    },
-                    "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk"
-                },
-                {
-                    "header" : {
-                        "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include",
-                        "header_files": [
-                            "wifi_device.h",
-                            "wifi_hotspot.h",
-                            "wifi_p2p.h",
-                            "wifi_scan.h",
-                            "wifi_hid2d.h"
-                        ]
-                    },
-                    "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk"
-                }
-            ],
-            "test": [
-            ]
-        },
-        "hisysevent_config": [
-            "//foundation/communication/wifi/hisysevent.yaml"
-        ]
-    }
-}

dhcp/bundle.json

@@ -0,0 +1,78 @@
+{
+    "name": "@ohos/communication_wifi",
+    "version": "3.1.0",
+    "description": "The DHCP module provides DHCP client and DHCP service, used to obtain, assign and manage IP address.",
+    "homePage": "https://gitee.com/openharmony",
+    "license": "Apache License 2.0",
+    "repository": "https://gitee.com/openharmony/communication_wifi",
+    "domain": "os",
+    "language": "",
+    "publishAs": "code-segment",
+    "private": false,
+    "scripts": {},
+    "tags": [
+        "foundation"
+    ],
+    "keywords": [
+        "communication",
+        "dhcp"
+    ],
+    "envs": [],
+    "dirs": [],
+    "author": {
+        "name": "",
+        "email": "",
+        "url": ""
+    },
+    "contributors": [
+        {
+            "name": "",
+            "email": "",
+            "url": ""
+        }
+    ],
+    "segment": {
+        "destPath": "foundation/communication/wifi/dhcp"
+    },
+    "component": {
+        "name": "dhcp",
+        "subsystem": "communication",
+        "syscap": [
+        ],
+        "features": [
+        ],
+        "adapted_system_type": [
+            "standard"
+        ],
+        "rom": "",
+        "ram": "",
+        "deps": {
+            "components": [
+                "ipc",
+                "ces_standard",
+                "hiviewdfx_hilog_native",
+                "hisysevent_native"
+            ],
+            "third_party": [
+                "wpa_supplicant",
+                "node",
+                "bounds_checking_function",
+                "googletest",
+                "openssl"
+            ]
+        },
+        "build": {
+            "sub_component": [
+                "//foundation/communication/wifi/dhcp/services/mgr_service:dhcp_manager_service",
+                "//foundation/communication/wifi/dhcp/services/dhcp_client:dhcp_client_service",
+                "//foundation/communication/wifi/dhcp/services/dhcp_server:dhcp_server"
+            ],
+            "inner_kits": [
+            ],
+            "test": [
+            ]
+        },
+        "hisysevent_config": [
+        ]
+    }
+}

dhcp/dhcp.gni

@@ -0,0 +1,19 @@
+# Copyright (c) 2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SUBSYSTEM_DIR = "//foundation/communication"
+WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi"
+DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp"
+
+declare_args() {
+}

dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OHOS_DHCP_SERVICE_API_H
+#define OHOS_DHCP_SERVICE_API_H
+
+#include "i_dhcp_service.h"
+
+namespace OHOS {
+namespace Wifi {
+class DhcpServiceApi {
+public:
+    static std::unique_ptr<IDhcpService> GetInstance();
+};
+}  // namespace Wifi
+}  // namespace OHOS
+#endif

dhcp/services/dhcp_client/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021-2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -13,24 +13,25 @@
 
 import("//build/ohos.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
 ################################################################################
 
 ohos_executable("dhcp_client_service") {
   install_enable = true
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_main.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_api.cpp",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_client.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_function.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_ipv4.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_main.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_options.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_socket.c",
   ]
 
   include_dirs = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$DHCP_ROOT_DIR/services/dhcp_client/include",
     "//utils/native/base/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
@@ -52,6 +53,6 @@ ohos_executable("dhcp_client_service") {
   ]
   defines = []
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
 }

dhcp/services/dhcp_server/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021-2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -12,6 +12,8 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
+
 ohos_executable("dhcp_server") {
   install_enable = true
   dhcp_hilog_enable = true
@@ -31,7 +33,7 @@ ohos_executable("dhcp_server") {
   include_dirs = [
     "include",
     "include/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include",
+    "$DHCP_ROOT_DIR/services/dhcp_client/include",
     "//utils/native/base/include",
   ]
 
@@ -45,6 +47,6 @@ ohos_executable("dhcp_server") {
     defines += [ "DHCP_HILOG_ENABLE" ]
   }
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
 }

dhcp/services/mgr_service/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021-2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -13,23 +13,26 @@
 
 import("//build/ohos.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
 ################################################################################
 
 ohos_shared_library("dhcp_manager_service") {
   install_enable = true
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_client_service_impl.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_event_subscriber.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_func.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_server_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service_api.cpp",
   ]
 
   include_dirs = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
     "//utils/native/base/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
@@ -55,6 +58,6 @@ ohos_shared_library("dhcp_manager_service") {
     "-Wl,-E",
   ]
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
 }

dhcp/services/mgr_service/src/dhcp_service.cpp

@@ -212,4 +212,4 @@ int DhcpService::InitServerService()
     return DHCP_OPT_SUCCESS;
 }
 }  // namespace Wifi
-}  // namespace OHOS
+}  // namespace OHOS

dhcp/services/mgr_service/src/dhcp_service_api.cpp

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "dhcp_service_api.h"
+#include "dhcp_service.h"
+#include "wifi_logger.h"
+
+DEFINE_WIFILOG_DHCP_LABEL("DhcpServiceApi");
+
+namespace OHOS {
+namespace Wifi {
+std::unique_ptr<IDhcpService> DhcpServiceApi::GetInstance()
+{
+    std::unique_ptr<IDhcpService> service = std::unique_ptr<DhcpService>();
+    if (service == nullptr) {
+        WIFI_LOGI("DhcpApi GetInstance is null");
+    }
+    return service;
+}
+
+}  // namespace Wifi
+}  // namespace OHOS

dhcp/tests/services/dhcp_client/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021-2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -13,29 +13,29 @@
 
 import("//build/test.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
 ################################################################################
 
-SUBSYSTEM_DIR = "//foundation/communication"
 module_output_path = "wifi_standard/dhcp_client_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/test",
+    "$DHCP_ROOT_DIR/services/dhcp_client/include",
   ]
 }
 
 ohos_unittest("dhcp_client_unittest") {
   module_out_path = module_output_path
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_api.cpp",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_client.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_function.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_ipv4.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_options.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_socket.c",
     "dhcp_client_test.cpp",
     "dhcp_function_test.cpp",
     "dhcp_ipv4_test.cpp",
@@ -49,9 +49,9 @@ ohos_unittest("dhcp_client_unittest") {
 
   include_dirs = [
     "//third_party/googletest/googlemock/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/test",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
+    "$DHCP_ROOT_DIR/services/dhcp_client/test",
+    "$DHCP_ROOT_DIR/services/dhcp_client/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
     "//utils/native/base/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
@@ -94,7 +94,7 @@ ohos_unittest("dhcp_client_unittest") {
   ]
   configs = [ ":module_private_config" ]
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
   testonly = true
 }

dhcp/tests/services/dhcp_server/unittest/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021-2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -12,15 +12,15 @@
 # limitations under the License.
 
 import("//build/test.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
-SUBSYSTEM_DIR = "//foundation/communication/wifi"
-module_output_path = "wifi_standard/dhcp_server_test"
+module_output_path = "dhcp/dhcp_server_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include",
+    "$DHCP_ROOT_DIR/services/dhcp_server/include",
   ]
 }
 
@@ -28,15 +28,15 @@ ohos_unittest("dhcp_server_unittest") {
   module_out_path = module_output_path
   dhcp_hilog_enable = true
   sources = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/address_utils.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_binding.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_config.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/hash_table.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/address_utils.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/common_util.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_address_pool.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_argument.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_binding.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_config.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_option.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_server.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/hash_table.c",
     "address_utils_test.cpp",
     "common_util_test.cpp",
     "dhcp_address_pool_test.cpp",
@@ -54,7 +54,7 @@ ohos_unittest("dhcp_server_unittest") {
     "//utils/native/base/include",
     "//third_party/googletest/googlemock/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include",
+    "$DHCP_ROOT_DIR/services/dhcp_server/include",
   ]
 
   defines = [ "__OHOS__" ]
@@ -85,7 +85,7 @@ ohos_unittest("dhcp_server_unittest") {
     defines += [ "DHCP_HILOG_ENABLE" ]
   }
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
   testonly = true
 }

dhcp/tests/services/mgr_service/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021-2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -13,10 +13,10 @@
 
 import("//build/test.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
 ################################################################################
 
-SUBSYSTEM_DIR = "//foundation/communication"
 module_output_path = "wifi_standard/dhcp_manage_test"
 even_path = "//base/notification/ces_standard"
 
@@ -24,18 +24,18 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/test",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
   ]
 }
 
 ohos_unittest("dhcp_manage_unittest") {
   module_out_path = module_output_path
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_client_service_impl.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_event_subscriber.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_func.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_server_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service.cpp",
     "dhcp_client_service_test.cpp",
     "dhcp_func_test.cpp",
     "dhcp_manage_test.cpp",
@@ -48,10 +48,11 @@ ohos_unittest("dhcp_manage_unittest") {
 
   include_dirs = [
     "//third_party/googletest/googlemock/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/test",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
+    "$DHCP_ROOT_DIR/services/mgr_service/test",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
     "//utils/native/base/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
@@ -97,7 +98,7 @@ ohos_unittest("dhcp_manage_unittest") {
   ]
   configs = [ ":module_private_config" ]
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
 }