From a432d6f39f8dd9cbab2d772b171d0825de8b94dc Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Fri, 25 Apr 2025 10:27:12 +0000 Subject: [PATCH] Fix issues --- otc_metadata/data/services/fg.yaml | 1 + otc_metadata/data/services/gloss.yaml | 1 + otc_metadata/data/services/hss.yaml | 1 + otc_metadata/data/services/iam.yaml | 3 ++- otc_metadata/data/services/ims.yaml | 3 ++- otc_metadata/data/services/kms.yaml | 3 ++- otc_metadata/data/services/lts.yaml | 3 ++- otc_metadata/data/services/natgw.yaml | 3 ++- otc_metadata/data/services/obs.yaml | 3 ++- otc_metadata/data/services/rae.yaml | 3 ++- otc_metadata/data/services/rds.yaml | 3 ++- otc_metadata/data/services/sd.yaml | 3 ++- otc_metadata/data/services/sdrs.yaml | 3 ++- otc_metadata/data/services/smn.yaml | 3 ++- otc_metadata/data/services/swr.yaml | 3 ++- otc_metadata/data/services/testservice.yaml | 1 + otc_metadata/data/services/tms.yaml | 3 ++- otc_metadata/data/services/vpc.yaml | 3 ++- otc_metadata/data/services/vpcep.yaml | 3 ++- otc_metadata/data/services/vpn.yaml | 3 ++- otc_metadata/data/services/wafd.yaml | 3 ++- otc_metadata/services.py | 23 +++++++++++++++++++++ 22 files changed, 61 insertions(+), 17 deletions(-) diff --git a/otc_metadata/data/services/fg.yaml b/otc_metadata/data/services/fg.yaml index e6b0c12..df59562 100644 --- a/otc_metadata/data/services/fg.yaml +++ b/otc_metadata/data/services/fg.yaml @@ -11,3 +11,4 @@ cloud_environments: - name: eu_de visibility: public is_global: false +is_global: false diff --git a/otc_metadata/data/services/gloss.yaml b/otc_metadata/data/services/gloss.yaml index 938e1ac..3c68c90 100644 --- a/otc_metadata/data/services/gloss.yaml +++ b/otc_metadata/data/services/gloss.yaml @@ -8,3 +8,4 @@ service_uri: glossary teams: - name: docs-eco-rw permission: write +is_global: true diff --git a/otc_metadata/data/services/hss.yaml b/otc_metadata/data/services/hss.yaml index f9138d2..aee98f5 100644 --- a/otc_metadata/data/services/hss.yaml +++ b/otc_metadata/data/services/hss.yaml @@ -10,3 +10,4 @@ cloud_environments: - name: eu_de visibility: public is_global: false +is_global: false diff --git a/otc_metadata/data/services/iam.yaml b/otc_metadata/data/services/iam.yaml index ad0941e..fd07d27 100644 --- a/otc_metadata/data/services/iam.yaml +++ b/otc_metadata/data/services/iam.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/ims.yaml b/otc_metadata/data/services/ims.yaml index 1b89b68..580e1ca 100644 --- a/otc_metadata/data/services/ims.yaml +++ b/otc_metadata/data/services/ims.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/kms.yaml b/otc_metadata/data/services/kms.yaml index 05be729..1d22e46 100644 --- a/otc_metadata/data/services/kms.yaml +++ b/otc_metadata/data/services/kms.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/lts.yaml b/otc_metadata/data/services/lts.yaml index 216c8e5..21a2919 100644 --- a/otc_metadata/data/services/lts.yaml +++ b/otc_metadata/data/services/lts.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/natgw.yaml b/otc_metadata/data/services/natgw.yaml index 1defb5a..b852349 100644 --- a/otc_metadata/data/services/natgw.yaml +++ b/otc_metadata/data/services/natgw.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/obs.yaml b/otc_metadata/data/services/obs.yaml index 0643226..a9b93db 100644 --- a/otc_metadata/data/services/obs.yaml +++ b/otc_metadata/data/services/obs.yaml @@ -11,4 +11,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/rae.yaml b/otc_metadata/data/services/rae.yaml index 1ab4d76..594a127 100644 --- a/otc_metadata/data/services/rae.yaml +++ b/otc_metadata/data/services/rae.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: hidden - name: swiss - visibility: hidden \ No newline at end of file + visibility: hidden +is_global: false diff --git a/otc_metadata/data/services/rds.yaml b/otc_metadata/data/services/rds.yaml index 1d4cae1..7a7e922 100644 --- a/otc_metadata/data/services/rds.yaml +++ b/otc_metadata/data/services/rds.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/sd.yaml b/otc_metadata/data/services/sd.yaml index c713a70..a6094b1 100644 --- a/otc_metadata/data/services/sd.yaml +++ b/otc_metadata/data/services/sd.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/sdrs.yaml b/otc_metadata/data/services/sdrs.yaml index 8a45dd9..b3e63bb 100644 --- a/otc_metadata/data/services/sdrs.yaml +++ b/otc_metadata/data/services/sdrs.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/smn.yaml b/otc_metadata/data/services/smn.yaml index 315fed9..f6852fe 100644 --- a/otc_metadata/data/services/smn.yaml +++ b/otc_metadata/data/services/smn.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/swr.yaml b/otc_metadata/data/services/swr.yaml index fdb8da6..9908a6a 100644 --- a/otc_metadata/data/services/swr.yaml +++ b/otc_metadata/data/services/swr.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/testservice.yaml b/otc_metadata/data/services/testservice.yaml index 6f41a2e..51ad77a 100644 --- a/otc_metadata/data/services/testservice.yaml +++ b/otc_metadata/data/services/testservice.yaml @@ -11,3 +11,4 @@ cloud_environments: teams: - name: docs-security-services-rw permission: write +is_global: false diff --git a/otc_metadata/data/services/tms.yaml b/otc_metadata/data/services/tms.yaml index 1d7132f..c896920 100644 --- a/otc_metadata/data/services/tms.yaml +++ b/otc_metadata/data/services/tms.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/vpc.yaml b/otc_metadata/data/services/vpc.yaml index 88af75f..29fb5ee 100644 --- a/otc_metadata/data/services/vpc.yaml +++ b/otc_metadata/data/services/vpc.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/vpcep.yaml b/otc_metadata/data/services/vpcep.yaml index b3c0619..99053d9 100644 --- a/otc_metadata/data/services/vpcep.yaml +++ b/otc_metadata/data/services/vpcep.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/vpn.yaml b/otc_metadata/data/services/vpn.yaml index b6821ba..0bf331a 100644 --- a/otc_metadata/data/services/vpn.yaml +++ b/otc_metadata/data/services/vpn.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/data/services/wafd.yaml b/otc_metadata/data/services/wafd.yaml index 5ef04f4..317e542 100644 --- a/otc_metadata/data/services/wafd.yaml +++ b/otc_metadata/data/services/wafd.yaml @@ -10,4 +10,5 @@ cloud_environments: - name: eu_de visibility: public - name: swiss - visibility: public \ No newline at end of file + visibility: public +is_global: false diff --git a/otc_metadata/services.py b/otc_metadata/services.py index d80e767..7d32dde 100644 --- a/otc_metadata/services.py +++ b/otc_metadata/services.py @@ -416,4 +416,27 @@ class Services(object): if repositories["service_type"] == service["service_type"]: res[i]["repositories"] = repositories["repositories"] break + return res + + def all_services_with_categories(self, cloud_environment, environment): + """Retrieve all services sorted by categories + """ + res = self.service_categories + for i, category in enumerate(res): + res[i]["services"] = [] + for srv in self.all_services: + if environment and cloud_environment: + cloud_environment_check = False + if srv["is_global"] is not True: + for srv_cloud_environment in srv["cloud_environments"]: + if srv_cloud_environment["name"] == cloud_environment: + if srv_cloud_environment["visibility"] == environment: + cloud_environment_check = True + else: + continue + if cloud_environment_check is False: + continue + for i, category in enumerate(res): + if category["name"] == srv["service_category"]: + res[i]["services"].append(srv) return res \ No newline at end of file