Generated Ml Namespace Endpoints Using OpenSearch API Specifications

Signed-off-by: saimedhi <saimedhi@amazon.com>
opensearch-project · Jul 15, 2024 · ef7c3d3 · ef7c3d3
1 parent b4f3a4b
commit ef7c3d3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/tests/Endpoints/MlNamespaceIntegrationTest.php b/tests/Endpoints/MlNamespaceIntegrationTest.php
@@ -30,7 +30,7 @@ public function testRegisterModelGroup()
     {
         $client = Utility::getClient();
 
-        if (!Utility::isOpenSearchVersionAtLeast($client, '2.8.0')) {
+        if (!Utility::isOpenSearchVersionAtLeast($client, '2.8.0') || !Utility::isOpenSearchVersionAtmost($client, '2.x')) {
             $this->markTestSkipped('Ml plugin tests require OpenSearch >= 2.8.0');
         }
 
@@ -47,7 +47,7 @@ public function testgetModels()
     {
         $client = Utility::getClient();
 
-        if (!Utility::isOpenSearchVersionAtLeast($client, '2.12.0')) {
+        if (!Utility::isOpenSearchVersionAtLeast($client, '2.12.0') || !Utility::isOpenSearchVersionAtmost($client, '2.x')) {
             $this->markTestSkipped('Ml plugin tests require OpenSearch >= 2.12.0');
         }
 
@@ -59,7 +59,7 @@ public function testsearchModels()
     {
         $client = Utility::getClient();
 
-        if (!Utility::isOpenSearchVersionAtLeast($client, '2.12.0')) {
+        if (!Utility::isOpenSearchVersionAtLeast($client, '2.12.0') || !Utility::isOpenSearchVersionAtmost($client, '2.x')) {
             $this->markTestSkipped('Ml plugin tests require OpenSearch >= 2.12.0');
         }
 

diff --git a/tests/Utility.php b/tests/Utility.php
@@ -82,6 +82,20 @@ public static function isOpenSearchVersionAtLeast(Client $client, string $versio
         return version_compare($versionNumber, $version) >= 0;
     }
 
+    /**
+     * Check if cluster is OpenSearch and version is less than the specified version.
+     */
+    public static function isOpenSearchVersionAtMost(Client $client, string $version): bool
+    {
+        $versionInfo = self::getVersion($client);
+        $distribution = $versionInfo['distribution'] ?? null;
+        if ($distribution !== 'opensearch') {
+            return false;
+        }
+        $versionNumber = $versionInfo['number'];
+        return version_compare($versionNumber, $version, '<');
+    }
+
     /**
      * Check if cluster is Elasticsearch and version is greater than or equal to specified version.
      */