Rename WAF and WAFD resources and documentation

Reviewed-on: #71
Reviewed-by: Hasko, Vladimir <vladimir.hasko@t-systems.com>
Co-authored-by: Dmitrii Sabelnikov <Dmitriy.Sabelnikov@t-systems.com>
Co-committed-by: Dmitrii Sabelnikov <Dmitriy.Sabelnikov@t-systems.com>

otc_metadata/data/cloud_environments/eu_de.yaml

@@ -0,0 +1,10 @@
+---
+name: eu_de
+internal_org: docs
+public_org: opentelekomcloud-docs
+regions:
+  - eu-de
+affected_locations:
+  - "EU-DE-01 AZ1 (Germany/Biere)"
+  - "EU-DE-02 AZ2 (Germany/Magdeburg)"
+  - "EU-DE-03 AZ3 (Germany/Biere)"

otc_metadata/data/cloud_environments/swiss.yaml

@@ -0,0 +1,10 @@
+---
+name: swiss
+internal_org: docs-swiss
+public_org: opentelekomcloud-docs-swiss
+regions:
+  - eu-ch2
+affected_locations:
+  - "EU-CH2-01 SwissCloud AZ1 (Switzerland/Zollikofen)"
+  - "EU-CH2-02 SwissCloud AZ2 (Switzerland/Bern)"
+  - "EU-CH2-03 SwissCloud AZ3 (Switzerland/Zollikofen)"

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: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: apig
 title: Developer Guide
-type: dev
+type: dev-guide
 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: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: as
 title: Developer Guide
-type: dev
+type: dev-guide
 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: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: bms
 title: Developer Guide
-type: dev
+type: dev-guide
 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: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: dms
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

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

@@ -0,0 +1,13 @@
+---
+hc_location: api/rabbitmq
+html_location: docs/dms_rabbitmq/api-ref
+link: /distributed-message-service-rabbitmq/api-ref/
+rst_location: api-ref/source
+service_type: dms_rabbitmq
+title: API Reference
+type: api-ref
+cloud_environments:
+  - name: eu_de
+    visibility: internal
+    pdf_visibility: public
+    pdf_enabled: true

otc_metadata/data/documents/dms_rabbitmq-umn.yaml

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

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: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: dws
 title: Developer Guide
-type: dev
+type: dev-guide
 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: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: ecs
 title: Developer Guide
-type: dev
+type: dev-guide
 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: hidden
+    visibility: public
-    pdf_visibility: hidden
+    pdf_visibility: public
     pdf_enabled: true

otc_metadata/data/documents/esw-umn.yaml

@@ -0,0 +1,13 @@
+---
+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: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: evs
 title: Developer Guide
-type: dev
+type: dev-guide
 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: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: fg
 title: Developer Guide
-type: dev
+type: dev-guide
 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: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: ims
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/obs-tool-guide-obsutil.yaml

@@ -0,0 +1,13 @@
+---
+hc_location: utiltg/obs
+html_location: docs/obs/tool-obsutil
+link: /object-storage-service/tool-guide-obsutil/
+rst_location: doc/tool-obsutil/source
+service_type: obs
+title: Tool Guide (obsutil)
+type: tool-guide-obsutil
+cloud_environments:
+  - name: eu_de
+    visibility: internal
+    pdf_visibility: internal
+    pdf_enabled: true

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

@@ -1,13 +1,13 @@
----
+---
-hc_location: sdk/c-devg-obs
+hc_location: sdk/c-devg-obs
-html_location: docs/obs_3rd_party/c_sdk
+html_location: docs/obs_3rd_party/c_sdk
-link: /object-storage-service-3rd-party/c-sdk/
+link: /object-storage-service-3rd-party/c-sdk/
-rst_location: doc/c-sdk/source
+rst_location: doc/c-sdk/source
-service_type: obs_3rd_party
+service_type: obs_3rd_party
-title: C SDK
+title: C SDK
-type: c-sdk
+type: c-sdk
-cloud_environments:
+cloud_environments:
-  - name: eu_de
+  - name: eu_de
-    visibility: public
+    visibility: public
-    pdf_visibility: public
+    pdf_visibility: public
-    pdf_enabled: false
+    pdf_enabled: false

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

@@ -0,0 +1,13 @@
+---
+hc_location: sdk/dotnet-devg-obs
+html_location: docs/obs_3rd_party/dotnet_sdk
+link: /object-storage-service-3rd-party/dotnet-sdk/
+rst_location: doc/dotnet-sdk/source
+service_type: obs_3rd_party
+title: .NET SDK
+type: dotnet-sdk
+cloud_environments:
+  - name: eu_de
+    visibility: public
+    pdf_visibility: public
+    pdf_enabled: false

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

@@ -1,13 +1,13 @@
----
+---
-hc_location: sdk/go-devg-obs
+hc_location: sdk/go-devg-obs
-html_location: docs/obs_3rd_party/go_sdk
+html_location: docs/obs_3rd_party/go_sdk
-link: /object-storage-service-3rd-party/go-sdk/
+link: /object-storage-service-3rd-party/go-sdk/
-rst_location: doc/go-sdk/source
+rst_location: doc/go-sdk/source
-service_type: obs_3rd_party
+service_type: obs_3rd_party
-title: Go SDK
+title: Go SDK
-type: go-sdk
+type: go-sdk
-cloud_environments:
+cloud_environments:
-  - name: eu_de
+  - name: eu_de
-    visibility: public
+    visibility: public
-    pdf_visibility: public
+    pdf_visibility: public
-    pdf_enabled: false
+    pdf_enabled: false

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

