fixing conversion of element li

match

metadata.yaml

@@ -20,6 +20,23 @@ categories:
         - name: docs-security-services-rw
           permission: write
       repository: docs/anti-ddos
+    - service_title: Database Security Service
+      service_type: dbss
+      docs:
+        - html_location: docs/dbss/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: dbss-api-ref
+        - html_location: docs/dbss/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: dbss-umn
+      teams:
+        - name: docs-security-services-rw
+          permission: write
+      repository: docs/database-security-service
     - service_title: Identity and Access Management
       service_type: iam
       docs:
@@ -851,6 +868,23 @@ categories:
         - name: docs-network-rw
           permission: write
       repository: docs/elastic-load-balancing
+    - service_title: Enterprise Router
+      service_type: er
+      docs:
+        - html_location: docs/er/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: er-api-ref
+        - html_location: docs/er/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: er-umn
+      teams:
+        - name: docs-network-rw
+          permission: write
+      repository: docs/enterprise-router
     - service_title: NAT Gateway
       service_type: natgw
       docs:

otc_doc_convertor/convertor.py

@@ -403,7 +403,8 @@ class OTCDocConvertor:
             # MRS UMN contain: /:*?"<>|\\;&,'`!{}[]$%+
             r"\s([^a-zA-Z0-9\s]{8,})",
             # MRS operation guide contain: /*+ MAPJOIN(join_table) \*/
-            r"\s(/\*.*\*/)",
+            # RDS UMN contain: /*FORCE_MASTER*/
+            r"(/\*.{5,}\*/)",
             # BMS API contain sequence in a dedicated paragraph
             r"^([^a-zA-Z0-9\s]{10,})$",
             # OBS special chars - "\$" "\\" etc

otc_doc_convertor/tests/unit/test_convertor.py

@@ -191,3 +191,31 @@ class TestConvertor(TestCase):
             str(res.find('p')),
             expected.strip(),
         )
+
+    def test_streamline_html_escape_14(self):
+        test_data= """
+        <li id="mrs_01_0979__en-us_topic_0000001173470738_en-us_topic_0116526932_li53294272">Use /*+ MAPJOIN(join_table) */.</li>
+        """ # noqa
+        expected = """
+        <li>Use <code>/*+ MAPJOIN(join_table) */</code>.</li>
+        """ # noqa
+        soup = bs4.BeautifulSoup(test_data, 'lxml')
+        res = self.convertor.streamline_html(soup, "dummy")
+        self.assertEqual(
+            str(res.find('li')),
+            expected.strip(),
+        )
+
+    def test_streamline_html_escape_15(self):
+        test_data= """
+        <p id="rds_11_0020__en-us_topic_0200110324_p133410225015">/*FORCE_MASTER*/: A SQL statement is routed to the primary DB instance.</p>
+        """ # noqa
+        expected = """
+        <p id="rds_11_0020__en-us_topic_0200110324_p133410225015"><code>/*FORCE_MASTER*/</code>: A SQL statement is routed to the primary DB instance.</p>
+        """ # noqa
+        soup = bs4.BeautifulSoup(test_data, 'lxml')
+        res = self.convertor.streamline_html(soup, "dummy")
+        self.assertEqual(
+            str(res.find('p')),
+            expected.strip(),
+        )

zuul.yaml

@@ -123,6 +123,7 @@
       - docs/dns
       - docs/eip
       - docs/elb
+      - docs/er
       - docs/natgw
       - docs/plas
       - docs/vpc
@@ -163,6 +164,7 @@
     files:
       - otc_doc_convertor/convertor.py
       - docs/antiddos
+      - docs/dbss
       - docs/iam
       - docs/kms
       - docs/waf