From 647b0847b23130ab29fcf8f2661b26969204cf6c Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Thu, 24 Sep 2015 06:45:19 +0900
Subject: [PATCH] neutron v2 command module cleanup #1

Purge "body[resource].update({key: value})" pattern
and use "body[key] = value" pattern.
The purged pattern is a bad convention in neutronclient and
I commented not to use it many times but I got tired of it.

Change-Id: I2fe0be30d648f59fa45c5951ccc5060c35527aff
---
 neutronclient/neutron/v2_0/agent.py           |  8 ++--
 .../neutron/v2_0/contrib/_fox_sockets.py      | 14 ++----
 neutronclient/neutron/v2_0/credential.py      | 15 ++----
 neutronclient/neutron/v2_0/floatingip.py      | 14 +++---
 neutronclient/neutron/v2_0/fw/firewall.py     | 12 ++---
 .../neutron/v2_0/fw/firewallpolicy.py         |  8 ++--
 neutronclient/neutron/v2_0/fw/firewallrule.py | 18 +++----
 .../neutron/v2_0/lb/healthmonitor.py          | 12 ++---
 neutronclient/neutron/v2_0/lb/member.py       | 12 ++---
 neutronclient/neutron/v2_0/lb/pool.py         | 12 ++---
 .../neutron/v2_0/lb/v2/healthmonitor.py       | 12 ++---
 neutronclient/neutron/v2_0/lb/v2/listener.py  | 12 ++---
 .../neutron/v2_0/lb/v2/loadbalancer.py        | 12 ++---
 neutronclient/neutron/v2_0/lb/v2/member.py    | 20 +++-----
 neutronclient/neutron/v2_0/lb/v2/pool.py      | 12 ++---
 neutronclient/neutron/v2_0/lb/vip.py          | 12 ++---
 neutronclient/neutron/v2_0/metering.py        | 28 ++++-------
 neutronclient/neutron/v2_0/netpartition.py    |  4 +-
 neutronclient/neutron/v2_0/network.py         | 17 ++++---
 neutronclient/neutron/v2_0/networkprofile.py  | 31 +++++-------
 .../neutron/v2_0/nsx/networkgateway.py        |  9 ++--
 neutronclient/neutron/v2_0/port.py            | 45 +++++++++---------
 neutronclient/neutron/v2_0/qos/policy.py      | 20 ++++----
 neutronclient/neutron/v2_0/rbac.py            | 13 ++---
 neutronclient/neutron/v2_0/router.py          | 15 +++---
 neutronclient/neutron/v2_0/securitygroup.py   | 47 +++++++------------
 neutronclient/neutron/v2_0/subnet.py          | 38 +++++++--------
 neutronclient/neutron/v2_0/subnetpool.py      | 18 +++----
 neutronclient/neutron/v2_0/vpn/ikepolicy.py   | 21 ++++-----
 .../neutron/v2_0/vpn/ipsec_site_connection.py | 31 +++++-------
 neutronclient/neutron/v2_0/vpn/ipsecpolicy.py | 23 ++++-----
 neutronclient/neutron/v2_0/vpn/vpnservice.py  | 10 ++--
 32 files changed, 236 insertions(+), 339 deletions(-)

diff --git a/neutronclient/neutron/v2_0/agent.py b/neutronclient/neutron/v2_0/agent.py
index 8f7de7a7e..123924c4a 100644
--- a/neutronclient/neutron/v2_0/agent.py
+++ b/neutronclient/neutron/v2_0/agent.py
@@ -72,9 +72,7 @@ class UpdateAgent(neutronV20.UpdateCommand):
             help=_('Description for the agent.'))
 
     def args2body(self, parsed_args):
-        body = {
-            self.resource: {
-                'admin_state_up': parsed_args.admin_state, }, }
-        neutronV20.update_dict(parsed_args, body[self.resource],
+        body = {'admin_state_up': parsed_args.admin_state}
+        neutronV20.update_dict(parsed_args, body,
                                ['description'])
-        return body
+        return {self.resource: body}
diff --git a/neutronclient/neutron/v2_0/contrib/_fox_sockets.py b/neutronclient/neutron/v2_0/contrib/_fox_sockets.py
index 740043537..c2e9b198d 100644
--- a/neutronclient/neutron/v2_0/contrib/_fox_sockets.py
+++ b/neutronclient/neutron/v2_0/contrib/_fox_sockets.py
@@ -16,7 +16,6 @@
 
 from neutronclient.common import extension
 from neutronclient.i18n import _
-from neutronclient.neutron import v2_0 as neutronV20
 
 
 def _add_updatable_args(parser):
@@ -27,7 +26,7 @@ def _add_updatable_args(parser):
 
 def _updatable_args2body(parsed_args, body, client):
     if parsed_args.name:
-        body['fox_socket'].update({'name': parsed_args.name})
+        body['name'] = parsed_args.name
 
 
 class FoxInSocket(extension.NeutronClientExtension):
@@ -59,11 +58,10 @@ class FoxInSocketsCreate(extension.ClientExtensionCreate, FoxInSocket):
         _add_updatable_args(parser)
 
     def args2body(self, parsed_args):
-        body = {'fox_socket': {}}
+        body = {}
         client = self.get_client()
         _updatable_args2body(parsed_args, body, client)
-        neutronV20.update_dict(parsed_args, body['fox_socket'], [])
-        return body
+        return {'fox_socket': body}
 
 
 class FoxInSocketsUpdate(extension.ClientExtensionUpdate, FoxInSocket):
@@ -79,10 +77,8 @@ class FoxInSocketsUpdate(extension.ClientExtensionUpdate, FoxInSocket):
             help=_('Name of this fox socket.'))
 
     def args2body(self, parsed_args):
-        body = {'fox_socket': {
-            'name': parsed_args.name}, }
-        neutronV20.update_dict(parsed_args, body['fox_socket'], [])
-        return body
+        body = {'name': parsed_args.name}
+        return {'fox_socket': body}
 
 
 class FoxInSocketsDelete(extension.ClientExtensionDelete, FoxInSocket):
diff --git a/neutronclient/neutron/v2_0/credential.py b/neutronclient/neutron/v2_0/credential.py
index c397627b7..67d532a1f 100644
--- a/neutronclient/neutron/v2_0/credential.py
+++ b/neutronclient/neutron/v2_0/credential.py
@@ -51,19 +51,14 @@ class CreateCredential(neutronV20.CreateCommand):
             help=_('Password for the credential.'))
 
     def args2body(self, parsed_args):
-        body = {'credential': {
-            'credential_name': parsed_args.credential_name}}
-
+        body = {'credential_name': parsed_args.credential_name}
         if parsed_args.credential_type:
-            body['credential'].update({'type':
-                                      parsed_args.credential_type})
+            body['type'] = parsed_args.credential_type
         if parsed_args.username:
-            body['credential'].update({'user_name':
-                                      parsed_args.username})
+            body['user_name'] = parsed_args.username
         if parsed_args.password:
-            body['credential'].update({'password':
-                                      parsed_args.password})
-        return body
+            body['password'] = parsed_args.password
+        return {'credential': body}
 
 
 class DeleteCredential(neutronV20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/floatingip.py b/neutronclient/neutron/v2_0/floatingip.py
index d1fc9f466..3022508bb 100644
--- a/neutronclient/neutron/v2_0/floatingip.py
+++ b/neutronclient/neutron/v2_0/floatingip.py
@@ -68,18 +68,16 @@ class CreateFloatingIP(neutronV20.CreateCommand):
     def args2body(self, parsed_args):
         _network_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'network', parsed_args.floating_network_id)
