Merge "Added __init__.py to tests/services/identity/"

5 files changed, 6 insertions, 6 deletions

diff --git a/tempest_lib/services/identity/v2/token_client.py b/tempest_lib/services/identity/v2/token_client.py
index 10c437c..741bf9f 100644
--- a/tempest_lib/services/identity/v2/token_client.py
+++ b/tempest_lib/services/identity/v2/token_client.py
@@ -50,7 +50,7 @@ class TokenClient(rest_client.RestClient):
         if tenant:
             creds['auth']['tenantName'] = tenant
 
-        body = json.dumps(creds)
+        body = json.dumps(creds, sort_keys=True)
         resp, body = self.post(self.auth_url, body=body)
         self.expected_success(200, resp.status)
 
diff --git a/tempest_lib/services/identity/v3/token_client.py b/tempest_lib/services/identity/v3/token_client.py
index 504b165..c030bba 100644
--- a/tempest_lib/services/identity/v3/token_client.py
+++ b/tempest_lib/services/identity/v3/token_client.py
@@ -116,7 +116,7 @@ class V3TokenClient(rest_client.RestClient):
         elif domain_name:
             creds['auth']['scope'] = dict(domain={'name': domain_name})
 
-        body = json.dumps(creds)
+        body = json.dumps(creds, sort_keys=True)
         resp, body = self.post(self.auth_url, body=body)
         self.expected_success(201, resp.status)
         return rest_client.ResponseBody(resp, body)
diff --git a/tempest_lib/tests/services/identity/__init__.py b/tempest_lib/tests/services/identity/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tempest_lib/tests/services/identity/__init__.py
diff --git a/tempest_lib/tests/services/identity/v2/test_token_client.py b/tempest_lib/tests/services/identity/v2/test_token_client.py
index f75bef8..57e439c 100644
--- a/tempest_lib/tests/services/identity/v2/test_token_client.py
+++ b/tempest_lib/tests/services/identity/v2/test_token_client.py
@@ -48,7 +48,7 @@ class TestTokenClientV2(base.TestCase):
                     'password': 'fake_pass',
                 },
             }
-        })
+        }, sort_keys=True)
         post_mock.mock.assert_called_once_with('fake_url/tokens',
                                                body=req_dict)
 
@@ -67,7 +67,7 @@ class TestTokenClientV2(base.TestCase):
                     'password': 'fake_pass',
                 },
             }
-        })
+        }, sort_keys=True)
         post_mock.mock.assert_called_once_with('fake_url/tokens',
                                                body=req_dict)
 
diff --git a/tempest_lib/tests/services/identity/v3/test_token_client.py b/tempest_lib/tests/services/identity/v3/test_token_client.py
index ed82b87..44cc8e2 100644
--- a/tempest_lib/tests/services/identity/v3/test_token_client.py
+++ b/tempest_lib/tests/services/identity/v3/test_token_client.py
@@ -53,7 +53,7 @@ class TestTokenClientV2(base.TestCase):
                     }
                 },
             }
-        })
+        }, sort_keys=True)
         post_mock.mock.assert_called_once_with('fake_url/auth/tokens',
                                                body=req_dict)
 
@@ -81,7 +81,7 @@ class TestTokenClientV2(base.TestCase):
                     }
                 },
             }
-        })
+        }, sort_keys=True)
 
         post_mock.mock.assert_called_once_with('fake_url/auth/tokens',
                                                body=req_dict)