Merge pull request softlayer#548 from softlayer/validate-create

sudorandom · sudorandom · commit b35c98d62d66 · 2015-06-03T09:29:36.000-05:00
Adds argument validation for vs/hardware create CLI commands
diff --git a/SoftLayer/CLI/server/create.py b/SoftLayer/CLI/server/create.py
@@ -52,6 +52,8 @@ def cli(env, **args):
     """Order/create a dedicated server."""
 
     template.update_with_template_args(args, list_args=['key'])
+    _validate_args(args)
+
     mgr = SoftLayer.HardwareManager(env.client)
 
     # Get the SSH keys
@@ -125,3 +127,20 @@ def cli(env, **args):
         output = table
 
     return output
+
+
+def _validate_args(args):
+    """Raises an ArgumentError if the given arguments are not valid."""
+    missing = []
+    for arg in ['size',
+                'datacenter',
+                'os',
+                'port_speed',
+                'hostname',
+                'domain']:
+        if not args.get(arg):
+            missing.append(arg)
+
+    if missing:
+        raise exceptions.ArgumentError('Missing required options: %s'
+                                       % ', '.join(missing))
diff --git a/SoftLayer/CLI/virt/create.py b/SoftLayer/CLI/virt/create.py
@@ -154,6 +154,14 @@ def cli(env, **args):
 
 def _validate_args(args):
     """Raises an ArgumentError if the given arguments are not valid."""
+    missing = []
+    for arg in ['cpu', 'memory', 'hostname', 'domain']:
+        if not args.get(arg):
+            missing.append(arg)
+
+    if missing:
+        raise exceptions.ArgumentError('Missing required options: %s'
+                                       % ', '.join(missing))
 
     if all([args['userdata'], args['userfile']]):
         raise exceptions.ArgumentError(
diff --git a/tox.ini b/tox.ini
@@ -28,13 +28,12 @@ commands =
     pylint SoftLayer \
            -r n \ # Don't show the long report
            --ignore=tests,fixtures \
-           -d too-many-locals \ # Too many local variables
-           -d star-args \       # Used * or ** magic
-           -d I0011 \           # Locally Disabling
+           -d too-many-locals \
+           -d star-args \
+           -d locally-disabled \
            --max-args=20 \
-           --max-branches=40 \
-           --max-statements=87 \
-           --max-returns=8 \
+           --max-branches=20 \
+           --max-statements=60 \
            --min-public-methods=0 \
            --min-similarity-lines=30
     pylint SoftLayer/testing/fixtures \
