added warning message and summary for disaster-recover-failover

Author: Rajarajan

SoftLayer/CLI/block/replication/disaster_recovery_failover.py

@@ -8,18 +8,22 @@
 from SoftLayer.CLI import exceptions
 
 
-@click.command()
+@click.command(epilog="""Failover an inaccessible block/file volume to its available replicant volume.
+If a volume (with replication) becomes inaccessible due to a disaster event, this method can be used to immediately failover to an available replica in another location.
+This method does not allow for fail back via the API. To fail back to the original volume after using this method, open a support ticket.
+To test failover, use SoftLayer_Network_Storage::failoverToReplicant instead.""")
 @click.argument('volume-id')
 @click.option('--replicant-id', help="ID of the replicant volume")
 @environment.pass_env
 def cli(env, volume_id, replicant_id):
     """Failover an inaccessible file volume to its available replicant volume."""
     block_storage_manager = SoftLayer.BlockStorageManager(env.client)
 
-    click.secho("""WARNING:Disaster Recovery Failover a block volume to the given replicant volume.\n"""
-                """* This action cannot be undone\n"""
-                """* You will not be able to perform failback to the original\n"""
-                """* You cannot failover without replica""",fg = 'red' )
+    click.secho("""WARNING : Failover an inaccessible block/file volume to its available replicant volume."""
+                """If a volume (with replication) becomes inaccessible due to a disaster event, this method can be used to immediately failover to an available replica in another location."""
+                """This method does not allow for fail back via the API."""
+                """To fail back to the original volume after using this method, open a support ticket."""
+                """To test failover, use SoftLayer_Network_Storage::failoverToReplicant instead.""",fg = 'red' )
 
     if not (formatting.confirm('Are you sure you want to continue?')):
         raise exceptions.CLIAbort('Aborted.')
@@ -29,4 +33,4 @@ def cli(env, volume_id, replicant_id):
         replicant_id
     )
 
-    click.echo("Disaster Recovery Failover to replicant is now in progress.")
+    click.echo("Disaster Recovery Failover to replicant is now in progress.")

SoftLayer/CLI/file/replication/disaster_recovery_failover.py

@@ -8,18 +8,22 @@
 from SoftLayer.CLI import exceptions
 
 
-@click.command()
+@click.command(epilog="""Failover an inaccessible block/file volume to its available replicant volume.
+If a volume (with replication) becomes inaccessible due to a disaster event, this method can be used to immediately failover to an available replica in another location.
+This method does not allow for fail back via API. If you wish to test failover, please use SoftLayer_Network_Storage::failoverToReplicant.
+After using this method, to fail back to the original volume, please open a support ticket""")
 @click.argument('volume-id')
 @click.option('--replicant-id', help="ID of the replicant volume")
 @environment.pass_env
 def cli(env, volume_id, replicant_id):
     """Failover an inaccessible file volume to its available replicant volume."""
     file_storage_manager = SoftLayer.FileStorageManager(env.client)
 
-    click.secho("""WARNING : Disaster Recovery Failover should not be performed unless data center for the primary volume is unreachable.\n"""
-                """* This action cannot be undone\n"""
-                """* You will not be able to perform failback to the original without support intervention\n"""
-                """* You cannot failover without replica""",fg = 'red' )
+    click.secho("""WARNING : Failover an inaccessible block/file volume to its available replicant volume."""
+                """If a volume (with replication) becomes inaccessible due to a disaster event, this method can be used to immediately failover to an available replica in another location."""
+                """This method does not allow for fail back via the API."""
+                """To fail back to the original volume after using this method, open a support ticket."""
+                """To test failover, use SoftLayer_Network_Storage::failoverToReplicant instead.""",fg = 'red' )
 
     if not (formatting.confirm('Are you sure you want to continue?')):
         raise exceptions.CLIAbort('Aborted.')

tests/CLI/modules/file_tests.py

@@ -503,19 +503,7 @@ def test_disaster_recovery_failover(self, disaster_recovery_failover_mock, confi
                                    '--replicant-id=5678'])
 
         self.assert_no_fail(result)
-        self.assertEqual('Disaster Recovery Failover to replicant is now in progress.\n',
-                         result.output)
-
-    @mock.patch('SoftLayer.CLI.formatting.confirm')
-    @mock.patch('SoftLayer.FileStorageManager.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(['file', 'disaster-recovery-failover', '12345678',
-                                   '--replicant-id=5678'])
-
-        self.assertEqual('Disaster Recovery Failover operation could not be initiated.\n',
+        self.assertIn('Disaster Recovery Failover to replicant is now in progress.\n',
                          result.output)
 
     @mock.patch('SoftLayer.CLI.formatting.confirm')