#1222 raise an exception if not found find a lbaas instance

Author: ATGE

SoftLayer/managers/load_balancer.py

@@ -5,6 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
+from SoftLayer import exceptions
 from SoftLayer.managers import ordering
 from SoftLayer import utils
 
@@ -110,12 +111,14 @@ def get_lbaas_by_name(self, name, mask=None):
 
         :param name: Name of the LBaaS instance
         :param mask:
-        :returns: SoftLayer_Network_LBaaS_LoadBalancer or an empty dictionary if the name is not found.
+        :returns: SoftLayer_Network_LBaaS_LoadBalancer.
         """
         object_filter = {'name': {'operation': name}}
         this_lbs = self.lbaas.getAllObjects(filter=object_filter, mask=mask)
+        if not this_lbs:
+            raise exceptions.SoftLayerError("Unable to find LBaaS with name: {}".format(name))
 
-        return this_lbs[0] if this_lbs else {}
+        return this_lbs[0]
 
     def delete_lb_member(self, identifier, member_id):
         """Removes a member from a LBaaS instance

tests/managers/loadbal_tests.py

@@ -8,6 +8,7 @@
     them directly to the API.
 """
 import SoftLayer
+from SoftLayer import exceptions
 from SoftLayer.fixtures import SoftLayer_Network_LBaaS_LoadBalancer
 from SoftLayer import testing
 
@@ -192,3 +193,9 @@ def test_get_lbaas_by_name(self):
         load_bal = self.lb_mgr.get_lbaas_by_name(name)
         self.assert_called_with('SoftLayer_Network_LBaaS_LoadBalancer', 'getAllObjects')
         self.assertIsNotNone(load_bal)
+
+    def test_get_lbaas_by_name_fails(self):
+        load_bal_mock = self.set_mock('SoftLayer_Network_LBaaS_LoadBalancer', 'getAllObjects')
+        load_bal_mock.return_value = []
+        name = 'test'
+        self.assertRaises(exceptions.SoftLayerError, self.lb_mgr.get_lbaas_by_name, name)