Merge pull request softlayer#390 from Neetuj/issue389again

underscorephil · underscorephil · commit 6c93b96958b2 · 2014-09-09T16:44:56.000-05:00
handle the case of missing billingitem in subnet cancel
diff --git a/SoftLayer/managers/network.py b/SoftLayer/managers/network.py
@@ -6,6 +6,7 @@
     :license: MIT, see LICENSE for more details.
 """
 
+from SoftLayer import exceptions
 from SoftLayer import utils
 
 DEFAULT_SUBNET_MASK = ','.join(['hardware',
@@ -132,8 +133,10 @@ def cancel_subnet(self, subnet_id):
         :param int subnet_id: The ID of the subnet to be cancelled.
         """
         subnet = self.get_subnet(subnet_id, mask='id, billingItem.id')
+        if "billingItem" not in subnet:
+            raise exceptions.SoftLayerError("subnet %s can not be cancelled"
+                                            " " % subnet_id)
         billing_id = subnet['billingItem']['id']
-
         return self.client['Billing_Item'].cancelService(id=billing_id)
 
     def edit_rwhois(self, abuse_email=None, address1=None, address2=None,
