Merge pull request #1329 from allmightyspiff/issues972

Allow for calling BluemixPages and IntegratedOfferingTeam_Region  services

Author: allmightyspiff

SoftLayer/API.py

@@ -162,8 +162,7 @@ def authenticate_with_password(self, username, password,
         :param string username: your SoftLayer username
         :param string password: your SoftLayer password
         :param int security_question_id: The security question id to answer
-        :param string security_question_answer: The answer to the security
-                                                question
+        :param string security_question_answer: The answer to the security question
 
         """
         self.auth = None
@@ -202,8 +201,7 @@ def call(self, service, method, *args, **kwargs):
         :param dict raw_headers: (optional) HTTP transport headers
         :param int limit: (optional) return at most this many results
         :param int offset: (optional) offset results by this many
-        :param boolean iter: (optional) if True, returns a generator with the
-                             results
+        :param boolean iter: (optional) if True, returns a generator with the results
         :param bool verify: verify SSL cert
         :param cert: client certificate path
 
@@ -224,7 +222,8 @@ def call(self, service, method, *args, **kwargs):
             raise TypeError(
                 'Invalid keyword arguments: %s' % ','.join(invalid_kwargs))
 
-        if self._prefix and not service.startswith(self._prefix):
+        prefixes = (self._prefix, 'BluePages_Search', 'IntegratedOfferingTeam_Region')
+        if self._prefix and not service.startswith(prefixes):
             service = self._prefix + service
 
         http_headers = {'Accept': '*/*'}

SoftLayer/fixtures/BluePages_Search.py

@@ -0,0 +1 @@
+findBluePagesProfile = True

tests/api_tests.py

@@ -259,6 +259,11 @@ def test_call_compression_override(self):
         headers = calls[0].transport_headers
         self.assertEqual(headers.get('accept-encoding'), 'gzip')
 
+    def test_special_services(self):
+        # Tests for the special classes that don't need to start with SoftLayer_
+        self.client.call('BluePages_Search', 'findBluePagesProfile')
+        self.assert_called_with('BluePages_Search', 'findBluePagesProfile')
+
 
 class UnauthenticatedAPIClient(testing.TestCase):
     def set_up(self):