Merge branch 'master' into issue1839

edsonarios · edsonarios · commit 07507c1237d3 · 2023-02-01T15:11:01.000-04:00
diff --git a/SoftLayer/CLI/block/replication/disaster_recovery_failover.py b/SoftLayer/CLI/block/replication/disaster_recovery_failover.py
@@ -15,7 +15,7 @@
 After using this method, to failback to the original volume, please open a support ticket.
 If you wish to test failover, please use replica-failover.""")
 @click.argument('volume-id')
-@click.option('--replicant-id', help="ID of the replicant volume")
+@click.option('--replicant-id', help="ID of the replicant volume.")
 @environment.pass_env
 def cli(env, volume_id, replicant_id):
     """Failover an inaccessible block volume to its available replicant volume."""
diff --git a/SoftLayer/CLI/block/replication/failback.py b/SoftLayer/CLI/block/replication/failback.py
@@ -10,7 +10,7 @@
 @click.argument('volume-id')
 @environment.pass_env
 def cli(env, volume_id):
-    """Failback a block volume from the given replicant volume."""
+    """Failback a block volume from the given replica volume."""
     block_storage_manager = SoftLayer.BlockStorageManager(env.client)
 
     success = block_storage_manager.failback_from_replicant(volume_id)
diff --git a/SoftLayer/CLI/block/replication/failover.py b/SoftLayer/CLI/block/replication/failover.py
@@ -8,10 +8,10 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume-id')
-@click.option('--replicant-id', help="ID of the replicant volume")
+@click.option('--replicant-id', help="ID of the replicant volume.")
 @environment.pass_env
 def cli(env, volume_id, replicant_id):
-    """Failover a block volume to the given replicant volume."""
+    """Failover a block volume to the given replica volume."""
     block_storage_manager = SoftLayer.BlockStorageManager(env.client)
 
     success = block_storage_manager.failover_to_replicant(
diff --git a/SoftLayer/CLI/block/replication/locations.py b/SoftLayer/CLI/block/replication/locations.py
@@ -22,12 +22,12 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume-id')
-@click.option('--sortby', help='Column to sort by', default='Long Name')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
               help='Columns to display. Options: {0}'.format(
                   ', '.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
 def cli(env, columns, sortby, volume_id):
     """List suitable replication datacenters for the given volume."""
diff --git a/SoftLayer/CLI/block/replication/order.py b/SoftLayer/CLI/block/replication/order.py
@@ -14,22 +14,16 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, context_settings=CONTEXT_SETTINGS)
 @click.argument('volume_id')
-@click.option('--snapshot-schedule', '-s',
-              help='Snapshot schedule to use for replication, '
-              '(HOURLY | DAILY | WEEKLY)',
-              required=True,
-              type=click.Choice(['HOURLY', 'DAILY', 'WEEKLY']))
-@click.option('--location', '-l',
-              help='Short name of the data center for the replicant '
-              '(e.g.: dal09)',
+@click.option('--datacenter', '-d',
+              help='Short name of the datacenter for the replica (e.g.: dal09)',
               required=True)
-@click.option('--tier',
-              help='Endurance Storage Tier (IOPS per GB) of the primary'
-              ' volume for which a replicant is ordered [optional]',
-              type=click.Choice(['0.25', '2', '4', '10']))
-@click.option('--os-type',
-              help='Operating System Type (e.g.: LINUX) of the primary'
-              ' volume for which a replica is ordered [optional]',
+@click.option('--iops', '-i',
+              help='Performance Storage IOPs, between 100 and 6000 in multiples of 100. If no IOPS value is specified,'
+              ' the IOPS value of the original volume will be used.',
+              type=int)
+@click.option('--os-type', '-o',
+              help='Operating System Type (eg. LINUX) of the primary volume for '
+              'which a replica is ordered [optional].',
               type=click.Choice([
                   'HYPER_V',
                   'LINUX',
@@ -38,22 +32,39 @@
                   'WINDOWS_GPT',
                   'WINDOWS',
                   'XEN']))
+@click.option('--snapshot-schedule', '-s',
+              help='Snapshot schedule to use for replication. Options are: '
+              'HOURLY, DAILY, WEEKLY',
+              required=True,
+              type=click.Choice(['HOURLY', 'DAILY', 'WEEKLY']))
+@click.option('--tier', '-t',
+              help='Endurance Storage Tier (IOPS per GB) of the primary volume for which a replica is ordered '
+              '[optional]. If no tier is specified, the tier of the original volume will be used',
+              type=click.Choice(['0.25', '2', '4', '10']))
 @environment.pass_env
-def cli(env, volume_id, snapshot_schedule, location, tier, os_type):
+def cli(env, volume_id, snapshot_schedule, datacenter, tier, os_type, iops):
     """Order a block storage replica volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     block_volume_id = helpers.resolve_id(block_manager.resolve_ids, volume_id, 'Block Volume')
 
     if tier is not None:
         tier = float(tier)
 