-        body = {self.resource: {'floating_network_id': _network_id}}
+        body = {'floating_network_id': _network_id}
         if parsed_args.port_id:
-            body[self.resource].update({'port_id': parsed_args.port_id})
+            body['port_id'] = parsed_args.port_id
         if parsed_args.tenant_id:
-            body[self.resource].update({'tenant_id': parsed_args.tenant_id})
+            body['tenant_id'] = parsed_args.tenant_id
         if parsed_args.fixed_ip_address:
-            body[self.resource].update({'fixed_ip_address':
-                                        parsed_args.fixed_ip_address})
+            body['fixed_ip_address'] = parsed_args.fixed_ip_address
         if parsed_args.floating_ip_address:
-            body[self.resource].update({'floating_ip_address':
-                                        parsed_args.floating_ip_address})
-        return body
+            body['floating_ip_address'] = parsed_args.floating_ip_address
+        return {self.resource: body}
 
 
 class DeleteFloatingIP(neutronV20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/fw/firewall.py b/neutronclient/neutron/v2_0/fw/firewall.py
index 3a88a6baa..a4dd2ee2b 100644
--- a/neutronclient/neutron/v2_0/fw/firewall.py
+++ b/neutronclient/neutron/v2_0/fw/firewall.py
@@ -67,17 +67,15 @@ class CreateFirewall(neutronv20.CreateCommand):
         _policy_id = neutronv20.find_resourceid_by_name_or_id(
             client, 'firewall_policy',
             parsed_args.firewall_policy_id)
-        body = {
-            self.resource: {
-                'firewall_policy_id': _policy_id,
-                'admin_state_up': parsed_args.admin_state, }, }
+        body = {'firewall_policy_id': _policy_id,
+                'admin_state_up': parsed_args.admin_state, }
         if parsed_args.routers:
-            body[self.resource]['router_ids'] = [
+            body['router_ids'] = [
                 neutronv20.find_resourceid_by_name_or_id(client, 'router', r)
                 for r in parsed_args.routers]
-        neutronv20.update_dict(parsed_args, body[self.resource],
+        neutronv20.update_dict(parsed_args, body,
                                ['name', 'description', 'tenant_id'])
-        return body
+        return {self.resource: body}
 
 
 class UpdateFirewall(neutronv20.UpdateCommand):
diff --git a/neutronclient/neutron/v2_0/fw/firewallpolicy.py b/neutronclient/neutron/v2_0/fw/firewallpolicy.py
index 410ec475f..e385d314c 100644
--- a/neutronclient/neutron/v2_0/fw/firewallpolicy.py
+++ b/neutronclient/neutron/v2_0/fw/firewallpolicy.py
@@ -45,13 +45,13 @@ def common_args2body(client, parsed_args):
             _firewall_rules.append(
                 neutronv20.find_resourceid_by_name_or_id(
                     client, 'firewall_rule', f))
-        body = {'firewall_policy': {'firewall_rules': _firewall_rules}}
+        body = {'firewall_rules': _firewall_rules}
     else:
-        body = {'firewall_policy': {}}
-    neutronv20.update_dict(parsed_args, body['firewall_policy'],
+        body = {}
+    neutronv20.update_dict(parsed_args, body,
                            ['name', 'description', 'shared',
                             'audited', 'tenant_id'])
-    return body
+    return {'firewall_policy': body}
 
 
 class ListFirewallPolicy(neutronv20.ListCommand):
diff --git a/neutronclient/neutron/v2_0/fw/firewallrule.py b/neutronclient/neutron/v2_0/fw/firewallrule.py
index e2c49d2f0..1f0536387 100644
--- a/neutronclient/neutron/v2_0/fw/firewallrule.py
+++ b/neutronclient/neutron/v2_0/fw/firewallrule.py
@@ -108,10 +108,8 @@ class CreateFirewallRule(neutronv20.CreateCommand):
             help=_('Action for the firewall rule.'))
 
     def args2body(self, parsed_args):
-        body = {
-            self.resource: {},
-        }
-        neutronv20.update_dict(parsed_args, body[self.resource],
+        body = {}
+        neutronv20.update_dict(parsed_args, body,
                                ['name', 'description', 'shared', 'protocol',
                                 'source_ip_address', 'destination_ip_address',
                                 'source_port', 'destination_port',
@@ -119,8 +117,8 @@ class CreateFirewallRule(neutronv20.CreateCommand):
         protocol = parsed_args.protocol
         if protocol == 'any':
             protocol = None
-        body[self.resource]['protocol'] = protocol
-        return body
+        body['protocol'] = protocol
+        return {self.resource: body}
 
 
 class UpdateFirewallRule(neutronv20.UpdateCommand):
@@ -135,15 +133,13 @@ class UpdateFirewallRule(neutronv20.UpdateCommand):
             help=_('Protocol for the firewall rule.'))
 
     def args2body(self, parsed_args):
-        body = {
-            self.resource: {},
-        }
+        body = {}
         protocol = parsed_args.protocol
         if protocol:
             if protocol == 'any':
                 protocol = None
-            body[self.resource]['protocol'] = protocol
-        return body
+            body['protocol'] = protocol
+        return {self.resource: body}
 
 
 class DeleteFirewallRule(neutronv20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/lb/healthmonitor.py b/neutronclient/neutron/v2_0/lb/healthmonitor.py
index d691ebf85..1da7eb01c 100644
--- a/neutronclient/neutron/v2_0/lb/healthmonitor.py
+++ b/neutronclient/neutron/v2_0/lb/healthmonitor.py
@@ -84,19 +84,15 @@ class CreateHealthMonitor(neutronV20.CreateCommand):
             help=_('One of the predefined health monitor types.'))
 
     def args2body(self, parsed_args):
-        body = {
-            self.resource: {
-                'admin_state_up': parsed_args.admin_state,
+        body = {'admin_state_up': parsed_args.admin_state,
                 'delay': parsed_args.delay,
                 'max_retries': parsed_args.max_retries,
                 'timeout': parsed_args.timeout,
-                'type': parsed_args.type,
-            },
-        }
-        neutronV20.update_dict(parsed_args, body[self.resource],
+                'type': parsed_args.type}
+        neutronV20.update_dict(parsed_args, body,
                                ['expected_codes', 'http_method', 'url_path',
                                 'tenant_id'])
-        return body
+        return {self.resource: body}
 
 
 class UpdateHealthMonitor(neutronV20.UpdateCommand):
diff --git a/neutronclient/neutron/v2_0/lb/member.py b/neutronclient/neutron/v2_0/lb/member.py
index 472cd05ee..2a5d4b1b6 100644
--- a/neutronclient/neutron/v2_0/lb/member.py
+++ b/neutronclient/neutron/v2_0/lb/member.py
@@ -65,18 +65,14 @@ class CreateMember(neutronV20.CreateCommand):
     def args2body(self, parsed_args):
         _pool_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'pool', parsed_args.pool_id)
-        body = {
-            self.resource: {
-                'pool_id': _pool_id,
-                'admin_state_up': parsed_args.admin_state,
-            },
-        }
+        body = {'pool_id': _pool_id,
+                'admin_state_up': parsed_args.admin_state}
         neutronV20.update_dict(
             parsed_args,
-            body[self.resource],
+            body,
             ['address', 'protocol_port', 'weight', 'tenant_id']
         )
-        return body
+        return {self.resource: body}
 
 
 class UpdateMember(neutronV20.UpdateCommand):
diff --git a/neutronclient/neutron/v2_0/lb/pool.py b/neutronclient/neutron/v2_0/lb/pool.py
index 174b91a0d..849e1c4bf 100644
--- a/neutronclient/neutron/v2_0/lb/pool.py
+++ b/neutronclient/neutron/v2_0/lb/pool.py
@@ -82,16 +82,12 @@ class CreatePool(neutronV20.CreateCommand):
     def args2body(self, parsed_args):
         _subnet_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'subnet', parsed_args.subnet_id)
-        body = {
-            self.resource: {
-                'admin_state_up': parsed_args.admin_state,
-                'subnet_id': _subnet_id,
-            },
-        }
-        neutronV20.update_dict(parsed_args, body[self.resource],
+        body = {'admin_state_up': parsed_args.admin_state,
+                'subnet_id': _subnet_id}
+        neutronV20.update_dict(parsed_args, body,
                                ['description', 'lb_method', 'name',
                                 'protocol', 'tenant_id', 'provider'])
-        return body
+        return {self.resource: body}
 
 
 class UpdatePool(neutronV20.UpdateCommand):
diff --git a/neutronclient/neutron/v2_0/lb/v2/healthmonitor.py b/neutronclient/neutron/v2_0/lb/v2/healthmonitor.py
index ac3b2aa93..4b621cdff 100644
--- a/neutronclient/neutron/v2_0/lb/v2/healthmonitor.py
+++ b/neutronclient/neutron/v2_0/lb/v2/healthmonitor.py
@@ -92,20 +92,16 @@ class CreateHealthMonitor(neutronV20.CreateCommand):
         pool_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'pool', parsed_args.pool,
             cmd_resource='lbaas_pool')
-        body = {
-            self.resource: {
-                'admin_state_up': parsed_args.admin_state,
+        body = {'admin_state_up': parsed_args.admin_state,
                 'delay': parsed_args.delay,
                 'max_retries': parsed_args.max_retries,
                 'timeout': parsed_args.timeout,
                 'type': parsed_args.type,
-                'pool_id': pool_id
-            },
-        }
-        neutronV20.update_dict(parsed_args, body[self.resource],
+                'pool_id': pool_id}
+        neutronV20.update_dict(parsed_args, body,
                                ['expected_codes', 'http_method', 'url_path',
                                 'tenant_id'])
-        return body
+        return {self.resource: body}
 
 
 class UpdateHealthMonitor(neutronV20.UpdateCommand):
diff --git a/neutronclient/neutron/v2_0/lb/v2/listener.py b/neutronclient/neutron/v2_0/lb/v2/listener.py
index 46afc5088..07509fb69 100644
--- a/neutronclient/neutron/v2_0/lb/v2/listener.py
+++ b/neutronclient/neutron/v2_0/lb/v2/listener.py
@@ -94,22 +94,18 @@ class CreateListener(neutronV20.CreateCommand):
             parsed_args.loadbalancer = _get_loadbalancer_id(
                 self.get_client(),
                 parsed_args.loadbalancer)
-        body = {
-            self.resource: {
-                'loadbalancer_id': parsed_args.loadbalancer,
+        body = {'loadbalancer_id': parsed_args.loadbalancer,
                 'protocol': parsed_args.protocol,
                 'protocol_port': parsed_args.protocol_port,
-                'admin_state_up': parsed_args.admin_state,
-            },
-        }
+                'admin_state_up': parsed_args.admin_state}
 
-        neutronV20.update_dict(parsed_args, body[self.resource],
+        neutronV20.update_dict(parsed_args, body,
                                ['connection-limit', 'description',
                                 'loadbalancer_id', 'name',
                                 'default_tls_container_ref',
                                 'sni_container_refs',
                                 'tenant_id'])
-        return body
+        return {self.resource: body}
 
 
 class UpdateListener(neutronV20.UpdateCommand):
diff --git a/neutronclient/neutron/v2_0/lb/v2/loadbalancer.py b/neutronclient/neutron/v2_0/lb/v2/loadbalancer.py
index 8e381107e..be70c4eca 100644
--- a/neutronclient/neutron/v2_0/lb/v2/loadbalancer.py
+++ b/neutronclient/neutron/v2_0/lb/v2/loadbalancer.py
@@ -65,16 +65,12 @@ class CreateLoadBalancer(neutronV20.CreateCommand):
     def args2body(self, parsed_args):
         _subnet_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'subnet', parsed_args.vip_subnet)
-        body = {
-            self.resource: {
-                'vip_subnet_id': _subnet_id,
-                'admin_state_up': parsed_args.admin_state,
-            },
-        }
-        neutronV20.update_dict(parsed_args, body[self.resource],
+        body = {'vip_subnet_id': _subnet_id,
+                'admin_state_up': parsed_args.admin_state}
+        neutronV20.update_dict(parsed_args, body,
                                ['description', 'provider', 'vip_address',
                                 'tenant_id', 'name'])
-        return body
+        return {self.resource: body}
 
 
 class UpdateLoadBalancer(neutronV20.UpdateCommand):
diff --git a/neutronclient/neutron/v2_0/lb/v2/member.py b/neutronclient/neutron/v2_0/lb/v2/member.py
index e94ff9933..24fd27122 100644
--- a/neutronclient/neutron/v2_0/lb/v2/member.py
+++ b/neutronclient/neutron/v2_0/lb/v2/member.py
@@ -97,17 +97,13 @@ class CreateMember(neutronV20.CreateCommand):
         self.parent_id = _get_pool_id(self.get_client(), parsed_args.pool)
         _subnet_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'subnet', parsed_args.subnet)
-        body = {
-            self.resource: {
-                'subnet_id': _subnet_id,
+        body = {'subnet_id': _subnet_id,
                 'admin_state_up': parsed_args.admin_state,
                 'protocol_port': parsed_args.protocol_port,
-                'address': parsed_args.address,
-            },
-        }
-        neutronV20.update_dict(parsed_args, body[self.resource],
+                'address': parsed_args.address}
+        neutronV20.update_dict(parsed_args, body,
                                ['weight', 'subnet_id', 'tenant_id'])
-        return body
+        return {self.resource: body}
 
 
 class UpdateMember(neutronV20.UpdateCommand):
@@ -130,12 +126,10 @@ class UpdateMember(neutronV20.UpdateCommand):
 
     def args2body(self, parsed_args):
         self.parent_id = _get_pool_id(self.get_client(), parsed_args.pool)
-        body = {
-            self.resource: {}
-        }
-        neutronV20.update_dict(parsed_args, body[self.resource],
+        body = {}
+        neutronV20.update_dict(parsed_args, body,
                                ['admin_state_up', 'weight'])
-        return body
+        return {self.resource: body}
 
 
 class DeleteMember(LbaasMemberMixin, neutronV20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/lb/v2/pool.py b/neutronclient/neutron/v2_0/lb/v2/pool.py
index f8280c7cf..c3c218525 100644
--- a/neutronclient/neutron/v2_0/lb/v2/pool.py
+++ b/neutronclient/neutron/v2_0/lb/v2/pool.py
@@ -90,18 +90,14 @@ class CreatePool(neutronV20.CreateCommand):
                 parsed_args.session_persistence)
         _listener_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'listener', parsed_args.listener)
-        body = {
-            self.resource: {
-                'admin_state_up': parsed_args.admin_state,
+        body = {'admin_state_up': parsed_args.admin_state,
                 'protocol': parsed_args.protocol,
                 'lb_algorithm': parsed_args.lb_algorithm,
-                'listener_id': _listener_id,
-            },
-        }
-        neutronV20.update_dict(parsed_args, body[self.resource],
+                'listener_id': _listener_id}
+        neutronV20.update_dict(parsed_args, body,
                                ['description', 'name',
                                 'session_persistence', 'tenant_id'])
-        return body
+        return {self.resource: body}
 
 
 class UpdatePool(neutronV20.UpdateCommand):
diff --git a/neutronclient/neutron/v2_0/lb/vip.py b/neutronclient/neutron/v2_0/lb/vip.py
index 59b0c3871..4e5d0c82b 100644
--- a/neutronclient/neutron/v2_0/lb/vip.py
+++ b/neutronclient/neutron/v2_0/lb/vip.py
@@ -81,18 +81,14 @@ class CreateVip(neutronV20.CreateCommand):
         _subnet_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'subnet', parsed_args.subnet_id)
 
-        body = {
-            self.resource: {
-                'pool_id': _pool_id,
+        body = {'pool_id': _pool_id,
                 'admin_state_up': parsed_args.admin_state,
-                'subnet_id': _subnet_id,
-            },
-        }
-        neutronV20.update_dict(parsed_args, body[self.resource],
+                'subnet_id': _subnet_id}
+        neutronV20.update_dict(parsed_args, body,
                                ['address', 'connection_limit', 'description',
                                 'name', 'protocol_port', 'protocol',
                                 'tenant_id'])
-        return body
+        return {self.resource: body}
 
 
 class UpdateVip(neutronV20.UpdateCommand):
diff --git a/neutronclient/neutron/v2_0/metering.py b/neutronclient/neutron/v2_0/metering.py
index 34bf2b6de..095689616 100644
--- a/neutronclient/neutron/v2_0/metering.py
+++ b/neutronclient/neutron/v2_0/metering.py
@@ -50,18 +50,14 @@ class CreateMeteringLabel(neutronv20.CreateCommand):
             help=_('Set the label as shared.'))
 
     def args2body(self, parsed_args):
-        body = {'metering_label': {
-            'name': parsed_args.name}, }
-
+        body = {'name': parsed_args.name}
         if parsed_args.tenant_id:
-            body['metering_label'].update({'tenant_id': parsed_args.tenant_id})
+            body['tenant_id'] = parsed_args.tenant_id
         if parsed_args.description:
-            body['metering_label'].update(
-                {'description': parsed_args.description})
+            body['description'] = parsed_args.description
         if parsed_args.shared:
-            body['metering_label'].update(
-                {'shared': True})
-        return body
+            body['shared'] = True
+        return {'metering_label': body}
 
 
 class DeleteMeteringLabel(neutronv20.DeleteCommand):
@@ -113,18 +109,14 @@ class CreateMeteringLabelRule(neutronv20.CreateCommand):
         label_id = neutronv20.find_resourceid_by_name_or_id(
             neutron_client, 'metering_label', parsed_args.label_id)
 
-        body = {'metering_label_rule': {
-            'metering_label_id': label_id,
-            'remote_ip_prefix': parsed_args.remote_ip_prefix
-        }}
+        body = {'metering_label_id': label_id,
+                'remote_ip_prefix': parsed_args.remote_ip_prefix}
 
         if parsed_args.direction:
-            body['metering_label_rule'].update(
-                {'direction': parsed_args.direction})
+            body['direction'] = parsed_args.direction
         if parsed_args.excluded:
-            body['metering_label_rule'].update(
-                {'excluded': True})
-        return body
+            body['excluded'] = True
+        return {'metering_label_rule': body}
 
 
 class DeleteMeteringLabelRule(neutronv20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/netpartition.py b/neutronclient/neutron/v2_0/netpartition.py
index 260ad0901..dda278218 100644
--- a/neutronclient/neutron/v2_0/netpartition.py
+++ b/neutronclient/neutron/v2_0/netpartition.py
@@ -42,8 +42,8 @@ class CreateNetPartition(CreateCommand):
             help='Name of netpartition to create.')
 
     def args2body(self, parsed_args):
-        body = {'net_partition': {'name': parsed_args.name}, }
-        return body
+        body = {'name': parsed_args.name}
+        return {'net_partition': body}
 
 
 class DeleteNetPartition(DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/network.py b/neutronclient/neutron/v2_0/network.py
index 8dc963cd4..4b5674437 100644
--- a/neutronclient/neutron/v2_0/network.py
+++ b/neutronclient/neutron/v2_0/network.py
@@ -148,19 +148,18 @@ class CreateNetwork(neutronV20.CreateCommand, qos_policy.CreateQosPolicyMixin):
         self.add_arguments_qos_policy(parser)
 
     def args2body(self, parsed_args):
-        body = {'network': {
-            'name': parsed_args.name,
-            'admin_state_up': parsed_args.admin_state}, }
-        neutronV20.update_dict(parsed_args, body['network'],
+        body = {'name': parsed_args.name,
+                'admin_state_up': parsed_args.admin_state}
+        neutronV20.update_dict(parsed_args, body,
                                ['shared', 'tenant_id',
                                 'vlan_transparent',
                                 'provider:network_type',
                                 'provider:physical_network',
                                 'provider:segmentation_id'])
 
-        self.args2body_qos_policy(parsed_args, body['network'])
+        self.args2body_qos_policy(parsed_args, body)
 
-        return body
+        return {'network': body}
 
 
 class DeleteNetwork(neutronV20.DeleteCommand):
@@ -178,6 +177,6 @@ class UpdateNetwork(neutronV20.UpdateCommand, qos_policy.UpdateQosPolicyMixin):
         self.add_arguments_qos_policy(parser)
 
     def args2body(self, parsed_args):
-        body = {'network': {}}
-        self.args2body_qos_policy(parsed_args, body['network'])
-        return body
+        body = {}
+        self.args2body_qos_policy(parsed_args, body)
+        return {'network': body}
diff --git a/neutronclient/neutron/v2_0/networkprofile.py b/neutronclient/neutron/v2_0/networkprofile.py
index ed85875f5..d27ec7c32 100644
--- a/neutronclient/neutron/v2_0/networkprofile.py
+++ b/neutronclient/neutron/v2_0/networkprofile.py
@@ -67,26 +67,20 @@ class CreateNetworkProfile(neutronV20.CreateCommand):
                                    "You can repeat this option."))
 
     def args2body(self, parsed_args):
-        body = {'network_profile': {'name': parsed_args.name}}
+        body = {'name': parsed_args.name}
         if parsed_args.segment_type:
-            body['network_profile'].update({'segment_type':
-                                           parsed_args.segment_type})
+            body['segment_type'] = parsed_args.segment_type
         if parsed_args.sub_type:
-            body['network_profile'].update({'sub_type':
-                                           parsed_args.sub_type})
+            body['sub_type'] = parsed_args.sub_type
         if parsed_args.segment_range:
-            body['network_profile'].update({'segment_range':
-                                           parsed_args.segment_range})
+            body['segment_range'] = parsed_args.segment_range
         if parsed_args.physical_network:
-            body['network_profile'].update({'physical_network':
-                                           parsed_args.physical_network})
+            body['physical_network'] = parsed_args.physical_network
         if parsed_args.multicast_ip_range:
-            body['network_profile'].update({'multicast_ip_range':
-                                           parsed_args.multicast_ip_range})
+            body['multicast_ip_range'] = parsed_args.multicast_ip_range
         if parsed_args.add_tenants:
-            body['network_profile'].update({'add_tenants':
-                                           parsed_args.add_tenants})
-        return body
+            body['add_tenants'] = parsed_args.add_tenants
+        return {'network_profile': body}
 
 
 class DeleteNetworkProfile(neutronV20.DeleteCommand):
@@ -112,13 +106,12 @@ class UpdateNetworkProfile(neutronV20.UpdateCommand):
                                    "You can repeat this option."))
 
     def args2body(self, parsed_args):
-        body = {'network_profile': {}}
+        body = {}
         if parsed_args.remove_tenants:
-            body['network_profile']['remove_tenants'] = (parsed_args.
-                                                         remove_tenants)
+            body['remove_tenants'] = parsed_args.remove_tenants
         if parsed_args.add_tenants:
-            body['network_profile']['add_tenants'] = parsed_args.add_tenants
-        return body
+            body['add_tenants'] = parsed_args.add_tenants
+        return {'network_profile': body}
 
 
 # Aaron: This function is deprecated
diff --git a/neutronclient/neutron/v2_0/nsx/networkgateway.py b/neutronclient/neutron/v2_0/nsx/networkgateway.py
index 251fbc658..124d7bbad 100644
--- a/neutronclient/neutron/v2_0/nsx/networkgateway.py
+++ b/neutronclient/neutron/v2_0/nsx/networkgateway.py
@@ -175,17 +175,16 @@ class CreateNetworkGateway(neutronV20.CreateCommand):
                    'option for multiple devices for HA gateways.'))
 
     def args2body(self, parsed_args):
-        body = {self.resource: {
-            'name': parsed_args.name}}
+        body = {'name': parsed_args.name}
         devices = []
         if parsed_args.device:
             for device in parsed_args.device:
                 devices.append(utils.str2dict(device))
         if devices:
-            body[self.resource].update({'devices': devices})
+            body['devices'] = devices
         if parsed_args.tenant_id:
-            body[self.resource].update({'tenant_id': parsed_args.tenant_id})
-        return body
+            body['tenant_id'] = parsed_args.tenant_id
+        return {self.resource: body}
 
 
 class DeleteNetworkGateway(neutronV20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/port.py b/neutronclient/neutron/v2_0/port.py
index 42d671473..f2483e1a8 100644
--- a/neutronclient/neutron/v2_0/port.py
+++ b/neutronclient/neutron/v2_0/port.py
@@ -69,11 +69,11 @@ def _add_updatable_args(parser):
 
 def _updatable_args2body(parsed_args, body, client):
     if parsed_args.device_id:
-        body['port'].update({'device_id': parsed_args.device_id})
+        body['device_id'] = parsed_args.device_id
     if parsed_args.device_owner:
-        body['port'].update({'device_owner': parsed_args.device_owner})
+        body['device_owner'] = parsed_args.device_owner
     if parsed_args.name:
-        body['port'].update({'name': parsed_args.name})
+        body['name'] = parsed_args.name
     ips = []
     if parsed_args.fixed_ip:
         for ip_spec in parsed_args.fixed_ip:
@@ -85,7 +85,7 @@ def _updatable_args2body(parsed_args, body, client):
                 ip_dict['subnet_id'] = _subnet_id
             ips.append(ip_dict)
     if ips:
-        body['port'].update({'fixed_ips': ips})
+        body['fixed_ips'] = ips
 
 
 class ListPort(neutronV20.ListCommand):
@@ -190,7 +190,7 @@ class UpdateExtraDhcpOptMixin(object):
                     raise exceptions.CommandError(edo_err_msg)
 
         if ops:
-            port.update({'extra_dhcp_opts': ops})
+            port['extra_dhcp_opts'] = ops
 
 
 class CreatePort(neutronV20.CreateCommand, UpdatePortSecGroupMixin,
@@ -241,24 +241,24 @@ class CreatePort(neutronV20.CreateCommand, UpdatePortSecGroupMixin,
         client = self.get_client()
         _network_id = neutronV20.find_resourceid_by_name_or_id(
             client, 'network', parsed_args.network_id)
-        body = {'port': {'admin_state_up': parsed_args.admin_state,
-                         'network_id': _network_id, }, }
+        body = {'admin_state_up': parsed_args.admin_state,
+                'network_id': _network_id, }
         _updatable_args2body(parsed_args, body, client)
         if parsed_args.mac_address:
-            body['port'].update({'mac_address': parsed_args.mac_address})
+            body['mac_address'] = parsed_args.mac_address
         if parsed_args.tenant_id:
-            body['port'].update({'tenant_id': parsed_args.tenant_id})
+            body['tenant_id'] = parsed_args.tenant_id
         if parsed_args.vnic_type:
-            body['port'].update({'binding:vnic_type': parsed_args.vnic_type})
+            body['binding:vnic_type'] = parsed_args.vnic_type
         if parsed_args.binding_profile:
-            body['port'].update({'binding:profile':
-                                 jsonutils.loads(parsed_args.binding_profile)})
+            body['binding:profile'] = jsonutils.loads(
+                parsed_args.binding_profile)
 
-        self.args2body_secgroup(parsed_args, body['port'])
-        self.args2body_extradhcpopt(parsed_args, body['port'])
-        self.args2body_qos_policy(parsed_args, body['port'])
+        self.args2body_secgroup(parsed_args, body)
+        self.args2body_extradhcpopt(parsed_args, body)
+        self.args2body_qos_policy(parsed_args, body)
 
-        return body
+        return {'port': body}
 
 
 class DeletePort(neutronV20.DeleteCommand):
@@ -288,15 +288,14 @@ class UpdatePort(neutronV20.UpdateCommand, UpdatePortSecGroupMixin,
         self.add_arguments_qos_policy(parser)
 
     def args2body(self, parsed_args):
-        body = {'port': {}}
+        body = {}
         client = self.get_client()
         _updatable_args2body(parsed_args, body, client)
         if parsed_args.admin_state_up:
-            body['port'].update({'admin_state_up':
-                                parsed_args.admin_state_up})
+            body['admin_state_up'] = parsed_args.admin_state_up
 
-        self.args2body_secgroup(parsed_args, body['port'])
-        self.args2body_extradhcpopt(parsed_args, body['port'])
-        self.args2body_qos_policy(parsed_args, body['port'])
+        self.args2body_secgroup(parsed_args, body)
+        self.args2body_extradhcpopt(parsed_args, body)
+        self.args2body_qos_policy(parsed_args, body)
 
-        return body
+        return {'port': body}
diff --git a/neutronclient/neutron/v2_0/qos/policy.py b/neutronclient/neutron/v2_0/qos/policy.py
index 6c680d22c..8d6035627 100755
--- a/neutronclient/neutron/v2_0/qos/policy.py
+++ b/neutronclient/neutron/v2_0/qos/policy.py
@@ -103,14 +103,14 @@ class CreateQoSPolicy(neutronv20.CreateCommand):
                    'Set shared to True (default is False).'))
 
     def args2body(self, parsed_args):
-        body = {self.resource: {'name': parsed_args.name}, }
+        body = {'name': parsed_args.name}
         if parsed_args.description:
-            body[self.resource]['description'] = parsed_args.description
+            body['description'] = parsed_args.description
         if parsed_args.shared:
-            body[self.resource]['shared'] = parsed_args.shared
+            body['shared'] = parsed_args.shared
         if parsed_args.tenant_id:
-            body[self.resource]['tenant_id'] = parsed_args.tenant_id
-        return body
+            body['tenant_id'] = parsed_args.tenant_id
+        return {self.resource: body}
 
 
 class UpdateQoSPolicy(neutronv20.UpdateCommand):
@@ -133,14 +133,14 @@ class UpdateQoSPolicy(neutronv20.UpdateCommand):
                    'Set shared to True (default is False).'))
 
     def args2body(self, parsed_args):
-        body = {self.resource: {}, }
+        body = {}
         if parsed_args.name:
-            body[self.resource]['name'] = parsed_args.name
+            body['name'] = parsed_args.name
         if parsed_args.description:
-            body[self.resource]['description'] = parsed_args.description
+            body['description'] = parsed_args.description
         if parsed_args.shared:
-            body[self.resource]['shared'] = parsed_args.shared
-        return body
+            body['shared'] = parsed_args.shared
+        return {self.resource: body}
 
 
 class DeleteQoSPolicy(neutronv20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/rbac.py b/neutronclient/neutron/v2_0/rbac.py
index 59a2c80bb..5dc72c0b3 100644
--- a/neutronclient/neutron/v2_0/rbac.py
+++ b/neutronclient/neutron/v2_0/rbac.py
@@ -68,13 +68,13 @@ class CreateRBACPolicy(neutronV20.CreateCommand):
         neutron_client.format = parsed_args.request_format
         _object_id = get_rbac_object_id(neutron_client, parsed_args.type,
                                         parsed_args.name)
-        body = {self.resource: {
+        body = {
             'object_id': _object_id,
             'object_type': parsed_args.type,
             'target_tenant': parsed_args.target_tenant,
             'action': parsed_args.action,
-        }, }
-        return body
+        }
+        return {self.resource: body}
 
 
 class UpdateRBACPolicy(neutronV20.UpdateCommand):
@@ -89,11 +89,8 @@ class UpdateRBACPolicy(neutronV20.UpdateCommand):
                    'policy will be enforced.'))
 
     def args2body(self, parsed_args):
-
-        body = {self.resource: {
-            'target_tenant': parsed_args.target_tenant,
-        }, }
-        return body
+        body = {'target_tenant': parsed_args.target_tenant}
+        return {self.resource: body}
 
 
 class DeleteRBACPolicy(neutronV20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/router.py b/neutronclient/neutron/v2_0/router.py
index 414759d68..31a2bf7ba 100644
--- a/neutronclient/neutron/v2_0/router.py
+++ b/neutronclient/neutron/v2_0/router.py
@@ -75,10 +75,10 @@ class CreateRouter(neutronV20.CreateCommand):
             help=_('Create a highly available router.'))
 
     def args2body(self, parsed_args):
-        body = {self.resource: {'admin_state_up': parsed_args.admin_state}}
-        neutronV20.update_dict(parsed_args, body[self.resource],
+        body = {'admin_state_up': parsed_args.admin_state}
+        neutronV20.update_dict(parsed_args, body,
                                ['name', 'tenant_id', 'distributed', 'ha'])
-        return body
+        return {self.resource: body}
 
 
 class DeleteRouter(neutronV20.DeleteCommand):
@@ -109,13 +109,12 @@ class UpdateRouter(neutronV20.UpdateCommand):
                    ' distributed mode.'))
 
     def args2body(self, parsed_args):
