Refactoring the disaster recovery method

Author: Rajarajan

SoftLayer/CLI/block/replication/disaster_recovery_failover.py

@@ -24,11 +24,9 @@ def cli(env, volume_id, replicant_id):
     if not (formatting.confirm('Are you sure you want to continue?')):
         raise exceptions.CLIAbort('Aborted.')
 
-    success = block_storage_manager.disaster_recovery_failover_to_replicant(
+    block_storage_manager.disaster_recovery_failover_to_replicant(
         volume_id,
         replicant_id
     )
-    if success:
-        click.echo("Disaster Recovery Failover to replicant is now in progress.")
-    else:
-        click.echo("Disaster Recovery Failover operation could not be initiated.")
+    
+    click.echo("Disaster Recovery Failover to replicant is now in progress.")

SoftLayer/CLI/file/replication/disaster_recovery_failover.py

@@ -24,11 +24,9 @@ def cli(env, volume_id, replicant_id):
     if not (formatting.confirm('Are you sure you want to continue?')):
         raise exceptions.CLIAbort('Aborted.')
 
-    success = file_storage_manager.disaster_recovery_failover_to_replicant(
+    file_storage_manager.disaster_recovery_failover_to_replicant(
         volume_id,
         replicant_id
     )
-    if success:
-        click.echo("Disaster Recovery Failover to replicant is now in progress.")
-    else:
-        click.echo("Disaster Recovery Failover operation could not be initiated.")
+    
+    click.echo("Disaster Recovery Failover to replicant is now in progress.")

tests/CLI/modules/block_tests.py

@@ -571,18 +571,6 @@ def test_replicant_failover_unsuccessful(self, failover_mock):
         self.assertEqual('Failover operation could not be initiated.\n',
                          result.output)
 
-    @mock.patch('SoftLayer.CLI.formatting.confirm')
-    @mock.patch('SoftLayer.BlockStorageManager.disaster_recovery_failover_to_replicant')
-    def test_disaster_recovery_failover_unsuccesful(self, disaster_recovery_failover_mock, confirm_mock):
-        confirm_mock.return_value = True
-        disaster_recovery_failover_mock.return_value = False
-
-        result = self.run_command(['block', 'disaster-recovery-failover', '12345678',
-                                   '--replicant-id=5678'])
-
-        self.assertIn('Disaster Recovery Failover operation could not be initiated.\n',
-                         result.output)
-
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_disaster_recovery_failover_aborted(self, confirm_mock):
         confirm_mock.return_value = False