From: shrinithi Date: Wed, 29 Jan 2025 06:01:31 +0000 (+0000) Subject: cluster name check dependency with profiles X-Git-Tag: v17.0.1~3 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=4543aed232626a7b44d7d94a8cbab22f7d540dbf;p=osm%2FNBI.git cluster name check dependency with profiles Change-Id: If50cb85abfe967bcfe554e739c579859e66f49df Signed-off-by: shrinithi Signed-off-by: garciadeblas --- diff --git a/osm_nbi/acm_topic.py b/osm_nbi/acm_topic.py index 27273f9..12ee1a8 100644 --- a/osm_nbi/acm_topic.py +++ b/osm_nbi/acm_topic.py @@ -263,14 +263,24 @@ class ACMTopic(BaseTopic, ACMOperationTopic): return def cluster_unique_name_check(self, session, name): + # First check using the method you have for unique name validation self.check_unique_name(session, name) _filter = {"name": name} - topic = "k8sclusters" - if self.db.get_one(topic, _filter, fail_on_empty=False, fail_on_more=False): - raise EngineException( - "name '{}' already exists".format(name), - HTTPStatus.CONFLICT, - ) + topics = [ + "k8sclusters", + "k8sapp", + "k8sinfra_config", + "k8sinfra_controller", + "k8sresource", + ] + + # Loop through each topic to check if the name already exists in any of them + for item in topics: + if self.db.get_one(item, _filter, fail_on_empty=False, fail_on_more=False): + raise EngineException( + f"name '{name}' already exists in topic '{item}'", + HTTPStatus.CONFLICT, + ) def list_both(self, session, filter_q=None, api_req=False): """List all clusters from both new and old APIs"""