fixed merge conflict

Author: allmightyspiff

.travis.yml

@@ -1,5 +1,5 @@
 # https://docs.travis-ci.com/user/languages/python/#python-37-and-higher
-dist: xenial
+dist: bionic
 language: python
 sudo: false
 matrix:
@@ -12,7 +12,7 @@ matrix:
       env: TOX_ENV=py37
     - python: "3.8"
       env: TOX_ENV=py38
-    - python: "pypy3.5"
+    - python: "pypy3"
       env: TOX_ENV=pypy3
     - python: "3.6"
       env: TOX_ENV=analysis

CONTRIBUTORS

@@ -6,6 +6,7 @@ chechuironman <chechuironman@gmail.com>
 Christopher Gallo <chrisagallo@gmail.com>
 David Ibarra <dtibarra@gmail.com>
 Hans Kristian Moen <hans@ububeet.(none)>
+Ian Sutton <ians@openbsd.org>
 Jake Williams <jwilliams@softlayer.com>
 Jason Johnson <spligak@gmail.com>
 Kevin Landreth <klandreth@softlayer.com>

SoftLayer/CLI/block/duplicate.py

@@ -54,9 +54,16 @@
               type=click.Choice(['hourly', 'monthly']),
               default='monthly',
               help="Optional parameter for Billing rate (default to monthly)")
+@click.option('--dependent-duplicate',
+              type=click.BOOL,
+              default=False,
+              show_default=True,
+              help='Whether or not this duplicate will be a dependent duplicate '
+                   'of the origin volume.')
 @environment.pass_env
 def cli(env, origin_volume_id, origin_snapshot_id, duplicate_size,
-        duplicate_iops, duplicate_tier, duplicate_snapshot_size, billing):
+        duplicate_iops, duplicate_tier, duplicate_snapshot_size, billing,
+        dependent_duplicate):
     """Order a duplicate block storage volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
 
@@ -75,7 +82,8 @@ def cli(env, origin_volume_id, origin_snapshot_id, duplicate_size,
             duplicate_iops=duplicate_iops,
             duplicate_tier_level=duplicate_tier,
             duplicate_snapshot_size=duplicate_snapshot_size,
-            hourly_billing_flag=hourly_billing_flag
+            hourly_billing_flag=hourly_billing_flag,
+            dependent_duplicate=dependent_duplicate
         )
     except ValueError as ex:
         raise exceptions.ArgumentError(str(ex))

SoftLayer/CLI/core.py

@@ -14,6 +14,7 @@
 
 import click
 
+import requests
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import exceptions
@@ -31,6 +32,7 @@
     3: logging.DEBUG
 }
 
+PROG_NAME = "slcli (SoftLayer Command-line)"
 VALID_FORMATS = ['table', 'raw', 'json', 'jsonraw']
 DEFAULT_FORMAT = 'raw'
 if sys.stdout.isatty():
@@ -69,6 +71,28 @@ def get_command(self, ctx, name):
             return module
 
 
+def get_latest_version():
+    """Gets the latest version of the Softlayer library."""
+    try:
+        result = requests.get('https://pypi.org/pypi/SoftLayer/json')
+        json_result = result.json()
+        latest = 'v{}'.format(json_result['info']['version'])
+    except Exception:
+        latest = "Unable to get version from pypi."
+    return latest
+
+
+def get_version_message(ctx, param, value):
+    """Gets current and latest release versions message."""
+    if not value or ctx.resilient_parsing:
+        return
+    current = SoftLayer.consts.VERSION
+    latest = get_latest_version()
+    click.secho("Current: {prog} {current}\nLatest:  {prog} {latest}".format(
+        prog=PROG_NAME, current=current, latest=latest))
+    ctx.exit()
+
+
 @click.group(help="SoftLayer Command-line Client",
              epilog="""To use most commands your SoftLayer
 username and api_key need to be configured. The easiest way to do that is to
@@ -103,7 +127,8 @@ def get_command(self, ctx, name):
               is_flag=True,
               required=False,
               help="Use demo data instead of actually making API calls")
-@click.version_option(prog_name="slcli (SoftLayer Command-line)")
+@click.option('--version', is_flag=True, expose_value=False, is_eager=True, callback=get_version_message,
+              help="Show version information.")
 @environment.pass_env
 def cli(env,
         format='table',

SoftLayer/CLI/file/duplicate.py

@@ -52,9 +52,16 @@
               type=click.Choice(['hourly', 'monthly']),
               default='monthly',
               help="Optional parameter for Billing rate (default to monthly)")
+@click.option('--dependent-duplicate',
+              type=click.BOOL,
+              default=False,
+              show_default=True,
+              help='Whether or not this duplicate will be a dependent duplicate'
+                   'of the origin volume.')
 @environment.pass_env
 def cli(env, origin_volume_id, origin_snapshot_id, duplicate_size,
-        duplicate_iops, duplicate_tier, duplicate_snapshot_size, billing):
+        duplicate_iops, duplicate_tier, duplicate_snapshot_size, billing,
+        dependent_duplicate):
     """Order a duplicate file storage volume."""
     file_manager = SoftLayer.FileStorageManager(env.client)
 
