Merge 048e389 into 6ffaeb6

deis · Feb 14, 2014 · 1154365 · 1154365
2 parents 6ffaeb6 + 048e389
commit 1154365
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/api/tests/test_layer.py b/api/tests/test_layer.py
@@ -66,10 +66,17 @@ def test_layer(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data['id'], layer_id)
-        body = {'config': {'new': 'value'}}
+        body = {'ssh_username': 'otto_test', 'config': {'new': 'value'}}
         response = self.client.patch(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 200)
+        self.assertEqual('otto_test', response.data['ssh_username'])
         self.assertIn('new', response.data['config'])
+        body = {'ssh_port': 9999, 'runtime': False}
+        response = self.client.patch(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual('otto_test', response.data['ssh_username'])
+        self.assertEqual(9999, response.data['ssh_port'])
+        self.assertFalse(response.data['runtime'])
         response = self.client.delete(url)
         self.assertEqual(response.status_code, 204)
 

diff --git a/client/deis.py b/client/deis.py
@@ -1496,18 +1496,18 @@ def layers_list(self, args):
 
     def layers_update(self, args):
         """
-        Create a layer of nodes
+        Update a layer of nodes
 
         Usage: deis layers:update <formation> <id> [options]
 
         Options:
 
-        --proxy=<yn>                    layer can be used for proxy [default: y]
-        --runtime=<yn>                  layer can be used for runtime [default: y]
-        --ssh_username=USERNAME         username for ssh connections [default: ubuntu]
-        --ssh_private_key=PRIVATE_KEY   private key for ssh comm (default: auto-gen)
-        --ssh_public_key=PUBLIC_KEY     public key for ssh comm (default: auto-gen)
-        --ssh_port=<port>               port number for ssh comm (default: 22)
+        --proxy=<yn>                    layer can be used for proxy
+        --runtime=<yn>                  layer can be used for runtime
+        --ssh_username=USERNAME         username for ssh connections
+        --ssh_private_key=PRIVATE_KEY   private key for ssh comm
+        --ssh_public_key=PUBLIC_KEY     public key for ssh comm
+        --ssh_port=<port>               port number for ssh comm
 
         """
         formation = args.get('<formation>')