commit b2776c9db1ee45d78092f6015b49aa84a9b4fd98
author Jenkins <jenkins@review.openstack.org> Tue Oct 08 18:33:03 2013 +0000
committer Gerrit Code Review <review@openstack.org> Tue Oct 08 18:33:03 2013 +0000
tree b257348dd6aa71b1b5dfa4685b1b48f451f407e7
parent f8c534baec692e68a826acdf6777bface1ee40a2
parent 454b1c5b5926f91b518346b7d400727c8e970f50

Merge "meta should be metadata in rebuild server"

tempest/api/compute/servers/test_server_actions.py

diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py
index e9defe5..6f646b2 100644
--- a/tempest/api/compute/servers/test_server_actions.py
+++ b/tempest/api/compute/servers/test_server_actions.py
@@ -118,7 +118,8 @@
         password = 'rebuildPassw0rd'
         resp, rebuilt_server = self.client.rebuild(self.server_id,
                                                    self.image_ref_alt,
-                                                   name=new_name, meta=meta,
+                                                   name=new_name,
+                                                   metadata=meta,
                                                    personality=personality,
                                                    adminPass=password)
 
@@ -226,7 +227,8 @@
         self.assertRaises(exceptions.NotFound,
                           self.client.rebuild,
                           999, self.image_ref_alt,
-                          name=new_name, meta=meta,
+                          name=new_name,
+                          metadata=meta,
                           personality=personality,
                           adminPass='rebuild')