-        body = {self.resource: {}}
+        body = {}
         if hasattr(parsed_args, 'admin_state'):
-            body[self.resource].update(
-                {'admin_state_up': parsed_args.admin_state})
-        neutronV20.update_dict(parsed_args, body[self.resource],
+            body['admin_state_up'] = parsed_args.admin_state
+        neutronV20.update_dict(parsed_args, body,
                                ['name', 'distributed'])
-        return body
+        return {self.resource: body}
 
 
 class RouterInterfaceCommand(neutronV20.NeutronCommand):
diff --git a/neutronclient/neutron/v2_0/securitygroup.py b/neutronclient/neutron/v2_0/securitygroup.py
index 31c589cba..9e8d0dab5 100644
--- a/neutronclient/neutron/v2_0/securitygroup.py
+++ b/neutronclient/neutron/v2_0/securitygroup.py
@@ -123,14 +123,12 @@ class CreateSecurityGroup(neutronV20.CreateCommand):
             help=_('Description of security group.'))
 
     def args2body(self, parsed_args):
-        body = {'security_group': {
-            'name': parsed_args.name}}
+        body = {'name': parsed_args.name}
         if parsed_args.description:
-            body['security_group'].update(
-                {'description': parsed_args.description})
+            body['description'] = parsed_args.description
         if parsed_args.tenant_id:
