Merge branch 'master' into issue1916

Author: edsonarios

SoftLayer/CLI/account/orders.py

@@ -10,16 +10,34 @@
 from SoftLayer import utils
 
 
+def upgrade_table(upgrades):
+    """Formats a table for upgrade orders"""
+    table = formatting.Table(['Id', 'Maintance window', 'Status', 'Created Date',
+                              'Case'], title="Upgrade orders")
+    table.align['Subject'] = 'l'
+    table.align['Impacted Resources'] = 'l'
+    for upgrade in upgrades:
+        table.add_row([upgrade.get('id'),
+                       upgrade.get('maintenanceStartTimeUtc'),
+                       upgrade.get('statusId'),
+                       upgrade.get('createDate'),
+                       upgrade.get('ticketId') or '--'])
+    return table
+
+
 @click.command(cls=SLCommand)
 @click.option('--limit', '-l',
               help='How many results to get in one api call',
-              default=50,
+              default=100,
               show_default=True)
+@click.option('--upgrades', is_flag=True, default=False,
+              help="Show upgrades orders.")
 @environment.pass_env
-def cli(env, limit):
+def cli(env, limit, upgrades):
     """Lists account orders. Use `slcli order lookup <ID>` to find more details about a specific order."""
     manager = AccountManager(env.client)
     orders = manager.get_account_all_billing_orders(limit)
+    upgrade = manager.get_account_upgrade_orders(limit)
 
     order_table = formatting.Table(['Id', 'State', 'User', 'Date', 'Amount', 'Item'],
                                    title="orders")
@@ -34,3 +52,5 @@ def cli(env, limit):
         order_table.add_row([order['id'], order['status'], order['userRecord']['username'], create_date,
                              order['orderTotalAmount'], utils.trim_to(' '.join(map(str, items)), 50)])
     env.fout(order_table)
+    if upgrades:
+        env.fout(upgrade_table(upgrade))

SoftLayer/CLI/block/detail.py

@@ -23,11 +23,14 @@ def cli(env, volume_id):
     table.align['Name'] = 'r'
     table.align['Value'] = 'l'
 
+    capacity = '0'
+    if block_volume['capacityGb'] != '':
+        capacity = "%iGB" % block_volume['capacityGb']
     storage_type = block_volume['storageType']['keyName'].split('_').pop(0)
     table.add_row(['ID', block_volume['id']])
     table.add_row(['Username', block_volume['username']])
     table.add_row(['Type', storage_type])
-    table.add_row(['Capacity (GB)', "%iGB" % block_volume['capacityGb']])
+    table.add_row(['Capacity (GB)', capacity])
     table.add_row(['LUN Id', "%s" % block_volume['lunId']])
 
     if block_volume.get('provisionedIops'):

SoftLayer/CLI/cdn/create.py

