fix the merge conflicts

Author: caberos

SoftLayer/CLI/account/licenses.py

@@ -0,0 +1,42 @@
+"""Show all licenses."""
+# :license: MIT, see LICENSE for more details.
+import click
+
+from SoftLayer import utils
+
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+from SoftLayer.managers import account
+
+
+@click.command()
+@environment.pass_env
+def cli(env):
+    """Show all licenses."""
+
+    manager = account.AccountManager(env.client)
+
+    control_panel = manager.get_active_virtual_licenses()
+    vmwares = manager.get_active_account_licenses()
+
+    table_panel = formatting.KeyValueTable(['id', 'ip_address', 'manufacturer', 'software',
+                                            'key', 'subnet', 'subnet notes'], title="Control Panel Licenses")
+
+    table_vmware = formatting.KeyValueTable(['name', 'license_key', 'cpus', 'description',
+                                             'manufacturer', 'requiredUser'], title="VMware Licenses")
+    for panel in control_panel:
+        table_panel.add_row([panel.get('id'), panel.get('ipAddress'),
+                             utils.lookup(panel, 'softwareDescription', 'manufacturer'),
+                             utils.trim_to(utils.lookup(panel, 'softwareDescription', 'longDescription'), 40),
+                             panel.get('key'), utils.lookup(panel, 'subnet', 'broadcastAddress'),
+                             utils.lookup(panel, 'subnet', 'note')])
+
+    env.fout(table_panel)
+    for vmware in vmwares:
+        table_vmware.add_row([utils.lookup(vmware, 'softwareDescription', 'name'),
+                              vmware.get('key'), vmware.get('capacity'),
+                              utils.lookup(vmware, 'billingItem', 'description'),
+                              utils.lookup(vmware, 'softwareDescription', 'manufacturer'),
+                              utils.lookup(vmware, 'softwareDescription', 'requiredUser')])
+
+    env.fout(table_vmware)

SoftLayer/CLI/block/count.py

@@ -37,6 +37,6 @@ def cli(env, sortby, datacenter):
 
     table = formatting.KeyValueTable(DEFAULT_COLUMNS)
     table.sortby = sortby
-    for datacenter_name in datacenters:
-        table.add_row([datacenter_name, datacenters[datacenter_name]])
+    for key, value in datacenters.items():
+        table.add_row([key, value])
     env.fout(table)

SoftLayer/CLI/core.py

@@ -54,17 +54,17 @@ def list_commands(self, ctx):
 
         return sorted(env.list_commands(*self.path))
 
-    def get_command(self, ctx, name):
+    def get_command(self, ctx, cmd_name):
         """Get command for click."""
         env = ctx.ensure_object(environment.Environment)
         env.load()
 
         # Do alias lookup (only available for root commands)
         if len(self.path) == 0:
-            name = env.resolve_alias(name)
+            cmd_name = env.resolve_alias(cmd_name)
 
         new_path = list(self.path)
-        new_path.append(name)
+        new_path.append(cmd_name)
         module = env.get_command(*new_path)
         if isinstance(module, types.ModuleType):
             return CommandLoader(*new_path, help=module.__doc__ or '')

SoftLayer/CLI/file/count.py

@@ -36,6 +36,6 @@ def cli(env, sortby, datacenter):
 
     table = formatting.KeyValueTable(DEFAULT_COLUMNS)
     table.sortby = sortby
-    for datacenter_name in datacenters:
-        table.add_row([datacenter_name, datacenters[datacenter_name]])
+    for key, value in datacenters.items():
+        table.add_row([key, value])
     env.fout(table)

SoftLayer/CLI/formatting.py

@@ -248,11 +248,11 @@ def __str__(self):
 class CLIJSONEncoder(json.JSONEncoder):
     """A JSON encoder which is able to use a .to_python() method on objects."""
 
-    def default(self, obj):
+    def default(self, o):
         """Encode object if it implements to_python()."""
-        if hasattr(obj, 'to_python'):
-            return obj.to_python()
-        return super().default(obj)
+        if hasattr(o, 'to_python'):
+            return o.to_python()
+        return super().default(o)
 
 
 class Table(object):

SoftLayer/CLI/licenses/cancel.py

@@ -0,0 +1,19 @@
+"""Cancel a license."""
+# :licenses: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+
+from SoftLayer.CLI import environment
+
+
+@click.command()
+@click.argument('key')
+@click.option('--immediate', is_flag=True, help='Immediate cancellation')
+@environment.pass_env
+def cli(env, key, immediate):
+    """Cancel a license."""
+
+    licenses = SoftLayer.LicensesManager(env.client)
+
+    env.fout(licenses.cancel_item(key, immediate))

SoftLayer/CLI/licenses/create.py

@@ -0,0 +1,34 @@
+"""Order/create a vwmare licenses."""
+# :licenses: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command()
+@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 License."""
+
+    item_package = [key]
+
+    licenses = SoftLayer.LicensesManager(env.client)
+
+    result = licenses.create(datacenter, item_package)
+
+    table = formatting.KeyValueTable(['name', 'value'])
+    table.align['name'] = 'r'
+    table.align['value'] = 'l'
+    table.add_row(['id', result['orderId']])
+    table.add_row(['created', result['orderDate']])
+
+    env.fout(table)

SoftLayer/CLI/loadbal/detail.py

@@ -83,8 +83,8 @@ def lbaas_table(this_lb):
 
     # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_Member/
     member_col = ['UUID', 'Address', 'Weight', 'Modify', 'Active']
-    for uuid in pools:
-        member_col.append(pools[uuid])
+    for uuid in pools.values():
+        member_col.append(uuid)
     member_table = formatting.Table(member_col)
     for member in this_lb.get('members', []):
         row = [

SoftLayer/CLI/loadbal/pools.py

@@ -114,9 +114,9 @@ def edit(env, identifier, listener, **args):
         'sslcert': 'tlsCertificateId'
     }
 
-    for arg in args:
-        if args[arg]:
-            new_listener[arg_to_option[arg]] = args[arg]
+    for key, value in args.items():
+        if value:
+            new_listener[arg_to_option[key]] = value
 
     try:
         mgr.add_lb_listener(uuid, new_listener)

SoftLayer/CLI/routes.py

@@ -16,6 +16,7 @@
     ('account:invoices', 'SoftLayer.CLI.account.invoices:cli'),
     ('account:events', 'SoftLayer.CLI.account.events:cli'),
     ('account:event-detail', 'SoftLayer.CLI.account.event_detail:cli'),
+    ('account:licenses', 'SoftLayer.CLI.account.licenses:cli'),
     ('account:summary', 'SoftLayer.CLI.account.summary:cli'),
     ('account:billing-items', 'SoftLayer.CLI.account.billing_items:cli'),
     ('account:item-detail', 'SoftLayer.CLI.account.item_detail:cli'),
@@ -220,6 +221,10 @@
     ('nas:list', 'SoftLayer.CLI.nas.list:cli'),
     ('nas:credentials', 'SoftLayer.CLI.nas.credentials:cli'),
 
+    ('licenses', 'SoftLayer.CLI.licenses'),
+    ('licenses:create', 'SoftLayer.CLI.licenses.create:cli'),
+    ('licenses:cancel', 'SoftLayer.CLI.licenses.cancel:cli'),
+
     ('object-storage', 'SoftLayer.CLI.object_storage'),
 
     ('object-storage:accounts', 'SoftLayer.CLI.object_storage.list_accounts:cli'),