-            body['security_group'].update({'tenant_id': parsed_args.tenant_id})
-        return body
+            body['tenant_id'] = parsed_args.tenant_id
+        return {'security_group': body}
 
 
 class DeleteSecurityGroup(neutronV20.DeleteCommand):
@@ -154,14 +152,12 @@ class UpdateSecurityGroup(neutronV20.UpdateCommand):
             help=_('Description of security group.'))
 
     def args2body(self, parsed_args):
-        body = {'security_group': {}}
+        body = {}
         if parsed_args.name:
-            body['security_group'].update(
-                {'name': parsed_args.name})
+            body['name'] = parsed_args.name
         if parsed_args.description:
-            body['security_group'].update(
-                {'description': parsed_args.description})
-        return body
+            body['description'] = parsed_args.description
+        return {'security_group': body}
 
 
 class ListSecurityGroupRule(neutronV20.ListCommand):
@@ -344,32 +340,25 @@ class CreateSecurityGroupRule(neutronV20.CreateCommand):
     def args2body(self, parsed_args):
         _security_group_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'security_group', parsed_args.security_group_id)
-        body = {'security_group_rule': {
-            'security_group_id': _security_group_id,
-            'direction': parsed_args.direction,
-            'ethertype': parsed_args.ethertype}}
+        body = {'security_group_id': _security_group_id,
+                'direction': parsed_args.direction,
+                'ethertype': parsed_args.ethertype}
         if parsed_args.protocol:
