Merge lp:~newell-jensen/maas/fix-1667754 into lp:~maas-committers/maas/trunk

[Newell Jensen]

Add work around for 404 error from RSD PODM when trying to decompose a resource that has already been decomposed.

At some point in the future we will need to re-implement how we handle this from the region.

[Blake Rouse (blake-rouse)]

Looks good. Just two comments.

review: Approve

=== modified file 'src/provisioningserver/drivers/pod/rsd.py'
--- src/provisioningserver/drivers/pod/rsd.py	2017-02-21 21:10:31 +0000
+++ src/provisioningserver/drivers/pod/rsd.py	2017-02-28 18:25:17 +0000
@@ -676,8 +676,18 @@
         headers = self.make_auth_headers(**context)
         # Delete machine at node_id.
         endpoint = b"redfish/v1/Nodes/%s" % node_id
-        yield self.redfish_request(
-            b"DELETE", join(url, endpoint), headers)
+        try:
+            yield self.redfish_request(
+                b"DELETE", join(url, endpoint), headers)
+        except PartialDownloadError as error:
+            # XXX newell 2017-02-27 bug=1667754:
+            # Catch the 404 error when trying to decompose the
+            # resource that has already been decomposed.
+            # This is a work around and will need to be handled
+            # differently on the region so we don't try to
+            # decompose a machine multiple times.
+            if int(error.status) != HTTPStatus.NOT_FOUND:
+                raise
 
         # Retrieve pod resources.
         discovered_pod = yield self.get_pod_resources(url, headers)

=== modified file 'src/provisioningserver/drivers/pod/tests/test_rsd.py'
--- src/provisioningserver/drivers/pod/tests/test_rsd.py	2017-02-15 15:49:54 +0000
+++ src/provisioningserver/drivers/pod/tests/test_rsd.py	2017-02-28 18:25:17 +0000
@@ -728,8 +728,8 @@
 
         with ExpectedException(PartialDownloadError):
             yield driver.redfish_request(b"GET", uri, headers)
-        self.assertThat(mock_readBody, MockCalledOnceWith(
-            "Response"))
+            self.assertThat(mock_readBody, MockCalledOnceWith(
+                "Response"))
 
     @inlineCallbacks
     def test__list_resources(self):
@@ -1284,6 +1284,53 @@
             discovered_pod))
 
     @inlineCallbacks
+    def test_decompose_continues_on_404_error(self):
+        driver = RSDPodDriver()
+        context = make_context()
+        url = driver.get_url(context)
+        node_id = context.get('node_id').encode('utf-8')
+        headers = driver.make_auth_headers(**context)
+        endpoint = b"redfish/v1/Nodes/%s" % node_id
+        mock_redfish_request = self.patch(driver, 'redfish_request')
+        error = PartialDownloadError(
+            response=json.dumps(SAMPLE_JSON_SYSTEMS).encode('utf-8'),
+            code=HTTPStatus.NOT_FOUND)
+        mock_redfish_request.side_effect = error
+        mock_get_pod_resources = self.patch(driver, 'get_pod_resources')
+        discovered_pod = make_discovered_pod()
+        mock_get_pod_resources.return_value = discovered_pod
+        mock_get_pod_hints = self.patch(driver, 'get_pod_hints')
+
+        yield driver.decompose(
+            factory.make_name('system_id'), context)
+        self.assertThat(mock_redfish_request, MockCalledOnceWith(
+            b"DELETE", join(url, endpoint), headers))
+        self.assertThat(mock_get_pod_resources, MockCalledOnceWith(
+            url, headers))
+        self.assertThat(mock_get_pod_hints, MockCalledOnceWith(
+            discovered_pod))
+
+    @inlineCallbacks
+    def test_decompose_raises_when_not_404_error(self):
+        driver = RSDPodDriver()
+        context = make_context()
+        url = driver.get_url(context)
+        node_id = context.get('node_id').encode('utf-8')
+        headers = driver.make_auth_headers(**context)
+        endpoint = b"redfish/v1/Nodes/%s" % node_id
+        mock_redfish_request = self.patch(driver, 'redfish_request')
+        error = PartialDownloadError(
+            response=json.dumps(SAMPLE_JSON_SYSTEMS).encode('utf-8'),
+            code=HTTPStatus.BAD_REQUEST)
+        mock_redfish_request.side_effect = error
+
+        with ExpectedException(PartialDownloadError):
+            yield driver.decompose(
+                factory.make_name('system_id'), context)
+            self.assertThat(mock_redfish_request, MockCalledOnceWith(
+                b"DELETE", join(url, endpoint), headers))
+
+    @inlineCallbacks
     def test__set_pxe_boot(self):
         driver = RSDPodDriver()
         context = make_context()
@@ -1380,9 +1427,9 @@
 
         with ExpectedException(PodFatalError):
             yield driver.assemble_node(url, node_id, headers)
-        self.assertThat(mock_get_composed_node_state, MockCalledOnceWith(
-            url, node_id, headers))
-        self.assertThat(mock_redfish_request, MockNotCalled())
+            self.assertThat(mock_get_composed_node_state, MockCalledOnceWith(
+                url, node_id, headers))
+            self.assertThat(mock_redfish_request, MockNotCalled())
 
     @inlineCallbacks
     def test_assemble_node_raises_error_if_assembling_fails(self):
@@ -1402,12 +1449,12 @@
 
         with ExpectedException(PodFatalError):
             yield driver.assemble_node(url, node_id, headers)
-        self.assertThat(mock_get_composed_node_state, MockCallsMatch(
-            call(url, node_id, headers),
-            call(url, node_id, headers),
-            call(url, node_id, headers)))
-        self.assertThat(mock_redfish_request, MockCalledOnceWith(
-            b"POST", uri, headers))
+            self.assertThat(mock_get_composed_node_state, MockCallsMatch(
+                call(url, node_id, headers),
+                call(url, node_id, headers),
+                call(url, node_id, headers)))
+            self.assertThat(mock_redfish_request, MockCalledOnceWith(
+                b"POST", uri, headers))
 
     @inlineCallbacks
     def test_power_issues_power_reset(self):
@@ -1533,9 +1580,9 @@
 
         with ExpectedException(PodActionError):
             yield driver.power_query(system_id, context)
-        self.assertThat(
-            mock_assemble_node,
-            MockCalledOnceWith(url, node_id, headers))
-        self.assertThat(
-            mock_get_composed_node_state,
-            MockCalledOnceWith(url, node_id, headers))
+            self.assertThat(
+                mock_assemble_node,
+                MockCalledOnceWith(url, node_id, headers))
+            self.assertThat(
+                mock_get_composed_node_state,
+                MockCalledOnceWith(url, node_id, headers))