@@ -73,7 +80,8 @@ def cli(env, origin_volume_id, origin_snapshot_id, duplicate_size,
             duplicate_iops=duplicate_iops,
             duplicate_tier_level=duplicate_tier,
             duplicate_snapshot_size=duplicate_snapshot_size,
-            hourly_billing_flag=hourly_billing_flag
+            hourly_billing_flag=hourly_billing_flag,
+            dependent_duplicate=dependent_duplicate
         )
     except ValueError as ex:
         raise exceptions.ArgumentError(str(ex))

SoftLayer/CLI/user/permissions.py

@@ -11,7 +11,7 @@
 @click.argument('identifier')
 @environment.pass_env
 def cli(env, identifier):
-    """User Permissions. TODO change to list all permissions, and which users have them"""
+    """User Permissions."""
 
     mgr = SoftLayer.UserManager(env.client)
     user_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'username')

SoftLayer/managers/storage_utils.py

@@ -789,7 +789,8 @@ def prepare_replicant_order_object(manager, snapshot_schedule, location,
 
 def prepare_duplicate_order_object(manager, origin_volume, iops, tier,
                                    duplicate_size, duplicate_snapshot_size,
-                                   volume_type, hourly_billing_flag=False):
+                                   volume_type, hourly_billing_flag=False,
+                                   dependent_duplicate=False):
     """Prepare the duplicate order to submit to SoftLayer_Product::placeOrder()
 
     :param manager: The File or Block manager calling this function
@@ -800,6 +801,8 @@ def prepare_duplicate_order_object(manager, origin_volume, iops, tier,
     :param duplicate_snapshot_size: The size for the duplicate snapshot space
     :param volume_type: The type of the origin volume ('file' or 'block')
     :param hourly_billing_flag: Billing type, monthly (False) or hourly (True)
+    :param dependent_duplicate: Duplicate type, normal (False) or dependent
+        duplicate (True)
     :return: Returns the order object to be passed to the
              placeOrder() method of the Product_Order service
     """
@@ -904,6 +907,9 @@ def prepare_duplicate_order_object(manager, origin_volume, iops, tier,
     if volume_is_performance:
         duplicate_order['iops'] = iops
 
+    if dependent_duplicate:
+        duplicate_order['isDependentDuplicateFlag'] = 1
+
     return duplicate_order
 
 

docs/cli/hardware.rst

@@ -41,8 +41,16 @@ Provides some basic functionality to order a server. `slcli order` has a more fu
    :prog: hw edit
    :show-nested:
 
-When setting port speed, use "-1" to indicate best possible configuration. Using 10/100/1000/10000 on a server with a redundant interface may result the interface entering a degraded state. See `setPublicNetworkInterfaceSpeed <http://sldn.softlayer.com/reference/services/SoftLayer_Hardware_Server/setPublicNetworkInterfaceSpeed/>`_ for more information.
+**Note :** Using multiple ' **:** ' can cause an error.
+
+     $ slcli hw edit 123456 --tag "cloud:service:db2whoc, cloud:svcplan:flex, cloud:svcenv:prod, cloud:bmixenv:fra"
+
+         TransportError(0): ('Connection aborted.',
 
+         RemoteDisconnected('Remote end closed connection without response',))
+
+
+When setting port speed, use "-1" to indicate best possible configuration. Using 10/100/1000/10000 on a server with a redundant interface may result the interface entering a degraded state. See `setPublicNetworkInterfaceSpeed <http://sldn.softlayer.com/reference/services/SoftLayer_Hardware_Server/setPublicNetworkInterfaceSpeed/>`_ for more information.
 
 .. click:: SoftLayer.CLI.hardware.list:cli
    :prog: hw list

tests/CLI/core_tests.py

@@ -10,6 +10,7 @@
 import click
 import mock
 
+from requests.models import Response
 import SoftLayer
 from SoftLayer.CLI import core
 from SoftLayer.CLI import environment
@@ -52,6 +53,28 @@ def test_diagnostics(self):
         self.assertIn('"python_version"', result.output)
         self.assertIn('"library_location"', result.output)
 
+    @mock.patch('requests.get')
+    def test_get_latest_version(self, request_get):
+        response = Response()
+        response.status_code = 200
+        response.json = mock.MagicMock(return_value={"info": {"version": "1.1.1"}})
+        request_get.return_value = response
+        version = core.get_latest_version()
+        self.assertIn('1.1.1', version)
+
+    @mock.patch('requests.get')
+    def test_unable_get_latest_version(self, request_get):
+        request_get.side_effect = Exception
+        version = core.get_latest_version()
+        self.assertIn('Unable', version)
+
+    @mock.patch('SoftLayer.CLI.core.get_latest_version')
+    def test_get_version_message(self, get_latest_version_mock):
+        get_latest_version_mock.return_value = '1.1.1'
+        env = environment.Environment()
+        result = self.run_command(['--version'], env=env)
+        self.assert_no_fail(result)
+
 
 class CoreMainTests(testing.TestCase):
 

tests/CLI/modules/block_tests.py

@@ -642,7 +642,8 @@ def test_duplicate_order_hourly_billing(self, order_mock):
                                       duplicate_size=250, duplicate_iops=None,
                                       duplicate_tier_level=2,
                                       duplicate_snapshot_size=20,
-                                      hourly_billing_flag=True)
+                                      hourly_billing_flag=True,
+                                      dependent_duplicate=False)
         self.assert_no_fail(result)
         self.assertEqual(result.output,
                          'Order #24602 placed successfully!\n'