Merge "Added Test List Region and Region Groups"

ranger_tempest_plugin/schemas/regions_schema.py

@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License
 
+# pylint: disable=C0103
+
 _metadata = {
     'type': 'object',
     'items': {
@@ -205,3 +207,7 @@ list_region_groups = {
 delete_region_group = {
     'status_code': [204]
 }
+
+delete_region_metadata = {
+    'status_code': [204]
+}

ranger_tempest_plugin/services/rms_client.py

@@ -113,7 +113,7 @@ class RmsClient(base_client.RangerClientBase):
     def list_regions(self, filter=None):
         uri = '%s/%s/orm/regions' % (self.rms_url, self.version)
         if filter is not None:
-            uri += '?' + urllib.parse.urlencode(filter)
+            uri += '?' + urllib.urlencode(filter)
         return self.get_request(uri, schema.list_region)
 
     def delete_region(self, region_id):
@@ -125,15 +125,11 @@ class RmsClient(base_client.RangerClientBase):
             % (self.rms_url, self.version, region_id)
         post_body = json.dumps(kwargs)
         return self.post_request(uri, post_body, schema.update_metadata)
-#
-#    def delete_region_metadata(self, region_id, key):
-#        uri = '%s/%s/orm/regions/%s/metadata/%s' % (
-#            self.rms_url, self.version, region_id, key)
-#        ex_headers = self.get_headers()
-#        resp, body = self.delete(uri, extra_headers=ex_headers)
-#        self.expected_success(200, resp.status)
-#        body = json.loads(body)
-#        return rest_client.ResponseBody(resp, body)
+
+    def delete_region_metadata(self, region_id, key):
+        uri = '%s/%s/orm/regions/%s/metadata/%s' % (
+            self.rms_url, self.version, region_id, key)
+        return self.delete_request(uri, schema.delete_region_metadata)
 
     def create_region_group(self, **kwargs):
         uri = '%s/%s/orm/groups' % (self.rms_url, self.version)

ranger_tempest_plugin/tests/api/test_region_groups.py

@@ -19,6 +19,7 @@ from ranger_tempest_plugin.tests.api import base
 from tempest import config
 
 from tempest.lib import decorators
+from tempest.lib import exceptions
 
 from tempest.lib.common.utils import data_utils
 
@@ -85,3 +86,48 @@ class TestTempestRegionGroup(base.BaseOrmTest):
         _id = self.group_1['group']['id']
         _, body = self.client.get_region_group(_id)
         self.assert_expected(self.group_1['group'], body, ['links'])
+
+    @decorators.idempotent_id('504cc5cb-bc19-48ea-9456-16f5b24c9529')
+    def test_create_region_group(self):
+        _, region_group = self.client.create_region_group(
+            **orm_data_utils.rand_region_group(self.setup_ids)
+        )
+        _, region_group_details = self.client.get_region_group(
+            region_group['group']['id']
+        )
+        self.assertEqual(
+            region_group_details['regions'],
+            [self.region_1['id'], self.region_2['id']]
+        )
+        # add to cleanup
+        self.group_ids.append(region_group['group']['id'])
+
+    @decorators.idempotent_id('504cc5cb-bc19-48ea-9456-16f5b24c9530')
+    def test_delete_region_group(self):
+        _, region_group = self.client.create_region_group(
+            **orm_data_utils.rand_region_group(self.setup_ids)
+        )
+        _, region_group_details = self.client.get_region_group(
+            region_group['group']['id']
+        )
+        self.assertEqual(
+            region_group_details['regions'],
+            [self.region_1['id'], self.region_2['id']]
+        )
+
+        self.client.delete_region_group(region_group['group']['id'])
+        self.assertRaises(
+            exceptions.NotFound, self.client.get_region_group,
+            region_group['group']['id']
+        )
+
+    @decorators.idempotent_id('504cc5cb-bc19-48ea-9456-16f5b24c9531')
+    def test_validate_region_group(self):
+        # Validate the Regions added to group are present in Ranger
+        # try to add NON-EXISTENANT Region in the payload to create Group
+        ids = ['some_non_existenant_region']
+
+        self.assertRaises(
+            exceptions.BadRequest, self.client.create_region_group,
+            **orm_data_utils.rand_region_group(ids)
+        )

ranger_tempest_plugin/tests/api/test_regions.py

@@ -175,3 +175,20 @@ class TestTempestRegion(rms_base.RmsBaseOrmTest):
         regions = [x for x in body['regions']]
         self.assertTrue(
             all([region[key] == self.region_1[key] for region in regions]))
+
+    @decorators.idempotent_id('77257e0c-e2f8-4b98-886c-359508a4a73d')
+    def test_list_multiple_filter(self):
+        filter = {
+            'vlcp_name': self.region_1['vlcpName'],
+            'status': self.region_1['status'],
+            'regionname': self.region_1['name']
+        }
+        self._list_regions_with_filter(filter, 'name')
+
+    @decorators.idempotent_id('ce9bcbba-a97b-4da2-937e-69afbc5f93f8')
+    def test_delete_region_metadata(self):
+        _, body = self.client.delete_region_metadata(
+            self.region_1['id'], 'key'
+        )
+        _, region = self.client.get_region(self.region_1['id'])
+        self.assertEqual(region['metadata'], {})