+    if iops is not None:
+        if iops < 100 or iops > 6000:
+            raise exceptions.ArgumentError(f"Invalid value for '--iops' / '-i': '{iops}' is not one "
+                                           "of between 100 and 6000.")
+        if iops % 100 != 0:
+            raise exceptions.ArgumentError(f"Invalid value for '--iops' / '-i': '{iops}' is not a multiple of 100.")
+
     try:
         order = block_manager.order_replicant_volume(
             block_volume_id,
             snapshot_schedule=snapshot_schedule,
-            location=location,
+            location=datacenter,
             tier=tier,
             os_type=os_type,
+            iops=iops
         )
     except ValueError as ex:
         raise exceptions.ArgumentError(str(ex))
diff --git a/SoftLayer/CLI/block/replication/partners.py b/SoftLayer/CLI/block/replication/partners.py
@@ -14,15 +14,15 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume-id')
-@click.option('--sortby', help='Column to sort by', default='Username')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
               help='Columns to display. Options: {0}'.format(
                   ', '.join(column.name for column in COLUMNS)),
               default=','.join(DEFAULT_COLUMNS))
+@click.option('--sortby', help='Column to sort by', default='Username')
 @environment.pass_env
 def cli(env, columns, sortby, volume_id):
-    """List existing replicant volumes for a block volume."""
+    """List existing replica volumes for a block volume."""
     block_storage_manager = SoftLayer.BlockStorageManager(env.client)
 
     legal_volumes = block_storage_manager.get_replication_partners(
diff --git a/SoftLayer/CLI/virt/capture.py b/SoftLayer/CLI/virt/capture.py
@@ -29,7 +29,7 @@ def cli(env, identifier, name, all, note):
     table.align['name'] = 'r'
     table.align['value'] = 'l'
 
-    table.add_row(['vs_id', capture['guestId']])
+    table.add_row(['globalIdentifier', capture['globalIdentifier']])
     table.add_row(['date', capture['createDate'][:10]])
     table.add_row(['time', capture['createDate'][11:19]])
     table.add_row(['transaction', formatting.transaction_status(capture)])
diff --git a/SoftLayer/CLI/vlan/list.py b/SoftLayer/CLI/vlan/list.py
@@ -65,7 +65,7 @@ def cli(env, sortby, datacenter, number, name, limit):
             vlan.get('vlanNumber'),
             vlan.get('fullyQualifiedName'),
             vlan.get('name') or formatting.blank(),
-            vlan.get('networkSpace').capitalize(),
+            vlan.get('networkSpace', 'Direct Link').capitalize(),
             utils.lookup(vlan, 'primaryRouter', 'datacenter', 'name'),
             get_pod_with_closed_announcement(vlan, pods),
             get_gateway_firewall(vlan),
diff --git a/SoftLayer/fixtures/SoftLayer_Account.py b/SoftLayer/fixtures/SoftLayer_Account.py
@@ -485,7 +485,7 @@
 
 getNetworkVlans = [{
     'id': 1,
-    'networkSpace': 'PRIVATE',
+    'networkSpace': '',
     'hardwareCount': 0,
     'hardware': [],
     'vlanNumber': 12,
diff --git a/SoftLayer/fixtures/SoftLayer_Virtual_Guest.py b/SoftLayer/fixtures/SoftLayer_Virtual_Guest.py
@@ -716,14 +716,15 @@
 setUserMetadata = ['meta']
 reloadOperatingSystem = 'OK'
 setTags = True
-createArchiveTransaction = {
+createArchiveTemplate = {
     'createDate': '2018-12-10T17:29:18-06:00',
     'elapsedSeconds': 0,
     'guestId': 12345678,
     'hardwareId': None,
     'id': 12345,
     'modifyDate': '2018-12-10T17:29:18-06:00',
-    'statusChangeDate': '2018-12-10T17:29:18-06:00'
+    'statusChangeDate': '2018-12-10T17:29:18-06:00',
+    'globalIdentifier': '495c47c2-80af-4fef-87a9-97faf132345678'
 }
 
 executeRescueLayer = True
diff --git a/SoftLayer/managers/storage.py b/SoftLayer/managers/storage.py
@@ -217,7 +217,8 @@ def order_replicant_volume(self,
                                snapshot_schedule,
                                location,
                                tier=None,
-                               os_type=None):
+                               os_type=None,
+                               iops=None):
         """Places an order for a replicant volume.
 
         :param volume_id: The ID of the primary volume to be replicated
@@ -239,9 +240,12 @@ def order_replicant_volume(self,
         storage_class = storage_utils.block_or_file(
             block_volume['storageType']['keyName'])
 
+        if iops is None:
+            iops = int(block_volume['provisionedIops'])
+
         order = storage_utils.prepare_replicant_order_object(
             self, snapshot_schedule, location, tier, block_volume,
-            storage_class)
+            storage_class, iops)
 
         if storage_class == 'block':
             if os_type is None:
diff --git a/SoftLayer/managers/storage_utils.py b/SoftLayer/managers/storage_utils.py
@@ -645,7 +645,7 @@ def _get_order_type_and_category(service_offering, storage_type, volume_type):
 
 
 def prepare_replicant_order_object(manager, snapshot_schedule, location,
-                                   tier, volume, volume_type):
+                                   tier, volume, volume_type, iops):
     """Prepare the order object which is submitted to the placeOrder() method
 
     :param manager: The File or Block manager calling this function
@@ -730,7 +730,7 @@ def prepare_replicant_order_object(manager, snapshot_schedule, location,
                     "A replica volume cannot be ordered for this performance "
                     "volume since it does not support Encryption at Rest.")
             volume_is_performance = True
-            iops = int(volume['provisionedIops'])
+
             prices = [
                 find_price_by_category(package, billing_item_category_code),
                 find_price_by_category(package, 'storage_' + volume_type),
diff --git a/SoftLayer/managers/vs.py b/SoftLayer/managers/vs.py
@@ -996,7 +996,7 @@ def capture(self, instance_id, name, additional_disks=False, notes=None):
 
             disks_to_capture.append(block_device)
 
-        return self.guest.createArchiveTransaction(
+        return self.guest.createArchiveTemplate(
             name, disks_to_capture, notes, id=instance_id)
 
     def upgrade(self, instance_id, cpus=None, memory=None, nic_speed=None, public=True, preset=None, disk=None):
diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@
         'prompt_toolkit >= 2',
         'pygments >= 2.0.0',
         'urllib3 >= 1.24',
-        'rich == 13.2.0'
+        'rich == 13.3.1'
     ],
     keywords=['softlayer', 'cloud', 'slcli'],
     classifiers=[
diff --git a/tests/CLI/modules/block_tests.py b/tests/CLI/modules/block_tests.py
@@ -625,7 +625,8 @@ def test_replicant_order_order_not_placed(self, order_mock):
 
         result = self.run_command(['block', 'replica-order', '100',
                                    '--snapshot-schedule=DAILY',
-                                   '--location=dal05'])
+                                   '--datacenter=dal05',
+                                   '--iops=100'])
 
         self.assert_no_fail(result)
         self.assertEqual(result.output,
@@ -650,7 +651,8 @@ def test_replicant_order(self, order_mock):
 
         result = self.run_command(['block', 'replica-order', '100',
                                    '--snapshot-schedule=DAILY',
-                                   '--location=dal05', '--tier=2'])
+                                   '--datacenter=dal05', '--tier=2',
+                                   '--iops=100'])
 
         self.assert_no_fail(result)
         self.assertEqual(result.output,
diff --git a/tests/CLI/modules/vlan_tests.py b/tests/CLI/modules/vlan_tests.py
@@ -143,6 +143,12 @@ def test_vlan_list(self):
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Account', 'getNetworkVlans')
 
+    def test_vlan_list_space_empty(self):
+        result = self.run_command(['vlan', 'list'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Account', 'getNetworkVlans')
+        self.assertEqual(json.loads(result.output)[0]['Network'], '')
+
     def test_create_vlan(self):
         _mock = self.set_mock('SoftLayer_Product_Package', 'getItems')
         _mock.return_value = SoftLayer_Product_Package.getItemsVLAN
diff --git a/tests/CLI/modules/vs/vs_tests.py b/tests/CLI/modules/vs/vs_tests.py
@@ -743,7 +743,7 @@ def test_vs_capture(self):
 
         result = self.run_command(['vs', 'capture', '100', '--name', 'TestName'])
         self.assert_no_fail(result)
-        self.assert_called_with('SoftLayer_Virtual_Guest', 'createArchiveTransaction', identifier=100)
+        self.assert_called_with('SoftLayer_Virtual_Guest', 'createArchiveTemplate', identifier=100)
 
     @mock.patch('SoftLayer.CLI.formatting.no_going_back')
     def test_usage_no_confirm(self, confirm_mock):
diff --git a/tests/managers/storage_utils_tests.py b/tests/managers/storage_utils_tests.py
diff --git a/tests/managers/vs/vs_tests.py b/tests/managers/vs/vs_tests.py
diff --git a/tools/requirements.txt b/tools/requirements.txt
