fixcode

Author: caberos

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5,3.6,3.7,3.8,3.9]
+        python-version: [3.6,3.7,3.8,3.9]
 
     steps:
     - uses: actions/checkout@v2

SoftLayer/CLI/environment.py

@@ -67,7 +67,23 @@ def input(self, prompt, default=None, show_default=True):
 
     def getpass(self, prompt, default=None):
         """Provide a password prompt."""
-        return click.prompt(prompt, hide_input=True, default=default)
+        password = click.prompt(prompt, hide_input=True, default=default)
+
+        # https://github.com/softlayer/softlayer-python/issues/1436
+        # click.prompt uses python's getpass() in the background
+        # https://github.com/python/cpython/blob/3.9/Lib/getpass.py#L97
+        # In windows, shift+insert actually inputs the below 2 characters
+        # If we detect those 2 characters, need to manually read from the clipbaord instead
+        # https://stackoverflow.com/questions/101128/how-do-i-read-text-from-the-clipboard
+        if password == 'àR':
+            # tkinter is a built in python gui, but it has clipboard reading functions.
+            # pylint: disable=import-outside-toplevel
+            from tkinter import Tk
+            tk_manager = Tk()
+            password = tk_manager.clipboard_get()
+            # keep the window from showing
+            tk_manager.withdraw()
+        return password
 
     # Command loading methods
     def list_commands(self, *path):

SoftLayer/CLI/hardware/upgrade.py

@@ -24,24 +24,40 @@
               default=None,
               type=click.Choice(['Non-RAID', 'RAID']))
 @click.option('--public-bandwidth', type=click.INT, help="Public Bandwidth in GB")
+@click.option('--add-disk', nargs=2, multiple=True, type=(int, int),
+              help="Add a Hard disk in GB to a specific channel, e.g 1000 GB in disk2, it will be "
+                   "--add-disk 1000 2")
+@click.option('--resize-disk', nargs=2, multiple=True, type=(int, int),
+              help="Upgrade a specific disk size in GB, e.g --resize-disk 2000 2")
 @click.option('--test', is_flag=True, default=False, help="Do not actually upgrade the hardware server")
 @environment.pass_env
-def cli(env, identifier, memory, network, drive_controller, public_bandwidth, test):
+def cli(env, identifier, memory, network, drive_controller, public_bandwidth, add_disk, resize_disk, test):
     """Upgrade a Hardware Server."""
 
     mgr = SoftLayer.HardwareManager(env.client)
 
-    if not any([memory, network, drive_controller, public_bandwidth]):
+    if not any([memory, network, drive_controller, public_bandwidth, add_disk, resize_disk]):
         raise exceptions.ArgumentError("Must provide "
-                                       " [--memory], [--network], [--drive-controller], or [--public-bandwidth]")
+                                       " [--memory], [--network], [--drive-controller], [--public-bandwidth],"
+                                       "[--add-disk] or [--resize-disk]")
 
     hw_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'Hardware')
     if not test:
         if not (env.skip_confirmations or formatting.confirm(
                 "This action will incur charges on your account. Continue?")):
             raise exceptions.CLIAbort('Aborted')
 
+    disk_list = list()
+    if add_disk:
+        for guest_disk in add_disk:
+            disks = {'description': 'add_disk', 'capacity': guest_disk[0], 'number': guest_disk[1]}
+            disk_list.append(disks)
+    if resize_disk:
+        for guest_disk in resize_disk:
+            disks = {'description': 'resize_disk', 'capacity': guest_disk[0], 'number': guest_disk[1]}
+            disk_list.append(disks)
+
     if not mgr.upgrade(hw_id, memory=memory, nic_speed=network, drive_controller=drive_controller,
-                       public_bandwidth=public_bandwidth, test=test):
+                       public_bandwidth=public_bandwidth, disk=disk_list, test=test):
         raise exceptions.CLIAbort('Hardware Server Upgrade Failed')
     env.fout('Successfully Upgraded.')

SoftLayer/CLI/virt/detail.py

@@ -69,6 +69,11 @@ def cli(env, identifier, passwords=False, price=False):
     table.add_row(['transient', result.get('transientGuestFlag', False)])
     table.add_row(['created', result['createDate']])
     table.add_row(['modified', result['modifyDate']])
