Remove file dependency

azurelinuxagent/common/protocol/hostplugin.py

@@ -77,6 +77,15 @@ def is_default_channel():
     def set_default_channel(is_default):
         HostPluginProtocol._is_default_channel = is_default
 
+    def update_container_id(self, new_container_id):
+        self.container_id = new_container_id
+
+    def update_role_config_name(self, new_role_config_name):
+        self.role_config_name = new_role_config_name
+
+    def update_manifest_uri(self, new_manifest_uri):
+        self.manifest_uri = new_manifest_uri
+
     def ensure_initialized(self):
         if not self.is_initialized:
             self.api_versions = self.get_api_versions()

azurelinuxagent/common/protocol/util.py

@@ -175,7 +175,7 @@ def get_wireserver_endpoint(self):
                     logger.info("WireServer endpoint {0} read from file", self.endpoint)
                     return self.endpoint
 
-                logger.error("[GetWireserverEndpoint] Unexpected empty file {0}: {1}", file_path, str(e))
+                logger.error("[GetWireserverEndpoint] Unexpected empty file {0}", file_path)
             except (IOError, OSError) as e:
                 logger.error("[GetWireserverEndpoint] Error reading file {0}: {1}", file_path, str(e))
         else:

azurelinuxagent/common/rdma.py

@@ -27,50 +27,21 @@
 import azurelinuxagent.common.logger as logger
 import azurelinuxagent.common.utils.fileutil as fileutil
 import azurelinuxagent.common.utils.shellutil as shellutil
-from azurelinuxagent.common.utils.textutil import parse_doc, find, getattrib
-
-
-from azurelinuxagent.common.protocol.wire import SHARED_CONF_FILE_NAME
 
 dapl_config_paths = [
     '/etc/dat.conf',
     '/etc/rdma/dat.conf',
     '/usr/local/etc/dat.conf'
 ]
 
-def setup_rdma_device(nd_version):
-    logger.verbose("Parsing SharedConfig XML contents for RDMA details")
-    xml_doc = parse_doc(
-        fileutil.read_file(os.path.join(conf.get_lib_dir(), SHARED_CONF_FILE_NAME)))
-    if xml_doc is None:
-        logger.error("Could not parse SharedConfig XML document")
-        return
-    instance_elem = find(xml_doc, "Instance")
-    if not instance_elem:
-        logger.error("Could not find <Instance> in SharedConfig document")
-        return
 
-    rdma_ipv4_addr = getattrib(instance_elem, "rdmaIPv4Address")
-    if not rdma_ipv4_addr:
-        logger.error(
-            "Could not find rdmaIPv4Address attribute on Instance element of SharedConfig.xml document")
+def setup_rdma_device(nd_version, shared_conf):
+    logger.verbose("Fetching SharedConfig contents for RDMA details")
+    if shared_conf.rdma_ipv4_addr is None or shared_conf.rdma_mac_addr is None:
         return
 
-    rdma_mac_addr = getattrib(instance_elem, "rdmaMacAddress")
-    if not rdma_mac_addr:
-        logger.error(
-            "Could not find rdmaMacAddress attribute on Instance element of SharedConfig.xml document")
-        return
-
-    # add colons to the MAC address (e.g. 00155D33FF1D ->
-    # 00:15:5D:33:FF:1D)
-    rdma_mac_addr = ':'.join([rdma_mac_addr[i:i+2]
-                              for i in range(0, len(rdma_mac_addr), 2)])
-    logger.info("Found RDMA details. IPv4={0} MAC={1}".format(
-        rdma_ipv4_addr, rdma_mac_addr))
-
     # Set up the RDMA device with collected informatino
-    RDMADeviceHandler(rdma_ipv4_addr, rdma_mac_addr, nd_version).start()
+    RDMADeviceHandler(shared_conf.rdma_ipv4_addr, shared_conf.rdma_mac_addr, nd_version).start()
     logger.info("RDMA: device is set up")
     return
 

