summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluwenpeng <[email protected]>2024-10-18 10:50:22 +0800
committerluwenpeng <[email protected]>2024-10-18 10:50:22 +0800
commit5c1b881b95c50a846378811d510393976f89e560 (patch)
tree7b35308f3501f5e028a425ee7e88e05b7330c358
parent89a4a16713dada32cb4445ae62b64fe3e48be0d8 (diff)
TSG-22751 Revert: TRAFFICS_MIRROR_PROFILE -> TRAFFIC_MIRROR_PROFILEv4.10.3-20241018
-rw-r--r--plugin/business/traffic-mirror/src/entry.cpp6
-rw-r--r--resource/pangu/doh.json2
-rw-r--r--resource/pangu/pangu_http.json2
-rw-r--r--resource/pangu/table_info.conf2
-rw-r--r--resource/pangu/table_info_traffic_mirror.conf2
5 files changed, 7 insertions, 7 deletions
diff --git a/plugin/business/traffic-mirror/src/entry.cpp b/plugin/business/traffic-mirror/src/entry.cpp
index aa79d63..a292993 100644
--- a/plugin/business/traffic-mirror/src/entry.cpp
+++ b/plugin/business/traffic-mirror/src/entry.cpp
@@ -521,13 +521,13 @@ int traffic_mirror_init(struct tfe_proxy * proxy)
goto errout;
}
- result = maat_plugin_table_ex_schema_register(instance->maat_feather, "TRAFFICS_MIRROR_PROFILE",
+ result = maat_plugin_table_ex_schema_register(instance->maat_feather, "TRAFFIC_MIRROR_PROFILE",
profile_table_ex_data_new_cb, profile_table_ex_data_free_cb, profile_table_ex_data_dup_cb,
0, instance);
if (unlikely(result < 0))
{
- TFE_LOG_ERROR(instance->logger, "failed at Maat_plugin_EX_register(TRAFFICS_MIRROR_PROFILE)");
+ TFE_LOG_ERROR(instance->logger, "failed at Maat_plugin_EX_register(TRAFFIC_MIRROR_PROFILE)");
goto errout;
}
@@ -610,7 +610,7 @@ int traffic_mirror_on_open_cb(const struct tfe_stream * stream, unsigned int thr
if (policy_ex_data->is_profile_set)
{
uuid_unparse(policy_ex_data->profile_uuid, profile_uuid_str);
- profile_ex_data = (struct profile_table_ex_data *)maat_plugin_table_get_ex_data(instance->maat_feather, "TRAFFICS_MIRROR_PROFILE", (const char *)profile_uuid_str, strlen(profile_uuid_str));
+ profile_ex_data = (struct profile_table_ex_data *)maat_plugin_table_get_ex_data(instance->maat_feather, "TRAFFIC_MIRROR_PROFILE", (const char *)profile_uuid_str, strlen(profile_uuid_str));
if (!profile_ex_data)
{
TFE_LOG_ERROR(instance->logger, "failed at getting policy %s's profile, profile id = %s, "
diff --git a/resource/pangu/doh.json b/resource/pangu/doh.json
index 4e741c3..26b93cb 100644
--- a/resource/pangu/doh.json
+++ b/resource/pangu/doh.json
@@ -61,7 +61,7 @@
],
"plugin_table": [
{
- "table_name": "TRAFFICS_MIRROR_PROFILE",
+ "table_name": "TRAFFIC_MIRROR_PROFILE",
"table_content": [
{"uuid":"TRAFFIC0-MIRR-0000-0000-000000000001","vlan_ids":[1,2,3,4,5,6,7,8,9],"is_valid":1}
]
diff --git a/resource/pangu/pangu_http.json b/resource/pangu/pangu_http.json
index f2d48e0..a65e635 100644
--- a/resource/pangu/pangu_http.json
+++ b/resource/pangu/pangu_http.json
@@ -141,7 +141,7 @@
],
"plugin_table": [
{
- "table_name": "TRAFFICS_MIRROR_PROFILE",
+ "table_name": "TRAFFIC_MIRROR_PROFILE",
"table_content": [
{"uuid":"TRAFFIC0-MIRR-0000-0000-000000000001","vlan_ids":[1,2,3,4,5,6,7,8,9],"is_valid":1}
]
diff --git a/resource/pangu/table_info.conf b/resource/pangu/table_info.conf
index de0bad6..b2b28cb 100644
--- a/resource/pangu/table_info.conf
+++ b/resource/pangu/table_info.conf
@@ -144,7 +144,7 @@
},
{
"table_id":20,
- "table_name":"TRAFFICS_MIRROR_PROFILE",
+ "table_name":"TRAFFIC_MIRROR_PROFILE",
"table_type":"plugin",
"custom": {
"key_type":"pointer",
diff --git a/resource/pangu/table_info_traffic_mirror.conf b/resource/pangu/table_info_traffic_mirror.conf
index 0fb907d..3c984e3 100644
--- a/resource/pangu/table_info_traffic_mirror.conf
+++ b/resource/pangu/table_info_traffic_mirror.conf
@@ -10,7 +10,7 @@
},
{
"table_id":1,
- "table_name":"TRAFFICS_MIRROR_PROFILE",
+ "table_name":"TRAFFIC_MIRROR_PROFILE",
"table_type":"plugin",
"custom": {
"key_type":"pointer",