Import patches-unapplied version 2.2.2-0ubuntu1 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 63d399807de30a64456e672063e7c20babf7aadc

New changelog entries:
  * New upstream release (LP: #1651128)
    - d/patches/fix-auto-update.patch,
      d/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch:
      - Dropped as changes have been applied upstream
    - Refreshed debian/patches/disable_import_test.patch

1 files changed, 96 insertions, 13 deletions

diff --git a/tests/protocol/test_hostplugin.py b/tests/protocol/test_hostplugin.py
index 65c8465..3b99050 100644
--- a/tests/protocol/test_hostplugin.py
+++ b/tests/protocol/test_hostplugin.py
@@ -15,23 +15,32 @@
 # Requires Python 2.4+ and Openssl 1.0+
 #
 
-from tests.tools import *
 import unittest
-import azurelinuxagent.common.protocol.wire as wire
+
 import azurelinuxagent.common.protocol.restapi as restapi
+import azurelinuxagent.common.protocol.wire as wire
+import azurelinuxagent.common.protocol.hostplugin as hostplugin
+from tests.protocol.mockwiredata import WireProtocolData, DATA_FILE
+from tests.tools import *
 
 wireserver_url = "168.63.129.16"
 sas_url = "http://sas_url"
+testtype = 'BlockBlob'
 api_versions = '["2015-09-01"]'
 
 
 class TestHostPlugin(AgentTestCase):
     def test_fallback(self):
-        with patch.object(wire.HostPluginProtocol,
-                          "put_vm_status") as patch_put:
-            with patch.object(wire.StatusBlob, "upload") as patch_upload:
-                patch_upload.return_value = False
+        """
+        Validate fallback to upload status using HostGAPlugin is happening when status reporting via
+        default method is unsuccessful
+        """
+        test_goal_state = wire.GoalState(WireProtocolData(DATA_FILE).goal_state)
+
+        with patch.object(wire.HostPluginProtocol, "put_vm_status") as patch_put:
+            with patch.object(wire.StatusBlob, "upload", return_value=False) as patch_upload:
                 wire_protocol_client = wire.WireProtocol(wireserver_url).client
+                wire_protocol_client.get_goal_state = Mock(return_value=test_goal_state)
                 wire_protocol_client.ext_conf = wire.ExtensionsConfig(None)
                 wire_protocol_client.ext_conf.status_upload_blob = sas_url
                 wire_protocol_client.upload_status_blob()
@@ -39,7 +48,43 @@ class TestHostPlugin(AgentTestCase):
                                 "Fallback was not engaged")
                 self.assertTrue(patch_put.call_args[0][1] == sas_url)
 
+    def test_validate_http_request(self):
+        """Validate correct set of data is sent to HostGAPlugin when reporting VM status"""
+        from azurelinuxagent.common.protocol.hostplugin import API_VERSION
+        from azurelinuxagent.common.utils import restutil
+        exp_method = 'PUT'
+        exp_url = 'http://{0}:32526/status'.format(wireserver_url)
+        exp_data = '{"content": "eyJkdW1teSI6ICJkYXRhIn0=", "headers": [{"headerName": ' \
+                   '"x-ms-version", "headerValue": "2014-02-14"}, ' \
+                   '{"headerName": "x-ms-blob-type", "headerValue": "BlockBlob"}], ' \
+                   '"requestUri": "http://sas_url"}'
+        test_goal_state = wire.GoalState(WireProtocolData(DATA_FILE).goal_state)
+
+        with patch.object(restutil, "http_request") as patch_http:
+            wire_protocol_client = wire.WireProtocol(wireserver_url).client
+            wire_protocol_client.get_goal_state = Mock(return_value=test_goal_state)
+            plugin = wire_protocol_client.get_host_plugin()
+            blob = wire_protocol_client.status_blob
+            blob.vm_status = restapi.VMStatus()
+            blob.data = '{"dummy": "data"}'
+            with patch.object(plugin, 'get_api_versions') as patch_api:
+                patch_api.return_value = API_VERSION
+                plugin.put_vm_status(blob, sas_url, testtype)
+                self.assertTrue(patch_http.call_count == 1)
+                self.assertTrue(patch_http.call_args[0][0] == exp_method)
+                self.assertTrue(patch_http.call_args[0][1] == exp_url)
+                self.assertTrue(patch_http.call_args[0][2] == exp_data)
+
+                # Assert headers
+                headers = patch_http.call_args[1]['headers']
+                self.assertEqual(headers['x-ms-containerid'], test_goal_state.container_id)
+                self.assertEqual(headers['x-ms-host-config-name'], test_goal_state.role_config_name)
+
     def test_no_fallback(self):
