Remove iSCSI deploy support for IPA Mitaka

The Newton (6.0.0) release included a fix [1] to support
iSCSI deploys to IPA ramdisks < 1.3 (Mitaka). These older
versions of IPA did not handle wiping disk metadata or
customized portal ports.

We are in the Ocata cycle and ironic no longer needs to
support IPA Mitaka or earlier, so we can remove this fix.

[1] Commit ba83fb1bb45b63e056c87c3bbf42cabaade7865c

Change-Id: Ib97344d96a938a550ad2c61e14d793d0f56c6a89
Fixes-Bug: #1661096

1 files changed, 19 insertions, 83 deletions

diff --git a/ironic/tests/unit/drivers/modules/test_agent_client.py b/ironic/tests/unit/drivers/modules/test_agent_client.py
index a61c3066f..5f81decaa 100644
--- a/ironic/tests/unit/drivers/modules/test_agent_client.py
+++ b/ironic/tests/unit/drivers/modules/test_agent_client.py
@@ -173,12 +173,12 @@ class TestAgentClient(base.TestCase):
     def test_start_iscsi_target(self):
         self.client._command = mock.MagicMock(spec_set=[])
         iqn = 'fake-iqn'
-        port = 3260
-        wipe_disk_metadata = True
-        params = {'iqn': iqn, 'wipe_disk_metadata': True}
+        port = agent_client.DEFAULT_IPA_PORTAL_PORT
+        wipe_disk_metadata = False
+        params = {'iqn': iqn, 'portal_port': port,
+                  'wipe_disk_metadata': wipe_disk_metadata}
 
-        self.client.start_iscsi_target(self.node, iqn, portal_port=port,
-                                       wipe_disk_metadata=wipe_disk_metadata)
+        self.client.start_iscsi_target(self.node, iqn)
         self.client._command.assert_called_once_with(
             node=self.node, method='iscsi.start_iscsi_target',
             params=params, wait=True)
@@ -188,91 +188,27 @@ class TestAgentClient(base.TestCase):
         iqn = 'fake-iqn'
         port = 3261
         wipe_disk_metadata = False
-        params = {'iqn': iqn, 'portal_port': port}
+        params = {'iqn': iqn, 'portal_port': port,
+                  'wipe_disk_metadata': wipe_disk_metadata}
 
-        self.client.start_iscsi_target(self.node, iqn, portal_port=port,
-                                       wipe_disk_metadata=wipe_disk_metadata)
+        self.client.start_iscsi_target(self.node, iqn, portal_port=port)
         self.client._command.assert_called_once_with(
             node=self.node, method='iscsi.start_iscsi_target',
             params=params, wait=True)
 
-    @mock.patch.object(agent_client, 'LOG')
-    def test_start_iscsi_target_old_agent_only_wipe(self, log_mock):
-        self.client._command = mock.MagicMock(
-            spec_set=[],
-            side_effect=[
-                {
-                    'command_status': 'FAILED',
-                    'command_error': {
-                        'message': u"wipe_disk_metadata doesn't exist",
-                        'type': u'TypeError'
-                    }
-                },
-                {
-                    'command_status': 'SUCCESS',
-                }
-            ]
-        )
+    def test_start_iscsi_target_wipe_disk_metadata(self):
+        self.client._command = mock.MagicMock(spec_set=[])
         iqn = 'fake-iqn'
-        port = 3260
+        port = agent_client.DEFAULT_IPA_PORTAL_PORT
         wipe_disk_metadata = True
-        params_first_try = {'iqn': iqn,
-                            'wipe_disk_metadata': wipe_disk_metadata}
-        params_second_try = {'iqn': iqn}
-
-        ret = self.client.start_iscsi_target(
-            self.node, iqn, portal_port=port,
-            wipe_disk_metadata=wipe_disk_metadata)
-        self.client._command.assert_has_calls([
-            mock.call(node=self.node, method='iscsi.start_iscsi_target',
-                      params=params_first_try, wait=True),
-            mock.call(node=self.node, method='iscsi.start_iscsi_target',
-                      params=params_second_try, wait=True)
-        ])
-        self.assertEqual('SUCCESS', ret['command_status'])
-        self.assertTrue(log_mock.warning.called)
-        self.assertFalse(log_mock.error.called)
-
-    @mock.patch.object(agent_client, 'LOG')
-    def test_start_iscsi_target_old_agent_custom_options(self, log_mock):
-        self.client._command = mock.MagicMock(
-            spec_set=[],
-            side_effect=[
-                {
-                    'command_status': 'FAILED',
-                    'command_error': {
-                        'message': u"wipe_disk_metadata doesn't exist",
-                        'type': u'TypeError'
-                    }
-                },
-                {
-                    'command_status': 'FAILED',
-                    'command_error': {
-                        'message': u"portal_port doesn't exist",
-                        'type': u'TypeError'
-                    }
-                }
-            ]
-        )
-        iqn = 'fake-iqn'
-        port = 3261
-        wipe_disk_metadata = True
-        params_first_try = {'iqn': iqn, 'portal_port': port,
-                            'wipe_disk_metadata': wipe_disk_metadata}
-        params_second_try = {'iqn': iqn, 'portal_port': port}
-
-        ret = self.client.start_iscsi_target(
-            self.node, iqn, portal_port=port,
-            wipe_disk_metadata=wipe_disk_metadata)
-        self.client._command.assert_has_calls([
-            mock.call(node=self.node, method='iscsi.start_iscsi_target',
-                      params=params_first_try, wait=True),
-            mock.call(node=self.node, method='iscsi.start_iscsi_target',
-                      params=params_second_try, wait=True)
-        ])
-        self.assertEqual('FAILED', ret['command_status'])
-        self.assertTrue(log_mock.warning.called)
-        self.assertTrue(log_mock.error.called)
+        params = {'iqn': iqn, 'portal_port': port,
+                  'wipe_disk_metadata': wipe_disk_metadata}
+
+        self.client.start_iscsi_target(self.node, iqn,
+                                       wipe_disk_metadata=wipe_disk_metadata)
+        self.client._command.assert_called_once_with(
+            node=self.node, method='iscsi.start_iscsi_target',
+            params=params, wait=True)
 
     def test_install_bootloader(self):
         self.client._command = mock.MagicMock(spec_set=[])