Update tests to use existing test file

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
harshavamsi · Jan 8, 2024 · e7d29da · e7d29da
1 parent c50f23b
commit e7d29da
Show file tree

Hide file tree

Showing 2 changed files with 111 additions and 150 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml
@@ -47,18 +47,22 @@ setup:
                 type: unsigned_long
                 index: true
                 doc_values: true
+              ip_field:
+                type: ip
+                index: true
+                doc_values: true
 
   - do:
       bulk:
         index: test-iodvq
         refresh: true
         body:
           - '{"index": {"_index": "test-iodvq", "_id": "1" }}'
-          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800 }'
+          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800, "ip_field": "192.168.0.1" }'
           - '{ "index": { "_index": "test-iodvq", "_id": "2" }}'
-          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801 }'
+          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801, "ip_field": "192.168.0.2" }'
           - '{ "index": { "_index": "test-iodvq", "_id": "3" } }'
-          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802 }'
+          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802, "ip_field": "192.168.0.3" }'
 
   - do:
       search:
@@ -162,7 +166,6 @@ setup:
 
   - match: { hits.total: 1 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -174,6 +177,16 @@ setup:
 
   - match: { hits.total: 1 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              ip_field: "192.168.0.1"
+
+  - match: {hits.total: 1}
 
   - do:
       search:
@@ -186,7 +199,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -264,6 +276,17 @@ setup:
 
   - match: { hits.total: 2 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              ip_field: ["192.168.0.1", "192.168.0.2"]
+
+  - match: { hits.total: 2 }
+
   - do:
       search:
         rest_total_hits_as_int: true
@@ -384,6 +407,19 @@ setup:
 
   - match: { hits.total: 2 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range:
+              ip_field:
+                gte: "192.168.0.1"
+                lte: "192.168.0.2"
+
+  - match: { hits.total: 2 }
+
 ---
 "search on fields with only index enabled":
   - do:
@@ -428,18 +464,22 @@ setup:
                 type: unsigned_long
                 index: true
                 doc_values: false
+              ip_field:
+                type: ip
+                index: true
+                doc_values: false
 
   - do:
       bulk:
         index: test-index
         refresh: true
         body:
           - '{"index": {"_index": "test-index", "_id": "1" }}'
-          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800 }'
+          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800, "ip_field": "192.168.0.1" }'
           - '{ "index": { "_index": "test-index", "_id": "2" }}'
-          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801 }'
+          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801, "ip_field": "192.168.0.2" }'
           - '{ "index": { "_index": "test-index", "_id": "3" } }'
-          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802 }'
+          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802, "ip_field": "192.168.0.3" }'
 
   - do:
       search:
@@ -465,7 +505,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -555,6 +594,16 @@ setup:
 
   - match: { hits.total: 1 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              ip_field: "192.168.0.1"
+
+  - match: {hits.total: 1}
 
   - do:
       search:
@@ -567,7 +616,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -645,6 +693,17 @@ setup:
 
   - match: { hits.total: 2 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              ip_field: ["192.168.0.1", "192.168.0.2"]
+
+  - match: { hits.total: 2 }
+
   - do:
       search:
         rest_total_hits_as_int: true
@@ -765,6 +824,18 @@ setup:
 
   - match: { hits.total: 2 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range:
+              ip_field:
+                gte: "192.168.0.1"
+                lte: "192.168.0.2"
+
+  - match: { hits.total: 2 }
 ---
 "search on fields with only doc_values enabled":
   - do:
@@ -809,18 +880,22 @@ setup:
                 type: unsigned_long
                 index: false
                 doc_values: true
+              ip_field:
+                type: ip
+                index: false
+                doc_values: true
 
   - do:
       bulk:
         index: test-doc-values
         refresh: true
         body:
           - '{"index": {"_index": "test-doc-values", "_id": "1" }}'
-          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800 }'
+          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800, "ip_field": "192.168.0.1" }'
           - '{ "index": { "_index": "test-doc-values", "_id": "2" }}'
-          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801 }'
+          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801, "ip_field": "192.168.0.2" }'
           - '{ "index": { "_index": "test-doc-values", "_id": "3" } }'
-          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802 }'
+          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802, "ip_field": "192.168.0.3" }'
 
   - do:
       search:
@@ -846,7 +921,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -924,7 +998,6 @@ setup:
 
   - match: { hits.total: 1 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -936,6 +1009,16 @@ setup:
 
   - match: { hits.total: 1 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              ip_field: "192.168.0.3"
+
+  - match: { hits.total: 1 }
 
   - do:
       search:
@@ -948,7 +1031,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -1145,3 +1227,16 @@ setup:
             }
 
   - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range:
+              ip_field:
+                gte: "192.168.0.1"
+                lte: "192.168.0.2"
+
+  - match: { hits.total: 2 }