Add requested changes

Signed-off-by: Divya Madala <divyaasm@amazon.com>

Author: Divyaasm

src/validation_workflow/deb/validation_deb.py

@@ -29,27 +29,29 @@ def installation(self) -> bool:
                 execute(f'sudo {set_password} dpkg -i {os.path.basename(self.args.file_path.get(project))}', str(self.tmp_dir.path))
                 time.sleep(80)
         except:
-            raise Exception("Failed to install Opensearch")
+            raise Exception("Failed to install OpenSearch/OpenSearch-Dashboards")
         return True
 
     def start_cluster(self) -> bool:
         try:
             for project in self.args.projects:
                 execute(f'sudo systemctl enable {project}', ".")
                 execute(f'sudo systemctl start {project}', ".")
-                time.sleep(20)
                 execute(f'sudo systemctl status {project}', ".")
         except:
             raise Exception('Failed to Start Cluster')
         return True
 
     def validation(self) -> bool:
-        test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(os.sep, "usr", "share", "opensearch")) if not self.args.force_https else True)  # noqa: E501
-        if (test_result):
-            logging.info(f'All tests Pass : {counter}')
-            return True
+        if self.check_cluster_readiness():
+            test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(os.sep, "usr", "share", "opensearch")) if not self.args.force_https else True)  # noqa: E501
+            if (test_result):
+                logging.info(f'All tests Pass : {counter}')
+                return True
+            else:
+                raise Exception(f'Not all tests Pass : {counter}')
         else:
-            raise Exception(f'Not all tests Pass : {counter}')
+            raise Exception("Cluster is not ready for API test")
 
     def cleanup(self) -> bool:
         try:

src/validation_workflow/docker/validation_docker.py

@@ -9,14 +9,10 @@
 import os
 import shutil
 import subprocess
-import time
 from subprocess import PIPE
 from typing import Any
 
-import requests
-
 from test_workflow.integ_test.utils import get_password
-from validation_workflow.api_request import ApiTest
 from validation_workflow.api_test_cases import ApiTestCases
 from validation_workflow.docker.inspect_docker_image import InspectDockerImage
 from validation_workflow.validation import Validation
@@ -79,7 +75,7 @@ def validation(self) -> bool:
                 self.args.version
             )
             if return_code:
-                logging.info('Checking if cluster is ready for API test in every 10 seconds\n\n')
+                logging.info('Checking if cluster is ready for API test in every 5 seconds\n\n')
 
                 if self.check_cluster_readiness():
                     # STEP 4 . OS, OSD API validation
@@ -129,36 +125,6 @@ def cleanup_process(self) -> bool:
 
         return('returncode=0' in (str(result)))
 
-    def check_http_request(self) -> bool:
-        self.test_readiness_urls = {
-            'https://localhost:9200': 'opensearch cluster API'
-        }
-        if 'opensearch-dashboards' in self.args.projects:
-            self.test_readiness_urls['http://localhost:5601/api/status'] = 'opensearch-dashboards API'
-        for url, name in self.test_readiness_urls.items():
-            try:
-                status_code, response_text = ApiTest(url, self.args.version).api_get()
-                if status_code != 200:
-                    logging.error(f'Error connecting to {name} ({url}): status code {status_code}')
-                    return False
-            except (requests.exceptions.ConnectionError, requests.exceptions.ConnectTimeout) as e:
-                logging.error(f'Error connecting to {name} ({url}): {e}')
-                return False
-        return True
-
-    def check_cluster_readiness(self) -> bool:
-        max_retry = 20
-        retry_count = 0
-        while retry_count < max_retry:
-            logging.info(f'sleeping 10sec for retry {retry_count + 1}/{max_retry}')
-            time.sleep(10)
-            if self.check_http_request():
-                logging.info('\n\ncluster is now ready for API test\n\n')
-                return True
-            retry_count += 1
-        logging.error(f"Maximum number of retries ({max_retry}) reached. Cluster is not ready for API test.")
-        return False
-
     def get_artifact_image_name(self, artifact: str, using_staging_artifact_only: str) -> Any:
         self.image_names = {
             'dockerhub': {

src/validation_workflow/rpm/validation_rpm.py

@@ -7,7 +7,6 @@
 
 import logging
 import os
-import time
 
 from system.execute import execute
 from test_workflow.integ_test.utils import get_password
@@ -37,7 +36,6 @@ def start_cluster(self) -> bool:
         try:
             for project in self.args.projects:
                 execute(f'sudo systemctl start {project}', ".")
-                time.sleep(20)
                 (stdout, stderr, status) = execute(f'sudo systemctl status {project}', ".")
                 if(status == 0):
                     logging.info(stdout)
@@ -49,12 +47,15 @@ def start_cluster(self) -> bool:
         return True
 
     def validation(self) -> bool:
-        test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(os.sep, "usr", "share", "opensearch")) if not self.args.force_https else True)  # noqa: E501
-        if (test_result):
-            logging.info(f'All tests Pass : {counter}')
-            return True
+        if self.check_cluster_readiness():
+            test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(os.sep, "usr", "share", "opensearch")) if not self.args.force_https else True)  # noqa: E501
+            if (test_result):
+                logging.info(f'All tests Pass : {counter}')
+                return True
+            else:
+                raise Exception(f'Not all tests Pass : {counter}')
         else:
-            raise Exception(f'Not all tests Pass : {counter}')
+            raise Exception("Cluster is not ready for API test")
 
     def cleanup(self) -> bool:
         try:

src/validation_workflow/tar/validation_tar.py

@@ -7,7 +7,6 @@
 
 import logging
 import os
-import time
 
 from system.execute import execute
 from system.process import Process
@@ -37,22 +36,23 @@ def installation(self) -> bool:
     def start_cluster(self) -> bool:
         try:
             self.os_process.start(f'export OPENSEARCH_INITIAL_ADMIN_PASSWORD={get_password(str(self.args.version))} && ./opensearch-tar-install.sh', os.path.join(self.tmp_dir.path, "opensearch"))
-            time.sleep(85)
             if ("opensearch-dashboards" in self.args.projects):
                 self.osd_process.start(os.path.join(str(self.tmp_dir.path), "opensearch-dashboards", "bin", "opensearch-dashboards"), ".")
-                time.sleep(20)
             logging.info('Started cluster')
         except:
             raise Exception('Failed to Start Cluster')
         return True
 
     def validation(self) -> bool:
-        test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(self.tmp_dir.path, "opensearch")) if not self.args.force_https else True)  # noqa: E501
-        if (test_result):
-            logging.info(f'All tests Pass : {counter}')
+        if self.check_cluster_readiness():
+            test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(self.tmp_dir.path, "opensearch")) if not self.args.force_https else True)  # noqa: E501
+            if (test_result):
+                logging.info(f'All tests Pass : {counter}')
+                return True
+            else:
+                raise Exception(f'Not all tests Pass : {counter}')
         else:
-            raise Exception(f'Not all tests Pass : {counter}')
-        return True
+            raise Exception("Cluster is not ready for API test")
 
     def cleanup(self) -> bool:
         try:

src/validation_workflow/validation.py

@@ -10,10 +10,14 @@
 import os
 import re
 import shutil
+import time
 from abc import ABC, abstractmethod
 from typing import Any
 
+import requests
+
 from system.temporary_directory import TemporaryDirectory
+from validation_workflow.api_request import ApiTest
 from validation_workflow.download_utils import DownloadUtils
 from validation_workflow.validation_args import ValidationArgs
 
@@ -80,6 +84,36 @@ def get_filepath(self, project: str) -> str:
             return f"{self.base_url_production}{project}/{self.args.version[0:1]}.x/{project}-{self.args.version[0:1]}.x.repo"
         return f"{self.base_url_production}{project}/{self.args.version}/{project}-{self.args.version}-{self.args.platform}-{self.args.arch}.{file_name_suffix}"
 
+    def check_cluster_readiness(self) -> bool:
+        max_retry = 20
+        retry_count = 0
+        while retry_count < max_retry:
+            logging.info(f'sleeping 5sec for retry {retry_count + 1}/{max_retry}')
+            time.sleep(5)
+            if self.check_http_request():
+                logging.info('\n\ncluster is now ready for API test\n\n')
+                return True
+            retry_count += 1
+        logging.error(f"Maximum number of retries ({max_retry}) reached. Cluster is not ready for API test.")
+        return False
+
+    def check_http_request(self) -> bool:
+        self.test_readiness_urls = {
+            'https://localhost:9200': 'opensearch cluster API'
+        }
+        if 'opensearch-dashboards' in self.args.projects:
+            self.test_readiness_urls['http://localhost:5601/api/status'] = 'opensearch-dashboards API'
+        for url, name in self.test_readiness_urls.items():
+            try:
+                status_code, response_text = ApiTest(url, self.args.version).api_get()
+                if status_code != 200:
+                    logging.error(f'Error connecting to {name} ({url}): status code {status_code}')
+                    return False
+            except (requests.exceptions.ConnectionError, requests.exceptions.ConnectTimeout) as e:
+                logging.error(f'Error connecting to {name} ({url}): {e}')
+                return False
+        return True
+
     @abstractmethod
     def installation(self) -> bool:
         pass