-            body['security_group_rule'].update(
-                {'protocol': parsed_args.protocol})
+            body['protocol'] = parsed_args.protocol
         if parsed_args.port_range_min:
-            body['security_group_rule'].update(
-                {'port_range_min': parsed_args.port_range_min})
+            body['port_range_min'] = parsed_args.port_range_min
         if parsed_args.port_range_max:
-            body['security_group_rule'].update(
-                {'port_range_max': parsed_args.port_range_max})
+            body['port_range_max'] = parsed_args.port_range_max
         if parsed_args.remote_ip_prefix:
-            body['security_group_rule'].update(
-                {'remote_ip_prefix': parsed_args.remote_ip_prefix})
+            body['remote_ip_prefix'] = parsed_args.remote_ip_prefix
         if parsed_args.remote_group_id:
             _remote_group_id = neutronV20.find_resourceid_by_name_or_id(
                 self.get_client(), 'security_group',
                 parsed_args.remote_group_id)
-            body['security_group_rule'].update(
-                {'remote_group_id': _remote_group_id})
+            body['remote_group_id'] = _remote_group_id
         if parsed_args.tenant_id:
-            body['security_group_rule'].update(
-                {'tenant_id': parsed_args.tenant_id})
-        return body
+            body['tenant_id'] = parsed_args.tenant_id
+        return {'security_group_rule': body}
 
 
 class DeleteSecurityGroupRule(neutronV20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/subnet.py b/neutronclient/neutron/v2_0/subnet.py
index 402be1347..a0dd9947e 100644
--- a/neutronclient/neutron/v2_0/subnet.py
+++ b/neutronclient/neutron/v2_0/subnet.py
@@ -108,32 +108,32 @@ def updatable_args2body(parsed_args, body, for_create=True, ip_version=None):
             "You cannot enable and disable DHCP at the same time."))
 
     if parsed_args.no_gateway:
