Fix is_global

Reviewed-by: Tino Schreiber <tino.schreiber@t-systems.com>
Co-authored-by: Sebastian Gode <sebastian.gode@telekom.de>
Co-committed-by: Sebastian Gode <sebastian.gode@telekom.de>

otc_metadata/data/documents/aom-api-ref.yaml

@@ -1,11 +1,11 @@
 ---
-hc_location: usermanual/aom
+hc_location: api/aom
-html_location: docs/aom/umn
+html_location: docs/aom/api-ref
-link: /application-operations-management/umn/
+link: /application-operations-management/api-ref/
-rst_location: umn/source
+rst_location: api-ref/source
 service_type: aom
-title: User Guide
+title: API Reference
-type: umn
+type: api-ref
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/obs_3rd_party-python-sdk.yaml

@@ -5,7 +5,7 @@ link: /object-storage-service-3rd-party/python-sdk/
 rst_location: doc/python-sdk/source
 service_type: obs_3rd_party
 title: Python SDK
-type: 3rd_party_sdk
+type: python-sdk
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/taurusdb-umn.yaml

@@ -2,6 +2,7 @@
 hc_location: usermanual/taurusdb
 html_location: docs/taurusdb/umn
 link: /taurusdb/umn/
+rst_location: umn/source
 pdf_enabled: true
 service_type: taurusdb
 title: User Guide

otc_metadata/data/documents/testservice-api-ref.yaml

@@ -1,13 +0,0 @@
----
-hc_location: usermanual/testservice
-html_location: docs/testservice/api-ref
-link: /testservice/api-ref/
-rst_location: api-ref/source
-service_type: testservice
-title: User Guide
-type: api-ref
-cloud_environments:
-  - name: swiss
-    visibility: public
-    pdf_visibility: public
-    pdf_enabled: true

otc_metadata/data/documents/testservice-umn.yaml

@@ -1,13 +0,0 @@
----
-hc_location: usermanual/testservice
-html_location: docs/testservice/umn
-link: /testservice/umn/
-rst_location: umn/source
-service_type: testservice
-title: User Guide
-type: umn
-cloud_environments:
-  - name: eu_de
-    visibility: public
-    pdf_visibility: public
-    pdf_enabled: true

otc_metadata/data/repositories/gloss.yaml

@@ -5,9 +5,9 @@ repositories:
     repo: opentelekomcloud-docs/glossary
     type: github
     cloud_environments:
-      - 
+      - eu_de
   - environment: internal
     repo: docs/glossary
     type: gitea
     cloud_environments:
-      - 
+      - eu_de

otc_metadata/data/repositories/testservice.yaml

@@ -1,13 +0,0 @@
----
-service_type: testservice
-repositories:
-  - environment: public
-    repo: opentelekomcloud-docs/testservice
-    type: github
-    cloud_environments:
-      - eu_de
-  - environment: internal
-    repo: docs/testservice
-    type: gitea
-    cloud_environments:
-      - eu_de

otc_metadata/data/service_categories/application.yaml

@@ -1,3 +1,3 @@
 ---
 name: application
-title: Application Services
+title: Application

otc_metadata/data/services/testservice.yaml

@@ -1,14 +0,0 @@
----
-environment: public
-is_global: false
-service_category: security-services
-service_title: Test Service
-service_type: testservice
-service_uri: testservice
-cloud_environments:
-  - name: eu_de
-    visibility: internal
-teams:
-  - name: docs-security-services-rw
-    permission: write
-is_global: false

otc_metadata/services.py

@@ -13,7 +13,6 @@
 
 import copy
 import warnings
-import json
 
 import otc_metadata.data
 
@@ -76,7 +75,7 @@ class Services(object):
     def all_docs(self):
         "Service Docs data listing."
         return copy.deepcopy(self._service_data["documents"])
-    
+
     @property
     def all_repositories(self):
         "Service Repositories data listing."
@@ -104,6 +103,11 @@ class Services(object):
         for srv in self.all_services:
             if environment and cloud_environment:
                 cloud_environment_check = False
+                if srv["is_global"] is True:
+                    if srv["environment"] == environment:
+                        cloud_environment_check = True
+                    else:
+                        continue
                 if srv["is_global"] is not True:
                     for srv_cloud_environment in srv["cloud_environments"]:
                         if srv_cloud_environment["name"] == cloud_environment:
@@ -151,7 +155,7 @@ class Services(object):
                     continue
             for repositories in self.all_repositories:
                 if repositories["service_type"] == service["service_type"]:
-                    res["repositories"] = repositories["repositories"]
+                    res[cat]["repositories"] = repositories["repositories"]
             res[cat].setdefault("docs", [])
             res[cat]["docs"].append(res_doc)
         return res