src/validation_workflow/validation_args.py

@@ -144,7 +144,7 @@ def __init__(self) -> None:
 
         if args.distribution == "docker":
             if args.osd_build_number != "latest" and "opensearch-dashboards" not in args.projects:
-                raise Exception("Provide opensearch-dashboards in projects argument to validate OSD")
+                raise Exception("Provide opensearch-dashboards in projects argument to validate OpenSearch-Dashboards")
             if not(args.validate_digest_only or args.using_staging_artifact_only):
                 raise Exception("Provide either of --validate-digest-only and --using-staging-artifact-only for Docker Validation")
 

src/validation_workflow/yum/validation_yum.py

@@ -7,7 +7,6 @@
 
 import logging
 import os
-import time
 
 from system.execute import execute
 from test_workflow.integ_test.utils import get_password
@@ -40,19 +39,21 @@ def start_cluster(self) -> bool:
         try:
             for project in self.args.projects:
                 execute(f'sudo systemctl start {project}', ".")
-                time.sleep(20)
                 execute(f'sudo systemctl status {project}', ".")
         except:
             raise Exception('Failed to Start Cluster')
         return True
 
     def validation(self) -> bool:
-        test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(os.sep, "usr", "share", "opensearch")) if not self.args.force_https else True)  # noqa: E501
-        if (test_result):
-            logging.info(f'All tests Pass : {counter}')
-            return True
+        if self.check_cluster_readiness():
+            test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(os.sep, "usr", "share", "opensearch")) if not self.args.force_https else True)  # noqa: E501
+            if (test_result):
+                logging.info(f'All tests Pass : {counter}')
+                return True
+            else:
+                raise Exception(f'Not all tests Pass : {counter}')
         else:
-            raise Exception(f'Not all tests Pass : {counter}')
+            raise Exception("Cluster is not ready for API test")
 
     def cleanup(self) -> bool:
         try:

src/validation_workflow/zip/validation_zip.py

@@ -7,7 +7,6 @@
 
 import logging
 import os
-import time
 
 from system.process import Process
 from system.zip_file import ZipFile
@@ -30,28 +29,29 @@ def installation(self) -> bool:
                 with ZipFile(os.path.join(self.tmp_dir.path, os.path.basename(self.args.file_path.get(project))), "r") as zip:
                     zip.extractall(self.tmp_dir.path)
         except:
-            raise Exception("Failed to install Opensearch")
+            raise Exception("Failed to install OpenSearch/OpenSearch-Dashboards")
         return True
 
     def start_cluster(self) -> bool:
         try:
             self.os_process.start(f"env OPENSEARCH_INITIAL_ADMIN_PASSWORD={get_password(str(self.args.version))} .\\opensearch-windows-install.bat", os.path.join(self.tmp_dir.path, f"opensearch-{self.args.version}"), False)  # noqa: E501
-            time.sleep(85)
             if "opensearch-dashboards" in self.args.projects:
                 self.osd_process.start(".\\bin\\opensearch-dashboards.bat", os.path.join(self.tmp_dir.path, f"opensearch-dashboards-{self.args.version}"), False)
-                time.sleep(20)
             logging.info("Starting cluster")
         except:
             raise Exception('Failed to Start Cluster')
         return True
 
     def validation(self) -> bool:
-        test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(self.tmp_dir.path, "opensearch")) if not self.args.force_https else True)  # noqa: E501
-        if test_result:
-            logging.info(f'All tests Pass : {counter}')
+        if self.check_cluster_readiness():
+            test_result, counter = ApiTestCases().test_apis(self.args.version, self.args.projects, self.check_for_security_plugin(os.path.join(self.tmp_dir.path, "opensearch")) if not self.args.force_https else True)  # noqa: E501
+            if (test_result):
+                logging.info(f'All tests Pass : {counter}')
+                return True
+            else:
+                raise Exception(f'Not all tests Pass : {counter}')
         else:
-            raise Exception(f'Not all tests Pass : {counter}')
-        return True
+            raise Exception("Cluster is not ready for API test")
 
     def cleanup(self) -> bool:
         try: