RDKEMW-11471: getNetStatus update and legacy remote ids

Reason for change:
Test Procedure:
Risks:
Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

Author: klu339

src/ble/ctrlm_ble_network.cpp

@@ -2463,14 +2463,15 @@ void ctrlm_obj_network_ble_t::controllers_load() {
          XLOGD_WARN("deleting legacy IR controller object");
          add_controller->db_destroy();
          delete add_controller;
-      } else if (id < BLE_RCU_ID_RANGE_MIN || id > BLE_RCU_ID_RANGE_MAX) {
-          XLOGD_WARN("Deleting legacy controller id <%d> entry - will update on re-connect", id);
-         add_controller->db_destroy();
-         delete add_controller;
-      } else {
-         XLOGD_INFO("adding BLE controller with ID = 0x%X", id);
-         controllers_[id] = add_controller;
+         continue;
+      }
+      if (id < BLE_RCU_ID_RANGE_MIN || id > BLE_RCU_ID_RANGE_MAX) {
+         XLOGD_WARN("Legacy BLE RCU controller id <%d> found - updating controller id", id);
+         id = controller_id_assign();
+         add_controller->controller_id_set(id);
       }
+      XLOGD_INFO("adding BLE controller with ID = 0x%X", id);
+      controllers_[id] = add_controller;
    }
 }
 

src/ctrlm_controller.cpp

@@ -410,3 +410,7 @@ uint8_t ctrlm_obj_controller_t::get_upgrade_increment() const {
 bool ctrlm_obj_controller_t::is_upgrade_progress_at_increment() const {
     return ((upgrade_progress_ % upgrade_increment_ == 0) || (upgrade_progress_ == 100));
 }
+
+void ctrlm_obj_controller_t::controller_id_set(ctrlm_controller_id_t id) {
+    controller_id_ = id;
+}

src/ctrlm_controller.h

@@ -59,6 +59,7 @@ class ctrlm_obj_controller_t
    std::string             get_irdb_entry_id_name_avr() const;
 
    ctrlm_controller_id_t   controller_id_get() const;
+   void                    controller_id_set(ctrlm_controller_id_t id);
    ctrlm_network_id_t      network_id_get() const;
    std::string             device_id_get() const;
    std::string             service_account_id_get() const;

src/ipc/ctrlm_rcp_ipc_event.cpp

@@ -135,14 +135,14 @@ void ctrlm_rcp_ipc_net_status_t::populate_status(const ctrlm_obj_network_t &netw
     }
 }
 
-const char *ctrlm_rcp_ipc_net_status_t::get_ir_prog_state(void)
+ctrlm_ir_state_t ctrlm_rcp_ipc_net_status_t::get_ir_prog_state(void)
 {
-    return ctrlm_ir_state_str(irdb_state_);
+    return irdb_state_;
 }
 
-const char *ctrlm_rcp_ipc_net_status_t::get_rf_pair_state(void)
+ctrlm_rf_pair_state_t ctrlm_rcp_ipc_net_status_t::get_rf_pair_state(void)
 {
-    return ctrlm_rf_pair_state_str(pair_state_);
+    return pair_state_;
 }
 
 void ctrlm_rcp_ipc_net_status_t::get_controller_status_list(std::vector<ctrlm_rcp_ipc_controller_status_t> &list)

src/ipc/ctrlm_rcp_ipc_event.h

@@ -119,10 +119,10 @@ class ctrlm_rcp_ipc_net_status_t : public ctrlm_virtual_json_t
     void                 set_net_id(ctrlm_network_id_t net_id)       { net_id_ = net_id; }
     ctrlm_network_type_t get_type() const                            { return net_type_; }
 
-    void        populate_status(const ctrlm_obj_network_t &network);
-    const char *get_ir_prog_state(void);
-    const char *get_rf_pair_state(void);
-    void        get_controller_status_list(std::vector<ctrlm_rcp_ipc_controller_status_t> &list);
+    void                  populate_status(const ctrlm_obj_network_t &network);
+    ctrlm_ir_state_t      get_ir_prog_state(void);
+    ctrlm_rf_pair_state_t get_rf_pair_state(void);
+    void                  get_controller_status_list(std::vector<ctrlm_rcp_ipc_controller_status_t> &list);
 
 private:
     uint8_t                  api_revision_   = 0;

src/ipc/ctrlm_rcp_ipc_iarm_thunder.cpp

@@ -410,32 +410,40 @@ IARM_Result_t ctrlm_rcp_ipc_iarm_thunder_t::get_net_status(void *arg)
     json_t *status             = json_object();
     json_t *net_type_supported = json_array();
     json_t *remote_array       = json_array();
+
     std::map<ctrlm_network_id_t, ctrlm_rcp_ipc_net_status_t> status_map = params->get_reply();
     std::vector<ctrlm_rcp_ipc_controller_status_t> remotes;
-    std::string ir_prog_state, rf_pair_state;
+
+    ctrlm_network_type_t  type = CTRLM_NETWORK_TYPE_INVALID;
+    ctrlm_ir_state_t      ir_prog_state = CTRLM_IR_STATE_UNKNOWN;
+    ctrlm_rf_pair_state_t rf_pair_state = CTRLM_RF_PAIR_STATE_UNKNOWN;
     int err = 0;
 
     for (auto const &it : ctrlm_network_types_get()) {
         err |= json_array_append_new(net_type_supported, json_integer(it));
     }
-
     for (auto &it : status_map) {
-        if (it.second.get_type() == CTRLM_NETWORK_TYPE_BLUETOOTH_LE) {
-            ir_prog_state = it.second.get_ir_prog_state();
-        }
-        rf_pair_state = it.second.get_rf_pair_state();
         it.second.get_controller_status_list(remotes);
     }
-
     for (auto remote : remotes) {
         err |= json_array_append_new(remote_array, remote.to_json());
     }
+    // For now default to RF4CE network reporting if available
+    for (auto &it : status_map) {
+        ir_prog_state = it.second.get_ir_prog_state();
+        rf_pair_state = it.second.get_rf_pair_state();
+        type          = it.second.get_type();
+
+        if (type == CTRLM_NETWORK_TYPE_RF4CE) {
+            break;
+        }
+    }
 
     err |= json_object_set_new_nocheck(status, REMOTE_DATA,         remote_array);
     err |= json_object_set_new_nocheck(status, NET_TYPES_SUPPORTED, net_type_supported);
-    err |= json_object_set_new_nocheck(status, NET_TYPE,            json_integer(0)); // TODO
-    err |= json_object_set_new_nocheck(status, PAIRING_STATE,       json_string(ir_prog_state.c_str())); // TODO
-    err |= json_object_set_new_nocheck(status, IR_PROG_STATE,       json_string(rf_pair_state.c_str()));
+    err |= json_object_set_new_nocheck(status, NET_TYPE,            json_integer(type));
+    err |= json_object_set_new_nocheck(status, IR_PROG_STATE,       json_string(ctrlm_ir_state_str(ir_prog_state)));
+    err |= json_object_set_new_nocheck(status, PAIRING_STATE,       json_string(ctrlm_rf_pair_state_str(rf_pair_state)));
 
     err |= json_object_set_new_nocheck(ret, STATUS, status);
     err |= json_object_set_new_nocheck(ret, SUCCESS, json_boolean(params->get_result()));