Merge branch 'master' of github.com:softlayer/softlayer-python into issues771

Author: allmightyspiff

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 
 
+## [5.8.2] - 2019-11-15
+- https://github.com/softlayer/softlayer-python/compare/v5.8.1...v5.8.2
+
+
++ #1186 Fixed a unit test that could fail if the test took too long to run.
++ #1183 Added a check to ensure subnet and vlan options are properly added to the order for virtual servers.
++ #1184 Fixed a readme misspelling.
++ #1182 Fixed vs reboot unable to resolve vs names.
++ #1095 Handle missing Fixtures better for unit tests.
+
 ## [5.8.1] - 2019-10-11
 - https://github.com/softlayer/softlayer-python/compare/v5.8.0...v5.8.1
 

README.rst

@@ -129,7 +129,7 @@ System Requirements
 * A connection to SoftLayer's private network is required to use
   our private network API endpoints.
 
-Pyhton 2.7 Support
+Python 2.7 Support
 ------------------
 As of version 5.8.0 SoftLayer-Python will no longer support python2.7, which is `End Of Life as of 2020 <https://www.python.org/dev/peps/pep-0373/>`_ .
 If you cannot install python 3.6+ for some reason, you will need to use a version of softlayer-python <= 5.7.2
@@ -147,6 +147,6 @@ Python Packages
 
 Copyright
 ---------
-This software is Copyright (c) 2016-2018 SoftLayer Technologies, Inc.
+This software is Copyright (c) 2016-2019 SoftLayer Technologies, Inc.
 
 See the bundled LICENSE file for more information.

SoftLayer/consts.py

@@ -5,7 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-VERSION = 'v5.8.1'
+VERSION = 'v5.8.2'
 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/managers/cdn.py

@@ -21,6 +21,8 @@ class CDNManager(utils.IdentifierMixin, object):
 
     def __init__(self, client):
         self.client = client
+        self._start_date = None
+        self._end_date = None
         self.cdn_configuration = self.client['Network_CdnMarketplace_Configuration_Mapping']
         self.cdn_path = self.client['SoftLayer_Network_CdnMarketplace_Configuration_Mapping_Path']
         self.cdn_metrics = self.client['Network_CdnMarketplace_Metrics']
@@ -151,10 +153,20 @@ def get_usage_metrics(self, unique_id, history=30, frequency="aggregate"):
         _start = utils.days_to_datetime(history)
         _end = utils.days_to_datetime(0)
 
-        _start_date = utils.timestamp(_start)
-        _end_date = utils.timestamp(_end)
+        self._start_date = utils.timestamp(_start)
+        self._end_date = utils.timestamp(_end)
 
-        usage = self.cdn_metrics.getMappingUsageMetrics(unique_id, _start_date, _end_date, frequency)
+        usage = self.cdn_metrics.getMappingUsageMetrics(unique_id, self._start_date, self._end_date, frequency)
 
         # The method getMappingUsageMetrics() returns an array but there is only 1 object
         return usage[0]
+
+    @property
+    def start_data(self):
+        """Retrieve the cdn usage metric start date."""
+        return self._start_date
+
+    @property
+    def end_date(self):
+        """Retrieve the cdn usage metric end date."""
+        return self._end_date

SoftLayer/managers/vs.py

@@ -429,7 +429,6 @@ def _generate_create_dict(
     def _create_network_components(
             self, public_vlan=None, private_vlan=None,
             private_subnet=None, public_subnet=None):
-
         parameters = {}
         if private_vlan:
             parameters['primaryBackendNetworkComponent'] = {"networkVlan": {"id": int(private_vlan)}}
@@ -532,7 +531,16 @@ def verify_create_instance(self, **kwargs):
         """
         kwargs.pop('tags', None)
         create_options = self._generate_create_dict(**kwargs)
-        return self.guest.generateOrderTemplate(create_options)
+        template = self.guest.generateOrderTemplate(create_options)
+        if 'private_subnet' in kwargs or 'public_subnet' in kwargs:
+            vsi = template['virtualGuests'][0]
+            network_components = self._create_network_components(kwargs.get('public_vlan', None),
+                                                                 kwargs.get('private_vlan', None),
+                                                                 kwargs.get('private_subnet', None),
+                                                                 kwargs.get('public_subnet', None))
+            vsi.update(network_components)
+
+        return template
 
     def create_instance(self, **kwargs):
         """Creates a new virtual server instance.

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='SoftLayer',
-    version='5.8.1',
+    version='5.8.2',
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     author='SoftLayer Technologies, Inc.',

tests/managers/cdn_tests.py

@@ -7,7 +7,6 @@
 
 from SoftLayer.managers import cdn
 from SoftLayer import testing
-from SoftLayer import utils
 
 
 class CDNTests(testing.TestCase):
@@ -31,15 +30,9 @@ def test_detail_cdn(self):
     def test_detail_usage_metric(self):
         self.cdn_client.get_usage_metrics(12345, history=30, frequency="aggregate")
 
-        _start = utils.days_to_datetime(30)
-        _end = utils.days_to_datetime(0)
-
-        _start_date = utils.timestamp(_start)
-        _end_date = utils.timestamp(_end)
-
         args = (12345,
-                _start_date,
-                _end_date,
+                self.cdn_client.start_data,
+                self.cdn_client.end_date,
                 "aggregate")
         self.assert_called_with('SoftLayer_Network_CdnMarketplace_Metrics',
                                 'getMappingUsageMetrics',