fix pep8

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

@@ -14,4 +14,4 @@ cloud_environments:
   - name: swiss
     visibility: public
     pdf_visibility: public
-    pdf_enabled: false
+    pdf_enabled: true

otc_metadata/data/documents/cce-umn.yaml

@@ -14,4 +14,4 @@ cloud_environments:
   - name: swiss
     visibility: public
     pdf_visibility: public
-    pdf_enabled: false
+    pdf_enabled: true

otc_metadata/data/documents/iam-permissions.yaml

@@ -8,10 +8,10 @@ title: Permissions
 type: permissions
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: internal
     pdf_visibility: public
     pdf_enabled: true
   - name: swiss
-    visibility: public
+    visibility: internal
     pdf_visibility: public
     pdf_enabled: true

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: python-sdk
+type: 3rd_party_sdk
 cloud_environments:
   - name: eu_de
     visibility: public

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

@@ -1,13 +0,0 @@
----
-hc_location: api/ucs
-html_location: docs/ucs/api-ref
-link: /ubiquitous-cloud-native-service/api-ref/
-rst_location: api-ref/source
-service_type: ucs
-title: API Reference
-type: api-ref
-cloud_environments:
-  - name: eu_de
-    visibility: internal
-    pdf_visibility: internal
-    pdf_enabled: true

otc_metadata/data/documents/ucs-umn.yaml

@@ -1,13 +0,0 @@
----
-hc_location: usermanual/ucs
-html_location: docs/ucs/umn
-link: /ubiquitous-cloud-native-service/umn/
-rst_location: umn/source
-service_type: ucs
-title: User Guide
-type: umn
-cloud_environments:
-  - name: eu_de
-    visibility: internal
-    pdf_visibility: internal
-    pdf_enabled: true

otc_metadata/data/repositories/ucs.yaml

@@ -1,13 +0,0 @@
----
-service_type: ucs
-repositories:
-  - environment: public
-    repo: opentelekomcloud-docs/ubiquitous-cloud-native-service
-    type: github
-    cloud_environments:
-      - eu_de
-  - environment: internal
-    repo: docs/ubiquitous-cloud-native-service
-    type: gitea
-    cloud_environments:
-      - eu_de

otc_metadata/data/service_categories/application.yaml

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

otc_metadata/data/service_categories/big_data.yaml

@@ -1,3 +1,3 @@
 ---
 name: big_data
-title: Data Analysis
+title: Big Data and Data Analysis

otc_metadata/data/service_categories/network.yaml

@@ -1,3 +1,3 @@
 ---
 name: network
-title: Network
+title: Networking

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/obs_3rd_party.yaml

@@ -8,5 +8,5 @@ teams:
     permission: write
 cloud_environments:
   - name: eu_de
-    visibility: hidden
+    visibility: internal
 is_global: false

otc_metadata/data/services/ucs.yaml

@@ -1,12 +0,0 @@
----
-is_global: false
-service_category: container
-service_title: Ubiquitous Cloud Native Service
-service_type: ucs
-service_uri: ubiquitous-cloud-native-service
-cloud_environments:
-  - name: eu_de
-    visibility: internal
-teams:
-  - name: docs-container-rw
-    permission: write

otc_metadata/services.py

@@ -103,11 +103,6 @@ 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:

otc_metadata/templates/conf.py.j2

@@ -47,7 +47,6 @@ otcdocs_doc_type = '{{ doc_type }}'
 otcdocs_service_category = '{{ service_category }}'
 otcdocs_service_title = '{{ service_title }}'
 otcdocs_service_type = '{{ service_type }}'
-otcdocs_service_environment = '{{ service_environment }}'
 otcdocs_cloud_environment = '{{ otcdocs_cloud_environment }}'
 otcdocs_search_environment = '{{ otcdocs_search_environment }}'
 otcdocs_search_index = '{{ otcdocs_search_index }}'

otc_metadata/templates/doc_requirements.txt.j2

@@ -11,6 +11,10 @@ reno>=3.1.0 # Apache-2.0
 
 otc-sphinx-directives>=0.1.0
 sphinx-minify>=0.0.1 # Apache-2.0
-git+https://gitea.eco.tsi-dev.otc-service.com/infra/otc-metadata-rework.git#egg=otc_metadata
+{% if otcdocs_cloud_environment == 'eu_de' %}
+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

tools/generate_doc_confpy.py

@@ -215,7 +215,6 @@ def process_repositories(args, service):
                 context["service_category"] = service['service_category']
                 context["service_title"] = service['service_title']
                 context["service_type"] = service['service_type']
-                context["service_environment"] = args.target_environment
                 context["otcdocs_cloud_environment"] = args.cloud_environment
 
                 conf_py_content = conf_py_template.render(**context)
@@ -277,7 +276,6 @@ def process_repositories(args, service):
             context["otcdocs_search_index"] = "search_index_de"
         context["environment"] = args.target_environment
         context["otcdocs_cloud_environment"] = args.cloud_environment
-        context["service_environment"] = args.target_environment
         sbv_title = (service["service_title"] + "\n"
                      + ('=' * len(service["service_title"])))
         context["sbv_title"] = sbv_title