From 1f3e9b82acf881df2f43846251f101bbeeb48738 Mon Sep 17 00:00:00 2001
From: Yang Sun <sunytt@google.com>
Date: Wed, 28 Aug 2024 09:18:40 +0000
Subject: [PATCH] [telemetry] remove uploading epskc_state and
 border_agent_state

---
 src/proto/thread_telemetry.proto | 15 +--------------
 src/utils/thread_helper.cpp      | 21 ---------------------
 tests/dbus/test_dbus_client.cpp  |  2 --
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/proto/thread_telemetry.proto b/src/proto/thread_telemetry.proto
index f36c5269a07..f8ef9f4f51c 100644
--- a/src/proto/thread_telemetry.proto
+++ b/src/proto/thread_telemetry.proto
@@ -513,13 +513,6 @@ message TelemetryData {
     optional bool has_others_route_added = 3;
   }
 
-  enum BorderAgentState {
-    BORDER_AGENT_STATE_UNSPECIFIED = 0;
-    BORDER_AGENT_STATE_STOPPED = 1;
-    BORDER_AGENT_STATE_STARTED = 2;
-    BORDER_AGENT_STATE_ACTIVE = 3;
-  }
-
   message BorderAgentCounters {
     // The number of ePSKc activations
     optional uint32 epskc_activations = 1;
@@ -571,14 +564,8 @@ message TelemetryData {
   }
 
   message BorderAgentInfo {
-    // The border agent state
-    optional BorderAgentState border_agent_state = 1;
-
-    // The ePSKc active state
-    optional bool epskc_is_active = 2;
-
     // The border agent counters
-    optional BorderAgentCounters border_agent_counters = 3;
+    optional BorderAgentCounters border_agent_counters = 1;
   }
 
   message WpanBorderRouter {
diff --git a/src/utils/thread_helper.cpp b/src/utils/thread_helper.cpp
index 8278fcfc445..b7b62163fad 100644
--- a/src/utils/thread_helper.cpp
+++ b/src/utils/thread_helper.cpp
@@ -225,24 +225,6 @@ void CopyMdnsResponseCounters(const MdnsResponseCounters &from, threadnetwork::T
     to->set_aborted_count(from.mAborted);
     to->set_invalid_state_count(from.mInvalidState);
 }
-
-#if OTBR_ENABLE_BORDER_AGENT
-threadnetwork::TelemetryData_BorderAgentState BorderAgentStateFromOtBorderAgentState(
-    otBorderAgentState aBorderAgentState)
-{
-    switch (aBorderAgentState)
-    {
-    case OT_BORDER_AGENT_STATE_STOPPED:
-        return threadnetwork::TelemetryData::BORDER_AGENT_STATE_STOPPED;
-    case OT_BORDER_AGENT_STATE_STARTED:
-        return threadnetwork::TelemetryData::BORDER_AGENT_STATE_STARTED;
-    case OT_BORDER_AGENT_STATE_ACTIVE:
-        return threadnetwork::TelemetryData::BORDER_AGENT_STATE_ACTIVE;
-    default:
-        return threadnetwork::TelemetryData::BORDER_AGENT_STATE_UNSPECIFIED;
-    }
-}
-#endif // OTBR_ENABLE_BORDER_AGENT
 #endif // OTBR_ENABLE_TELEMETRY_DATA_API
 } // namespace
 
@@ -1084,9 +1066,6 @@ void ThreadHelper::RetrieveBorderAgentInfo(threadnetwork::TelemetryData::BorderA
     auto baCounters            = aBorderAgentInfo->mutable_border_agent_counters();
     auto otBorderAgentCounters = *otBorderAgentGetCounters(mInstance);
 
-    aBorderAgentInfo->set_border_agent_state(BorderAgentStateFromOtBorderAgentState(otBorderAgentGetState(mInstance)));
-    aBorderAgentInfo->set_epskc_is_active(otBorderAgentIsEphemeralKeyActive(mInstance));
-
     baCounters->set_epskc_activations(otBorderAgentCounters.mEpskcActivations);
     baCounters->set_epskc_deactivation_clears(otBorderAgentCounters.mEpskcDeactivationClears);
     baCounters->set_epskc_deactivation_timeouts(otBorderAgentCounters.mEpskcDeactivationTimeouts);
diff --git a/tests/dbus/test_dbus_client.cpp b/tests/dbus/test_dbus_client.cpp
index 7f8eedb910a..eef54162058 100644
--- a/tests/dbus/test_dbus_client.cpp
+++ b/tests/dbus/test_dbus_client.cpp
@@ -275,8 +275,6 @@ void CheckEphemeralKey(ThreadApiDBus *aApi)
 
 void CheckBorderAgentInfo(const threadnetwork::TelemetryData_BorderAgentInfo &aBorderAgentInfo)
 {
-    TEST_ASSERT(aBorderAgentInfo.border_agent_state() == threadnetwork::TelemetryData::BORDER_AGENT_STATE_STARTED);
-    TEST_ASSERT(aBorderAgentInfo.epskc_is_active() == false);
     TEST_ASSERT(aBorderAgentInfo.border_agent_counters().epskc_activations() == 0);
     TEST_ASSERT(aBorderAgentInfo.border_agent_counters().epskc_deactivation_clears() == 0);
     TEST_ASSERT(aBorderAgentInfo.border_agent_counters().epskc_deactivation_timeouts() == 0);