Merge branch 'master' of https://github.com/softlayer/softlayer-python into ft/cdn_edit_option

Author: Fernando

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release Snapcraft and PyPi (Testing)
 
 on:
   release:
@@ -20,4 +20,32 @@ jobs:
           VERSION=`snapcraft list-revisions slcli --arch ${{ matrix.arch }} | grep "edge\*" | awk '{print $1}'`
           echo Publishing $VERSION on ${{ matrix.arch }}
           snapcraft release slcli $VERSION stable
+  build-n-publish:
+    name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install pypa/build
+      run: >-
+        python -m
+        pip install
+        build
+        --user
+    - name: Build a binary wheel and a source tarball
+      run: >-
+        python -m
+        build
+        --sdist
+        --wheel
+        --outdir dist/
+        .
+    - name: Publish 📦 to Test PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        password: ${{ secrets.CGALLO_TEST_PYPI }}
+        repository_url: https://test.pypi.org/legacy/
 

.github/workflows/test_pypi_release.yml

@@ -4,18 +4,18 @@ name: Publish 📦 to TestPyPI
 
 on:
   push:
-    branches: [ test-pypi ]
+    branches: [test-pypi ]
 
 jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.8
     - name: Install pypa/build
       run: >-
         python -m

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## [5.9.6] - 2021-07-05
+https://github.com/softlayer/softlayer-python/compare/v5.9.5...v5.9.6
+
+#### Improvements
+- Updated snap to core20 and edited README #1494
+- Add a table result for `slcli hw upgrade` output. #1488
+- Remove block/file interval option for replica volume. #1497
+- `slcli vlan cancel` should report if a vlan is automatic. #1495
+- New method to manage how long text is in output tables. #1506
+- Fix Tox-analysis issues. #1510
+
+#### New Commands
+- add new email feature #1483
+    + `slcli email list`
+    + `slcli email detail`
+    + `slcli email edit`
+- `slcli vlan cancel`
+- Add slcli account licenses #1501
+    + `slcli account licenses`
+- Create a new commands on slcli that create/cancel a VMware licenses #1504
+    + `slcli licenses create`
+    + `slcli licenses cancel`
+
 
 ## [5.9.5] - 2021-05-25
 https://github.com/softlayer/softlayer-python/compare/v5.9.4...v5.9.5

SoftLayer/API.py

@@ -31,6 +31,7 @@
     'BaseClient',
     'API_PUBLIC_ENDPOINT',
     'API_PRIVATE_ENDPOINT',
+    'IAMClient',
 ]
 
 VALID_CALL_ARGS = set((

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):