update the branch

caberos · caberos · commit a6d69b522b99 · 2022-06-08T15:41:06.000-04:00
diff --git a/SoftLayer/CLI/block/duplicate_convert_status.py b/SoftLayer/CLI/block/duplicate_convert_status.py
@@ -0,0 +1,30 @@
+"""Get status for split or move completed percentage of a given block duplicate volume."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand,
+               epilog="""Get status for split or move completed percentage of a given block duplicate volume.""")
+@click.argument('volume-id')
+@environment.pass_env
+def cli(env, volume_id):
+    """Get status for split or move completed percentage of a given block duplicate volume."""
+    table = formatting.Table(['Username', 'Active Conversion Start Timestamp', 'Completed Percentage'])
+
+    block_manager = SoftLayer.BlockStorageManager(env.client)
+
+    value = block_manager.convert_dupe_status(volume_id)
+
+    table.add_row(
+        [
+            value['volumeUsername'],
+            value['activeConversionStartTime'],
+            value['deDuplicateConversionPercentage']
+        ]
+    )
+
+    env.fout(table)
diff --git a/SoftLayer/CLI/environment.py b/SoftLayer/CLI/environment.py
@@ -17,7 +17,7 @@
 from SoftLayer.CLI import formatting
 from SoftLayer.CLI import routes
 
-# pylint: disable=too-many-instance-attributes, invalid-name, no-self-use
+# pylint: disable=too-many-instance-attributes, invalid-name
 
 # Calling pkg_resources.iter_entry_points shows a false-positive
 # pylint: disable=no-member
diff --git a/SoftLayer/CLI/file/duplicate_convert_status.py b/SoftLayer/CLI/file/duplicate_convert_status.py
@@ -0,0 +1,30 @@
+"""Get status for split or move completed percentage of a given file duplicate volume."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand,
+               epilog="""Get status for split or move completed percentage of a given file duplicate volume.""")
+@click.argument('volume-id')
+@environment.pass_env
+def cli(env, volume_id):
+    """Get status for split or move completed percentage of a given file duplicate volume."""
+    table = formatting.Table(['Username', 'Active Conversion Start Timestamp', 'Completed Percentage'])
+
+    file_manager = SoftLayer.FileStorageManager(env.client)
+
+    value = file_manager.convert_dupe_status(volume_id)
+
+    table.add_row(
+        [
+            value['volumeUsername'],
+            value['activeConversionStartTime'],
+            value['deDuplicateConversionPercentage']
+        ]
+    )
+
+    env.fout(table)
diff --git a/SoftLayer/CLI/routes.py b/SoftLayer/CLI/routes.py
@@ -93,6 +93,7 @@
     ('block:access-list', 'SoftLayer.CLI.block.access.list:cli'),
     ('block:access-revoke', 'SoftLayer.CLI.block.access.revoke:cli'),
     ('block:access-password', 'SoftLayer.CLI.block.access.password:cli'),
+    ('block:duplicate-convert-status', 'SoftLayer.CLI.block.duplicate_convert_status:cli'),
     ('block:subnets-list', 'SoftLayer.CLI.block.subnets.list:cli'),
     ('block:subnets-assign', 'SoftLayer.CLI.block.subnets.assign:cli'),
     ('block:subnets-remove', 'SoftLayer.CLI.block.subnets.remove:cli'),
@@ -142,6 +143,7 @@
     ('file:access-authorize', 'SoftLayer.CLI.file.access.authorize:cli'),
     ('file:access-list', 'SoftLayer.CLI.file.access.list:cli'),
     ('file:access-revoke', 'SoftLayer.CLI.file.access.revoke:cli'),
+    ('file:duplicate-convert-status', 'SoftLayer.CLI.file.duplicate_convert_status:cli'),
     ('file:replica-failback', 'SoftLayer.CLI.file.replication.failback:cli'),
     ('file:replica-failover', 'SoftLayer.CLI.file.replication.failover:cli'),
     ('file:disaster-recovery-failover', 'SoftLayer.CLI.file.replication.disaster_recovery_failover:cli'),