@@ -283,7 +287,7 @@ class Services(object):
             if not service:
                 warnings.warn("No Service defition of type %s" % (cat))
                 continue
-            
+
             for repositories in self.all_repositories:
                 if repositories["service_type"] == service["service_type"]:
                     res_doc = copy.deepcopy(doc)
@@ -386,7 +390,7 @@ class Services(object):
                         break
                 break
         return res
-    
+
     def get_service_with_repo_by_service_type(self, service_type):
         """Retrieve service with repos by service_type
 
@@ -417,7 +421,7 @@ class Services(object):
                     res[i]["repositories"] = repositories["repositories"]
                     break
         return res
-    
+
     def all_services_by_categories(self, cloud_environment, environments):
         """Retrieve all services sorted by categories
         """
@@ -440,7 +444,7 @@ class Services(object):
             for i, category in enumerate(res):
                 if category["name"] == srv["service_category"]:
                     res[i]["services"].append(srv)
-        
+
         # Sort services
         for category in res:
             category["services"].sort(key=lambda x: x.get("service_title", "").lower())
@@ -448,4 +452,4 @@ class Services(object):
         # Sort categories
         res.sort(key=lambda x: x.get("name", "").lower())
 
-        return res
+        return res

otc_metadata/templates/doc_requirements.txt.j2

@@ -11,10 +11,6 @@ reno>=3.1.0 # Apache-2.0
 
 otc-sphinx-directives>=0.1.0
 sphinx-minify>=0.0.1 # Apache-2.0
-{% if otcdocs_cloud_environment == 'eu_de' %}
+git+https://gitea.eco.tsi-dev.otc-service.com/infra/otc-metadata-rework.git#egg=otc_metadata
-git+https://gitea.eco.tsi-dev.otc-service.com/infra/otc-metadata.git#egg=otc_metadata
-{% elif otcdocs_cloud_environment == 'swiss' %}
-git+https://gitea.eco.tsi-dev.otc-service.com/infra/otc-metadata-swiss.git#egg=otc_metadata
-{% endif %}
 setuptools
 gitpython

otc_metadata/templates/tox.ini.j2

@@ -28,7 +28,7 @@ commands = {posargs}
 [testenv:docs]
 deps =
   -r{toxinidir}/doc/requirements.txt
-  -c https://raw.githubusercontent.com/opentelekomcloud-docs/docs-constraints/main/constraints.txt
+  -c https://raw.githubusercontent.com/opentelekomcloud-docs/docs-constraints/main/constraints/{{otcdocs_cloud_environment}}/{{target_environment}}/constraints.txt
 allowlist_externals =
   mkdir
   cp

tools/generate_doc_confpy.py

@@ -170,7 +170,7 @@ def process_repositories(args, service):
                 if target_repo.get("type") != "github":
                     context["git_type"] = target_repo["type"]
                 if (args.target_environment == "public"
-                and args.cloud_environment == "swiss"):
+                   and args.cloud_environment == "swiss"):
                     context["html_options"] = dict(
                         logo_url="https://docs.sc.otc.t-systems.com",
                     )
@@ -183,7 +183,7 @@ def process_repositories(args, service):
                     context["otcdocs_search_environment"] = "hc_de"
                     context["otcdocs_search_index"] = "search_index_de"
                 elif (args.target_environment == "internal"
-                    and args.cloud_environment == "swiss"):
+                      and args.cloud_environment == "swiss"):
                     context["html_options"] = dict(
                         disable_search=True,
                         site_name="Internal Documentation Portal",
@@ -348,11 +348,11 @@ def process_repositories(args, service):
                 if cloud_environment["name"] == args.cloud_environment:
                     if doc["type"] == "dev":
                         doc["type"] = "dev-guide"
-                    if cloud_environment["name"] == "swiss":
-                        context["template"] = "helpcenter-swiss-base-jobs"
-                    elif cloud_environment["name"] == "eu_de":
-                        context["template"] = "helpcenter-base-jobs"
                     context["docs"].append(doc)
+        if args.cloud_environment == "swiss":
+            context["template"] = "helpcenter-swiss-base-jobs"
+        elif args.cloud_environment == "eu_de":
+            context["template"] = "helpcenter-base-jobs"
         context["service_type"] = service['service_type']
 
         zuul_yaml_content = zuul_yaml_template.render(**context)

tools/generate_docexports_data.py

@@ -24,7 +24,7 @@ def main():
     data = otc_metadata.services.Services()
     data._sort_data()
 
-    docs = data.docs_html_by_category(environment="internal",cloud_environment=args.cloud_environment)
+    docs = data.docs_html_by_category(environment="internal", cloud_environment=args.cloud_environment)
 
     # Filter out documents with "disable_import": True
     for category, services in docs['categories'].items():