Merge pull request #2109 from FedML-AI/alexleung/dev_v070_for_refactor

Alexleung/dev v070 for refactor

Author: fedml-alex

python/fedml/computing/scheduler/master/base_master_protocol_manager.py

@@ -448,7 +448,7 @@ def response_device_info_to_mlops(self, topic, payload):
         response_topic = f"deploy/master_agent/mlops/response_device_info"
         if self.mlops_metrics is not None:
             response_payload = {"run_id": self.run_id, "master_agent_device_id": self.edge_id,
-                                "fedml_version": fedml.__version__}
+                                "fedml_version": fedml.__version__, "edge_id": self.edge_id}
             self.mlops_metrics.report_json_message(response_topic, json.dumps(response_payload))
 
     def init_job_task(self, request_json):

python/fedml/computing/scheduler/slave/base_slave_protocol_manager.py

@@ -414,7 +414,7 @@ def callback_request_device_info_from_mlops(self, topic, payload):
     def response_device_info_to_mlops(self, topic, payload):
         response_topic = f"deploy/slave_agent/mlops/response_device_info"
         response_payload = {"run_id": self.run_id, "slave_agent_device_id": self.edge_id,
-                            "fedml_version": fedml.__version__}
+                            "fedml_version": fedml.__version__, "edge_id": self.edge_id}
         self.message_center.send_message(response_topic, json.dumps(response_payload))
 
     def callback_client_logout(self, topic, payload):