Merge remote-tracking branch 'origin/master' into 1026

Author: allmightyspiff

CHANGELOG.md

@@ -1,7 +1,17 @@
 # Change Log
 
 
-## [5.5.1] - 2018-08-31
+## [5.5.3] - 2018-08-31
+- Changes: https://github.com/softlayer/softlayer-python/compare/v5.5.2...v5.5.3
+
++ Added `slcli user delete`
++ #1023 Added `slcli order quote` to let users create a quote from the slcli.
++ #1032 Fixed vs upgrades when using flavors.
++ #1034 Added pagination to ticket list commands
++ #1037 Fixed DNS manager to be more flexible and support more zone types.
++ #1044 Pinned Click library version at >=5 < 7
+
+## [5.5.2] - 2018-08-31
 - Changes: https://github.com/softlayer/softlayer-python/compare/v5.5.1...v5.5.2
 
 + #1018 Fixed hardware credentials.

README.rst

@@ -17,7 +17,7 @@ SoftLayer API Python Client
 
 
 This library provides a simple Python client to interact with `SoftLayer's
-XML-RPC API <http://developer.softlayer.com/reference/softlayerapi>`_. 
+XML-RPC API <https://softlayer.github.io/reference/softlayerapi>`_.
 
 A command-line interface is also included and can be used to manage various
 SoftLayer products and services.
@@ -120,7 +120,7 @@ If you are using the library directly in python, you can do something like this.
 
 System Requirements
 -------------------
-* Python 2.7, 3.3, 3.4, 3.5 or 3.6.
+* Python 2.7, 3.3, 3.4, 3.5, 3.6, or 3.7.
 * A valid SoftLayer API username and key.
 * A connection to SoftLayer's private network is required to use
   our private network API endpoints.
@@ -129,7 +129,7 @@ Python Packages
 ---------------
 * six >= 1.7.0
 * prettytable >= 0.7.0
-* click >= 5
+* click >= 5, < 7
 * requests >= 2.18.4
 * prompt_toolkit >= 0.53
 * pygments >= 2.0.0

SoftLayer/consts.py

@@ -5,7 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-VERSION = 'v5.5.2'
+VERSION = 'v5.5.3'
 API_PUBLIC_ENDPOINT = 'https://api.softlayer.com/xmlrpc/v3.1/'
 API_PRIVATE_ENDPOINT = 'https://api.service.softlayer.com/xmlrpc/v3.1/'
 API_PUBLIC_ENDPOINT_REST = 'https://api.softlayer.com/rest/v3.1/'

SoftLayer/fixtures/SoftLayer_Account.py

@@ -554,11 +554,11 @@
         'name': 'dal05'
     },
     'memoryCapacity': 242,
-    'name': 'khnguyendh',
+    'name': 'test-dedicated',
     'diskCapacity': 1200,
     'guestCount': 1,
     'cpuCount': 56,
-    'id': 44701
+    'id': 12345
 }]
 
 

SoftLayer/fixtures/SoftLayer_Virtual_DedicatedHost.py

@@ -11,57 +11,57 @@
 
 
 getAvailableRouters = [
-    {'hostname': 'bcr01a.dal05', 'id': 51218},
-    {'hostname': 'bcr02a.dal05', 'id': 83361},
-    {'hostname': 'bcr03a.dal05', 'id': 122762},
-    {'hostname': 'bcr04a.dal05', 'id': 147566}
+    {'hostname': 'bcr01a.dal05', 'id': 12345},
+    {'hostname': 'bcr02a.dal05', 'id': 12346},
+    {'hostname': 'bcr03a.dal05', 'id': 12347},
+    {'hostname': 'bcr04a.dal05', 'id': 12348}
 ]
 
 getObjectById = {
     'datacenter': {
-        'id': 138124,
+        'id': 12345,
         'name': 'dal05',
         'longName': 'Dallas 5'
     },
     'memoryCapacity': 242,
     'modifyDate': '2017-11-06T11:38:20-06:00',
-    'name': 'khnguyendh',
+    'name': 'test-dedicated',
     'diskCapacity': 1200,
     'backendRouter': {
-        'domain': 'softlayer.com',
+        'domain': 'test.com',
         'hostname': 'bcr01a.dal05',
-        'id': 51218
+        'id': 12345
     },
     'guestCount': 1,
     'cpuCount': 56,
     'guests': [{
-        'domain': 'Softlayer.com',
-        'hostname': 'khnguyenDHI',
-        'id': 43546081,
-        'uuid': '806a56ec-0383-4c2e-e6a9-7dc89c4b29a2'
+        'domain': 'test.com',
+        'hostname': 'test-dedicated',
+        'id': 12345,
+        'uuid': 'F9329795-4220-4B0A-B970-C86B950667FA'
     }],
     'billingItem': {
         'nextInvoiceTotalRecurringAmount': 1515.556,
         'orderItem': {
-            'id': 263060473,
+            'id': 12345,
             'order': {
                 'status': 'APPROVED',
                 'privateCloudOrderFlag': False,
                 'modifyDate': '2017-11-02T11:42:50-07:00',
                 'orderQuoteId': '',
-                'userRecordId': 6908745,
+                'userRecordId': 12345,
                 'createDate': '2017-11-02T11:40:56-07:00',
                 'impersonatingUserRecordId': '',
                 'orderTypeId': 7,
                 'presaleEventId': '',
                 'userRecord': {
-                    'username': '232298_khuong'
+                    'username': 'test-dedicated'
                 },
-                'id': 20093269,
-                'accountId': 232298
+                'id': 12345,
+                'accountId': 12345
             }
         },
-        'id': 235379377,
+        'id': 12345,
         'children': [
             {
                 'nextInvoiceTotalRecurringAmount': 0.0,
@@ -73,6 +73,6 @@
             }
         ]
     },
-    'id': 44701,
+    'id': 12345,
     'createDate': '2017-11-02T11:40:56-07:00'
 }

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='SoftLayer',
-    version='5.5.2',
+    version='5.5.3',
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     author='SoftLayer Technologies, Inc.',
@@ -32,7 +32,7 @@
     install_requires=[
         'six >= 1.7.0',
         'ptable >= 0.9.2',
-        'click >= 5',
+        'click >= 5, < 7',
         'requests >= 2.18.4',
         'prompt_toolkit >= 0.53',
         'pygments >= 2.0.0',

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: slcli # check to see if it's available
-version: '5.5.2+git' # check versioning
+version: '5.5.3+git' # check versioning
 summary: Python based SoftLayer API Tool. # 79 char long summary
 description: |
     A command-line interface is also included and can be used to manage various SoftLayer products and services.