Add download-installer and download-rhcos-image subcommand

osia/cli.py

@@ -20,14 +20,15 @@
 
 import coloredlogs  # type: ignore[import-untyped]
 import distro
-from semantic_version import (SimpleSpec,  # type: ignore[import-untyped]
-                              Version)
+from semantic_version import SimpleSpec  # type: ignore[import-untyped]
+from semantic_version import Version
 
 from .config import read_config
 from .config.config import (ARCH_AARCH64, ARCH_AMD, ARCH_ARM, ARCH_PPC,
                             ARCH_S390X, ARCH_X86_64)
 from .installer import (delete_cluster, download_installer, install_cluster,
                         storage)
+from .installer.downloader.image import download_rhcos_image, get_url
 
 
 def _identity(in_attr: str) -> str:
@@ -66,8 +67,6 @@ def _read_list(in_str: str) -> list[str]:
         'worker_flavor': {'help': 'flavor of worker node'},
         'worker_replicas': {'help': 'Number of replicas of worker nodes', 'type': int},
         'certificate_bundle_file': {'help': 'CA bundle file'},
-        'images_dir': {'help': 'Directory where images should be stored', 'type': str,
-                       'default': 'images'},
         'skip_clean': {'help': 'Skip clean when installation fails', 'action': 'store_true'},
         'enable_fips': {'help': 'Enable fips mode to the cluster', 'action': 'store_true'},
     },
@@ -173,6 +172,23 @@ def _exec_delete_cluster(args):
         storage.delete_directory(conf['cluster_name'])
 
 
+def _exec_download_insaller(args):
+    args.cluster_name = ""
+    args.installer = None
+    conf = _merge_dictionaries(args)
+    print(conf['installer'])
+
+
+def _exec_download_rhcos_image(args):
+    args.cluster_name = ""
+    args.installer = None
+    args.enable_fips = None
+    conf = _merge_dictionaries(args)
+
+    url, version = get_url(conf['installer'])
+    print(download_rhcos_image(args.images_dir, url, version))
+
+
 def _get_helper(parser: argparse.ArgumentParser):
     def printer(unused_conf):
         print("Operation not set, please specify either install or clean!")
@@ -181,11 +197,20 @@ def printer(unused_conf):
     return printer
 
 
-def _create_commons() -> argparse.ArgumentParser:
-    commons = argparse.ArgumentParser(add_help=False)
+def _add_cluster_commons(commons: argparse.ArgumentParser) -> argparse.ArgumentParser:
     common_arguments: list[tuple[list[str], dict]] = [
         (['--cluster-name'], {"required": True, "help": "Name of the cluster"}),
         (['--installer'], {"required": False, "help": 'Executable binary of openshift install cli', "default": None}),
+        (['--skip-git'], {"help": 'When set, the persistance will be skipped', "action": 'store_true'}),
+    ]
+    for args, kwargs in common_arguments:
+        commons.add_argument(*args, **kwargs)
+    return commons
+
+
+def _create_commons() -> argparse.ArgumentParser:
+    commons = argparse.ArgumentParser(add_help=False)
+    common_arguments: list[tuple[list[str], dict]] = [
         (['--installer-version'], {"help": 'Version of downloader to be downloaded', "default": 'latest', "type": str}),
         (['--installer-arch'], {"help": 'Architecture of downloader to be downloaded',
                                 "choices": [ARCH_AMD, ARCH_X86_64, ARCH_ARM, ARCH_AARCH64, ARCH_PPC, ARCH_S390X],
@@ -194,7 +219,8 @@ def _create_commons() -> argparse.ArgumentParser:
                                   "choices": ["prod", "devel", "prev"], "default": 'prod'}),
         (['--installers-dir'], {"help": 'Folder where installers are stored', "required": False,
                                 "default": 'installers'}),
-        (['--skip-git'], {"help": 'When set, the persistance will be skipped', "action": 'store_true'}),
+        (['--images-dir'], {"help": 'Directory where images should be stored', "required": False,
+                            "default": 'images'}),
         (['-v', '--verbose'], {"help": 'Increase verbosity level', "action": 'store_true'}),
     ]
     for args, kwargs in common_arguments:
@@ -205,19 +231,30 @@ def _create_commons() -> argparse.ArgumentParser:
 def _setup_parser() -> argparse.ArgumentParser:
     commons = _create_commons()
 
+    cluster_commons = argparse.ArgumentParser(add_help=False, parents=[commons])
+    cluster_commons = _add_cluster_commons(cluster_commons)
+
     parser = argparse.ArgumentParser("osia")
     parser.set_defaults(func=_get_helper(parser))
     sub_parsers = parser.add_subparsers()
 
