commit 42e8fea6e88fa67c3b953cb8623b88ce05715379
author Jenkins <jenkins@review.openstack.org> Tue May 10 14:28:55 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue May 10 14:28:56 2016 +0000
tree 9bf3740efd562d09e713dd02d214691a123c7c79
parent 6b690736c298714d13c8582df58cc989edb52dc3
parent 81c427dfc5b8c1f5910974a1b949cb3602a5aca6

Merge "Py3: fix an error when adding two `dict_items`"

tempest/lib/services/compute/servers_client.py

diff --git a/tempest/lib/services/compute/servers_client.py b/tempest/lib/services/compute/servers_client.py
index 0472eda..8e4eca1 100644
--- a/tempest/lib/services/compute/servers_client.py
+++ b/tempest/lib/services/compute/servers_client.py
@@ -61,7 +61,7 @@
         post_body = {'server': body}
 
         if hints:
-            post_body = dict(post_body.items() + hints.items())
+            post_body.update(hints)
 
         post_body = json.dumps(post_body)
         resp, body = self.post('servers', post_body)