-        body['subnet'].update({'gateway_ip': None})
+        body['gateway_ip'] = None
     elif parsed_args.gateway:
-        body['subnet'].update({'gateway_ip': parsed_args.gateway})
+        body['gateway_ip'] = parsed_args.gateway
     if parsed_args.name:
-        body['subnet'].update({'name': parsed_args.name})
+        body['name'] = parsed_args.name
     if parsed_args.disable_dhcp:
-        body['subnet'].update({'enable_dhcp': False})
+        body['enable_dhcp'] = False
     if parsed_args.enable_dhcp:
-        body['subnet'].update({'enable_dhcp': True})
+        body['enable_dhcp'] = True
     if parsed_args.allocation_pools:
-        body['subnet']['allocation_pools'] = parsed_args.allocation_pools
+        body['allocation_pools'] = parsed_args.allocation_pools
     if parsed_args.host_routes:
-        body['subnet']['host_routes'] = parsed_args.host_routes
+        body['host_routes'] = parsed_args.host_routes
     if parsed_args.dns_nameservers:
-        body['subnet']['dns_nameservers'] = parsed_args.dns_nameservers
+        body['dns_nameservers'] = parsed_args.dns_nameservers
     if for_create and parsed_args.ipv6_ra_mode:
         if ip_version == 4:
             raise exceptions.CommandError(_("--ipv6-ra-mode is invalid "
                                             "when --ip-version is 4"))