@@ -0,0 +1,56 @@
+"""Create a CDN domain mapping."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@click.option('--hostname', required=True, help="To route requests to your website, enter the hostname for your"
+              "website, for example, www.example.com or app.example.com.")
+@click.option('--origin', required=True, help="Your server IP address or hostname.")
+@click.option('--origin-type', default="server", type=click.Choice(['server', 'storage']), show_default=True,
+              help="The origin type. Note: If OriginType is storage then OriginHost is take as Endpoint")
+@click.option('--http', help="Http port")
+@click.option('--https', help="Https port")
+@click.option('--bucket-name', help="Bucket name")
+@click.option('--cname', help="Enter a globally unique subdomain. The full URL becomes the CNAME we use to configure"
+              " your DNS. If no value is entered, we will generate a CNAME for you.")
+@click.option('--header', help="The edge server uses the host header in the HTTP header to communicate with the"
+              " Origin host. It defaults to Hostname.")
+@click.option('--path', help="Give a path relative to the domain provided, which can be used to reach this Origin."
+              " For example, 'articles/video' => 'www.example.com/articles/video")
+@click.option('--ssl', default="dvSan", type=click.Choice(['dvSan', 'wilcard']), help="A DV SAN Certificate allows"
+              " HTTPS traffic over your personal domain, but it requires a domain validation to prove ownership."
+              " A wildcard certificate allows HTTPS traffic only when using the CNAME given.")
+@environment.pass_env
+def cli(env, hostname, origin, origin_type, http, https, bucket_name, cname, header, path, ssl):
+    """Create a CDN domain mapping."""
+    if not http and not https:
+        raise exceptions.CLIAbort('Is needed http or https options')
+
+    manager = SoftLayer.CDNManager(env.client)
+    cdn = manager.create_cdn(hostname, origin, origin_type, http, https, bucket_name, cname, header, path, ssl)
+
+    table = formatting.Table(['Name', 'Value'])
+    table.add_row(['CDN Unique ID', cdn.get('uniqueId')])
+    if bucket_name:
+        table.add_row(['Bucket Name', cdn.get('bucketName')])
+    table.add_row(['Hostname', cdn.get('domain')])
+    table.add_row(['Header', cdn.get('header')])
+    table.add_row(['IBM CNAME', cdn.get('cname')])
+    table.add_row(['Akamai CNAME', cdn.get('akamaiCname')])
+    table.add_row(['Origin Host', cdn.get('originHost')])
+    table.add_row(['Origin Type', cdn.get('originType')])
+    table.add_row(['Protocol', cdn.get('protocol')])
+    table.add_row(['Http Port', cdn.get('httpPort')])
+    table.add_row(['Https Port', cdn.get('httpsPort')])
+    table.add_row(['Certificate Type', cdn.get('certificateType')])
+    table.add_row(['Provider', cdn.get('vendorName')])
+    table.add_row(['Path', cdn.get('path')])
+
+    env.fout(table)

SoftLayer/CLI/cdn/delete.py

@@ -0,0 +1,21 @@
+"""Delete a CDN domain mapping."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@click.argument('unique_id')
+@environment.pass_env
+def cli(env, unique_id):
+    """Delete a CDN domain mapping."""
+
+    manager = SoftLayer.CDNManager(env.client)
+
+    cdn = manager.delete_cdn(unique_id)
+
+    if cdn:
+        env.fout("Cdn with uniqueId: {} was deleted.".format(unique_id))

SoftLayer/CLI/file/detail.py

@@ -9,6 +9,14 @@
 from SoftLayer import utils
 
 
+def get_capacity(file_volume):
+    """Get the capacity Gb with validate the data"""
+    capacity = '0'
+    if file_volume['capacityGb'] != '':
+        capacity = "%iGB" % file_volume['capacityGb']
+    return capacity
+
+
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @environment.pass_env
@@ -27,7 +35,7 @@ def cli(env, volume_id):
     table.add_row(['ID', file_volume['id']])
     table.add_row(['Username', file_volume['username']])
     table.add_row(['Type', storage_type])
-    table.add_row(['Capacity (GB)', "%iGB" % file_volume['capacityGb']])
+    table.add_row(['Capacity (GB)', get_capacity(file_volume)])
 
     used_space = int(file_volume['bytesUsed']) \
         if file_volume['bytesUsed'] else 0

SoftLayer/CLI/firewall/detail.py