@@ -1,13 +1,13 @@
----
+---
-hc_location: sdk/java-devg-obs
+hc_location: sdk/java-devg-obs
-html_location: docs/obs_3rd_party/java_sdk
+html_location: docs/obs_3rd_party/java_sdk
-link: /object-storage-service-3rd-party/java-sdk/
+link: /object-storage-service-3rd-party/java-sdk/
-rst_location: doc/java-sdk/source
+rst_location: doc/java-sdk/source
-service_type: obs_3rd_party
+service_type: obs_3rd_party
-title: Java SDK
+title: Java SDK
-type: java-sdk
+type: java-sdk
-cloud_environments:
+cloud_environments:
-  - name: eu_de
+  - name: eu_de
-    visibility: public
+    visibility: public
-    pdf_visibility: public
+    pdf_visibility: public
-    pdf_enabled: false
+    pdf_enabled: false

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

@@ -1,7 +1,7 @@
 ---
 hc_location: api/waf
 html_location: docs/waf/api-ref
-link: /web-application-firewall/api-ref/
+link: /web-application-firewall-classic/api-ref/
 rst_location: api-ref/source
 service_type: waf
 title: API Reference

otc_metadata/data/documents/waf-umn.yaml

@@ -1,7 +1,7 @@
 ---
 hc_location: usermanual/waf
 html_location: docs/waf/umn
-link: /web-application-firewall/umn/
+link: /web-application-firewall-classic/umn/
 rst_location: umn/source
 service_type: waf
 title: User Guide

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

@@ -1,7 +1,7 @@
 ---
 hc_location: api/dwaf
 html_location: docs/wafd/api-ref
-link: /web-application-firewall-dedicated/api-ref/
+link: /web-application-firewall/api-ref/
 rst_location: api-ref/source
 service_type: wafd
 title: API Reference

otc_metadata/data/documents/wafd-umn.yaml

@@ -1,7 +1,7 @@
 ---
 hc_location: usermanual/dwaf
 html_location: docs/wafd/umn
-link: /web-application-firewall-dedicated/umn/
+link: /web-application-firewall/umn/
 rst_location: umn/source
 service_type: wafd
 title: User Guide

otc_metadata/data/repositories/dms_rabbitmq.yaml

@@ -0,0 +1,13 @@
+---
+service_type: dms_rabbitmq
+repositories:
+  - environment: public
+    repo: opentelekomcloud-docs/distributed-message-service-rabbitmq
+    type: github
+    cloud_environments:
+      - eu_de
+  - environment: internal
+    repo: docs/distributed-message-service-rabbitmq
+    type: gitea
+    cloud_environments:
+      - eu_de

otc_metadata/data/repositories/esw.yaml

@@ -0,0 +1,13 @@
+---
+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/repositories/waf.yaml

@@ -2,12 +2,12 @@
 service_type: waf
 repositories:
   - environment: public
-    repo: opentelekomcloud-docs/web-application-firewall
+    repo: opentelekomcloud-docs/web-application-firewall (classic)
     type: github
     cloud_environments:
       - eu_de
   - environment: internal
-    repo: docs/web-application-firewall
+    repo: docs/web-application-firewall (classic)
     type: gitea
     cloud_environments:
       - eu_de

otc_metadata/data/repositories/wafd.yaml

@@ -2,12 +2,12 @@
 service_type: wafd
 repositories:
   - environment: public
-    repo: opentelekomcloud-docs/web-application-firewall-dedicated
+    repo: opentelekomcloud-docs/web-application-firewall
     type: github
     cloud_environments:
       - eu_de
   - environment: internal
-    repo: docs/web-application-firewall-dedicated
+    repo: docs/web-application-firewall
     type: gitea
     cloud_environments:
       - eu_de

otc_metadata/data/services.yaml

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

otc_metadata/data/services/dms_rabbitmq.yaml

@@ -0,0 +1,12 @@
+---
+service_category: application
+service_title: Distributed Message Service (for RabbitMQ)
+service_type: dms_rabbitmq
+service_uri: distributed-message-service-rabbitmq
+teams:
+  - name: docs-paas-rw
+    permission: write
+cloud_environments:
+  - name: eu_de
+    visibility: internal
+is_global: false

otc_metadata/data/services/esw.yaml

@@ -0,0 +1,12 @@
+---
+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/data/services/waf.yaml

@@ -1,8 +1,8 @@
 ---
 service_category: security-services
-service_title: Web Application Firewall
+service_title: Web Application Firewall Classic
 service_type: waf
-service_uri: web-application-firewall
+service_uri: web-application-firewall classic
 teams:
   - name: docs-security-services-rw
     permission: write

otc_metadata/data/services/wafd.yaml

@@ -1,8 +1,8 @@
 ---
 service_category: security-services
-service_title: Dedicated Web Application Firewall
+service_title: Web Application Firewall
 service_type: wafd
-service_uri: web-application-firewall-dedicated
+service_uri: web-application-firewall
 teams:
   - name: docs-security-services-rw
     permission: write

otc_metadata/services.py

@@ -62,10 +62,20 @@ 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."