merge branch for to fix bug817826

This commit is contained in:
Dan Wendlandt 2011-07-31 12:01:37 -07:00
commit 11cc083e2a
2 changed files with 3 additions and 3 deletions

View File

@ -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)

View File

@ -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)