commit a49c4445e7f2af97e3af3c51ce1d95cda8b6e420
author Jenkins <jenkins@review.openstack.org> Wed Sep 30 21:41:45 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Sep 30 21:41:45 2015 +0000
tree a40015650790d18caae63729ecfebf9f9c7b809a
parent 5221dcd916fe8e124e13041200e5700d4fb237a9
parent c4e947972a6fde3fcff7b36efdad9cdd64261c5a

Merge "Fix response data for API access-allow"

manila_tempest_tests/tests/api/test_rules.py

diff --git a/manila_tempest_tests/tests/api/test_rules.py b/manila_tempest_tests/tests/api/test_rules.py
index 7198c90..5336127 100644
--- a/manila_tempest_tests/tests/api/test_rules.py
+++ b/manila_tempest_tests/tests/api/test_rules.py
@@ -30,7 +30,10 @@
     """
     rule = self.shares_client.create_access_rule(
         self.share["id"], self.access_type, self.access_to, 'ro')
+
     self.assertEqual('ro', rule['access_level'])
+    for key in ('deleted', 'deleted_at', 'instance_mappings'):
+        self.assertNotIn(key, rule.keys())
     self.shares_client.wait_for_access_rule_status(
         self.share["id"], rule["id"], "active")
     self.shares_client.delete_access_rule(self.share["id"], rule["id"])
@@ -61,7 +64,10 @@
         # create rule
         rule = self.shares_client.create_access_rule(
             self.share["id"], self.access_type, access_to)
+
         self.assertEqual('rw', rule['access_level'])
+        for key in ('deleted', 'deleted_at', 'instance_mappings'):
+            self.assertNotIn(key, rule.keys())
         self.shares_client.wait_for_access_rule_status(
             self.share["id"], rule["id"], "active")
 
@@ -79,6 +85,9 @@
         # create rule
         rule = self.shares_client.create_access_rule(
             self.share["id"], self.access_type, access_to)
+
+        for key in ('deleted', 'deleted_at', 'instance_mappings'):
+            self.assertNotIn(key, rule.keys())
         self.assertEqual('rw', rule['access_level'])
         self.shares_client.wait_for_access_rule_status(
             self.share["id"], rule["id"], "active")
@@ -128,7 +137,10 @@
         # create rule
         rule = self.shares_client.create_access_rule(
             self.share["id"], self.access_type, self.access_to)
+
         self.assertEqual('rw', rule['access_level'])
+        for key in ('deleted', 'deleted_at', 'instance_mappings'):
+            self.assertNotIn(key, rule.keys())
         self.shares_client.wait_for_access_rule_status(
             self.share["id"], rule["id"], "active")
 
@@ -179,7 +191,10 @@
         # create rule
         rule = self.shares_client.create_access_rule(
             self.share["id"], self.access_type, self.access_to)
+
         self.assertEqual('rw', rule['access_level'])
+        for key in ('deleted', 'deleted_at', 'instance_mappings'):
+            self.assertNotIn(key, rule.keys())
         self.shares_client.wait_for_access_rule_status(
             self.share["id"], rule["id"], "active")
 
@@ -193,7 +208,10 @@
     def test_create_delete_cert_ro_access_rule(self):
         rule = self.shares_client.create_access_rule(
             self.share["id"], 'cert', 'client2.com', 'ro')
+
         self.assertEqual('ro', rule['access_level'])
+        for key in ('deleted', 'deleted_at', 'instance_mappings'):
+            self.assertNotIn(key, rule.keys())
         self.shares_client.wait_for_access_rule_status(
             self.share["id"], rule["id"], "active")
         self.shares_client.delete_access_rule(self.share["id"], rule["id"])
@@ -249,8 +267,10 @@
         rules = self.shares_client.list_access_rules(self.share["id"])
 
         # verify keys
-        keys = ["state", "id", "access_type", "access_to", "access_level"]
-        [self.assertIn(key, r.keys()) for r in rules for key in keys]
+        for key in ("state", "id", "access_type", "access_to", "access_level"):
+            [self.assertIn(key, r.keys()) for r in rules]
+        for key in ('deleted', 'deleted_at', 'instance_mappings'):
+            [self.assertNotIn(key, r.keys()) for r in rules]
 
         # verify values
         self.assertEqual("active", rules[0]["state"])