addressed comment

azurelinuxagent/ga/agent_update_handler.py

@@ -305,7 +305,7 @@ def run(self, goal_state):
                 if not self.__should_agent_attempt_manifest_download():
                     return
                 if conf.get_enable_ga_versioning():  # log the warning only when ga versioning is enabled
-                    # Need to revisit this msg when version is missing in Goal state. We may need to handle better way to report the error
+                    # TODO: Need to revisit this msg when version is missing in Goal state. We may need to handle better way to report the error
                     warn_msg = "Missing requested version in agent family: {0} for incarnation: {1}, fallback to largest version update".format(self._ga_family, self._gs_id)
                     GAUpdateReportState.report_error_msg = warn_msg
                 agent_manifest = goal_state.fetch_agent_manifest(agent_family.name, agent_family.uris)
@@ -342,8 +342,9 @@ def run(self, goal_state):
                 raise AgentUpdateError("The Agent received a request to downgrade to version {0}, but downgrading to a version less than "
                                        "the Agent installed on the image ({1}) is not supported. Skipping downgrade.".format(requested_version, daemon_version))
 
-            msg = "Goal state {0} is requesting a new agent version {1} [IsRSMUpdate:{2}], will update the agent before processing the goal state.".format(
-                self._gs_id, str(requested_version), self._is_requested_version_update)
+            # Todo: Need to update the message when we fix RSM stuff
+            msg = "Self-update discovered new agent version:{0} in agent manifest for goal state {1}, will update the agent before processing the goal state.".format(
+                str(requested_version), self._gs_id)
             self.__log_event(LogLevel.INFO, msg)
 
             agent = self.__download_and_get_agent(goal_state, agent_family, agent_manifest, requested_version)

tests/ga/test_agent_update_handler.py

@@ -77,7 +77,7 @@ def __assert_agent_directories_exist_and_others_dont_exist(self, versions):
 
     def __assert_agent_requested_version_in_goal_state(self, mock_telemetry, inc=1, version="9.9.9.10"):
         upgrade_event_msgs = [kwarg['message'] for _, kwarg in mock_telemetry.call_args_list if
-                              'Goal state incarnation_{0} is requesting a new agent version {1}'.format(inc, version) in kwarg['message'] and kwarg[
+                              'discovered new agent version:{0} in agent manifest for goal state incarnation_{1}'.format(version, inc) in kwarg['message'] and kwarg[
                                   'op'] == WALAEventOperation.AgentUpgrade]
         self.assertEqual(1, len(upgrade_event_msgs),
                          "Did not find the event indicating that the agent requested version found. Got: {0}".format(

tests/ga/test_update.py

@@ -1593,7 +1593,7 @@ def test_it_should_not_update_if_requested_version_not_found_in_manifest(self):
                       kwarg['op'] in (WALAEventOperation.AgentUpgrade, WALAEventOperation.Download)]
         # This will throw if corresponding message not found so not asserting on that
         requested_version_found = next(kwarg for kwarg in agent_msgs if
-                                       "Goal state incarnation_1 is requesting a new agent version 5.2.1.0 [IsRSMUpdate:True], will update the agent before processing the goal state" in kwarg['message'])
+                                       "discovered new agent version:5.2.1.0 in agent manifest for goal state incarnation_1, will update the agent before processing the goal state" in kwarg['message'])
         self.assertTrue(requested_version_found['is_success'],
                         "The requested version found op should be reported as a success")