Merge pull request #258 from Ankit152/mtsre-692

[MTSRE-692] ocm client send namespace with labels

Author: ashishmax31

managedtenants/utils/ocm.py

@@ -50,6 +50,7 @@ class OcmCli:
         "subOperators": "sub_operators",
         "managedService": "managed_service",
         "config": "config",
+        "namespaces": "namespaces",
     }
 
     IMAGESET_KEYS = {
@@ -415,6 +416,14 @@ def set_addon_config(self, addon, addon_id, config_obj, mapped_key):
 
         return addon
 
+    def get_namespace_labels_list(self, namespaces, namespaceLabels):
+        namespaceLabelsList = []
+        for namespace in namespaces:
+            namespaceLabelsList.append(
+                {"name": namespace, "labels": namespaceLabels}
+            )
+        return namespaceLabelsList
+
     def _addon_from_metadata(self, metadata):
         addon = {}
         # Set empty values if attrs are not present
@@ -427,6 +436,12 @@ def _addon_from_metadata(self, metadata):
         metadata["config"] = metadata.get("config", {})
         metadata["config"]["env"] = metadata["config"].get("env", [])
         metadata["config"]["secrets"] = metadata["config"].get("secrets", [])
+        # ocm client to send in namespaces(along with labels)
+        namespaceLabels = metadata.get("namespaceLabels")
+        namespaces = metadata.get("namespaces", [])
+        metadata["namespaces"] = self.get_namespace_labels_list(
+            namespaces, namespaceLabels
+        )
 
         for key, val in metadata.items():
             if key in self.ADDON_KEYS:

tests/utils/test_ocm.py

@@ -6,6 +6,7 @@
 from managedtenants.data.paths import SCHEMAS_DIR
 from managedtenants.utils.ocm import OcmCli
 from tests.testutils.addon_helpers import (  # noqa: F401; noqa: F401; flake8: noqa: F401
+    addon_with_deadmanssnitch,
     addon_with_imageset_and_default_config,
     addon_with_imageset_and_multiple_config,
     addon_with_imageset_and_only_required_attrs,
@@ -230,3 +231,43 @@ def test_ocm_addon_default_values(addon_str, expected_result, request):
 
     for k, expected_value in expected_result.items():
         assert ocm_addon.get(k) == expected_value
+
+
+@pytest.mark.parametrize(
+    "addon_str,expected_result",
+    [
+        (
+            "addon_without_imageset_and_only_required_attrs",
+            {
+                "namespaces": [
+                    {
+                        "name": "mock-operator",
+                        "labels": {"monitoring-key": "mock"},
+                    },
+                ],
+            },
+        ),
+        (
+            "addon_with_deadmanssnitch",
+            {
+                "namespaces": [
+                    {
+                        "name": "redhat-test-operator",
+                        "labels": {},
+                    }
+                ],
+            },
+        ),
+    ],
+)
+def test_ocm_addon_namespace_with_labels(addon_str, expected_result, request):
+    addon = request.getfixturevalue(addon_str)
+    ocm_cli = OcmCli(offline_token=None)
+    if addon.imageset:
+        ocm_addon = ocm_cli._addon_from_imageset(
+            imageset=addon.imageset, metadata=addon.metadata
+        )
+    else:
+        ocm_addon = ocm_cli._addon_from_metadata(metadata=addon.metadata)
+    for k, expected_value in expected_result.items():
+        assert ocm_addon.get(k) == expected_value