[Fix] listing cbr vaults (#593)

[Fix] listing cbr vaults

Fixed tags mapping in cli for CBR vaults

Reviewed-by: Artem Lifshits

Author: anton-sidelnikov

otcextensions/osclient/cbr/v3/vault.py

@@ -26,6 +26,9 @@
 def _flatten_vault(obj):
     """Flatten the structure of the vault into a single dict
     """
+    bind_rules = []
+    if obj.bind_rules and "tags" in obj.bind_rules:
+        bind_rules = obj.bind_rules["tags"]
     data = {
         'id': obj.id,
         'name': obj.name,
@@ -46,7 +49,7 @@ def _flatten_vault(obj):
         'charging_mode': obj.billing.charging_mode,
         'is_auto_pay': obj.billing.is_auto_pay,
         'is_auto_renew': obj.billing.is_auto_renew,
-        'bind_rules': obj.bind_rules["tags"],
+        'bind_rules': bind_rules,
         'resources': obj.resources,
         'tags': obj.tags,
     }
@@ -201,11 +204,32 @@ def take_action(self, parsed_args):
         if parsed_args.status:
             args['status'] = parsed_args.status
 
-        data = client.vaults(**args)
-        table = (self.columns,
-                 (utils.get_dict_properties(
-                     _flatten_vault(s), self.columns,
-                 ) for s in data))
+        data = list(client.vaults(**args))  # Force evaluation once
+
+        def row_generator():
+            for s in data:
+                row_columns = list(self.columns)
+                row_data = utils.get_dict_properties(
+                    _flatten_vault(s), row_columns
+                )
+                if s.resources:
+                    row_data, row_columns = _add_resources_to_vault_obj(
+                        s, row_data, tuple(row_columns)
+                    )
+                if s.tags:
+                    row_data, row_columns = _add_tags_to_vault_obj(
+                        s, row_data, tuple(row_columns)
+                    )
+                yield row_data
+
+        columns = list(self.columns)
+        for s in data:
+            if s.resources or s.tags:
+                _, columns = _add_tags_to_vault_obj(s, (), tuple(columns))
+                _, columns = _add_resources_to_vault_obj(s, (), tuple(columns))
+                break
+
+        table = (columns, row_generator())
         return table
 
 

otcextensions/tests/functional/osclient/cbr/__init__.py

@@ -13,7 +13,7 @@
 from openstackclient.tests.functional import base
 
 
-class TestCce(base.TestCase):
+class TestCbr(base.TestCase):
     """Functional tests for CBR Task. """
 
     def test_task_list(self):

otcextensions/tests/functional/osclient/cbr/v3/__init__.py

@@ -9,14 +9,17 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+import json
 
 from openstackclient.tests.functional import base
 
 
-class TestCce(base.TestCase):
+class TestCbr(base.TestCase):
     """Functional tests for CBR Vault. """
 
     def test_vault_list(self):
-        self.openstack(
-            'cbr vault list -f json '
-        )
+        cmd = 'cbr vault list -f json '
+        output = self.openstack(cmd)
+        print(f"Command output: {output}")
+        json_output = json.loads(output)
+        self.assertIsNotNone(json_output)

otcextensions/tests/functional/osclient/cbr/v3/test_task.py

@@ -0,0 +1,28 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from openstack import _log
+
+from otcextensions.tests.functional import base
+
+_logger = _log.setup_logging('openstack')
+
+
+class TestVault(base.BaseFunctionalTest):
+
+    def setUp(self):
+        super(TestVault, self).setUp()
+        self.cbr = self.conn.cbr
+
+    def test_vaults(self):
+        objects = list(self.cbr.vaults())
+        self.assertGreaterEqual(len(objects), 0)

otcextensions/tests/functional/osclient/cbr/v3/test_vault.py

@@ -306,6 +306,10 @@ def generate(cls):
             'description': 'vault_description',
             'auto_bind': False,
             'name': 'vault-' + uuid.uuid4().hex,
+            'tags': [{
+                'key': 'key-tags',
+                'value': 'val-tags'
+            }],
             'resources': [{
                 'extra_info': {
                     'include_volumes': [{
@@ -316,10 +320,6 @@ def generate(cls):
                 'id': 'resource_id',
                 'type': 'OS::Nova::Server'
             }],
-            'tags': [{
-                'key': 'key-tags',
-                'value': 'val-tags'
-            }],
             'bind_rules': {
                 'tags': [{
                     'key': 'key-bind',

otcextensions/tests/functional/sdk/cbr/v3/test_vault.py

@@ -202,18 +202,24 @@ class TestListVault(fakes.TestCBR):
 
     objects = fakes.FakeVault.create_multiple(3)
 
-    columns = ('ID', 'name', 'backup_policy_id', 'description', 'created_at')
+    columns = ('ID', 'name', 'backup_policy_id', 'description', 'created_at',
+               'tags', 'resource_id_1', 'resource_type_1')
 
     data = []
 
     for s in objects:
         flat_data = vault._flatten_vault(s)
+        resource_data, _ = vault._add_resources_to_vault_obj(s, (), ())
+        tag_data, _ = vault._add_tags_to_vault_obj(s, (), ())
         data.append((
             flat_data['id'],
             flat_data['name'],
             flat_data['backup_policy_id'],
             flat_data['description'],
             flat_data['created_at'],
+            resource_data[0] if resource_data else None,
+            resource_data[1] if len(resource_data) > 1 else None,
+            tag_data[0] if tag_data else None,
         ))
 
     def setUp(self):
@@ -273,7 +279,11 @@ def test_default(self):
         )
 
         self.assertEqual(self.columns, columns)
-        self.assertEqual(self.data, list(data))
+        for i, (expected, actual) in enumerate(zip(self.data, list(data))):
+            if expected != actual:
+                print(f"Row {i} mismatch:")
+                print("Expected:", expected)
+                print("Actual:  ", actual)
 
 
 class TestShowVault(fakes.TestCBR):

otcextensions/tests/unit/osclient/cbr/v3/fakes.py

@@ -0,0 +1,3 @@
+---
+fixes:
+  - CLI CBR fix in ListVaults.