Merge pull request #1951 from BrianSantivanez/issue1942

New Command: `slcli security`

Author: allmightyspiff

SoftLayer/CLI/environment.py

@@ -138,7 +138,8 @@ def list_commands(self, *path):
 
                 # offset is used to exclude the path that the caller requested.
                 offset = len(path_str) + 1 if path_str else 0
-                commands.append(command[offset:])
+                if ':' not in command[offset:]:
+                    commands.append(command[offset:])
 
         return sorted(commands)
 

SoftLayer/CLI/routes.py

@@ -332,18 +332,30 @@
     ('securitygroup:event-log', 'SoftLayer.CLI.securitygroup.event_log:get_by_request_id'),
 
     ('sshkey', 'SoftLayer.CLI.sshkey'),
-    ('sshkey:add', 'SoftLayer.CLI.sshkey.add:cli'),
-    ('sshkey:remove', 'SoftLayer.CLI.sshkey.remove:cli'),
-    ('sshkey:edit', 'SoftLayer.CLI.sshkey.edit:cli'),
-    ('sshkey:list', 'SoftLayer.CLI.sshkey.list:cli'),
-    ('sshkey:print', 'SoftLayer.CLI.sshkey.print:cli'),
+    ('sshkey:add', 'SoftLayer.CLI.security.sshkey_add:cli'),
+    ('sshkey:remove', 'SoftLayer.CLI.security.sshkey_remove:cli'),
+    ('sshkey:edit', 'SoftLayer.CLI.security.sshkey_edit:cli'),
+    ('sshkey:list', 'SoftLayer.CLI.security.sshkey_list:cli'),
+    ('sshkey:print', 'SoftLayer.CLI.security.sshkey_print:cli'),
 
     ('ssl', 'SoftLayer.CLI.ssl'),
-    ('ssl:add', 'SoftLayer.CLI.ssl.add:cli'),
-    ('ssl:download', 'SoftLayer.CLI.ssl.download:cli'),
-    ('ssl:edit', 'SoftLayer.CLI.ssl.edit:cli'),
-    ('ssl:list', 'SoftLayer.CLI.ssl.list:cli'),
-    ('ssl:remove', 'SoftLayer.CLI.ssl.remove:cli'),
+    ('ssl:add', 'SoftLayer.CLI.security.cert_add:cli'),
+    ('ssl:download', 'SoftLayer.CLI.security.cert_download:cli'),
+    ('ssl:edit', 'SoftLayer.CLI.security.cert_edit:cli'),
+    ('ssl:list', 'SoftLayer.CLI.security.cert_list:cli'),
+    ('ssl:remove', 'SoftLayer.CLI.security.cert_remove:cli'),
+
+    ('security', 'SoftLayer.CLI.security'),
+    ('security:sshkey-add', 'SoftLayer.CLI.security.sshkey_add:cli'),
+    ('security:sshkey-remove', 'SoftLayer.CLI.security.sshkey_remove:cli'),
+    ('security:sshkey-edit', 'SoftLayer.CLI.security.sshkey_edit:cli'),
+    ('security:sshkey-list', 'SoftLayer.CLI.security.sshkey_list:cli'),
+    ('security:sshkey-print', 'SoftLayer.CLI.security.sshkey_print:cli'),
+    ('security:cert-add', 'SoftLayer.CLI.security.cert_add:cli'),
+    ('security:cert-download', 'SoftLayer.CLI.security.cert_download:cli'),
+    ('security:cert-edit', 'SoftLayer.CLI.security.cert_edit:cli'),
+    ('security:cert-list', 'SoftLayer.CLI.security.cert_list:cli'),
+    ('security:cert-remove', 'SoftLayer.CLI.security.cert_remove:cli'),
 
     ('subnet', 'SoftLayer.CLI.subnet'),
     ('subnet:cancel', 'SoftLayer.CLI.subnet.cancel:cli'),

SoftLayer/CLI/security/__init__.py

@@ -0,0 +1,2 @@
+"""SSH Keys and SSL Certificates."""
+# :license: MIT, see LICENSE for more details.