azurelinuxagent/daemon/main.py

@@ -154,7 +154,7 @@ def daemon(self, child_args=None):
                     raise Exception("Attempt to setup RDMA without Wireserver")
                 protocol.client.update_goal_state(forced=True)
 
-                setup_rdma_device(nd_version)
+                setup_rdma_device(nd_version, protocol.client.get_shared_conf())
             except Exception as e:
                 logger.error("Error setting up rdma device: %s" % e)
         else:

azurelinuxagent/ga/monitor.py

@@ -153,6 +153,8 @@ def stop(self):
 
     def init_protocols(self):
         self.protocol = self.protocol_util.get_protocol()
+        # Update the GoalState first time to instantiate all required objects for the monitor thread
+        self.protocol.update_goal_state()
         self.health_service = HealthService(self.protocol.get_endpoint())
 
     def is_alive(self):

azurelinuxagent/ga/remoteaccess.py

@@ -28,7 +28,7 @@
 from datetime import datetime, timedelta
 
 from azurelinuxagent.common.event import add_event, WALAEventOperation
-from azurelinuxagent.common.exception import RemoteAccessError
+from azurelinuxagent.common.exception import RemoteAccessError, ProtocolError
 from azurelinuxagent.common.future import ustr
 from azurelinuxagent.common.utils.cryptutil import CryptUtil
 from azurelinuxagent.common.version import AGENT_NAME, CURRENT_VERSION
@@ -62,7 +62,12 @@ def run(self):
                 if self.incarnation != current_incarnation:
                     # something changed. Handle remote access if any.
                     self.incarnation = current_incarnation
-                    self.remote_access = self.protocol.client.get_remote_access()
+                    try:
+                        self.remote_access = self.protocol.client.get_remote_access()
+                    except ProtocolError as e:
+                        logger.warn(
+                            "Error when trying to initialize Remote Access, setting it to None. Error: {0}".format(e))
+                        self.remote_access = None
                     self.handle_remote_access()
         except Exception as e:
             msg = u"Exception processing remote access handler: {0} {1}".format(ustr(e), traceback.format_exc())

tests/ga/test_monitor.py

