🎈 perf(DPISDN-5): 修改etherfabric、vwire配置项名称v4.6.20-20230330

修改etherfabric、vwire配置项名称

3 files changed, 8 insertions, 9 deletions

diff --git a/service/src/node_classifier.c b/service/src/node_classifier.c
index 0095ddd..0c4f253 100644
--- a/service/src/node_classifier.c
+++ b/service/src/node_classifier.c
@@ -2163,7 +2163,6 @@ int parser_classifier_rule_local(struct sc_main * sc, struct classifier_manageme
     for (int rule_index = 0; rule_index < MAX_RULE_NUM; rule_index++)
     {
         struct rule_parse rule_parse = {};
-
         rule_parse.src_ip_addr_v4.s_addr = MR_CLASSIFIER_DEFAULT_IP_ADDR_V4;
         rule_parse.dst_ip_addr_v4.s_addr = MR_CLASSIFIER_DEFAULT_IP_ADDR_V4;
         rule_parse.proto = MR_CLASSIFIER_DEFAULT_PROTO_ANY;
diff --git a/service/src/node_etherfabric.c b/service/src/node_etherfabric.c
index 0c39b79..04a23c1 100644
--- a/service/src/node_etherfabric.c
+++ b/service/src/node_etherfabric.c
@@ -148,7 +148,7 @@ int parser_etherfabric_service_conf(struct sc_main * sc, struct etherfabric_mana
     uint32_t sid_range_start = 0, sid_range_end = 0, nr_sid = 0;
 
     /* Get sid range start */
-    ret = MESA_load_profile_uint_nodef(sc->local_cfgfile, "service_etherfabric", "sid_range_start", &sid_range_start);
+    ret = MESA_load_profile_uint_nodef(sc->local_cfgfile, "etherfabric_adapters", "sid_range_start", &sid_range_start);
     if (ret < 0)
     {
         MR_ERROR("Service etherfabric no config 'sid_range_start' .");
@@ -156,7 +156,7 @@ int parser_etherfabric_service_conf(struct sc_main * sc, struct etherfabric_mana
     }
 
     /* Get sid range end */
-    ret = MESA_load_profile_uint_nodef(sc->local_cfgfile, "service_etherfabric", "sid_range_end", &sid_range_end);
+    ret = MESA_load_profile_uint_nodef(sc->local_cfgfile, "etherfabric_adapters", "sid_range_end", &sid_range_end);
     if (ret < 0)
     {
         MR_ERROR("Service etherfabric no config 'sid_range_end' .");
@@ -181,7 +181,7 @@ int parser_etherfabric_service_conf(struct sc_main * sc, struct etherfabric_mana
     for (int index = 0; index < g_ef_max_entry; index++)
     {
         char str_conf_section[MR_STRING_MAX] = {};
-        snprintf(str_conf_section, sizeof(str_conf_section), "service_etherfabric:%d", index);
+        snprintf(str_conf_section, sizeof(str_conf_section), "etherfabric_adapter:%d", index);
 
         /* Get rule mode */
         char str_mode[MR_STRING_MAX] = {};
@@ -311,7 +311,7 @@ void dump_etherfabric_service_config(struct etherfabric_management * etherfabric
 int etherfabric_init(struct sc_main * sc)
 {
     /* Get ef max entry,default is 256 */
-    MESA_load_profile_uint_def(sc->local_cfgfile, "service_etherfabric", "max_rules", &g_ef_max_entry, 256);
+    MESA_load_profile_uint_def(sc->local_cfgfile, "etherfabric_adapters", "max_rules", &g_ef_max_entry, 256);
 
     /* Malloc etherfabric main */
     struct node_etherfabric_main * _etherfabric_main = ZMALLOC(sizeof(struct node_etherfabric_main));
diff --git a/service/src/node_vwire.c b/service/src/node_vwire.c
index f8018a0..45d93f7 100644
--- a/service/src/node_vwire.c
+++ b/service/src/node_vwire.c
@@ -359,7 +359,7 @@ int vwire_init(struct sc_main * sc)
     uint32_t sid_range_start = 0, sid_range_end = 0, nr_sid = 0;
 
     /* Get ef max entry,default is 256 */
-    MESA_load_profile_uint_def(sc->local_cfgfile, "service_vwire", "max_rules", &g_vwire_max_entry, 256);
+    MESA_load_profile_uint_def(sc->local_cfgfile, "vwires", "max_rules", &g_vwire_max_entry, 256);
     struct vwire_node_main * vwire_node_main = ZMALLOC(sizeof(struct vwire_node_main));
     MR_VERIFY_MALLOC(vwire_node_main);
 
@@ -369,7 +369,7 @@ int vwire_init(struct sc_main * sc)
     p_vwire_node_main = vwire_node_main;
 
     /* Get sid range start */
-    ret = MESA_load_profile_uint_nodef(sc->local_cfgfile, "service_vwire", "sid_range_start", &sid_range_start);
+    ret = MESA_load_profile_uint_nodef(sc->local_cfgfile, "vwires", "sid_range_start", &sid_range_start);
     if (ret < 0)
     {
         MR_ERROR("Service Vwire No config 'sid_range_start' .");
@@ -377,7 +377,7 @@ int vwire_init(struct sc_main * sc)
     }
 
     /* Get sid range end */
-    ret = MESA_load_profile_uint_nodef(sc->local_cfgfile, "service_vwire", "sid_range_end", &sid_range_end);
+    ret = MESA_load_profile_uint_nodef(sc->local_cfgfile, "vwires", "sid_range_end", &sid_range_end);
     if (ret < 0)
     {
         MR_ERROR("Service Vwire No config 'sid_range_end' .");
@@ -402,7 +402,7 @@ int vwire_init(struct sc_main * sc)
     for (unsigned int i = 0; i < g_vwire_max_entry; i++)
     {
         char sec_symbol[MR_SYMBOL_MAX] = {0};
-        snprintf(sec_symbol, sizeof(sec_symbol) - 1, "vwire_group:%u", i);
+        snprintf(sec_symbol, sizeof(sec_symbol) - 1, "vwire:%u", i);
 
         char str_int_dev[MR_SYMBOL_MAX] = {0};
         ret = MESA_load_profile_string_nodef(sc->local_cfgfile, sec_symbol, "interface_int", str_int_dev,