-    install = sub_parsers.add_parser('install', help='Install new cluster', parents=[commons])
+    install = sub_parsers.add_parser('install', help='Install new cluster', parents=[cluster_commons])
 
     for arg, value in sorted({k: v for _, x in ARGUMENTS.items() for k, v in x.items()}.items()):
         install.add_argument(f"--{arg.replace('_', '-')}",
                              **{k: v for k, v in value.items() if k != 'proc'})
     install.set_defaults(func=_exec_install_cluster)
 
-    clean = sub_parsers.add_parser('clean', help='Remove cluster', parents=[commons])
+    clean = sub_parsers.add_parser('clean', help='Remove cluster', parents=[cluster_commons])
     clean.set_defaults(func=_exec_delete_cluster)
+
+    installer = sub_parsers.add_parser('download-installer', help='Download installer', parents=[commons])
+    installer.add_argument("--enable-fips", help='Enable fips mode to the cluster', action='store_true')
+    installer.set_defaults(func=_exec_download_insaller)
+
+    rhcos_image = sub_parsers.add_parser('download-rhcos-image', help='Download rhcos image', parents=[commons])
+    rhcos_image.set_defaults(func=_exec_download_rhcos_image)
+
     return parser
 
 

osia/installer/clouds/base.py

@@ -24,8 +24,8 @@
 from typing import Protocol
 
 from jinja2 import Environment, PackageLoader
-from semantic_version import (SimpleSpec,  # type: ignore[import-untyped]
-                              Version)
+from semantic_version import SimpleSpec  # type: ignore[import-untyped]
+from semantic_version import Version
 
 
 class AbstractInstaller(ABC):

osia/installer/clouds/openstack.py

@@ -27,7 +27,7 @@
 from openstack.network.v2.port import Port
 
 from osia.installer.clouds.base import AbstractInstaller
-from osia.installer.downloader import download_image, get_url
+from osia.installer.downloader import download_rhcos_image, get_url
 
 
 class ImageException(Exception):
@@ -157,16 +157,9 @@ def upload_uniq_image(osp_connection: Connection,
                       images_dir: str,
                       installer: str):
     """Function uploads unique image to the cluster, instead of making shared one"""
-    inst_url, version = get_url(installer)
+    url, version = get_url(installer)
     image_name = f"osia-{cluster_name}-{version}"
-    image_path = Path(images_dir).joinpath(f"rhcos-{version}.qcow2")
-    image_file = None
-    if image_path.exists():
-        logging.info("Found image at %s", image_path.name)
-        image_file = image_path.as_posix()
-    else:
-        logging.info("Starting download of image %s", inst_url)
-        image_file = download_image(inst_url, image_path.as_posix())
+    image_file = download_rhcos_image(images_dir, url, version)
 
     logging.info("Starting upload of image into openstack")
     osp_connection.create_image(image_name, filename=image_file,
@@ -190,18 +183,11 @@ def resolve_image(osp_connection: Connection,
                   error: Exception | None):
     """Function searches for image in openstack and creates it
     if it doesn't exist"""
-    inst_url, version = get_url(installer)
+    url, version = get_url(installer)
     image_name = f"osia-rhcos-{version}"
     image = osp_connection.image.find_image(image_name, ignore_missing=True)
     if image is None:
-        image_path = Path(images_dir).joinpath(f"rhcos-{version}.qcow2")
-        image_file = None
-        if image_path.exists():
-            logging.info("Found image at %s", image_path.name)
-            image_file = image_path.as_posix()
-        else:
-            logging.info("Starting download of image %s", inst_url)
-            image_file = download_image(inst_url, image_path.as_posix())
+        image_file = download_rhcos_image(images_dir, url, version)
 
         logging.info("Starting upload of image into openstack")
         osp_connection.create_image(image_name, filename=image_file,

osia/installer/downloader/__init__.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 """Module implements download logic of resources
 required by installer"""
-from .image import download_image, get_url
+from .image import download_image, download_rhcos_image, get_url
 from .install import download_installer
 
-__all__ = ['download_installer', 'download_image', 'get_url']
+__all__ = ['download_installer', 'download_image', 'download_rhcos_image', 'get_url']

osia/installer/downloader/image.py

@@ -98,3 +98,18 @@ def download_image(image_url: str, image_file: str):
         logging.debug("Directory %s for images already exists", directory)
     res_file = get_data(image_url, image_file, _extract_gzip)
     return res_file
+
+
+def download_rhcos_image(images_dir: str, url: str, version: str) -> str:
+    """ Download rhcos image """
+    image_path = Path(images_dir).joinpath(f"rhcos-{version}.qcow2")
+    image_file = None
+    if image_path.exists():
+        logging.info("Found image at %s", image_path.name)
+        image_file = image_path.as_posix()
+        return image_file
+
+    logging.info("Starting download of image %s", url)
+    image_file = download_image(url, image_path.as_posix())
+
+    return image_path.as_posix()