commit dc075720dc26d644843e88b45a341d3a8618268c
author Valeriy Ponomaryov <vponomaryov@mirantis.com> Wed Sep 30 12:07:50 2015 +0300
committer Valeriy Ponomaryov <vponomaryov@mirantis.com> Thu Oct 01 09:52:44 2015 +0000
tree 1832d096138905922b6a1015018c9f59105cdce7
parent f9a82c9c2ebd200ce9241d5370d196f913276af7

Fix response data for API access-allow

API access-allow returns following redundant data:
- deleted
- deleted_at
- instance_mappings

So, remove them for create share api method and cover it with
unit and tempest tests.

Change-Id: I103380c3f0008d4879b39f339187e57eeec40456
Closes-Bug: #1499733
(cherry picked from commit beb9191c69058cecb3c961297213a1c59f65745e)

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"])