diff --git a/SoftLayer/auth.py b/SoftLayer/auth.py
@@ -5,7 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-# pylint: disable=no-self-use
+
 
 __all__ = [
     'BasicAuthentication',
diff --git a/SoftLayer/managers/account.py b/SoftLayer/managers/account.py
@@ -12,7 +12,7 @@
 from SoftLayer import utils
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/SoftLayer/managers/cdn.py b/SoftLayer/managers/cdn.py
@@ -9,7 +9,7 @@
 from SoftLayer import utils
 
 
-# pylint: disable=no-self-use,too-many-lines,too-many-instance-attributes
+# pylint: disable=too-many-lines,too-many-instance-attributes
 
 
 class CDNManager(utils.IdentifierMixin, object):
diff --git a/SoftLayer/managers/dedicated_host.py b/SoftLayer/managers/dedicated_host.py
@@ -13,7 +13,7 @@
 from SoftLayer import utils
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/SoftLayer/managers/email.py b/SoftLayer/managers/email.py
@@ -10,7 +10,7 @@
 
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 
 class EmailManager(utils.IdentifierMixin, object):
diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -20,7 +20,7 @@
 LOGGER = logging.getLogger(__name__)
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use, too-many-lines
+# pylint: disable=invalid-name, too-many-lines
 
 EXTRA_CATEGORIES = ['pri_ipv6_addresses',
                     'static_ipv6_addresses',
diff --git a/SoftLayer/managers/ordering.py b/SoftLayer/managers/ordering.py
@@ -5,7 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-# pylint: disable=no-self-use
+
 
 from re import match
 
diff --git a/SoftLayer/managers/storage.py b/SoftLayer/managers/storage.py
@@ -25,7 +25,7 @@ def __init__(self, client):
         self.client = client
         self.resolvers = [self._get_ids_from_username]
 
-    def _get_ids_from_username(self, username):  # pylint: disable=unused-argument,no-self-use
+    def _get_ids_from_username(self, username):  # pylint: disable=unused-argument
         """Should only be actually called from the block/file manager"""
         return []
 
@@ -577,3 +577,12 @@ def convert_dep_dupe(self, volume_id):
         return self.client.call('Network_Storage',
                                 'convertCloneDependentToIndependent',
                                 id=volume_id)
+
+    def convert_dupe_status(self, volume_id):
+        """Get the Clone split/move status completion of a duplicate volume
+
+        :param integer volume_id: The id of the volume.
+        """
+        return self.client.call('Network_Storage',
+                                'getDuplicateConversionStatus',
+                                id=volume_id)
diff --git a/SoftLayer/managers/vs.py b/SoftLayer/managers/vs.py
@@ -28,7 +28,7 @@
                     'software_guard_extensions']
 
 
-# pylint: disable=no-self-use,too-many-lines
+# pylint: disable=,too-many-lines
 
 
 class VSManager(utils.IdentifierMixin, object):
@@ -360,7 +360,7 @@ def get_create_options(self, vsi_type="PUBLIC_CLOUD_SERVER", datacenter=None):
                     'prices': get_item_price(item['prices'], location_group_id)
                 })
 
-            elif category.__contains__('guest_disk'):
+            elif 'guest_disk' in category:
                 local_disk.append({
                     'name': item['description'],
                     'capacity': item['capacity'],
@@ -1043,7 +1043,7 @@ def upgrade(self, instance_id, cpus=None, memory=None, nic_speed=None, public=Tr
             disk_number = 0
             vsi_disk = self.get_instance(instance_id)
             for item in vsi_disk.get('billingItem').get('children'):
-                if item.get('categoryCode').__contains__('guest_disk'):
+                if 'guest_disk' in item.get('categoryCode'):
                     if disk_number < int("".join(filter(str.isdigit, item.get('categoryCode')))):
                         disk_number = int("".join(filter(str.isdigit, item.get('categoryCode'))))
             for disk_guest in disk:
diff --git a/SoftLayer/managers/vs_capacity.py b/SoftLayer/managers/vs_capacity.py
@@ -14,7 +14,7 @@
 from SoftLayer import utils
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/SoftLayer/managers/vs_placement.py b/SoftLayer/managers/vs_placement.py
@@ -11,7 +11,7 @@
 from SoftLayer import utils
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/SoftLayer/transports/__init__.py b/SoftLayer/transports/__init__.py
@@ -17,7 +17,7 @@
 from .xmlrpc import XmlRpcTransport
 
 # transports.Request does have a lot of instance attributes. :(
-# pylint: disable=too-many-instance-attributes, no-self-use
+# pylint: disable=too-many-instance-attributes
 
 __all__ = [
     'Request',
diff --git a/SoftLayer/transports/transport.py b/SoftLayer/transports/transport.py
@@ -30,7 +30,7 @@ def get_session(user_agent):
 
 
 # transports.Request does have a lot of instance attributes. :(
-# pylint: disable=too-many-instance-attributes, no-self-use
+# pylint: disable=too-many-instance-attributes
 class Request(object):
     """Transport request object."""
 
diff --git a/docs/cli/block.rst b/docs/cli/block.rst
@@ -155,3 +155,8 @@ Block Commands
 .. click:: SoftLayer.CLI.block.snapshot.get_notify_status:cli
     :prog: block snapshot-get-notification-status
     :show-nested:
+
+.. click:: SoftLayer.CLI.block.duplicate_convert_status:cli
+    :prog: block duplicate-convert-status
+    :show-nested:
+
diff --git a/docs/cli/file.rst b/docs/cli/file.rst
@@ -135,3 +135,7 @@ File Commands
     :prog: file snapshot-get-notification-status
     :show-nested:
 
+.. click:: SoftLayer.CLI.file.duplicate_convert_status:cli
+    :prog: file duplicate-convert-status
+    :show-nested:
+
diff --git a/tox.ini b/tox.ini
@@ -31,8 +31,6 @@ commands =
            -r n \
            --ignore=tests,fixtures \
            -d too-many-locals \
-           -d star-args \
-           -d redefined-variable-type \
            -d locally-disabled \
            -d no-else-return \ 
            -d len-as-condition \