-        body['subnet']['ipv6_ra_mode'] = parsed_args.ipv6_ra_mode
+        body['ipv6_ra_mode'] = parsed_args.ipv6_ra_mode
     if for_create and parsed_args.ipv6_address_mode:
         if ip_version == 4:
             raise exceptions.CommandError(_("--ipv6-address-mode is "
                                             "invalid when --ip-version "
                                             "is 4"))
-        body['subnet']['ipv6_address_mode'] = parsed_args.ipv6_address_mode
+        body['ipv6_address_mode'] = parsed_args.ipv6_address_mode
 
 
 class ListSubnet(neutronV20.ListCommand):
@@ -199,10 +199,10 @@ class CreateSubnet(neutronV20.CreateCommand):
     def args2body(self, parsed_args):
         _network_id = neutronV20.find_resourceid_by_name_or_id(
             self.get_client(), 'network', parsed_args.network_id)
-        body = {'subnet': {'network_id': _network_id}}
+        body = {'network_id': _network_id}
 
         if parsed_args.prefixlen:
-            body['subnet'].update({'prefixlen': parsed_args.prefixlen})
+            body['prefixlen'] = parsed_args.prefixlen
         ip_version = parsed_args.ip_version
         if parsed_args.subnetpool:
             if parsed_args.subnetpool == 'None':
@@ -214,16 +214,16 @@ class CreateSubnet(neutronV20.CreateCommand):
                 # Now that we have the pool_id - let's just have a check on the
                 # ip version used in the pool
                 ip_version = _subnetpool['ip_version']
-            body['subnet'].update({'subnetpool_id': _subnetpool_id})
+            body['subnetpool_id'] = _subnetpool_id
 
         # IP version needs to be set as IP version can be
         # determined by subnetpool.
-        body['subnet']['ip_version'] = ip_version
+        body['ip_version'] = ip_version
 
         if parsed_args.cidr:
             # With subnetpool, cidr is now optional for creating subnet.
             cidr = parsed_args.cidr
-            body['subnet'].update({'cidr': cidr})
+            body['cidr'] = cidr
             unusable_cidr = '/32' if ip_version == 4 else '/128'
             if cidr.endswith(unusable_cidr):
                 self.log.warning(_("An IPv%(ip)d subnet with a %(cidr)s CIDR "
@@ -235,9 +235,9 @@ class CreateSubnet(neutronV20.CreateCommand):
 
         updatable_args2body(parsed_args, body, ip_version=ip_version)
         if parsed_args.tenant_id:
-            body['subnet'].update({'tenant_id': parsed_args.tenant_id})
+            body['tenant_id'] = parsed_args.tenant_id
 
-        return body
+        return {'subnet': body}
 
 
 class DeleteSubnet(neutronV20.DeleteCommand):
@@ -255,6 +255,6 @@ class UpdateSubnet(neutronV20.UpdateCommand):
         add_updatable_arguments(parser)
 
     def args2body(self, parsed_args):
-        body = {'subnet': {}}
+        body = {}
         updatable_args2body(parsed_args, body, for_create=False)
-        return body
+        return {'subnet': body}
diff --git a/neutronclient/neutron/v2_0/subnetpool.py b/neutronclient/neutron/v2_0/subnetpool.py
index bc0bdf0d4..2357750bc 100644
--- a/neutronclient/neutron/v2_0/subnetpool.py
+++ b/neutronclient/neutron/v2_0/subnetpool.py
@@ -35,7 +35,7 @@ def add_updatable_arguments(parser):
 
 
 def updatable_args2body(parsed_args, body, for_create=True):
-    neutronV20.update_dict(parsed_args, body['subnetpool'],
+    neutronV20.update_dict(parsed_args, body,
                            ['name', 'prefixes', 'default_prefixlen',
                             'min_prefixlen', 'max_prefixlen'])
 
@@ -78,18 +78,18 @@ class CreateSubnetPool(neutronV20.CreateCommand):
                    'scopes'))
 
     def args2body(self, parsed_args):
-        body = {'subnetpool': {'prefixes': parsed_args.prefixes}}
+        body = {'prefixes': parsed_args.prefixes}
         updatable_args2body(parsed_args, body)
         if parsed_args.shared:
-            body['subnetpool']['shared'] = True
+            body['shared'] = True
 
         # Parse and update for "address-scope" option
         if parsed_args.address_scope:
             _addrscope_id = neutronV20.find_resourceid_by_name_or_id(
                 self.get_client(), 'address_scope',
                 parsed_args.address_scope)
-            body['subnetpool']['address_scope_id'] = _addrscope_id
-        return body
+            body['address_scope_id'] = _addrscope_id
+        return {'subnetpool': body}
 
 
 class DeleteSubnetPool(neutronV20.DeleteCommand):
@@ -120,15 +120,15 @@ class UpdateSubnetPool(neutronV20.UpdateCommand):
                                            'address scope'))
 
     def args2body(self, parsed_args):
-        body = {'subnetpool': {}}
+        body = {}
         updatable_args2body(parsed_args, body, for_create=False)
 
         # Parse and update for "address-scope" option/s
         if parsed_args.no_address_scope:
-            body['subnetpool']['address_scope_id'] = None
+            body['address_scope_id'] = None
         elif parsed_args.address_scope:
             _addrscope_id = neutronV20.find_resourceid_by_name_or_id(
                 self.get_client(), 'address_scope',
                 parsed_args.address_scope)
-            body['subnetpool']['address_scope_id'] = _addrscope_id
-        return body
+            body['address_scope_id'] = _addrscope_id
+        return {'subnetpool': body}
diff --git a/neutronclient/neutron/v2_0/vpn/ikepolicy.py b/neutronclient/neutron/v2_0/vpn/ikepolicy.py
index ea93eda40..e34c350ec 100644
--- a/neutronclient/neutron/v2_0/vpn/ikepolicy.py
+++ b/neutronclient/neutron/v2_0/vpn/ikepolicy.py
@@ -78,23 +78,23 @@ class CreateIKEPolicy(neutronv20.CreateCommand):
 
     def args2body(self, parsed_args):
 
-        body = {'ikepolicy': {
+        body = {
             'auth_algorithm': parsed_args.auth_algorithm,
             'encryption_algorithm': parsed_args.encryption_algorithm,
             'phase1_negotiation_mode': parsed_args.phase1_negotiation_mode,
             'ike_version': parsed_args.ike_version,
             'pfs': parsed_args.pfs,
-        }, }
+        }
         if parsed_args.name:
