Merge branch 'master' of github.com:softlayer/softlayer-python into billing

Author: allmightyspiff

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Change Log
 
+## [5.7.1] - 2019-02-26
+- https://github.com/softlayer/softlayer-python/compare/v5.7.0...v5.7.1
+
++ #1089 removed legacy SL message queue commands
++ Support for Hardware reflash firmware CLI/Manager method
+
+## [5.7.0] - 2019-02-15
+- Changes: https://github.com/softlayer/softlayer-python/compare/v5.6.4...v5.7.0
+
++ #1099 Support for security group Ids
++ event-log cli command
++ #1069 Virtual Placement Group Support
+   ```
+      slcli vs placementgroup --help
+    Commands:
+      create          Create a placement group.
+      create-options  List options for creating a placement group.
+      delete          Delete a placement group.
+      detail          View details of a placement group.
+      list            List placement groups.
+   ```
++ #962 Rest Transport improvements. Properly handle HTTP exceptions instead of crashing.
++ #1090 removed power_state column option from "slcli server list"
++ #676 - ipv6 support for creating virtual guests
+  * Refactored virtual guest creation to use Product_Order::placeOrder instead of Virtual_Guest::createObject, because createObject doesn't allow adding IPv6
++ #882 Added table which shows the status of each url in object storage
++ #1085 Update provisionedIops reading to handle float-y values
++ #1074 fixed issue with config setup
++ #1081 Fix file volume-cancel
++ #1059 Support for SoftLayer_Hardware_Server::toggleManagementInterface
+  * `slcli hw toggle-ipmi`
+
 
 ## [5.6.4] - 2018-11-16
 

SoftLayer/CLI/block/access/authorize.py

@@ -14,8 +14,7 @@
 @click.option('--virtual-id', '-v', multiple=True,
               help='The id of one SoftLayer_Virtual_Guest to authorize')
 @click.option('--ip-address-id', '-i', multiple=True,
-              help='The id of one SoftLayer_Network_Subnet_IpAddress'
-              ' to authorize')
+              help='The id of one SoftLayer_Network_Subnet_IpAddress to authorize')
 @click.option('--ip-address', multiple=True,
               help='An IP address to authorize')
 @environment.pass_env
@@ -30,16 +29,11 @@ def cli(env, volume_id, hardware_id, virtual_id, ip_address_id, ip_address):
         for ip_address_value in ip_address:
             ip_address_object = network_manager.ip_lookup(ip_address_value)
             if ip_address_object == "":
-                click.echo("IP Address not found on your account.  " +
-                           "Please confirm IP and try again.")
+                click.echo("IP Address not found on your account. Please confirm IP and try again.")
                 raise exceptions.ArgumentError('Incorrect IP Address')
-            else:
-                ip_address_id_list.append(ip_address_object['id'])
+            ip_address_id_list.append(ip_address_object['id'])
 
-    block_manager.authorize_host_to_volume(volume_id,
-                                           hardware_id,
-                                           virtual_id,
-                                           ip_address_id_list)
+    block_manager.authorize_host_to_volume(volume_id, hardware_id, virtual_id, ip_address_id_list)
 
     # If no exception was raised, the command succeeded
     click.echo('The specified hosts were authorized to access %s' % volume_id)

SoftLayer/CLI/file/access/authorize.py

@@ -33,11 +33,9 @@ def cli(env, volume_id, hardware_id, virtual_id, ip_address_id,
         for ip_address_value in ip_address:
             ip_address_object = network_manager.ip_lookup(ip_address_value)
             if ip_address_object == "":
-                click.echo("IP Address not found on your account.  " +
-                           "Please confirm IP and try again.")
+                click.echo("IP Address not found on your account. Please confirm IP and try again.")
                 raise exceptions.ArgumentError('Incorrect IP Address')
-            else:
-                ip_address_id_list.append(ip_address_object['id'])
+            ip_address_id_list.append(ip_address_object['id'])
 
     file_manager.authorize_host_to_volume(volume_id,
                                           hardware_id,

SoftLayer/CLI/hardware/edit.py

@@ -12,25 +12,18 @@
 @click.command()
 @click.argument('identifier')
 @click.option('--domain', '-D', help="Domain portion of the FQDN")
-@click.option('--userfile', '-F',
-              help="Read userdata from file",
-              type=click.Path(exists=True, readable=True, resolve_path=True))
-@click.option('--tag', '-g',
-              multiple=True,
+@click.option('--userfile', '-F', type=click.Path(exists=True, readable=True, resolve_path=True),
+              help="Read userdata from file")
+@click.option('--tag', '-g', multiple=True,
               help="Tags to set or empty string to remove all")
 @click.option('--hostname', '-H', help="Host portion of the FQDN")
 @click.option('--userdata', '-u', help="User defined metadata string")
-@click.option('--public-speed',
-              help="Public port speed.",
-              default=None,
-              type=click.Choice(['0', '10', '100', '1000', '10000']))
-@click.option('--private-speed',
-              help="Private port speed.",
-              default=None,
-              type=click.Choice(['0', '10', '100', '1000', '10000']))
+@click.option('--public-speed', default=None, type=click.Choice(['0', '10', '100', '1000', '10000', '-1']),
+              help="Public port speed. -1 is best speed available")
+@click.option('--private-speed', default=None, type=click.Choice(['0', '10', '100', '1000', '10000', '-1']),
+              help="Private port speed. -1 is best speed available")
 @environment.pass_env
-def cli(env, identifier, domain, userfile, tag, hostname, userdata,
-        public_speed, private_speed):
+def cli(env, identifier, domain, userfile, tag, hostname, userdata, public_speed, private_speed):
     """Edit hardware details."""
 
     if userdata and userfile:

SoftLayer/CLI/hardware/reflash_firmware.py

@@ -0,0 +1,26 @@
+"""Reflash firmware."""
+# :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
+from SoftLayer.CLI import helpers
+
+
+@click.command()
+@click.argument('identifier')
+@environment.pass_env
+def cli(env, identifier):
+    """Reflash server firmware."""
+
+    mgr = SoftLayer.HardwareManager(env.client)
+    hw_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'hardware')
+    if not (env.skip_confirmations or
+            formatting.confirm('This will power off the server with id %s and '
+                               'reflash device firmware. Continue?' % hw_id)):
+        raise exceptions.CLIAbort('Aborted.')
+
+    mgr.reflash_firmware(hw_id)