+        """
+        Validate fallback to upload status using HostGAPlugin is not happening when status reporting via
+        default method is successful
+        """
         with patch.object(wire.HostPluginProtocol,
                           "put_vm_status") as patch_put:
             with patch.object(wire.StatusBlob, "upload") as patch_upload:
@@ -51,21 +96,29 @@ class TestHostPlugin(AgentTestCase):
                 self.assertTrue(patch_put.call_count == 0,
                                 "Fallback was engaged")
 
-    def test_init_put(self):
+    def test_validate_http_put(self):
+        """Validate correct set of data is sent to HostGAPlugin when reporting VM status"""
+        test_goal_state = wire.GoalState(WireProtocolData(DATA_FILE).goal_state)
         expected_url = "http://168.63.129.16:32526/status"
-        expected_headers = {'x-ms-version': '2015-09-01'}
-        expected_content = '{"content": "b2s=", ' \
+        expected_headers = {'x-ms-version': '2015-09-01',
+                            "Content-type": "application/json",
+                            "x-ms-containerid": test_goal_state.container_id,
+                            "x-ms-host-config-name": test_goal_state.role_config_name}
+        expected_content = '{"content": "eyJkdW1teSI6ICJkYXRhIn0=", ' \
                            '"headers": [{"headerName": "x-ms-version", ' \
                            '"headerValue": "2014-02-14"}, ' \
                            '{"headerName": "x-ms-blob-type", "headerValue": ' \
                            '"BlockBlob"}], ' \
                            '"requestUri": "http://sas_url"}'
 
-        host_client = wire.HostPluginProtocol(wireserver_url)
+        host_client = wire.HostPluginProtocol(wireserver_url,
+                                              test_goal_state.container_id,
+                                              test_goal_state.role_config_name)
         self.assertFalse(host_client.is_initialized)
         self.assertTrue(host_client.api_versions is None)
         status_blob = wire.StatusBlob(None)
-        status_blob.vm_status = "ok"
+        status_blob.vm_status = restapi.VMStatus()
+        status_blob.data = '{"dummy": "data"}'
         status_blob.type = "BlockBlob"
         with patch.object(wire.HostPluginProtocol,
                           "get_api_versions") as patch_get:
@@ -77,9 +130,39 @@ class TestHostPlugin(AgentTestCase):
                 self.assertFalse(host_client.api_versions is None)
                 self.assertTrue(patch_put.call_count == 1)
                 self.assertTrue(patch_put.call_args[0][0] == expected_url)
-                self.assertTrue(patch_put.call_args[0][1] == expected_content)
-                self.assertTrue(patch_put.call_args[0][2] == expected_headers)
+                self.assertTrue(patch_put.call_args[1]['data'] == expected_content)
+                self.assertTrue(patch_put.call_args[1]['headers'] == expected_headers)
+
+    def test_validate_get_extension_artifacts(self):
+        test_goal_state = wire.GoalState(WireProtocolData(DATA_FILE).goal_state)
+        expected_url = hostplugin.URI_FORMAT_GET_EXTENSION_ARTIFACT.format(wireserver_url, hostplugin.HOST_PLUGIN_PORT)
+        expected_headers = {'x-ms-version': '2015-09-01',
+                            "x-ms-containerid": test_goal_state.container_id,
+                            "x-ms-host-config-name": test_goal_state.role_config_name,
+                            "x-ms-artifact-location": sas_url}
+
+        host_client = wire.HostPluginProtocol(wireserver_url,
+                                              test_goal_state.container_id,
+                                              test_goal_state.role_config_name)
+        self.assertFalse(host_client.is_initialized)
+        self.assertTrue(host_client.api_versions is None)
+
+        with patch.object(wire.HostPluginProtocol, "get_api_versions", return_value=api_versions) as patch_get:
+            actual_url, actual_headers = host_client.get_artifact_request(sas_url)
+            self.assertTrue(host_client.is_initialized)
+            self.assertFalse(host_client.api_versions is None)
+            self.assertEqual(expected_url, actual_url)
+            for k in expected_headers:
+                self.assertTrue(k in actual_headers)
+                self.assertEqual(expected_headers[k], actual_headers[k])
+
+class MockResponse:
+    def __init__(self, body, status_code):
+        self.body = body
+        self.status = status_code
 
+    def read(self):
+        return self.body
 
 if __name__ == '__main__':
     unittest.main()