fix bug 817826 and similar error in batch_config.py

diff --git a/quantum/cli.py b/quantum/cli.py
index 02bafbd09dc258b5195aed45397229f7abc16bb9..0f6a0c27e0b1fe264a2c82526e0c3c29080e705a 100644 (file)
--- a/quantum/cli.py
+++ b/quantum/cli.py
@@ -114,7 +114,7 @@ def create_net(manager, *args):
 
 def api_create_net(client, *args):
     tid, name = args
-    data = {'network': {'network-name': '%s' % name}}
+    data = {'network': {'net-name': '%s' % name}}
     body = Serializer().serialize(data, CONTENT_TYPE)
     res = client.do_request(tid, 'POST', "/networks." + FORMAT, body=body)
     rd = json.loads(res.read())
@@ -185,7 +185,7 @@ def rename_net(manager, *args):
 
 def api_rename_net(client, *args):
     tid, nid, name = args
-    data = {'network': {'network-name': '%s' % name}}
+    data = {'network': {'net-name': '%s' % name}}
     body = Serializer().serialize(data, CONTENT_TYPE)
     res = client.do_request(tid, 'PUT', "/networks/%s.%s" % (nid, FORMAT),
       body=body)

diff --git a/tools/batch_config.py b/tools/batch_config.py
index 63f4a5223d25890ad6620de6ad0751ecefd2609b..8415513d01d0c3592be0eef7ca150cd6610e8c64 100644 (file)
--- a/tools/batch_config.py
+++ b/tools/batch_config.py
@@ -84,7 +84,7 @@ def delete_all_nets(client, tenant_id):
 
 
 def create_net_with_attachments(net_name, iface_ids):
-        data = {'network': {'network-name': '%s' % net_name}}
+        data = {'network': {'net-name': '%s' % net_name}}
         body = Serializer().serialize(data, CONTENT_TYPE)
         res = client.do_request(tenant_id, 'POST',
             "/networks." + FORMAT, body=body)