Add Marathon pods support (#778)

- Commands detect if Marathon provides the pods API
- Commands supported: add, list, remove, show, update
- Rename `dcos.util.normalize_app_id()` to `normalize_marathod_id_path()`.
- Make Marathon 409 response status error message less confusing
- Marathon deployment table view now includes pods

cli/binary/binary.spec

@@ -11,7 +11,8 @@ a = Analysis(['../dcoscli/main.py'],
                      ],
              binaries=None,
             datas=[('../dcoscli/data/help/*', 'dcoscli/data/help'),
-                   ('../../dcos/data/config-schema/*', 'dcos/data/config-schema')
+                   ('../../dcos/data/config-schema/*', 'dcos/data/config-schema'),
+                   ('../../dcos/data/marathon/*', 'dcos/data/marathon')
                   ],
              hiddenimports=[],
              hookspath=[],

cli/dcoscli/data/help/marathon.txt

@@ -27,6 +27,11 @@ Usage:
     dcos marathon group show [--group-version=<group-version>] <group-id>
     dcos marathon group remove [--force] <group-id>
     dcos marathon group update [--force] <group-id> [<properties>...]
+    dcos marathon pod add [<pod-resource>]
+    dcos marathon pod list [--json]
+    dcos marathon pod remove [--force] <pod-id>
+    dcos marathon pod show <pod-id>
+    dcos marathon pod update [--force] <pod-id>
     dcos marathon task list [--json <app-id>]
     dcos marathon task stop [--wipe] <task-id>
     dcos marathon task show <task-id>
@@ -74,6 +79,16 @@ Commands:
         Remove a group.
     group update
         Update a group.
+    pod add
+        Create a new pod.
+    pod list
+        List the deployed pods.
+    pod remove
+        Remove a pod.
+    pod show
+        Display detailed information for a specific pod.
+    pod update
+        Update a pod.
     task list
         List all tasks.
     task stop
@@ -105,7 +120,7 @@ Options:
     --interval=<interval>
         Number of seconds to wait between actions.
     --json
-        Print JSON-formatted list of tasks.
+        Print JSON-formatted data.
     --max-count=<max-count>
         Maximum number of entries to fetch and return.
     --scale
@@ -132,10 +147,15 @@ Positional Arguments:
         https://mesosphere.github.io/marathon/docs/rest-api.html#post-v2-groups.
     <instances>
         The number of instances.
+    <pod-id>
+        The pod ID.
+    <pod-resource>
+        Path to a file or HTTP(S) URL that contains the pod's JSON definition.
+        If omitted, the definition is read from stdin.
     <properties>
-        List of space-separated config.json properties to update.  The list must
-        be formatted as <key>=<value>. For example, `cpus=2.0 mem=308`. If
-        omitted, properties are read from stdin.
+        List of space-separated JSON object properties to update.  The list
+        must be formatted as <key>=<value>. For example, `cpus=2.0 mem=308`.
+        If omitted, properties are read from a JSON object provided on stdin.
     <task-id>
         The task ID.
     <scale-factor>