fix the team code review comments

Author: caberos

SoftLayer/CLI/licenses/cancel.py

@@ -1,37 +1,19 @@
-"""Cancel a vwmare licenses."""
+"""Cancel a license."""
 # :licenses: MIT, see LICENSE for more details.
 
 import click
-from SoftLayer import utils
+import SoftLayer
 
 from SoftLayer.CLI import environment
-from SoftLayer.CLI import exceptions
-from SoftLayer.managers.license import LicensesManager
 
 
 @click.command()
 @click.argument('key')
 @click.option('--immediate', is_flag=True, help='Immediate cancellation')
 @environment.pass_env
 def cli(env, key, immediate):
-    """Cancel VMware licenses."""
+    """Cancel a license."""
 
-    if not immediate:
-        immediate = False
-    vm_ware_find = False
-    licenses = LicensesManager(env.client)
+    licenses = SoftLayer.LicensesManager(env.client)
 
-    vm_ware_licenses = licenses.get_all_objects()
-
-    for vm_ware in vm_ware_licenses:
-        if vm_ware.get('key') == key:
-            vm_ware_find = True
-            licenses.cancel_item(utils.lookup(vm_ware, 'billingItem', 'id'),
-                                 immediate,
-                                 'Cancel by cli command',
-                                 'Cancel by cli command')
-            break
-
-    if not vm_ware_find:
-        raise exceptions.CLIAbort(
-            "The VMware not found, try whit another key")
+    env.fout(licenses.cancel_item(key, immediate))

SoftLayer/CLI/licenses/create.py

@@ -2,28 +2,29 @@
 # :licenses: MIT, see LICENSE for more details.
 
 import click
-from SoftLayer.managers import ordering
+
+import SoftLayer
 
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 
 
 @click.command()
-@click.option('--key', '-k', required=True, prompt=True, help="The License Key for this specific Account License.")
+@click.option('--key', '-k', required=True, prompt=True,
+              help="The VMware License Key. "
+                   "To get could use the product_package::getItems id=301 with name Software License Package"
+                   "E.g VMWARE_VSAN_ENTERPRISE_TIER_III_65_124_TB_6_X_2")
 @click.option('--datacenter', '-d', required=True, prompt=True, help="Datacenter shortname")
 @environment.pass_env
 def cli(env, key, datacenter):
-    """Order/create a Vm licenses instance."""
+    """Order/Create License."""
 
-    complex_type = 'SoftLayer_Container_Product_Order_Software_License'
     item_package = [key]
 
-    ordering_manager = ordering.OrderingManager(env.client)
-    result = ordering_manager.place_order(package_keyname='SOFTWARE_LICENSE_PACKAGE',
-                                          location=datacenter,
-                                          item_keynames=item_package,
-                                          complex_type=complex_type,
-                                          hourly=False)
+    licenses = SoftLayer.LicensesManager(env.client)
+
+    result = licenses.create(datacenter, item_package)
+
     table = formatting.KeyValueTable(['name', 'value'])
     table.align['name'] = 'r'
     table.align['value'] = 'l'

SoftLayer/managers/__init__.py

@@ -17,6 +17,7 @@
 from SoftLayer.managers.hardware import HardwareManager
 from SoftLayer.managers.image import ImageManager
 from SoftLayer.managers.ipsec import IPSECManager
+from SoftLayer.managers.license import LicensesManager
 from SoftLayer.managers.load_balancer import LoadBalancerManager
 from SoftLayer.managers.metadata import MetadataManager
 from SoftLayer.managers.network import NetworkManager
@@ -43,6 +44,7 @@
     'HardwareManager',
     'ImageManager',
     'IPSECManager',
+    'LicensesManager',
     'LoadBalancerManager',
     'MetadataManager',
     'NetworkManager',

SoftLayer/managers/license.py

@@ -6,35 +6,56 @@
     :license: MIT, see LICENSE for more details.
 """
 
-
 # pylint: disable=too-many-public-methods
+from SoftLayer.CLI import exceptions
+from SoftLayer.managers import ordering
+from SoftLayer import utils
 
 
 class LicensesManager(object):
-    """Manages account lincese."""
+    """Manages account license."""
 
     def __init__(self, client):
         self.client = client
 
     def get_all_objects(self):
-        """Show the all VM ware licenses of account.
+        """Show the all VMware licenses of an account.
 
          """
         _mask = '''softwareDescription,billingItem'''
 
         return self.client.call('SoftLayer_Software_AccountLicense',
                                 'getAllObjects', mask=_mask)
 
-    def cancel_item(self, identifier, cancel_immediately,
-                    reason_cancel, customer_note):
+    def cancel_item(self, key, cancel_immediately=False):
         """Cancel a billing item immediately, deleting all its data.
 
         :param integer identifier: the instance ID to cancel
         :param string reason_cancel: reason cancel
         """
-        return self.client.call('SoftLayer_Billing_Item', 'cancelItem',
-                                cancel_immediately,
-                                True,
-                                reason_cancel,
-                                customer_note,
-                                id=identifier)
+        vm_ware_licenses = self.get_all_objects()
+        vm_ware_find = False
+        for vm_ware in vm_ware_licenses:
+            if vm_ware.get('key') == key:
+                vm_ware_find = True
+                self.client.call('SoftLayer_Billing_Item', 'cancelItem',
+                                 cancel_immediately,
+                                 True,
+                                 'Cancel by cli command',
+                                 'Cancel by cli command',
+                                 id=utils.lookup(vm_ware, 'billingItem', 'id'))
+
+        if not vm_ware_find:
+            raise exceptions.CLIAbort(
+                "Unable to find license key: {}".format(key))
+        return vm_ware_find
+
+    def create(self, datacenter, item_package):
+
+        complex_type = 'SoftLayer_Container_Product_Order_Software_License'
+        ordering_manager = ordering.OrderingManager(self.client)
+        return ordering_manager.place_order(package_keyname='SOFTWARE_LICENSE_PACKAGE',
+                                            location=datacenter,
+                                            item_keynames=item_package,
+                                            complex_type=complex_type,
+                                            hourly=False)