Rename fetch_correlation_id to hostga_plugin_correlation_id (Azure#2526)

* Rename fetch_correlation_id to hostga_plugin_correlation_id

* Rename variable

Co-authored-by: narrieta <narrieta>

azurelinuxagent/common/protocol/extensions_goal_state_from_vm_settings.py

@@ -37,7 +37,7 @@ def __init__(self, etag, json_text, correlation_id):
  self._id = "etag_{0}".format(etag)
  self._etag = etag
  self._svd_sequence_number = 0
- self._fetch_correlation_id = correlation_id
+ self._hostga_plugin_correlation_id = correlation_id
  self._text = json_text
  self._host_ga_plugin_version = FlexibleVersion('0.0.0.0')
  self._schema_version = FlexibleVersion('0.0.0.0')
@@ -93,11 +93,11 @@ def correlation_id(self):
  return self._correlation_id
 
  @property
- def fetch_correlation_id(self):
+ def hostga_plugin_correlation_id(self):
  """
- The correlation id for the fetch operation (i.e. the call to the HostGAPlugin vmSettings API)
+ The correlation id for the call to the HostGAPlugin vmSettings API
  """
- return self._fetch_correlation_id
+ return self._hostga_plugin_correlation_id
 
  @property
  def created_on_timestamp(self):

azurelinuxagent/common/protocol/goal_state.py

@@ -145,7 +145,7 @@ def update(self, force_update=False):
  timestamp = create_timestamp()
  vm_settings, vm_settings_updated = self._fetch_vm_settings(force_update=force_update)
  if vm_settings_updated:
- logger.info("Fetched new vmSettings [correlation ID: {0} eTag: {1} source: {2}]", vm_settings.fetch_correlation_id, vm_settings.etag, vm_settings.source)
+ logger.info("Fetched new vmSettings [HostGAPlugin correlation ID: {0} eTag: {1} source: {2}]", vm_settings.hostga_plugin_correlation_id, vm_settings.etag, vm_settings.source)
  self._history = GoalStateHistory(timestamp, vm_settings.etag)
  self._extensions_goal_state = vm_settings
  self._history.save_vm_settings(vm_settings.get_redacted_text())
@@ -246,7 +246,7 @@ def _fetch_extended_goal_state(self, xml_text, xml_doc, force_vm_settings_update
 
  if vm_settings is not None:
  new = " new " if vm_settings_updated else " "
- logger.info("Fetched{0}vmSettings [correlation ID: {1} eTag: {2} source: {3}]", new, vm_settings.fetch_correlation_id, vm_settings.etag, vm_settings.source)
+ logger.info("Fetched{0}vmSettings [HostGAPlugin correlation ID: {1} eTag: {2} source: {3}]", new, vm_settings.hostga_plugin_correlation_id, vm_settings.etag, vm_settings.source)
  self._extensions_goal_state = vm_settings
  if vm_settings_updated:
  self._history.save_vm_settings(vm_settings.get_redacted_text())