Fix issues

otc_metadata/data/services/fg.yaml

@@ -11,3 +11,4 @@ cloud_environments:
   - name: eu_de
     visibility: public
 is_global: false
+is_global: false

otc_metadata/data/services/gloss.yaml

@@ -8,3 +8,4 @@ service_uri: glossary
 teams:
 - name: docs-eco-rw
   permission: write
+is_global: true

otc_metadata/data/services/hss.yaml

@@ -10,3 +10,4 @@ cloud_environments:
   - name: eu_de
     visibility: public
 is_global: false
+is_global: false

otc_metadata/data/services/iam.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/ims.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/kms.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/lts.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/natgw.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/obs.yaml

@@ -11,4 +11,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/rae.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: hidden
   - name: swiss
-    visibility: hidden
+    visibility: hidden
+is_global: false

otc_metadata/data/services/rds.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/sd.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/sdrs.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/smn.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/swr.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/testservice.yaml

@@ -11,3 +11,4 @@ cloud_environments:
 teams:
   - name: docs-security-services-rw
     permission: write
+is_global: false

otc_metadata/data/services/tms.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/vpc.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/vpcep.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/vpn.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

otc_metadata/data/services/wafd.yaml

@@ -10,4 +10,5 @@ cloud_environments:
   - name: eu_de
     visibility: public
   - name: swiss
-    visibility: public
+    visibility: public
+is_global: false

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