Merge branch 'main' into actions-github

otc_metadata/analytics/public/eu_de.json

@@ -1,12 +1,12 @@
 [
   "evs",
+  "ims",
   "ecs",
   "obs",
   "cce",
-  "iam",
+  "elb",
-  "ims",
   "rds",
-  "vpc",
+  "sfs",
-  "ces",
+  "iam",
-  "vpn"
+  "vpc"
 ]

otc_metadata/analytics/public/swiss.json

@@ -1,12 +1,12 @@
 [
   "evs",
+  "ims",
   "ecs",
   "obs",
   "cce",
-  "iam",
+  "elb",
-  "ims",
   "rds",
+  "iam",
   "vpc",
-  "ces",
   "vpn"
 ]

otc_metadata/data/cloud_environments/eu_de.yaml

@@ -1,4 +0,0 @@
----
-name: eu_de
-internal_org: docs
-public_org: opentelekomcloud-docs

otc_metadata/data/cloud_environments/swiss.yaml

@@ -1,4 +0,0 @@
----
-name: swiss
-internal_org: docs-swiss
-public_org: opentelekomcloud-docs-swiss

otc_metadata/data/documents/apig-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/apig
 html_location: docs/apig/dev
 link: /api-gateway/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: apig
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: hidden

otc_metadata/data/documents/as-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/as
 html_location: docs/as/dev
 link: /auto-scaling/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: as
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/bms-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/bms
 html_location: docs/bms/dev
 link: /bare-metal-server/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: bms
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/dli-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/dli
 html_location: docs/dli/dev
 link: /data-lake-insight/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: dli
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/dms-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/dms
 html_location: docs/dms/dev
 link: /distributed-message-service/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: dms
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/dws-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/dws
 html_location: docs/dws/dev
 link: /data-warehouse-service/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: dws
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/ecs-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/ecs
 html_location: docs/ecs/dev
 link: /elastic-cloud-server/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: ecs
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/ed-alerting.yaml

@@ -6,6 +6,6 @@ title: Alerting
 type: alerting
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: hidden
-    pdf_visibility: public
+    pdf_visibility: hidden
     pdf_enabled: true

otc_metadata/data/documents/esw-umn.yaml

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

otc_metadata/data/documents/evs-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/evs
 html_location: docs/evs/dev
 link: /elastic-volume-service/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: evs
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/fg-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/functiongraph
 html_location: docs/fg/dev
 link: /function-graph/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: fg
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: internal

otc_metadata/data/documents/ims-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/ims
 html_location: docs/ims/dev
 link: /image-management-service/dev-guide/
-rst_location: doc/dev-guide/source
+rst_location: dev_guide/source
 service_type: ims
 title: Developer Guide
-type: dev-guide
+type: dev
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/repositories/esw.yaml

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

otc_metadata/data/services.yaml

@@ -17,7 +17,6 @@
 # documents/services/service_categories is being merged with
 # the content here.
 ---
-cloud_environments: []
 documents: []
 service_categories: []
 services: []

otc_metadata/data/services/esw.yaml

@@ -1,12 +0,0 @@
----
-service_category: network
-service_title: Enterprise Switch
-service_type: esw
-service_uri: enterprise-switch
-teams:
-  - name: docs-network-rw
-    permission: write
-cloud_environments:
-  - name: eu_de
-    visibility: internal
-is_global: false

otc_metadata/services.py

@@ -62,20 +62,10 @@ class Services(object):
         if other in self._service_data["service_categories"]:
             self._service_data["service_categories"].remove(other)
             self._service_data["service_categories"].append(other)
-        # sort cloud environments by <name>
-        self._service_data["cloud_environments"] = sorted(
-            self._service_data["cloud_environments"],
-            key=lambda x: f"{x.get('name')}",
-        )
 
     def _rewrite_data(self):
         otc_metadata.data.rewrite_data("services.yaml", self._service_data)
 
-    @property
-    def all_cloud_environments(self):
-        "Cloud Environments data listing."
-        return copy.deepcopy(self._service_data["cloud_environments"])
-
     @property
     def all_services(self):
         "Service Categories data listing."

otc_metadata/templates/build-html-docs.yaml.j2

@@ -12,9 +12,6 @@ jobs:
           tox-env: docs
           
       - name: Upload documentation preview
-        {% raw -%}
-        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-        {%- endraw %}
         uses: https://github.com/opentelekomcloud-infra/github-actions/.github/actions/tox-upload-swift@v1
       {%- elif environment == 'public' %}
       - uses: opentelekomcloud-infra/github-actions/.github/actions/tox-run-env@v1
@@ -22,9 +19,6 @@ jobs:
           tox-env: docs
           
       - name: Upload documentation preview
-        {% raw -%}
-        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-        {%- endraw %}
         uses: opentelekomcloud-infra/github-actions/.github/actions/tox-upload-swift@v1
       {%- endif %}
         with:

otc_metadata/templates/build-pdf-docs.yaml.j2

@@ -12,9 +12,6 @@ jobs:
           tox-env: pdf-docs
           
       - name: Upload documentation preview
-        {% raw -%}
-        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-        {%- endraw %}
         uses: https://github.com/opentelekomcloud-infra/github-actions/.github/actions/tox-upload-swift@v1
       {%- elif environment == 'public' %}
       - uses: opentelekomcloud-infra/github-actions/.github/actions/tox-run-env@v1
@@ -22,9 +19,6 @@ jobs:
           tox-env: pdf-docs
           
       - name: Upload documentation preview
-        {% raw -%}
-        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-        {%- endraw %}
         uses: opentelekomcloud-infra/github-actions/.github/actions/tox-upload-swift@v1
       {%- endif %}
         with: