fix the merge conflicts

Author: caberos

SoftLayer/CLI/autoscale/delete.py

@@ -0,0 +1,26 @@
+"""Delete autoscale."""
+# :license: MIT, see LICENSE for more details.
+import click
+import SoftLayer
+
+from SoftLayer.CLI import environment
+from SoftLayer.managers.autoscale import AutoScaleManager
+
+
+@click.command()
+@click.argument('identifier')
+@environment.pass_env
+def cli(env, identifier):
+    """Delete this group and destroy all members of it.
+
+    Example: slcli autoscale delete autoscaleId
+
+    """
+
+    autoscale = AutoScaleManager(env.client)
+
+    try:
+        autoscale.delete(identifier)
+        click.secho("%s deleted successfully" % identifier, fg='green')
+    except SoftLayer.SoftLayerAPIError as ex:
+        click.secho("Failed to delete %s\n%s" % (identifier, ex), fg='red')

SoftLayer/CLI/autoscale/scale.py

@@ -37,14 +37,14 @@ def cli(env, identifier, scale_up, scale_by, amount):
 
     try:
         # Check if the first guest has a cancellation date, assume we are removing guests if it is.
-        cancel_date = result[0]['virtualGuest']['billingItem']['cancellationDate'] or False
+        status = result[0]['virtualGuest']['status']['keyName'] or False
     except (IndexError, KeyError, TypeError):
-        cancel_date = False
+        status = False
 
-    if cancel_date:
-        member_table = formatting.Table(['Id', 'Hostname', 'Created'], title="Cancelled Guests")
-    else:
+    if status == 'ACTIVE':
         member_table = formatting.Table(['Id', 'Hostname', 'Created'], title="Added Guests")
+    else:
+        member_table = formatting.Table(['Id', 'Hostname', 'Created'], title="Cancelled Guests")
 
     for guest in result:
         real_guest = guest.get('virtualGuest')

SoftLayer/CLI/routes.py

@@ -378,7 +378,8 @@
     ('autoscale:scale', 'SoftLayer.CLI.autoscale.scale:cli'),
     ('autoscale:logs', 'SoftLayer.CLI.autoscale.logs:cli'),
     ('autoscale:tag', 'SoftLayer.CLI.autoscale.tag:cli'),
-    ('autoscale:edit', 'SoftLayer.CLI.autoscale.edit:cli')
+    ('autoscale:edit', 'SoftLayer.CLI.autoscale.edit:cli'),
+    ('autoscale:delete', 'SoftLayer.CLI.autoscale.delete:cli'),
 ]
 
 ALL_ALIASES = {

SoftLayer/CLI/virt/detail.py

@@ -69,11 +69,13 @@ def cli(env, identifier, passwords=False, price=False):
     table.add_row(['transient', result.get('transientGuestFlag', False)])
     table.add_row(['created', result['createDate']])
     table.add_row(['modified', result['modifyDate']])
-    last_transaction = "{} ({})".format(utils.lookup(result, 'lastTransaction', 'transactionGroup', 'name'),
-                                        utils.clean_time(utils.lookup(result, 'lastTransaction', 'modifyDate')))
+    last_transaction = ''
+    if result.get('lastTransaction'):
+        last_transaction = "{} ({})".format(utils.lookup(result, 'lastTransaction', 'transactionGroup', 'name'),
+                                            utils.clean_time(utils.lookup(result, 'lastTransaction', 'modifyDate')))
 
     table.add_row(['last_transaction', last_transaction])
-    table.add_row(['billing', 'Hourly' if result['hourlyBillingFlag'] else'Monthly'])
+    table.add_row(['billing', 'Hourly' if result['hourlyBillingFlag'] else 'Monthly'])
     table.add_row(['preset', utils.lookup(result, 'billingItem',
                                           'orderItem',
                                           'preset',

SoftLayer/fixtures/SoftLayer_Scale_Group.py

@@ -455,6 +455,7 @@
 ]
 
 editObject = True
+forceDeleteObject = True
 
 createObject = {
     "accountId": 307608,

SoftLayer/managers/autoscale.py

@@ -127,3 +127,13 @@ def create(self, template):
                 .. _SoftLayer_Scale_Group: https://sldn.softlayer.com/reference/datatypes/SoftLayer_Scale_Group/
                 """
         return self.client.call('SoftLayer_Scale_Group', 'createObject', template)
+
+    def delete(self, identifier):
+        """Calls `SoftLayer_Scale_Group::forceDeleteObject()`_
+
+        :param identifier: SoftLayer_Scale_Group id
+
+        .. _SoftLayer_Scale_Group::forceDeleteObject():
+            https://sldn.softlayer.com/reference/services/SoftLayer_Scale_Group/forceDeleteObject/
+        """
+        return self.client.call('SoftLayer_Scale_Group', 'forceDeleteObject', id=identifier)

docs/cli/autoscale.rst

@@ -34,6 +34,10 @@ For making changes to the triggers or the autoscale group itself, see the `Autos
     :prog: autoscale edit
     :show-nested:
 
+.. click:: SoftLayer.CLI.autoscale.delete:cli
+    :prog: autoscale delete
+    :show-nested:
+
 .. click:: SoftLayer.CLI.autoscale.create:cli
     :prog: autoscale create
     :show-nested:

tests/CLI/modules/autoscale_tests.py

@@ -111,3 +111,7 @@ def test_autoscale_create(self, confirm_mock):
                                    '--disk=25'])
         self.assert_no_fail(result)
         self.assertEqual(result.exit_code, 0)
+
+    def test_autoscale_delete(self):
+        result = self.run_command(['autoscale', 'delete', '12345'])
+        self.assert_no_fail(result)

tests/CLI/modules/vs/vs_tests.py

@@ -947,3 +947,13 @@ def test_authorize_volume_and_portable_storage_vs(self):
     def test_monitoring_vs(self):
         result = self.run_command(['vs', 'monitoring', '1234'])
         self.assert_no_fail(result)
+
+    def test_last_transaction_empty(self):
+        vg_return = SoftLayer_Virtual_Guest.getObject
+        transaction = []
+
+        vg_return['lastTransaction'] = transaction
+        mock = self.set_mock('SoftLayer_Virtual_Guest', 'getObject')
+        mock.return_value = vg_return
+        result = self.run_command(['vs', 'detail', '100'])
+        self.assert_no_fail(result)

tests/managers/autoscale_tests.py

@@ -174,3 +174,7 @@ def test_create_object(self):
             'SoftLayer_Scale_Group',
             'createObject',
             args=(template,))
+
+    def test_delete_object(self):
+        self.autoscale.delete(12345)
+        self.assert_called_with('SoftLayer_Scale_Group', 'forceDeleteObject')