fix the merge conflicts

Author: caberos

SoftLayer/CLI/account/hook_create.py

@@ -0,0 +1,31 @@
+"""Order/create a provisioning script."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand)
+@click.option('--name', '-N', required=True, prompt=True, help="The name of the hook.")
+@click.option('--uri', '-U', required=True, prompt=True, help="The endpoint that the script will be downloaded")
+@environment.pass_env
+def cli(env, name, uri):
+    """Order/create a provisioning script."""
+
+    manager = SoftLayer.AccountManager(env.client)
+
+    provisioning = manager.create_provisioning(name, uri)
+
+    table = formatting.KeyValueTable(['name', 'value'])
+    table.align['name'] = 'r'
+    table.align['value'] = 'l'
+
+    table.add_row(['Id', provisioning.get('id')])
+    table.add_row(['Name', provisioning.get('name')])
+    table.add_row(['Created', provisioning.get('createDate')])
+    table.add_row(['Uri', provisioning.get('uri')])
+
+    env.fout(table)

SoftLayer/CLI/autoscale/__init__.py

@@ -15,17 +15,30 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.option('--sortby', help='Column to sort by', default='Datacenter')
+@click.option('--datacenter', '-d', help='Filter by datacenter')
 @environment.pass_env
-def cli(env, sortby):
+def cli(env, sortby, datacenter):
     """List number of block storage volumes limit per datacenter."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     block_volumes = block_manager.list_block_volume_limit()
 
     table = formatting.KeyValueTable(DEFAULT_COLUMNS)
     table.sortby = sortby
-    for volume in block_volumes:
-        datacenter_name = volume['datacenterName']
-        maximum_available_count = volume['maximumAvailableCount']
-        provisioned_count = volume['provisionedCount']
-        table.add_row([datacenter_name, maximum_available_count, provisioned_count])
+
+    for volumen in block_volumes:
+        if datacenter:
+            if volumen.get('datacenterName') != '':
+                if volumen.get('datacenterName') == datacenter:
+                    table.add_row([volumen.get('datacenterName'),
+                                   volumen.get('maximumAvailableCount'),
+                                   volumen.get('provisionedCount')])
+                    break
+        else:
+            if volumen.get('datacenterName') != '':
+                table.add_row([volumen.get('datacenterName'), volumen.get('maximumAvailableCount'),
+                               volumen.get('provisionedCount')])
+            else:
+                table.add_row([' - ',
+                               volumen.get('maximumAvailableCount'),
+                               volumen.get('provisionedCount')])
     env.fout(table)

SoftLayer/CLI/autoscale/delete.py

@@ -15,17 +15,29 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.option('--sortby', help='Column to sort by', default='Datacenter')
+@click.option('--datacenter', '-d', help='Filter by datacenter')
 @environment.pass_env
-def cli(env, sortby):
+def cli(env, sortby, datacenter):
     """List number of block storage volumes limit per datacenter."""
     file_manager = SoftLayer.FileStorageManager(env.client)
     file_volumes = file_manager.list_file_volume_limit()
 
     table = formatting.KeyValueTable(DEFAULT_COLUMNS)
     table.sortby = sortby
-    for volume in file_volumes:
-        datacenter_name = volume['datacenterName']
-        maximum_available_count = volume['maximumAvailableCount']
-        provisioned_count = volume['provisionedCount']
-        table.add_row([datacenter_name, maximum_available_count, provisioned_count])
+    for volumen in file_volumes:
+        if datacenter:
+            if volumen.get('datacenterName') != '':
+                if volumen.get('datacenterName') == datacenter:
+                    table.add_row([volumen.get('datacenterName'),
+                                   volumen.get('maximumAvailableCount'),
+                                   volumen.get('provisionedCount')])
+                    break
+        else:
+            if volumen.get('datacenterName') != '':
+                table.add_row([volumen.get('datacenterName'), volumen.get('maximumAvailableCount'),
+                               volumen.get('provisionedCount')])
+            else:
+                table.add_row([' - ',
+                               volumen.get('maximumAvailableCount'),
+                               volumen.get('provisionedCount')])
     env.fout(table)

SoftLayer/CLI/autoscale/detail.py

@@ -0,0 +1,23 @@
+"""Share an image template with another account."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import helpers
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@click.argument('identifier')
+@click.option('--account-id', help='Account Id for another account to share image template', required=True)
+@environment.pass_env
+def cli(env, identifier, account_id):
+    """Share an image template with another account."""
+
+    image_mgr = SoftLayer.ImageManager(env.client)
+    image_id = helpers.resolve_id(image_mgr.resolve_ids, identifier, 'image')
+    shared_image = image_mgr.share_image(image_id, account_id)
+
+    if shared_image:
+        env.fout("Image template {} was shared to account {}.".format(identifier, account_id))

SoftLayer/CLI/autoscale/list.py

@@ -25,6 +25,7 @@
     ('account:orders', 'SoftLayer.CLI.account.orders:cli'),
     ('account:bandwidth-pools', 'SoftLayer.CLI.account.bandwidth_pools:cli'),
     ('account:hooks', 'SoftLayer.CLI.account.hooks:cli'),
+    ('account:hook-create', 'SoftLayer.CLI.account.hook_create:cli'),
     ('account:hook-delete', 'SoftLayer.CLI.account.hook_delete:cli'),
 
     ('virtual', 'SoftLayer.CLI.virt'),

SoftLayer/CLI/block/limit.py

@@ -14,7 +14,7 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, short_help="Capture SoftLayer image.")
 @click.argument('identifier')
 @click.option('--name', '-n', required=True, help="Name of the image")
-@click.option('--all', help="Capture all disks belonging to the VS")
+@click.option('--all', is_flag=True, default=False, help="Capture all disks belonging to the VS")
 @click.option('--note', help="Add a note to be associated with the image")
 @environment.pass_env
 def cli(env, identifier, name, all, note):