Detect rest transport (#747)

* Adds condition to check for a rest endpoint url

* Fixes bug that ocurrs if endpoint_url isn't specified

* Adds test to verify that rest URLs are detected properly

Author: sudorandom

SoftLayer/API.py

@@ -85,14 +85,24 @@ def create_client_from_env(username=None,
                                           proxy=proxy,
                                           config_file=config_file)
 
-    # Default the transport to use XMLRPC
     if transport is None:
-        transport = transports.XmlRpcTransport(
-            endpoint_url=settings.get('endpoint_url'),
-            proxy=settings.get('proxy'),
-            timeout=settings.get('timeout'),
-            user_agent=user_agent,
-        )
+        url = settings.get('endpoint_url')
+        if url is not None and '/rest' in url:
+            # If this looks like a rest endpoint, use the rest transport
+            transport = transports.RestTransport(
+                endpoint_url=settings.get('endpoint_url'),
+                proxy=settings.get('proxy'),
+                timeout=settings.get('timeout'),
+                user_agent=user_agent,
+            )
+        else:
+            # Default the transport to use XMLRPC
+            transport = transports.XmlRpcTransport(
+                endpoint_url=settings.get('endpoint_url'),
+                proxy=settings.get('proxy'),
+                timeout=settings.get('timeout'),
+                user_agent=user_agent,
+            )
 
     # If we have enough information to make an auth driver, let's do it
     if auth is None and settings.get('username') and settings.get('api_key'):

tests/api_tests.py

@@ -25,6 +25,21 @@ def test_init(self):
         self.assertIsInstance(client.transport, transports.XmlRpcTransport)
         self.assertEqual(client.transport.timeout, 10)
 
+    def test_init_with_rest_url(self):
+        client = SoftLayer.Client(username='doesnotexist',
+                                  api_key='issurelywrong',
+                                  timeout=10,
+                                  endpoint_url='http://example.com/v3/rest/')
+
+        self.assertIsInstance(client.auth, SoftLayer.BasicHTTPAuthentication)
+        self.assertEqual(client.auth.username, 'doesnotexist')
+        self.assertEqual(client.auth.api_key, 'issurelywrong')
+        self.assertIsNotNone(client.transport)
+        self.assertIsInstance(client.transport, transports.RestTransport)
+        self.assertEqual(client.transport.endpoint_url,
+                         'http://example.com/v3/rest')
+        self.assertEqual(client.transport.timeout, 10)
+
     @mock.patch('SoftLayer.config.get_client_settings')
     def test_env(self, get_client_settings):
         auth = mock.Mock()