Merge with master

Author: edsonarios

.github/workflows/release.yml

@@ -1,25 +1,10 @@
-name: Release Snapcraft and PyPi
+name: Release to PyPi
 
 on:
   release:
     types: [published]
 
 jobs:
-  snap-release:
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-        arch: ['armhf','amd64','arm64','ppc64el','s390x']
-    steps:
-      - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@v1.2.0
-        with:
-          snapcraft_token: ${{ secrets.snapcraft_token }}
-      - name: Push to stable
-        run: |
-          VERSION=`snapcraft list-revisions slcli --arch ${{ matrix.arch }} | grep "edge\*" | awk '{print $1}'`
-          echo Publishing $VERSION on ${{ matrix.arch }}
-          snapcraft release slcli $VERSION stable
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
     runs-on: ubuntu-latest

SoftLayer/API.py

@@ -177,7 +177,7 @@ def __init__(self, auth=None, transport=None, config_file=None):
                     endpoint_url=url,
                     proxy=self.settings['softlayer'].get('proxy'),
                     # prevents an exception incase timeout is a float number.
-                    timeout=int(self.settings['softlayer'].getfloat('timeout')),
+                    timeout=int(self.settings['softlayer'].getfloat('timeout', 0)),
                     user_agent=consts.USER_AGENT,
                     verify=self.settings['softlayer'].getboolean('verify'),
                 )
@@ -186,7 +186,7 @@ def __init__(self, auth=None, transport=None, config_file=None):
                 transport = transports.XmlRpcTransport(
                     endpoint_url=url,
                     proxy=self.settings['softlayer'].get('proxy'),
-                    timeout=int(self.settings['softlayer'].getfloat('timeout')),
+                    timeout=int(self.settings['softlayer'].getfloat('timeout', 0)),
                     user_agent=consts.USER_AGENT,
                     verify=self.settings['softlayer'].getboolean('verify'),
                 )

SoftLayer/CLI/account/hooks.py

@@ -0,0 +1,25 @@
+"""Show all Provisioning Scripts."""
+# :license: MIT, see LICENSE for more details.
+import click
+
+
+from SoftLayer.CLI.command import SLCommand as SLCommand
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+from SoftLayer.managers import account
+
+
+@click.command(cls=SLCommand)
+@environment.pass_env
+def cli(env):
+    """Show all Provisioning Scripts."""
+
+    manager = account.AccountManager(env.client)
+    hooks = manager.get_provisioning_scripts()
+
+    table = formatting.Table(["Id", "Name", "Uri"])
+
+    for hook in hooks:
+        table.add_row([hook.get('id'), hook.get('name'), hook.get('uri')])
+
+    env.fout(table)

SoftLayer/CLI/block/options.py

@@ -22,7 +22,7 @@ def cli(env, prices, location=None):
     """List all options for ordering a block storage"""
 
     order_manager = SoftLayer.OrderingManager(env.client)
-    items = order_manager.get_items(PACKAGE_STORAGE)
+    items = order_manager.get_items(PACKAGE_STORAGE, mask="mask[categories]")
     datacenters = order_manager.get_regions(PACKAGE_STORAGE, location)
 
     tables = []
@@ -67,7 +67,7 @@ def _block_ios_get_table(items, prices):
             if block_item['itemCategory']['categoryCode'] == 'storage_tier_level':
                 table.add_row([block_item.get('id'), block_item.get('description'),
                                block_item.get('keyName')])
-    table.sortby = 'Id'
+    table.sortby = 'KeyName'
     table.align = 'l'
     return table
 
@@ -86,7 +86,7 @@ def _block_storage_table(items, prices):
             if block_item['itemCategory']['categoryCode'] == 'performance_storage_space':
                 table.add_row([block_item.get('id'), block_item.get('description'),
                                block_item.get('keyName'), block_item.get('capacityMinimum') or '-', ])
-    table.sortby = 'Id'
+    table.sortby = 'KeyName'
     table.align = 'l'
     return table
 
@@ -101,9 +101,16 @@ def _block_snapshot_get_table(items, prices):
     else:
         table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
         for block_item in items:
-            if block_item['itemCategory']['categoryCode'] == 'storage_snapshot_space':
-                table.add_row([block_item.get('id'), block_item.get('description'),
-                               block_item.get('keyName')])
-    table.sortby = 'Id'
+            if is_snapshot_category(block_item.get('categories', [])):
+                table.add_row([block_item.get('id'), block_item.get('description'), block_item.get('keyName')])
+    table.sortby = 'KeyName'
     table.align = 'l'
     return table
+
+
+def is_snapshot_category(categories):
+    """Checks if storage_snapshot_space is one of the categories"""
+    for item in categories:
+        if item.get('categoryCode') == "storage_snapshot_space":
+            return True
+    return False

SoftLayer/CLI/block/snapshot/cancel.py

@@ -11,11 +11,11 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume-id')
-@click.option('--reason', help="An optional reason for cancellation")
+@click.option('--reason', help="An optional reason for cancellation.")
 @click.option('--immediate',
               is_flag=True,
               help="Cancels the snapshot space immediately instead "
-                   "of on the billing anniversary")
+                   "of on the billing anniversary.")
 @environment.pass_env
 def cli(env, volume_id, reason, immediate):
     """Cancel existing snapshot space for a given volume."""

SoftLayer/CLI/block/snapshot/create.py

@@ -9,10 +9,10 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.option('--notes', '-n',
-              help='Notes to set on the new snapshot')
+              help='Notes to set on the new snapshot.')
 @environment.pass_env
 def cli(env, volume_id, notes):
-    """Creates a snapshot on a given volume"""
+    """Creates a snapshot on a given volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     snapshot = block_manager.create_snapshot(volume_id, notes=notes)
 

SoftLayer/CLI/block/snapshot/delete.py

@@ -10,7 +10,7 @@
 @click.argument('snapshot_id')
 @environment.pass_env
 def cli(env, snapshot_id):
-    """Deletes a snapshot on a given volume"""
+    """Deletes a snapshot on a given volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     deleted = block_manager.delete_snapshot(snapshot_id)
 

SoftLayer/CLI/block/snapshot/disable.py

@@ -10,11 +10,11 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.option('--schedule-type',
-              help='Snapshot schedule [INTERVAL|HOURLY|DAILY|WEEKLY]',
+              help='Snapshot schedule [INTERVAL|HOURLY|DAILY|WEEKLY].',
               required=True)
 @environment.pass_env
 def cli(env, volume_id, schedule_type):
-    """Disables snapshots on the specified schedule for a given volume"""
+    """Disables snapshots on the specified schedule for a given volume."""
 
     if (schedule_type not in ['INTERVAL', 'HOURLY', 'DAILY', 'WEEKLY']):
         raise exceptions.CLIAbort(

SoftLayer/CLI/block/snapshot/enable.py

@@ -10,24 +10,24 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.option('--schedule-type',
-              help='Snapshot schedule [INTERVAL|HOURLY|DAILY|WEEKLY]',
+              help='Snapshot schedule [INTERVAL|HOURLY|DAILY|WEEKLY].',
               required=True)
 @click.option('--retention-count',
-              help='Number of snapshots to retain',
+              help='Number of snapshots to retain.',
               required=True)
 @click.option('--minute',
-              help='Minute of the day when snapshots should be taken',
+              help='Minute of the day when snapshots should be taken.',
               default=0)
 @click.option('--hour',
-              help='Hour of the day when snapshots should be taken',
+              help='Hour of the day when snapshots should be taken.',
               default=0)
 @click.option('--day-of-week',
-              help='Day of the week when snapshots should be taken',
+              help='Day of the week when snapshots should be taken.',
               default='SUNDAY')
 @environment.pass_env
 def cli(env, volume_id, schedule_type, retention_count,
         minute, hour, day_of_week):
-    """Enables snapshots for a given volume on the specified schedule"""
+    """Enables snapshots for a given volume on the specified schedule."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
 
     valid_schedule_types = {'INTERVAL', 'HOURLY', 'DAILY', 'WEEKLY'}

SoftLayer/CLI/block/snapshot/get_notify_status.py

@@ -10,7 +10,7 @@
 @click.argument('volume_id')
 @environment.pass_env
 def cli(env, volume_id):
-    """Get snapshots space usage threshold warning flag setting for a given volume"""
+    """Get snapshots space usage threshold warning flag setting for a given volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     enabled = block_manager.get_volume_snapshot_notification_status(volume_id)