@@ -12,10 +12,10 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('identifier')
-@click.option('--credentials', type=click.BOOL,
+@click.option('--password', is_flag=True,
               help="Display FortiGate username and FortiGate password to multi vlans.")
 @environment.pass_env
-def cli(env, identifier, credentials):
+def cli(env, identifier, password):
     """Detail firewall.
 
     EXAMPLES:
@@ -63,7 +63,7 @@ def cli(env, identifier, credentials):
             table.add_row(['private vlan', utils.lookup(_firewall, 'networkGateway', 'privateVlan', 'vlanNumber')])
             table.add_row(['type', _firewall.get('firewallType')])
 
-            if credentials:
+            if password:
                 table.add_row(['fortiGate username', utils.lookup(_firewall, 'managementCredentials', 'username')])
                 table.add_row(['fortiGate password', utils.lookup(_firewall, 'managementCredentials', 'password')])
 

SoftLayer/CLI/object_storage/cancel.py

@@ -0,0 +1,39 @@
+"""Cancel an existing object-storage account."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@click.argument('storage-id')
+@click.option('--reason', help="An optional reason for cancellation")
+@click.option('--immediate',
+              is_flag=True,
+              help="Cancels the object storage immediately instead "
+                   "of on the billing anniversary")
+@environment.pass_env
+def cli(env, storage_id, reason, immediate):
+    """Cancel an existing object storage."""
+
+    block_storage_manager = SoftLayer.BlockStorageManager(env.client)
+
+    if not (env.skip_confirmations or formatting.no_going_back(storage_id)):
+        raise exceptions.CLIAbort('Aborted')
+
+    cancelled = block_storage_manager.cancel_block_volume(storage_id,
+                                                          reason, immediate)
+
+    if cancelled:
+        if immediate:
+            click.echo('Object storage with id %s has been marked'
+                       ' for immediate cancellation' % storage_id)
+        else:
+            click.echo('Object storage with id %s has been marked'
+                       ' for cancellation' % storage_id)
+    else:
+        click.echo('Unable to cancel object storage %s' % storage_id)

SoftLayer/CLI/routes.py

@@ -81,6 +81,8 @@
     ('cdn:origin-list', 'SoftLayer.CLI.cdn.origin_list:cli'),
     ('cdn:origin-remove', 'SoftLayer.CLI.cdn.origin_remove:cli'),
     ('cdn:purge', 'SoftLayer.CLI.cdn.purge:cli'),
+    ('cdn:delete', 'SoftLayer.CLI.cdn.delete:cli'),
+    ('cdn:create', 'SoftLayer.CLI.cdn.create:cli'),
 
     ('config', 'SoftLayer.CLI.config'),
     ('config:setup', 'SoftLayer.CLI.config.setup:cli'),
@@ -261,6 +263,7 @@
     ('object-storage:accounts', 'SoftLayer.CLI.object_storage.list_accounts:cli'),
     ('object-storage:endpoints', 'SoftLayer.CLI.object_storage.list_endpoints:cli'),
     ('object-storage:credential', 'SoftLayer.CLI.object_storage.credential:cli'),
+    ('object-storage:cancel', 'SoftLayer.CLI.object_storage.cancel:cli'),
 
     ('order', 'SoftLayer.CLI.order'),
     ('order:category-list', 'SoftLayer.CLI.order.category_list:cli'),
@@ -385,6 +388,7 @@
     ('user:vpn-subnet', 'SoftLayer.CLI.user.vpn_subnet:cli'),
     ('user:remove-access', 'SoftLayer.CLI.user.remove_access:cli'),
     ('user:grant-access', 'SoftLayer.CLI.user.grant_access:cli'),
+    ('user:vpn-password', 'SoftLayer.CLI.user.vpn_password:cli'),
 
     ('vlan', 'SoftLayer.CLI.vlan'),
     ('vlan:create', 'SoftLayer.CLI.vlan.create:cli'),

SoftLayer/CLI/user/detail.py

@@ -65,9 +65,14 @@ def basic_info(user, keys):
 
     table.add_row(['Id', user.get('id', '-')])
     table.add_row(['Username', user.get('username', '-')])
-    if keys:
-        for key in user.get('apiAuthenticationKeys'):
+    keys_array = user.get('apiAuthenticationKeys')
+    if keys and len(keys_array) != 0:
+        for key in keys_array:
             table.add_row(['APIKEY', key.get('authenticationKey')])
+    elif keys_array is not None and len(keys_array) != 0:
+        table.add_row(['APIKEY', 'Yes'])
+    else:
+        table.add_row(['APIKEY', 'No'])
     table.add_row(['Name', "%s %s" % (user.get('firstName', '-'), user.get('lastName', '-'))])
     table.add_row(['Email', user.get('email')])
     table.add_row(['OpenID', user.get('openIdConnectUserName')])

SoftLayer/CLI/user/vpn_password.py

@@ -0,0 +1,26 @@
+"""Set the user VPN password."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+
+from SoftLayer.CLI.command import SLCommand as SLCommand
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import helpers
+
+
+@click.command(cls=SLCommand, )
+@click.argument('identifier')
+@click.option('--password', required=True, help="Your new VPN password")
+@environment.pass_env
+def cli(env, identifier, password):
+    """Set the user VPN password.
+
+    Example: slcli user vpn-password 123456 --password=Mypassword1.
+    """
+
+    mgr = SoftLayer.UserManager(env.client)
+    user_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'username')
+    result = mgr.update_vpn_password(user_id, password)
+    if result:
+        click.secho("Successfully updated user VPN password.", fg='green')