fix the team code review comments

Author: caberos

SoftLayer/CLI/vpn/ipsec/cancel.py

@@ -1,4 +1,4 @@
-"""Cancel a dedicated server."""
+"""Cancel an IPSec service."""
 # :license: MIT, see LICENSE for more details.
 
 import click
@@ -12,19 +12,20 @@
 @click.option('--immediate',
               is_flag=True,
               default=False,
-              help="Cancels the server immediately (instead of on the billing anniversary)")
+              help="Cancels the service  immediately (instead of on the billing anniversary)")
 @click.option('--reason',
               help="An optional cancellation reason. See cancel-reasons for a list of available options")
-@click.option('--comment',
-              help="An optional comment to add to the cancellation ticket")
 @environment.pass_env
-def cli(env, identifier, immediate, reason, comment):
+def cli(env, identifier, immediate, reason):
     """Cancel a IPSEC VPN tunnel context."""
 
     manager = SoftLayer.IPSECManager(env.client)
     context = manager.get_tunnel_context(identifier, mask='billingItem')
 
-    result = manager.cancel_item(context['billingItem']['id'], immediate, reason, comment)
+    if 'billingItem' not in context:
+        raise SoftLayer.SoftLayerError("Cannot locate billing. May already be cancelled.")
+
+    result = manager.cancel_item(context['billingItem']['id'], immediate, reason)
 
     if result:
         env.fout("Ipsec {} was cancelled.".format(identifier))

SoftLayer/managers/ipsec.py

@@ -300,7 +300,7 @@ def order(self, datacenter, item_package):
                                             complex_type=complex_type,
                                             hourly=False)
 
-    def cancel_item(self, identifier, immediate, reason, comment):
+    def cancel_item(self, identifier, immediate, reason):
         """Cancels the specified billing item Ipsec.
 
         Example::
@@ -313,8 +313,7 @@ def cancel_item(self, identifier, immediate, reason, comment):
                               :func:`get_cancellation_reasons`.
         :param bool immediate: If set to True, will automatically update the cancelation ticket to request
                                the resource be reclaimed asap. This request still has to be reviewed by a human
-        :param string comment: An optional comment to include with the cancellation
         :returns: True on success or an exception
         """
         return self.client.call('SoftLayer_Billing_Item', 'cancelItem',
-                                True, immediate, reason, comment, id=identifier)
+                                True, immediate, reason, id=identifier)