Merge pull request #10386 from HJianBo/refactor-directoires

refactor(gw): rename all gateway application name

apps/emqx_gateway/test/emqx_gateway_SUITE.erl

@@ -68,11 +68,11 @@ end_per_testcase(_TestCase, _Config) ->
 
 t_registered_gateway(_) ->
     [
-        {coap, #{cbkmod := emqx_coap}},
+        {coap, #{cbkmod := emqx_gateway_coap}},
-        {exproto, #{cbkmod := emqx_exproto}},
+        {exproto, #{cbkmod := emqx_gateway_exproto}},
-        {lwm2m, #{cbkmod := emqx_lwm2m}},
+        {lwm2m, #{cbkmod := emqx_gateway_lwm2m}},
-        {mqttsn, #{cbkmod := emqx_mqttsn}},
+        {mqttsn, #{cbkmod := emqx_gateway_mqttsn}},
-        {stomp, #{cbkmod := emqx_stomp}}
+        {stomp, #{cbkmod := emqx_gateway_stomp}}
     ] = emqx_gateway:registered_gateway().
 
 t_load_unload_list_lookup(_) ->
@@ -192,7 +192,7 @@ setup_fake_usage_data(Lwm2mDataDir) ->
         [
             emqx_common_test_helpers:proj_root(),
             "apps",
-            "emqx_lwm2m",
+            "emqx_gateway_lwm2m",
             "lwm2m_xml"
         ]
     ),

apps/emqx_gateway/test/emqx_gateway_api_SUITE.erl

@@ -219,7 +219,7 @@ t_gateway_lwm2m(_) ->
         [
             emqx_common_test_helpers:proj_root(),
             "apps",
-            "emqx_lwm2m",
+            "emqx_gateway_lwm2m",
             "lwm2m_xml"
         ]
     ),

apps/emqx_gateway/test/emqx_gateway_cli_SUITE.erl

@@ -117,11 +117,11 @@ t_gateway_registry_usage(_) ->
 t_gateway_registry_list(_) ->
     emqx_gateway_cli:'gateway-registry'(["list"]),
     ?assertEqual(
-        "Registered Name: coap, Callback Module: emqx_coap\n"
+        "Registered Name: coap, Callback Module: emqx_gateway_coap\n"
-        "Registered Name: exproto, Callback Module: emqx_exproto\n"
+        "Registered Name: exproto, Callback Module: emqx_gateway_exproto\n"
-        "Registered Name: lwm2m, Callback Module: emqx_lwm2m\n"
+        "Registered Name: lwm2m, Callback Module: emqx_gateway_lwm2m\n"
-        "Registered Name: mqttsn, Callback Module: emqx_mqttsn\n"
+        "Registered Name: mqttsn, Callback Module: emqx_gateway_mqttsn\n"
-        "Registered Name: stomp, Callback Module: emqx_stomp\n",
+        "Registered Name: stomp, Callback Module: emqx_gateway_stomp\n",
         acc_print()
     ).
 

apps/emqx_gateway/test/emqx_gateway_test_utils.erl

@@ -102,11 +102,11 @@ assert_fields_exist(Ks, Map) ->
         Ks
     ).
 load_all_gateway_apps() ->
-    application:load(emqx_stomp),
+    application:load(emqx_gateway_stomp),
-    application:load(emqx_mqttsn),
+    application:load(emqx_gateway_mqttsn),
-    application:load(emqx_coap),
+    application:load(emqx_gateway_coap),
-    application:load(emqx_lwm2m),
+    application:load(emqx_gateway_lwm2m),
-    application:load(emqx_exproto).
+    application:load(emqx_gateway_exproto).
 
 %%--------------------------------------------------------------------
 %% http

apps/emqx_gateway_coap/src/emqx_gateway_coap.app.src

@@ -1,4 +1,4 @@
-{application, emqx_coap, [
+{application, emqx_gateway_coap, [
     {description, "CoAP Gateway"},
     {vsn, "0.1.0"},
     {registered, []},

apps/emqx_gateway_coap/src/emqx_gateway_coap.erl

@@ -15,7 +15,7 @@
 %%--------------------------------------------------------------------
 
 %% @doc The CoAP Gateway implement
--module(emqx_coap).
+-module(emqx_gateway_coap).
 
 -include_lib("emqx/include/logger.hrl").
 -include_lib("emqx_gateway/include/emqx_gateway.hrl").

apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl

@@ -56,7 +56,7 @@
 all() -> emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
-    application:load(emqx_coap),
+    application:load(emqx_gateway_coap),
     ok = emqx_common_test_helpers:load_config(emqx_gateway_schema, ?CONF_DEFAULT),
     emqx_mgmt_api_test_util:init_suite([emqx_authn, emqx_gateway]),
     ok = meck:new(emqx_access_control, [passthrough, no_history, no_link]),

apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl

@@ -56,7 +56,7 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
-    application:load(emqx_coap),
+    application:load(emqx_gateway_coap),
     ok = emqx_common_test_helpers:load_config(emqx_gateway_schema, ?CONF_DEFAULT),
     emqx_mgmt_api_test_util:init_suite([emqx_authn, emqx_gateway]),
     Config.

apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src

@@ -1,4 +1,4 @@
-{application, emqx_exproto, [
+{application, emqx_gateway_exproto, [
     {description, "ExProto Gateway"},
     {vsn, "0.1.0"},
     {registered, []},

apps/emqx_gateway_exproto/src/emqx_gateway_exproto.erl

@@ -15,7 +15,7 @@
 %%--------------------------------------------------------------------
 
 %% @doc The ExProto Gateway implement
--module(emqx_exproto).
+-module(emqx_gateway_exproto).
 
 -include_lib("emqx/include/logger.hrl").
 -include_lib("emqx_gateway/include/emqx_gateway.hrl").

apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl

@@ -76,7 +76,7 @@ metrics() ->
     [tcp, ssl, udp, dtls].
 
 init_per_group(GrpName, Cfg) ->
-    application:load(emqx_exproto),
+    application:load(emqx_gateway_exproto),
     put(grpname, GrpName),
     Svrs = emqx_exproto_echo_svr:start(),
     emqx_common_test_helpers:start_apps([emqx_authn, emqx_gateway], fun set_special_cfg/1),

apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.app.src

@@ -1,8 +1,8 @@
-{application, emqx_lwm2m, [
+{application, emqx_gateway_lwm2m, [
     {description, "LwM2M Gateway"},
     {vsn, "0.1.0"},
     {registered, []},
-    {applications, [kernel, stdlib, emqx, emqx_gateway, emqx_coap]},
+    {applications, [kernel, stdlib, emqx, emqx_gateway, emqx_gateway_coap]},
     {env, []},
     {modules, []},
     {licenses, ["Apache 2.0"]},

apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.erl

@@ -15,7 +15,7 @@
 %%--------------------------------------------------------------------
 
 %% @doc The LwM2M Gateway implement
--module(emqx_lwm2m).
+-module(emqx_gateway_lwm2m).
 
 -include_lib("emqx/include/logger.hrl").
 -include_lib("emqx_gateway/include/emqx_gateway.hrl").

apps/emqx_gateway_lwm2m/src/emqx_lwm2m_channel.erl

@@ -18,7 +18,7 @@
 
 -include("emqx_lwm2m.hrl").
 -include_lib("emqx/include/logger.hrl").
--include_lib("emqx_coap/include/emqx_coap.hrl").
+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
 
 %% API
 -export([

apps/emqx_gateway_lwm2m/src/emqx_lwm2m_cmd.erl

@@ -18,7 +18,7 @@
 
 -include("emqx_lwm2m.hrl").
 -include_lib("emqx/include/logger.hrl").
--include_lib("emqx_coap/include/emqx_coap.hrl").
+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
 
 -export([
     mqtt_to_coap/2,

apps/emqx_gateway_lwm2m/src/emqx_lwm2m_session.erl

@@ -20,7 +20,7 @@
 -include_lib("emqx/include/emqx.hrl").
 -include_lib("emqx/include/emqx_mqtt.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
--include_lib("emqx_coap/include/emqx_coap.hrl").
+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
 
 %% API
 -export([

apps/emqx_gateway_lwm2m/test/emqx_lwm2m_SUITE.erl

@@ -32,7 +32,7 @@
 -define(LOGT(Format, Args), ct:pal("TEST_SUITE: " ++ Format, Args)).
 
 -include("emqx_lwm2m.hrl").
--include_lib("emqx_coap/include/emqx_coap.hrl").
+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
@@ -134,7 +134,7 @@ groups() ->
 init_per_suite(Config) ->
     %% load application first for minirest api searching
     application:load(emqx_gateway),
-    application:load(emqx_lwm2m),
+    application:load(emqx_gateway_lwm2m),
     emqx_mgmt_api_test_util:init_suite([emqx_conf, emqx_authn]),
     Config.
 
@@ -181,7 +181,7 @@ default_config(Overrides) ->
         [
             emqx_common_test_helpers:proj_root(),
             "apps",
-            "emqx_lwm2m",
+            "emqx_gateway_lwm2m",
             "lwm2m_xml"
         ]
     ),

apps/emqx_gateway_lwm2m/test/emqx_lwm2m_api_SUITE.erl

@@ -24,7 +24,7 @@
 -define(LOGT(Format, Args), ct:pal("TEST_SUITE: " ++ Format, Args)).
 
 -include("emqx_lwm2m.hrl").
--include("emqx_coap/include/emqx_coap.hrl").
+-include("emqx_gateway_coap/include/emqx_coap.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 
@@ -59,7 +59,7 @@ all() ->
 
 init_per_suite(Config) ->
     application:load(emqx_gateway),
-    application:load(emqx_lwm2m),
+    application:load(emqx_gateway_lwm2m),
     DefaultConfig = emqx_lwm2m_SUITE:default_config(),
     ok = emqx_common_test_helpers:load_config(emqx_gateway_schema, DefaultConfig),
     emqx_mgmt_api_test_util:init_suite([emqx_conf, emqx_authn]),

apps/emqx_gateway_lwm2m/test/emqx_tlv_SUITE.erl

@@ -22,7 +22,7 @@
 -define(LOGT(Format, Args), logger:debug("TEST_SUITE: " ++ Format, Args)).
 
 -include("emqx_lwm2m.hrl").
--include("emqx_coap/include/emqx_coap.hrl").
+-include("emqx_gateway_coap/include/emqx_coap.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 %%--------------------------------------------------------------------

apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.app.src

@@ -1,4 +1,4 @@
-{application, emqx_mqttsn, [
+{application, emqx_gateway_mqttsn, [
     {description, "MQTT-SN Gateway"},
     {vsn, "0.1.0"},
     {registered, []},

apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.erl

@@ -15,7 +15,7 @@
 %%--------------------------------------------------------------------
 
 %% @doc The MQTT-SN Gateway implement interface
--module(emqx_mqttsn).
+-module(emqx_gateway_mqttsn).
 
 -include_lib("emqx/include/logger.hrl").
 

apps/emqx_gateway_mqttsn/test/emqx_sn_protocol_SUITE.erl

@@ -97,7 +97,7 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
-    application:load(emqx_mqttsn),
+    application:load(emqx_gateway_mqttsn),
     ok = emqx_common_test_helpers:load_config(emqx_gateway_schema, ?CONF_DEFAULT),
     emqx_mgmt_api_test_util:init_suite([emqx_conf, emqx_authn, emqx_gateway]),
     Config.