Rename WAF and WAFD resources and documentation

otc_metadata/data/cloud_environments/eu_de.yaml

@@ -1,6 +1,5 @@
 ---
 name: eu_de
-table_suffix: ""
 internal_org: docs
 public_org: opentelekomcloud-docs
 regions:

otc_metadata/data/cloud_environments/swiss.yaml

@@ -1,6 +1,5 @@
 ---
 name: swiss
-table_suffix: _swiss
 internal_org: docs-swiss
 public_org: opentelekomcloud-docs-swiss
 regions:

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

@@ -8,6 +8,6 @@ title: API Reference
 type: api-ref
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: internal
     pdf_visibility: public
     pdf_enabled: true

otc_metadata/data/documents/ccn-umn.yaml

@@ -8,6 +8,6 @@ title: User Guide
 type: umn
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: internal
     pdf_visibility: public
     pdf_enabled: true

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

@@ -8,6 +8,6 @@ title: API Reference
 type: api-ref
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: internal
     pdf_visibility: public
     pdf_enabled: true

otc_metadata/data/documents/dms_rocketmq-umn.yaml

@@ -8,6 +8,6 @@ title: User Guide
 type: umn
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: internal
     pdf_visibility: public
     pdf_enabled: true

otc_metadata/data/documents/ed-sustainability.yaml

@@ -1,11 +0,0 @@
----
-link: /enterprise-dashboard/sustainability/
-rst_location: doc/sustainability/source
-service_type: ed
-title: Sustainability
-type: sustainability
-cloud_environments:
-  - name: eu_de
-    visibility: public
-    pdf_visibility: public
-    pdf_enabled: true

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

@@ -8,6 +8,6 @@ title: API Reference
 type: api-ref
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: internal
     pdf_visibility: public
     pdf_enabled: true

otc_metadata/data/documents/eps-umn.yaml

@@ -8,6 +8,6 @@ title: User Guide
 type: umn
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: internal
     pdf_visibility: public
     pdf_enabled: true

otc_metadata/data/documents/esw-umn.yaml

@@ -8,6 +8,6 @@ title: User Guide
 type: umn
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: internal
     pdf_visibility: public
     pdf_enabled: true

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

@@ -8,6 +8,6 @@ title: Tool Guide (obsutil)
 type: tool-guide-obsutil
 cloud_environments:
   - name: eu_de
-    visibility: public
-    pdf_visibility: public
-    pdf_enabled: true
+    visibility: internal
+    pdf_visibility: internal
+    pdf_enabled: true

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/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/README.md

@@ -10,7 +10,6 @@ service_category: compute
 service_title: Elastic Cloud Server
 service_type: ecs
 service_uri: elastic-cloud-server
-jira_component: ECS
 teams:
   - name: docs-compute-rw
     permission: write
@@ -31,7 +30,6 @@ is_global: false
 | `service_title`      | string  | Display name of the service.                                          |
 | `service_type`       | string  | Unique identifier used across all metadata.                           |
 | `service_uri`        | string  | URI component used in documentation links.                            |
-| `jira_component`     | string  | Component name registered in JIRA (Capital letters).                  |
 | `cloud_environments` | list    | List of cloud regions and their visibility settings.                  |
 | `teams`              | list    | Contributor teams with write or read access.                          |
 

otc_metadata/data/services/ccn.yaml

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

otc_metadata/data/services/dms_rocketmq.yaml

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

otc_metadata/data/services/eps.yaml

@@ -1,5 +1,5 @@
 ---
-service_category: md
+service_category: security-services
 service_title: Enterprise Project Service
 service_type: eps
 service_uri: enterprise-project-service
@@ -8,5 +8,5 @@ teams:
     permission: write
 cloud_environments:
   - name: eu_de
-    visibility: public
+    visibility: internal
 is_global: false

otc_metadata/data/services/esw.yaml

@@ -8,5 +8,5 @@ teams:
     permission: write
 cloud_environments:
   - name: eu_de
-    visibility: public
+    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

test-requirements.txt

@@ -2,7 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pytest
-pytest-cov
+stestr>=2.0.0 # Apache-2.0
+testtools>=2.2.0 # MIT
 flake8
-pyyaml

tox.ini

@@ -9,7 +9,7 @@ usedevelop = True
 setenv =
    PYTHONWARNINGS=default::DeprecationWarning
 deps = -r{toxinidir}/test-requirements.txt
-commands = pytest {posargs}
+commands = stestr run {posargs}
 
 [testenv:pep8]
 commands = flake8 {posargs}