+    last_transaction = "{} ({})".format(utils.lookup(result, 'lastTransaction', 'transactionGroup', 'name'),
+                                        utils.clean_time(utils.lookup(result, 'lastTransaction', 'modifyDate')))
+
+    table.add_row(['last_transaction', last_transaction])
+    table.add_row(['billing', 'Hourly' if result['hourlyBillingFlag'] else'Monthly'])
     table.add_row(['preset', utils.lookup(result, 'billingItem',
                                           'orderItem',
                                           'preset',

SoftLayer/fixtures/SoftLayer_Hardware_Server.py

@@ -13,6 +13,10 @@
         'children': [
             {'description': 'test', 'nextInvoiceTotalRecurringAmount': 1},
         ],
+        'nextInvoiceChildren': [
+            {'description': 'test', 'nextInvoiceTotalRecurringAmount': 1, 'categoryCode': 'disk1'},
+            {'description': 'test2', 'nextInvoiceTotalRecurringAmount': 2, 'categoryCode': 'disk3'}
+        ],
         'orderItem': {
             'order': {
                 'userRecord': {
@@ -336,5 +340,40 @@
             "id": 6177,
             "keyName": "BANDWIDTH_500_GB"
         }
+    },
+    {
+        "hourlyRecurringFee": ".023",
+        "id": 49759,
+        "recurringFee": "15",
+        "categories": [
+            {
+                "categoryCode": "disk2",
+                "id": 6,
+                "name": "Third Hard Drive"
+            }
+        ],
+        "item": {
+            "capacity": "1000",
+            "description": "1.00 TB SATA",
+            "id": 6159,
+            "keyName": "HARD_DRIVE_1_00_TB_SATA_2",
+        }
+    },
+    {
+        "id": 49759,
+        "recurringFee": "0",
+        "categories": [
+            {
+                "categoryCode": "disk1",
+                "id": 5,
+                "name": "Second Hard Drive"
+            }
+        ],
+        "item": {
+            "capacity": "1000",
+            "description": "1.00 TB SATA",
+            "id": 6159,
+            "keyName": "HARD_DRIVE_1_00_TB_SATA_2"
+        }
     }
 ]

SoftLayer/managers/hardware.py

@@ -821,14 +821,15 @@ def authorize_storage(self, hardware_id, username_storage):
 
     def upgrade(self, instance_id, memory=None,
                 nic_speed=None, drive_controller=None,
-                public_bandwidth=None, test=False):
+                public_bandwidth=None, disk=None, test=False):
         """Upgrades a hardware server instance.
 
         :param int instance_id: Instance id of the hardware server to be upgraded.
         :param int memory: Memory size.
         :param string nic_speed: Network Port Speed data.
         :param string drive_controller: Drive Controller data.
         :param int public_bandwidth: Public keyName data.
+        :param list disk: List of disks to add or upgrade Hardware Server.
         :param bool test: Test option to verify the request.
 
         :returns: bool
@@ -860,6 +861,10 @@ def upgrade(self, instance_id, memory=None,
             'packageId': package_id
         }
 
+        if disk:
+            prices = self._get_disk_price_list(instance_id, disk)
+            order['prices'] = prices
+
         for option, value in data.items():
             price_id = self._get_prices_for_upgrade_option(upgrade_prices, option, value)
             if not price_id:
@@ -888,13 +893,13 @@ def get_instance(self, instance_id):
                   the specified instance.
         """
         mask = [
-            'billingItem[id,package[id,keyName]]'
+            'billingItem[id,package[id,keyName],nextInvoiceChildren]'
         ]
         mask = "mask[%s]" % ','.join(mask)
 
         return self.hardware.getObject(id=instance_id, mask=mask)
 
-    def _get_upgrade_prices(self, instance_id, include_downgrade_options=True):
+    def _get_upgrade_prices(self, instance_id):
         """Following Method gets all the price ids related to upgrading a Hardware Server.
 
         :param int instance_id: Instance id of the Hardware Server to be upgraded.
@@ -908,7 +913,7 @@ def _get_upgrade_prices(self, instance_id, include_downgrade_options=True):
             'item[keyName,description,capacity,units]'
         ]
         mask = "mask[%s]" % ','.join(mask)
-        return self.hardware.getUpgradeItemPrices(include_downgrade_options, id=instance_id, mask=mask)
+        return self.hardware.getUpgradeItemPrices(id=instance_id, mask=mask)
 
     @staticmethod
     def _get_prices_for_upgrade_option(upgrade_prices, option, value):
@@ -927,7 +932,10 @@ def _get_prices_for_upgrade_option(upgrade_prices, option, value):
             'disk_controller': 'disk_controller',
             'bandwidth': 'bandwidth'
         }
-        category_code = option_category.get(option)
+        if 'disk' in option:
+            category_code = option
+        else:
+            category_code = option_category.get(option)
 
         for price in upgrade_prices:
             if price.get('categories') is None or price.get('item') is None:
@@ -953,12 +961,75 @@ def _get_prices_for_upgrade_option(upgrade_prices, option, value):
                 elif option == 'bandwidth':
                     if str(product.get('capacity')) == str(value):
                         price_id = price.get('id')
+                elif 'disk' in option:
+                    if str(product.get('capacity')) == str(value):
+                        price_id = price
                 else:
                     if str(product.get('capacity')) == str(value):
                         price_id = price.get('id')
 
         return price_id
 
+    def _get_disk_price_list(self, instance_id, disk):
+        """Get the disks prices to be added or upgraded.
+
+        :param int instance_id: Hardware Server instance id.
+        :param list disk: List of disks to be added o upgraded to the HW.
+
+        :return list.
+        """
+        prices = []
+        disk_exist = False
+        upgrade_prices = self._get_upgrade_prices(instance_id)
+        server_response = self.get_instance(instance_id)
+        for disk_data in disk:
+            disk_channel = 'disk' + str(disk_data.get('number'))
+            for item in utils.lookup(server_response, 'billingItem', 'nextInvoiceChildren'):
+                if disk_channel == item['categoryCode']:
+                    disk_exist = True
+                    break
+            if disk_exist:
+                disk_price_detail = self._get_disk_price_detail(disk_data, upgrade_prices, disk_channel, 'add_disk')
+                prices.append(disk_price_detail)
+            else:
+                disk_price_detail = self._get_disk_price_detail(disk_data, upgrade_prices, disk_channel, 'resize_disk')
+                prices.append(disk_price_detail)
+
+        return prices
+
+    def _get_disk_price_detail(self, disk_data, upgrade_prices, disk_channel, disk_type):
+        """Get the disk price detail.
+
+        :param disk_data: List of disks to be added or upgraded.
+        :param list upgrade_prices: List of item prices.
+        :param String disk_channel: Disk position.
+        :param String disk_type: Disk type.
+
+        """
+        if disk_data.get('description') == disk_type:
+            if "add" in disk_type:
+                raise SoftLayerError("Unable to add the disk because this already exists.")
+            if "resize" in disk_type:
+                raise SoftLayerError("Unable to resize the disk because this does not exists.")
+        else:
+            price_id = self._get_prices_for_upgrade_option(upgrade_prices, disk_channel,
+                                                           disk_data.get('capacity'))
+            if not price_id:
+                raise SoftLayerError("The item price was not found for %s with 'capacity:' %i" %
+                                     (disk_channel, disk_data.get('capacity')))
+
+            disk_price = {
+                "id": price_id.get('id'),
+                "categories": [
+                    {
+                        "categoryCode": price_id['categories'][0]['categoryCode'],
+                        "id": price_id['categories'][0]['id']
+                    }
+                ]
+            }
+
+        return disk_price
+
 
 def _get_bandwidth_key(items, hourly=True, no_public=False, location=None):
     """Picks a valid Bandwidth Item, returns the KeyName"""

SoftLayer/managers/vs.py

@@ -227,7 +227,7 @@ def get_instance(self, instance_id, **kwargs):
                 'maxMemory,'
                 'datacenter,'
                 'activeTransaction[id, transactionStatus[friendlyName,name]],'
-                'lastTransaction[transactionStatus],'
+                'lastTransaction[transactionStatus,modifyDate,transactionGroup[name]],'
                 'lastOperatingSystemReload.id,'
                 'blockDevices,'
                 'blockDeviceTemplateGroup[id, name, globalIdentifier],'

SoftLayer/testing/__init__.py

@@ -9,9 +9,9 @@
 import logging
 import os.path
 import unittest
+from unittest import mock as mock
 
 from click import testing
-import mock
 
 import SoftLayer
 from SoftLayer.CLI import core

SoftLayer/utils.py

@@ -5,6 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
+import collections
 import datetime
 import re
 import time
@@ -57,6 +58,23 @@ def to_dict(self):
                 for key, val in self.items()}
 
 
+def dict_merge(dct1, dct2):
+    """Recursively merges dct2 and dct1, ideal for merging objectFilter together.
+
+    :param dct1: A dictionary
+    :param dct2: A dictionary
+    :return: dct1 + dct2
+    """
+
+    dct = dct1.copy()
+    for k, _ in dct2.items():
+        if (k in dct1 and isinstance(dct1[k], dict) and isinstance(dct2[k], collections.Mapping)):
+            dct[k] = dict_merge(dct1[k], dct2[k])
+        else:
+            dct[k] = dct2[k]
+    return dct
+
+
 def query_filter(query):
     """Translate a query-style string to a 'filter'.
 

setup.py

@@ -50,7 +50,6 @@
         'Operating System :: OS Independent',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',