From: Dan Wendlandt <dan@nicira.com>
Date: Sat, 30 Jul 2011 05:20:52 +0000 (-0700)
Subject: fix bug 817826 and similar error in batch_config.py
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=94e46173aa9d50ee09406f793f7cb10be4d3172c;p=openstack-build%2Fneutron-build.git

fix bug 817826 and similar error in batch_config.py
---

diff --git a/quantum/cli.py b/quantum/cli.py
index 02bafbd09..0f6a0c27e 100644
--- 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 63f4a5223..8415513d0 100644
--- 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)