-            body['ikepolicy'].update({'name': parsed_args.name})
+            body['name'] = parsed_args.name
         if parsed_args.description:
-            body['ikepolicy'].update({'description': parsed_args.description})
+            body['description'] = parsed_args.description
         if parsed_args.tenant_id:
-            body['ikepolicy'].update({'tenant_id': parsed_args.tenant_id})
+            body['tenant_id'] = parsed_args.tenant_id
         if parsed_args.lifetime:
             vpn_utils.validate_lifetime_dict(parsed_args.lifetime)
-            body['ikepolicy'].update({'lifetime': parsed_args.lifetime})
-        return body
+            body['lifetime'] = parsed_args.lifetime
+        return {'ikepolicy': body}
 
 
 class UpdateIKEPolicy(neutronv20.UpdateCommand):
@@ -111,12 +111,11 @@ class UpdateIKEPolicy(neutronv20.UpdateCommand):
 
     def args2body(self, parsed_args):
 
-        body = {'ikepolicy': {
-        }, }
+        body = {}
         if parsed_args.lifetime:
             vpn_utils.validate_lifetime_dict(parsed_args.lifetime)
-            body['ikepolicy'].update({'lifetime': parsed_args.lifetime})
-        return body
+            body['lifetime'] = parsed_args.lifetime
+        return {'ikepolicy': body}
 
 
 class DeleteIKEPolicy(neutronv20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py b/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
index 0d6914cd4..57ddd8a1d 100644
--- a/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
+++ b/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
@@ -123,7 +123,7 @@ class CreateIPsecSiteConnection(neutronv20.CreateCommand):
             message = _("Invalid MTU value: MTU must be "
                         "greater than or equal to 68")
             raise exceptions.CommandError(message)
-        body = {'ipsec_site_connection': {
+        body = {
             'vpnservice_id': _vpnservice_id,
             'ikepolicy_id': _ikepolicy_id,
             'ipsecpolicy_id': _ipsecpolicy_id,
@@ -133,27 +133,20 @@ class CreateIPsecSiteConnection(neutronv20.CreateCommand):
             'initiator': parsed_args.initiator,
             'psk': parsed_args.psk,
             'admin_state_up': parsed_args.admin_state_down,
-        }, }
+        }
         if parsed_args.name:
-            body['ipsec_site_connection'].update(
-                {'name': parsed_args.name}
-            )
+            body['name'] = parsed_args.name
         if parsed_args.description:
-            body['ipsec_site_connection'].update(
-                {'description': parsed_args.description}
-            )
+            body['description'] = parsed_args.description
         if parsed_args.tenant_id:
-            body['ipsec_site_connection'].update(
-                {'tenant_id': parsed_args.tenant_id}
-            )
+            body['tenant_id'] = parsed_args.tenant_id
         if parsed_args.dpd:
             vpn_utils.validate_dpd_dict(parsed_args.dpd)
-            body['ipsec_site_connection'].update({'dpd': parsed_args.dpd})
+            body['dpd'] = parsed_args.dpd
         if parsed_args.peer_cidrs:
-            body['ipsec_site_connection'][
-                'peer_cidrs'] = parsed_args.peer_cidrs
+            body['peer_cidrs'] = parsed_args.peer_cidrs
 
-        return body
+        return {'ipsec_site_connection': body}
 
 
 class UpdateIPsecSiteConnection(neutronv20.UpdateCommand):
@@ -170,13 +163,11 @@ class UpdateIPsecSiteConnection(neutronv20.UpdateCommand):
             help=vpn_utils.dpd_help("IPsec connection."))
 
     def args2body(self, parsed_args):
-        body = {'ipsec_site_connection': {
-        }, }
-
+        body = {}
         if parsed_args.dpd:
             vpn_utils.validate_dpd_dict(parsed_args.dpd)
-            body['ipsec_site_connection'].update({'dpd': parsed_args.dpd})
-        return body
+            body['dpd'] = parsed_args.dpd
+        return {'ipsec_site_connection': body}
 
 
 class DeleteIPsecSiteConnection(neutronv20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/vpn/ipsecpolicy.py b/neutronclient/neutron/v2_0/vpn/ipsecpolicy.py
index a1b3db909..bd3bf616e 100644
--- a/neutronclient/neutron/v2_0/vpn/ipsecpolicy.py
+++ b/neutronclient/neutron/v2_0/vpn/ipsecpolicy.py
@@ -77,25 +77,23 @@ class CreateIPsecPolicy(neutronv20.CreateCommand):
 
     def args2body(self, parsed_args):
 
-        body = {'ipsecpolicy': {
+        body = {
             'auth_algorithm': parsed_args.auth_algorithm,
             'encryption_algorithm': parsed_args.encryption_algorithm,
             'encapsulation_mode': parsed_args.encapsulation_mode,
             'transform_protocol': parsed_args.transform_protocol,
             'pfs': parsed_args.pfs,
-        }, }
+        }
         if parsed_args.name:
-            body['ipsecpolicy'].update({'name': parsed_args.name})
+            body['name'] = parsed_args.name
         if parsed_args.description:
-            body['ipsecpolicy'].update(
-                {'description': parsed_args.description}
-            )
+            body['description'] = parsed_args.description
         if parsed_args.tenant_id:
-            body['ipsecpolicy'].update({'tenant_id': parsed_args.tenant_id})
+            body['tenant_id'] = parsed_args.tenant_id
         if parsed_args.lifetime:
             vpn_utils.validate_lifetime_dict(parsed_args.lifetime)
-            body['ipsecpolicy'].update({'lifetime': parsed_args.lifetime})
-        return body
+            body['lifetime'] = parsed_args.lifetime
+        return {'ipsecpolicy': body}
 
 
 class UpdateIPsecPolicy(neutronv20.UpdateCommand):
@@ -112,12 +110,11 @@ class UpdateIPsecPolicy(neutronv20.UpdateCommand):
 
     def args2body(self, parsed_args):
 
-        body = {'ipsecpolicy': {
-        }, }
+        body = {}
         if parsed_args.lifetime:
             vpn_utils.validate_lifetime_dict(parsed_args.lifetime)
-            body['ipsecpolicy'].update({'lifetime': parsed_args.lifetime})
-        return body
+            body['lifetime'] = parsed_args.lifetime
+        return {'ipsecpolicy': body}
 
 
 class DeleteIPsecPolicy(neutronv20.DeleteCommand):
diff --git a/neutronclient/neutron/v2_0/vpn/vpnservice.py b/neutronclient/neutron/v2_0/vpn/vpnservice.py
index 88915f187..3022f2d5f 100644
--- a/neutronclient/neutron/v2_0/vpn/vpnservice.py
+++ b/neutronclient/neutron/v2_0/vpn/vpnservice.py
@@ -66,14 +66,14 @@ class CreateVPNService(neutronv20.CreateCommand):
             self.get_client(), 'router',
             parsed_args.router)
 
-        body = {self.resource: {'subnet_id': _subnet_id,
-                                'router_id': _router_id,
-                                'admin_state_up': parsed_args.admin_state}, }
-        neutronv20.update_dict(parsed_args, body[self.resource],
+        body = {'subnet_id': _subnet_id,
+                'router_id': _router_id,
+                'admin_state_up': parsed_args.admin_state}
+        neutronv20.update_dict(parsed_args, body,
                                ['name', 'description',
                                 'tenant_id'])
 
-        return body
+        return {self.resource: body}
 
 
 class UpdateVPNService(neutronv20.UpdateCommand):