Changes updated

Signed-off-by: Divya Madala <[email protected]>
opensearch-project · Nov 11, 2022 · 9011dc0 · 9011dc0
1 parent 6fdf7c3
commit 9011dc0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/src/validation_workflow/download_utils.py b/src/validation_workflow/download_utils.py
@@ -22,7 +22,8 @@ def is_url_valid(url: str) -> int:
 
     @staticmethod
     def download(url: str, tmp_dir: TemporaryDirectory) -> bool:
-        response = requests.get(url, stream=True)  # get() method sends a GET request to the url
+        # This method writes the contents from the response object into temporary directory file name fetched from the end of the url.
+        response = requests.get(url, stream=True)
         path = tmp_dir.name + "/" + url.split("/")[-1]
-        val = bool(open(path, "wb").write(response.content))  # writes the contents from the response object into temporary directory file name fetched from the end of the url
-        return val
+        status = bool(open(path, "wb").write(response.content))
+        return status
diff --git a/src/validation_workflow/validation.py b/src/validation_workflow/validation.py
@@ -10,7 +10,7 @@
 
 
 class Validation(ABC):
-    url = "https://artifacts.opensearch.org/releases/bundle/"
+    base_url = "https://artifacts.opensearch.org/releases/bundle/"
 
     def __init__(self, version: str, distribution: str, platform: str, projects: list) -> None:
         self.version = version

diff --git a/src/validation_workflow/validation_args.py b/src/validation_workflow/validation_args.py
@@ -33,7 +33,7 @@ class ValidationArgs:
     version: str
 
     def __init__(self) -> None:
-        parser = argparse.ArgumentParser(description="Download Artifacts.")
+        parser = argparse.ArgumentParser(description="Validation Framework for Validation Workflow.")
         parser.add_argument(
             "version",
             type=str,

diff --git a/src/validation_workflow/validation_rpm.py b/src/validation_workflow/validation_rpm.py
@@ -13,16 +13,16 @@
 
 
 class ValidationRpm(Validation, DownloadUtils):
+    tmp_dir = TemporaryDirectory()
 
     @classmethod
     def download_artifacts(self, projects: list, version: str, platform: str, architectures: list) -> bool:
-        tmp_dir = TemporaryDirectory()
         for project in projects:
             for architecture in architectures:
-                url = f"{self.url}{project}/{version}/{project}-{version}-{platform}-{architecture}.rpm"
-                if ValidationRpm.is_url_valid(url) and ValidationRpm.download(url, tmp_dir):
+                url = f"{self.base_url}{project}/{version}/{project}-{version}-{platform}-{architecture}.rpm"
+                if ValidationRpm.is_url_valid(url) and ValidationRpm.download(url, self.tmp_dir):
                     logging.info(f" Valid URL - {url} and Download Successful !")
                 else:
                     logging.info(f"Invalid URL - {url}")
-                    raise Exception("Invalid url - check version")
+                    raise Exception(f"Invalid url - {url}")
         return True
diff --git a/src/validation_workflow/validation_tar.py b/src/validation_workflow/validation_tar.py
@@ -13,16 +13,16 @@
 
 
 class ValidationTar(Validation, DownloadUtils):
+    tmp_dir = TemporaryDirectory()
 
     @classmethod
     def download_artifacts(self, projects: list, version: str, platform: str, architectures: list) -> bool:
-        tmp_dir = TemporaryDirectory()
         for project in projects:
             for architecture in architectures:
-                url = f"{self.url}{project}/{version}/{project}-{version}-{platform}-{architecture}.tar.gz"
-                if ValidationTar.is_url_valid(url) and ValidationTar.download(url, tmp_dir):
+                url = f"{self.base_url}{project}/{version}/{project}-{version}-{platform}-{architecture}.tar.gz"
+                if ValidationTar.is_url_valid(url) and ValidationTar.download(url, self.tmp_dir):
                     logging.info(f" Valid URL - {url} and Download Successful !")
                 else:
                     logging.info(f"Invalid URL - {url}")
-                    raise Exception("Invalid url - check version")
+                    raise Exception(f"Invalid url - {url}")
         return True
diff --git a/src/validation_workflow/validation_yum.py b/src/validation_workflow/validation_yum.py
@@ -13,15 +13,15 @@
 
 
 class ValidationYum(Validation, DownloadUtils):
+    tmp_dir = TemporaryDirectory()
 
     @classmethod
     def download_artifacts(self, projects: list, version: str, platform: str, architectures: list) -> bool:
-        tmp_dir = TemporaryDirectory()
         for project in projects:
-            url = f"{self.url}{project}/{version[0:1]}.x/{project}-{version[0:1]}.x.repo"
-            if ValidationYum.is_url_valid(url) and ValidationYum.download(url, tmp_dir):
+            url = f"{self.base_url}{project}/{version[0:1]}.x/{project}-{version[0:1]}.x.repo"
+            if ValidationYum.is_url_valid(url) and ValidationYum.download(url, self.tmp_dir):
                 logging.info(f" Valid URL - {url} and Download Successful !")
             else:
                 logging.info(f"Invalid URL - {url}")
-                raise Exception("Invalid url - check version")
+                raise Exception(f"Invalid url - {url}")
         return True