Merge branch 'master' into issue_1981

Author: allmightyspiff

SoftLayer/CLI/bandwidth/pools_create.py

@@ -0,0 +1,54 @@
+"""Create bandwidth pool."""
+# :license: MIT, see LICENSE for more details.
+import click
+
+from SoftLayer import BandwidthManager
+from SoftLayer.CLI.command import SLCommand as SLCommand
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+from SoftLayer import utils
+
+location_groups = {
+    "SJC/DAL/WDC/TOR/MON": "US/Canada",
+    "AMS/LON/MAD/PAR": "AMS/LON/MAD/PAR",
+    "SNG/HKG/OSA/TOK": "SNG/HKG/JPN",
+    "SYD": "AUS",
+    "MEX": "MEX",
+    "SAO": "BRA",
+    "CHE": "IND",
+    "MIL": "ITA",
+    "SEO": "KOR",
+    "FRA": "FRA"
+}
+
+
+@click.command(cls=SLCommand)
+@click.option('--name', required=True, help="Pool name")
+@click.option('--region', required=True,
+              type=click.Choice(['SJC/DAL/WDC/TOR/MON', 'AMS/LON/MAD/PAR', 'SNG/HKG/OSA/TOK',
+                                'SYD', 'MEX', 'SAO', 'CHE', 'MIL', 'SEO', 'FRA']),
+              help="Region selected")
+@environment.pass_env
+def cli(env, name, region):
+    """Create bandwidth pool."""
+
+    manager = BandwidthManager(env.client)
+    locations = manager.get_location_group()
+    id_location_group = get_id_from_location_group(locations, location_groups[region])
+    created_pool = manager.create_pool(name, id_location_group)
+
+    table = formatting.KeyValueTable(['Name', 'Value'])
+    table.add_row(['Id', created_pool.get('id')])
+    table.add_row(['Name Pool', name])
+    table.add_row(['Region', region])
+    table.add_row(['Created Date', utils.clean_time(created_pool.get('createDate'))])
+    env.fout(table)
+
+
+def get_id_from_location_group(locations, name):
+    """Gets the ID location group, from name"""
+    for location in locations:
+        if location['name'] == name:
+            return location['id']
+
+    return None

SoftLayer/CLI/block/access/list.py

@@ -14,10 +14,10 @@
 @click.argument('volume_id')
 @click.option('--columns',
               callback=column_helper.get_formatter(storage_utils.COLUMNS),
-              help=f"Columns to display. Options are: { ', '.join(column.name for column in storage_utils.COLUMNS)}.",
+              help=f"Columns to display. Options are: {', '.join(column.name for column in storage_utils.COLUMNS)}.",
               default=','.join(storage_utils.DEFAULT_COLUMNS))
 @click.option('--sortby',
-              help=f"Column to sort by. Options are: { ', '.join(column.name for column in storage_utils.COLUMNS)}.",
+              help=f"Column to sort by. Options are: {', '.join(column.name for column in storage_utils.COLUMNS)}.",
               default='name')
 @environment.pass_env
 def cli(env, columns, sortby, volume_id):

SoftLayer/CLI/block/list.py

@@ -60,7 +60,7 @@
 @click.option('--sortby', help='Column to sort by', default='username')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @environment.pass_env
 def cli(env, sortby, columns, datacenter, username, storage_type, order):

SoftLayer/CLI/block/replication/locations.py

@@ -24,7 +24,7 @@
 @click.argument('volume-id')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @click.option('--sortby', help='Column to sort by', default='Long Name')
 @environment.pass_env

SoftLayer/CLI/block/replication/partners.py

@@ -16,7 +16,7 @@
 @click.argument('volume-id')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @click.option('--sortby', help='Column to sort by', default='Username')
 @environment.pass_env

SoftLayer/CLI/block/snapshot/list.py

@@ -32,7 +32,7 @@
               default='created')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @environment.pass_env
 def cli(env, volume_id, sortby, columns):

SoftLayer/CLI/file/list.py

@@ -63,7 +63,7 @@
 @click.option('--sortby', help='Column to sort by', default='username')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @environment.pass_env
 def cli(env, sortby, columns, datacenter, username, storage_type, order):

SoftLayer/CLI/file/replication/locations.py

@@ -25,7 +25,7 @@
 @click.option('--sortby', help='Column to sort by', default='Long Name')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @environment.pass_env
 def cli(env, columns, sortby, volume_id):

SoftLayer/CLI/file/replication/partners.py

@@ -17,7 +17,7 @@
 @click.option('--sortby', help='Column to sort by', default='Username')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @environment.pass_env
 def cli(env, columns, sortby, volume_id):

SoftLayer/CLI/file/snapshot/list.py

@@ -31,7 +31,7 @@
               default='created')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @environment.pass_env
 def cli(env, volume_id, sortby, columns):