Merge "Cleaned up dict.update(single elem dict) code"

3 files changed, 25 insertions, 27 deletions

diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tests.py b/openstack_dashboard/dashboards/project/loadbalancers/tests.py
index 7513015e3..8b352a5db 100644
--- a/openstack_dashboard/dashboards/project/loadbalancers/tests.py
+++ b/openstack_dashboard/dashboards/project/loadbalancers/tests.py
@@ -574,7 +574,7 @@ class LoadBalancerTests(test.TestCase):
         self.mox.ReplayAll()
 
         form_data = data.copy()
-        form_data.update({'pool_id': pool.id})
+        form_data['pool_id'] = pool.id
 
         res = self.client.post(
             reverse(self.UPDATEPOOL_PATH, args=(pool.id,)), form_data)
@@ -616,7 +616,7 @@ class LoadBalancerTests(test.TestCase):
         self.mox.ReplayAll()
 
         form_data = data.copy()
-        form_data.update({'vip_id': vip.id})
+        form_data['vip_id'] = vip.id
 
         res = self.client.post(
             reverse(self.UPDATEVIP_PATH, args=(vip.id,)), form_data)
@@ -658,7 +658,7 @@ class LoadBalancerTests(test.TestCase):
         self.mox.ReplayAll()
 
         form_data = data.copy()
-        form_data.update({'member_id': member.id})
+        form_data['member_id'] = member.id
 
         res = self.client.post(
             reverse(self.UPDATEMEMBER_PATH, args=(member.id,)), form_data)
@@ -701,7 +701,7 @@ class LoadBalancerTests(test.TestCase):
         self.mox.ReplayAll()
 
         form_data = data.copy()
-        form_data.update({'monitor_id': monitor.id})
+        form_data['monitor_id'] = monitor.id
 
         res = self.client.post(
             reverse(self.UPDATEMONITOR_PATH, args=(monitor.id,)), form_data)
diff --git a/openstack_dashboard/dashboards/project/vpn/tests.py b/openstack_dashboard/dashboards/project/vpn/tests.py
index f3d1fde82..abbd1a1ec 100644
--- a/openstack_dashboard/dashboards/project/vpn/tests.py
+++ b/openstack_dashboard/dashboards/project/vpn/tests.py
@@ -584,7 +584,7 @@ class VPNTests(test.TestCase):
         self.mox.ReplayAll()
 
         form_data = data.copy()
-        form_data.update({'vpnservice_id': vpnservice.id})
+        form_data['vpnservice_id'] = vpnservice.id
 
         res = self.client.post(reverse(
             self.UPDATEVPNSERVICE_PATH, args=(vpnservice.id,)), form_data)
@@ -630,12 +630,11 @@ class VPNTests(test.TestCase):
 
         form_data = data.copy()
 
-        form_data.update({'lifetime_units': form_data['lifetime']['units']})
-        form_data.update({'lifetime_value': form_data['lifetime']['value']})
+        form_data.update({'lifetime_units': form_data['lifetime']['units'],
+                          'lifetime_value': form_data['lifetime']['value'],
+                          'ikepolicy_id': ikepolicy.id})
         form_data.pop('lifetime')
 
-        form_data.update({'ikepolicy_id': ikepolicy.id})
-
         res = self.client.post(reverse(
             self.UPDATEIKEPOLICY_PATH, args=(ikepolicy.id,)), form_data)
 
@@ -680,12 +679,11 @@ class VPNTests(test.TestCase):
 
         form_data = data.copy()
 
-        form_data.update({'lifetime_units': form_data['lifetime']['units']})
-        form_data.update({'lifetime_value': form_data['lifetime']['value']})
+        form_data.update({'lifetime_units': form_data['lifetime']['units'],
+                          'lifetime_value': form_data['lifetime']['value'],
+                          'ipsecpolicy_id': ipsecpolicy.id})
         form_data.pop('lifetime')
 
-        form_data.update({'ipsecpolicy_id': ipsecpolicy.id})
-
         res = self.client.post(reverse(
             self.UPDATEIPSECPOLICY_PATH, args=(ipsecpolicy.id,)), form_data)
 
@@ -737,15 +735,15 @@ class VPNTests(test.TestCase):
 
         form_data = data.copy()
 
-        form_data.update({'dpd_action': form_data['dpd']['action']})
-        form_data.update({'dpd_interval': form_data['dpd']['interval']})
-        form_data.update({'dpd_timeout': form_data['dpd']['timeout']})
+        form_data.update({
+            'dpd_action': form_data['dpd']['action'],
+            'dpd_interval': form_data['dpd']['interval'],
+            'dpd_timeout': form_data['dpd']['timeout'],
+            'peer_cidrs': ", ".join(ipsecsiteconnection['peer_cidrs']),
+            'ipsecsiteconnection_id': ipsecsiteconnection.id,
+        })
         form_data.pop('dpd')
 
-        form_data['peer_cidrs'] = ", ".join(ipsecsiteconnection['peer_cidrs'])
-
-        form_data.update({'ipsecsiteconnection_id': ipsecsiteconnection.id})
-
         res = self.client.post(
             reverse(self.UPDATEVPNCONNECTION_PATH,
                     args=(ipsecsiteconnection.id,)), form_data)
diff --git a/openstack_dashboard/dashboards/project/vpn/workflows.py b/openstack_dashboard/dashboards/project/vpn/workflows.py
index b74685543..51cad638a 100644
--- a/openstack_dashboard/dashboards/project/vpn/workflows.py
+++ b/openstack_dashboard/dashboards/project/vpn/workflows.py
@@ -177,8 +177,8 @@ class AddIKEPolicyStep(workflows.Step):
 
     def contribute(self, data, context):
         context = super(AddIKEPolicyStep, self).contribute(data, context)
-        context.update({'lifetime': {'units': data['lifetime_units'],
-                                     'value': data['lifetime_value']}})
+        context['lifetime'] = {'units': data['lifetime_units'],
+                               'value': data['lifetime_value']}
         context.pop('lifetime_units')
         context.pop('lifetime_value')
         if data:
@@ -274,8 +274,8 @@ class AddIPSecPolicyStep(workflows.Step):
 
     def contribute(self, data, context):
         context = super(AddIPSecPolicyStep, self).contribute(data, context)
-        context.update({'lifetime': {'units': data['lifetime_units'],
-                                     'value': data['lifetime_value']}})
+        context['lifetime'] = {'units': data['lifetime_units'],
+                               'value': data['lifetime_value']}
         context.pop('lifetime_units')
         context.pop('lifetime_value')
         if data:
@@ -450,9 +450,9 @@ class AddIPSecSiteConnectionOptionalStep(workflows.Step):
     def contribute(self, data, context):
         context = super(
             AddIPSecSiteConnectionOptionalStep, self).contribute(data, context)
-        context.update({'dpd': {'action': data['dpd_action'],
-                                'interval': data['dpd_interval'],
-                                'timeout': data['dpd_timeout']}})
+        context['dpd'] = {'action': data['dpd_action'],
+                          'interval': data['dpd_interval'],
+                          'timeout': data['dpd_timeout']}
         context.pop('dpd_action')
         context.pop('dpd_interval')
         context.pop('dpd_timeout')