@@ -621,7 +621,7 @@ def test_collect_and_send_events_should_prepare_all_fields_for_all_event_files(s
                 # list.
 
                 # The container id value is obtained from the goal state and must be present in all telemetry events.
-                container_id_param = TelemetryEventParam("ContainerId", protocol.client.goal_state.container_id)
+                container_id_param = TelemetryEventParam("ContainerId", protocol.client.get_goal_state().container_id)
                 self.assertTrue(container_id_param in event.parameters)
 
                 # Same for GAVersion
@@ -850,18 +850,23 @@ def test_collect_and_send_with_call_wireserver_returns_http_error(self, mock_lib
 @patch('azurelinuxagent.common.osutil.get_osutil')
 @patch('azurelinuxagent.common.protocol.get_protocol_util')
 @patch("azurelinuxagent.common.protocol.healthservice.HealthService._report")
-@patch('azurelinuxagent.common.protocol.util.ProtocolUtil.get_protocol', return_value=WireProtocol('endpoint'))
 @patch("azurelinuxagent.common.utils.restutil.http_get")
 class TestExtensionMetricsDataTelemetry(AgentTestCase):
 
     def setUp(self):
         AgentTestCase.setUp(self)
         event.init_event_logger(os.path.join(self.tmp_dir, "events"))
         CGroupsTelemetry.reset()
+        clear_singleton_instances(ProtocolUtil)
+        protocol = WireProtocol('endpoint')
+        protocol.update_goal_state = MagicMock()
+        self.get_protocol = patch('azurelinuxagent.common.protocol.util.ProtocolUtil.get_protocol', return_value=protocol)
+        self.get_protocol.start()
 
     def tearDown(self):
         AgentTestCase.tearDown(self)
         CGroupsTelemetry.reset()
+        self.get_protocol.stop()
 
     @patch('azurelinuxagent.common.event.EventLogger.add_metric')
     @patch('azurelinuxagent.common.event.EventLogger.add_event')
@@ -1238,32 +1243,32 @@ def test_generate_extension_metrics_telemetry_dictionary(self, *args):
         self.assertEqual(message_json, None)
 
 
-@patch('azurelinuxagent.common.event.EventLogger.add_event')
 @patch("azurelinuxagent.common.utils.restutil.http_post")
-@patch("azurelinuxagent.common.utils.restutil.http_get")
 @patch('azurelinuxagent.common.protocol.wire.WireClient.get_goal_state')
-@patch('azurelinuxagent.common.protocol.util.ProtocolUtil.get_protocol', return_value=WireProtocol('endpoint'))
+@patch('azurelinuxagent.common.event.EventLogger.add_event')
+@patch("azurelinuxagent.common.utils.restutil.http_get")
 class TestMonitorFailure(AgentTestCase):
 
     @patch("azurelinuxagent.common.protocol.healthservice.HealthService.report_host_plugin_heartbeat")
-    def test_error_heartbeat_creates_no_signal(self, patch_report_heartbeat, *args):
-        patch_http_get = args[2]
-        patch_add_event = args[4]
+    def test_error_heartbeat_creates_no_signal(self, patch_report_heartbeat, patch_http_get, patch_add_event, *args):
 
         monitor_handler = get_monitor_handler()
-        monitor_handler.init_protocols()
-        monitor_handler.last_host_plugin_heartbeat = datetime.datetime.utcnow() - timedelta(hours=1)
+        protocol = WireProtocol('endpoint')
+        protocol.update_goal_state = MagicMock()
+        with patch('azurelinuxagent.common.protocol.util.ProtocolUtil.get_protocol', return_value=protocol):
+            monitor_handler.init_protocols()
+            monitor_handler.last_host_plugin_heartbeat = datetime.datetime.utcnow() - timedelta(hours=1)
 
-        patch_http_get.side_effect = IOError('client error')
-        monitor_handler.send_host_plugin_heartbeat()
+            patch_http_get.side_effect = IOError('client error')
+            monitor_handler.send_host_plugin_heartbeat()
 
-        # health report should not be made
-        self.assertEqual(0, patch_report_heartbeat.call_count)
+            # health report should not be made
+            self.assertEqual(0, patch_report_heartbeat.call_count)
 
-        # telemetry with failure details is sent
-        self.assertEqual(1, patch_add_event.call_count)
-        self.assertEqual('HostPluginHeartbeat', patch_add_event.call_args[1]['op'])
-        self.assertTrue('client error' in patch_add_event.call_args[1]['message'])
+            # telemetry with failure details is sent
+            self.assertEqual(1, patch_add_event.call_count)
+            self.assertEqual('HostPluginHeartbeat', patch_add_event.call_args[1]['op'])
+            self.assertTrue('client error' in patch_add_event.call_args[1]['message'])
 
-        self.assertEqual(False, patch_add_event.call_args[1]['is_success'])
-        monitor_handler.stop()
+            self.assertEqual(False, patch_add_event.call_args[1]['is_success'])
+            monitor_handler.stop()

tests/ga/test_remoteaccess.py

@@ -84,10 +84,10 @@ def test_update_remote_access_conf_remote_access(self, _1, _2, _3):
         protocol = WireProtocol('12.34.56.78')
         goal_state = protocol.client.get_goal_state()
         protocol.client.update_remote_access_conf(goal_state)
-        self.assertNotEquals(None, protocol.client.remote_access)
-        self.assertEquals(1, len(protocol.client.remote_access.user_list.users))
-        self.assertEquals('testAccount', protocol.client.remote_access.user_list.users[0].name)
-        self.assertEquals('encryptedPasswordString', protocol.client.remote_access.user_list.users[0].encrypted_password)
+        self.assertNotEquals(None, protocol.client.get_remote_access())
+        self.assertEquals(1, len(protocol.client.get_remote_access().user_list.users))
+        self.assertEquals('testAccount', protocol.client.get_remote_access().user_list.users[0].name)
+        self.assertEquals('encryptedPasswordString', protocol.client.get_remote_access().user_list.users[0].encrypted_password)
 
     def test_parse_bad_remote_access_data(self):
         data = "foobar"

tests/ga/test_update.py

@@ -1426,64 +1426,6 @@ def test_write_pid_file_ignores_exceptions(self):
                 self.assertEqual(0, len(pid_files))
                 self.assertEqual(None, pid_file)
 
-    @patch('azurelinuxagent.common.protocol.wire.WireClient.get_goal_state',
-           return_value=GoalState(load_data('wire/goal_state.xml')))
-    def test_package_filter_for_agent_manifest(self, _):
-
-        protocol = WireProtocol('12.34.56.78')
-        extension_config = ExtensionsConfig(load_data('wire/ext_conf.xml'))
-        agent_manifest = extension_config.vmagent_manifests.vmAgentManifests[0]
-
-        # has agent versions 13, 14
-        ga_manifest_1 = ExtensionManifest(load_data('wire/ga_manifest_1.xml'))
-
-        # has agent versions 13, 14, 15
-        ga_manifest_2 = ExtensionManifest(load_data('wire/ga_manifest_2.xml'))
-
-        goal_state = protocol.client.get_goal_state()
-        disk_cache = os.path.join(conf.get_lib_dir(),
-                                  AGENTS_MANIFEST_FILE_NAME.format(
-                                      agent_manifest.family,
-                                      goal_state.incarnation))
-
-        self.assertFalse(os.path.exists(disk_cache))
-        self.assertTrue(ga_manifest_1.allowed_versions is None)
-
-        with patch(
-                'azurelinuxagent.common.protocol.wire.WireClient'
-                '.get_gafamily_manifest',
-                return_value=ga_manifest_1):
-
-            pkg_list_1 = protocol.get_vmagent_pkgs(agent_manifest)
-            self.assertTrue(pkg_list_1 is not None)
-            self.assertTrue(len(pkg_list_1.versions) == 2)
-            self.assertTrue(pkg_list_1.versions[0].version == '2.2.13')
-            self.assertTrue(pkg_list_1.versions[0].uris[0].uri == 'url1_13')
-            self.assertTrue(pkg_list_1.versions[1].version == '2.2.14')
-            self.assertTrue(pkg_list_1.versions[1].uris[0].uri == 'url1_14')
-
-        self.assertTrue(os.path.exists(disk_cache))
-
-        with patch(
-                'azurelinuxagent.common.protocol.wire.WireClient'
-                '.get_gafamily_manifest',
-                return_value=ga_manifest_2):
-
-            pkg_list_2 = protocol.get_vmagent_pkgs(agent_manifest)
-            self.assertTrue(pkg_list_2 is not None)
-            self.assertTrue(len(pkg_list_2.versions) == 2)
-            self.assertTrue(pkg_list_2.versions[0].version == '2.2.13')
-            self.assertTrue(pkg_list_2.versions[0].uris[0].uri == 'url2_13')
-            self.assertTrue(pkg_list_2.versions[1].version == '2.2.14')
-            self.assertTrue(pkg_list_2.versions[1].uris[0].uri == 'url2_14')
-            # does not contain 2.2.15
-
-        self.assertTrue(os.path.exists(disk_cache))
-        self.assertTrue(ga_manifest_2.allowed_versions is not None)
-        self.assertTrue(len(ga_manifest_2.allowed_versions) == 2)
-        self.assertTrue(ga_manifest_2.allowed_versions[0] == '2.2.13')
-        self.assertTrue(ga_manifest_2.allowed_versions[1] == '2.2.14')
-
     @patch('azurelinuxagent.common.conf.get_extensions_enabled', return_value=False)
     def test_update_happens_when_extensions_disabled(self, _):
         """