Update content

api-ref/source/apis_v3.0_recommended/backup_and_restoration/restoring_data_to_a_new_db_instance.rst

@@ -71,7 +71,7 @@ Requests
       |                       |                 |                  |                                                                                                                                                                                                                        |
       |                       |                 |                  | Enter a strong password to improve security, preventing security risks such as brute force cracking.                                                                                                                   |
       +-----------------------+-----------------+------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-      | disk_encryption_id    | No              | String           | The key ID used for disk encryption. The string must comply with UUID regular expression rules.                                                                                                                        |
+      | disk_encryption_id    | No              | String           | Specifies the key ID used for disk encryption. The string must comply with UUID regular expression rules.                                                                                                              |
       |                       |                 |                  |                                                                                                                                                                                                                        |
       |                       |                 |                  | If this parameter is not transferred, disk encryption is not performed.                                                                                                                                                |
       +-----------------------+-----------------+------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -479,7 +479,7 @@ Responses
           "vpc_id": "674e9b42-cd8d-4d25-a2e6-5abcc565b961",
           "subnet_id": "f1df08c5-71d1-406a-aff0-de435a51007b",
           "security_group_id": "7aa51dbf-5b63-40db-9724-dad3c4828b58",
-          "disk_encryption_id": "2gfdsh-844a-4023-a776-fc5c5fb71fb4",
+          "disk_encryption_id": "",
           "mode": "Sharding",
           "flavor": [
               {
@@ -528,7 +528,7 @@ Responses
           "vpc_id": "674e9b42-cd8d-4d25-a2e6-5abcc565b961",
           "subnet_id": "f1df08c5-71d1-406a-aff0-de435a51007b",
           "security_group_id": "7aa51dbf-5b63-40db-9724-dad3c4828b58",
-          "disk_encryption_id": "2gfdsh-844a-4023-a776-fc5c5fb71fb4",
+          "disk_encryption_id": "",
           "mode": "ReplicaSet",
           "flavor": [
               {
@@ -566,7 +566,7 @@ Responses
           "vpc_id": "674e9b42-cd8d-4d25-a2e6-5abcc565b961",
           "subnet_id": "f1df08c5-71d1-406a-aff0-de435a51007b",
           "security_group_id": "7aa51dbf-5b63-40db-9724-dad3c4828b58",
-          "disk_encryption_id": "2gfdsh-844a-4023-a776-fc5c5fb71fb4",
+          "disk_encryption_id": "",
           "mode": "Single",
           "flavor": [
               {

api-ref/source/apis_v3.0_recommended/db_instance_management/creating_a_db_instance.rst

@@ -78,7 +78,7 @@ Requests
       |                       |                 |                  |                                                                                                                                                                                                                                           |
       |                       |                 |                  | Enter a strong password to improve security, preventing security risks such as brute force cracking.                                                                                                                                      |
       +-----------------------+-----------------+------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-      | disk_encryption_id    | No              | String           | The key ID used for disk encryption. The string must comply with UUID regular expression rules.                                                                                                                                           |
+      | disk_encryption_id    | No              | String           | Specifies the key ID used for disk encryption. The string must comply with UUID regular expression rules.                                                                                                                                 |
       |                       |                 |                  |                                                                                                                                                                                                                                           |
       |                       |                 |                  | If this parameter is not transferred, disk encryption is not performed.                                                                                                                                                                   |
       +-----------------------+-----------------+------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -583,7 +583,7 @@ Responses
           "subnet_id": "f1df08c5-71d1-406a-aff0-de435a51007b",
           "security_group_id": "7aa51dbf-5b63-40db-9724-dad3c4828b58",
           "port": 8365,
-          "disk_encryption_id": "2gfdsh-844a-4023-a776-fc5c5fb71fb4",
+          "disk_encryption_id": "",
           "mode": "Sharding",
           "flavor": [
               {
@@ -637,7 +637,7 @@ Responses
           "subnet_id": "f1df08c5-71d1-406a-aff0-de435a51007b",
           "security_group_id": "7aa51dbf-5b63-40db-9724-dad3c4828b58",
           "port": 8365,
-          "disk_encryption_id": "2gfdsh-844a-4023-a776-fc5c5fb71fb4",
+          "disk_encryption_id": "",
           "mode": "ReplicaSet",
           "flavor": [
               {
@@ -680,7 +680,7 @@ Responses
           "subnet_id": "f1df08c5-71d1-406a-aff0-de435a51007b",
           "security_group_id": "7aa51dbf-5b63-40db-9724-dad3c4828b58",
           "port": 8365,
-          "disk_encryption_id": "2gfdsh-844a-4023-a776-fc5c5fb71fb4",
+          "disk_encryption_id": "",
           "mode": "Single",
           "flavor": [
               {

api-ref/source/apis_v3.0_recommended/db_instance_management/enabling_shard_or_config_ip_addresses.rst

@@ -16,7 +16,7 @@ Constraints
 -  Frozen instances do not support this operation.
 -  DB instances associated with the IPv6 subnet do not support this operation.
 -  If the IP address is enabled, restart the nodes for the setting to take effect.
--  Cluster instances of Community Edition 3.4, 4.0, 4.2 and 4.4 are supported.
+-  Cluster instances of Community Edition 3.4, 4.0 and 4.2 are supported.
 -  This function cannot be disabled after being enabled.
 
 URI

api-ref/source/apis_v3.0_recommended/db_instance_management/querying_db_instances_in_the_recycle_bin.rst

@@ -102,17 +102,17 @@ Responses
 
    .. table:: **Table 5** RecycleDatastore
 
-      +-----------------------+-----------------------+----------------------------------------------------------------------------------------------------------------------+
+      +-----------------------+-----------------------+--------------------------------------------------------------------------------------------------------+
-      | Name                  | Type                  | Description                                                                                                          |
+      | Name                  | Type                  | Description                                                                                            |
-      +=======================+=======================+======================================================================================================================+
+      +=======================+=======================+========================================================================================================+
-      | type                  | String                | Database type. The value is **DDS-Community**.                                                                       |
+      | type                  | String                | Database type. The value is **DDS-Community**.                                                         |
-      |                       |                       |                                                                                                                      |
+      |                       |                       |                                                                                                        |
-      |                       |                       | Enumerated values:                                                                                                   |
+      |                       |                       | Enumerated values:                                                                                     |
-      |                       |                       |                                                                                                                      |
+      |                       |                       |                                                                                                        |
-      |                       |                       | -  DDS-Community                                                                                                     |
+      |                       |                       | -  DDS-Community                                                                                       |
-      +-----------------------+-----------------------+----------------------------------------------------------------------------------------------------------------------+
+      +-----------------------+-----------------------+--------------------------------------------------------------------------------------------------------+
-      | version               | String                | Database version. Versions 3.4, 4.0, 4.2, and 4.4 are supported. The value can be **3.4, 4.0,** **4.2,** or **4.4**. |
+      | version               | String                | Database version. Versions 3.4, 4.0, and 4.2 are supported. The value can be **3.4, 4.0,** or **4.2**. |
-      +-----------------------+-----------------------+----------------------------------------------------------------------------------------------------------------------+
+      +-----------------------+-----------------------+--------------------------------------------------------------------------------------------------------+
 
 -  Response Example
 

api-ref/source/apis_v3.0_recommended/db_instance_management/querying_instances_and_details.rst

@@ -168,7 +168,7 @@ Responses
       |                       |                       |                                                                                                                                                                                        |
       |                       |                       | For more information, see :ref:`Table 6 <dds_api_0023__table0581104824211>`.                                                                                                           |
       +-----------------------+-----------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-      | disk_encryption_id    | String                | The disk encryption key ID. This parameter is returned only when the instance disk is encrypted.                                                                                       |
+      | disk_encryption_id    | String                | Indicates the disk encryption key ID. This parameter is returned only when the instance disk is encrypted.                                                                             |
       +-----------------------+-----------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
       | enterprise_project_id | String                | Indicates the enterprise project ID.                                                                                                                                                   |
       |                       |                       |                                                                                                                                                                                        |

doc/requirements.txt

@@ -8,4 +8,3 @@ 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.git#egg=otc_metadata
-setuptools

tox.ini

@@ -45,19 +45,15 @@ commands =
   {[testenv:json-best-practice]commands}
 
 [testenv:docs-pdf]
-deps =
+deps = {[testenv:docs]deps}
-  {[testenv:docs]deps}
-  {[testenv:bindeps]deps}
 allowlist_externals =
   rm
   mkdir
-  wget
   make
   bash
   cp
 commands =
   mkdir -p doc/build/pdf
-  {[testenv:bindeps]commands}
   {[testenv:umn-pdf-docs]commands}
   {[testenv:best-practice-pdf-docs]commands}
 
@@ -184,21 +180,6 @@ commands =
 
 
 
-[testenv:bindeps]
-deps =
-    bindep
-allowlist_externals =
-    wget
-    rm
-    bash
-commands =
-    rm -rf {toxinidir}/bindep.txt
-    rm -rf {toxinidir}/packages.txt
-    wget -O {toxinidir}/bindep.txt https://raw.githubusercontent.com/opentelekomcloud/otcdocstheme/main/bindep.txt
-    bash -c "bindep test -b -f {toxinidir}/bindep.txt > {toxinidir}/packages.txt || true"
-    bash -c 'if [ -s {toxinidir}/packages.txt ]; then if command -v apt &>/dev/null; then apt update && xargs apt install --no-install-recommends -y < {toxinidir}/packages.txt; fi; fi'
-    bash -c 'if [ -s {toxinidir}/packages.txt ]; then if command -v dnf &>/dev/null; then dnf install -y $(cat {toxinidir}/packages.txt); fi; fi'
-
 [doc8]
 ignore = D001
 extensions = .rst, .yaml

zuul.yaml

@@ -4,9 +4,5 @@
     default-branch: main
     templates:
       - helpcenter-base-jobs
-    check:
+      - api-ref-hc-int-jobs
-      jobs:
+      - umn-hc-int-jobs
-        - noop
-    gate:
-      jobs:
-        - noop