Merge pull request #144 from guidotijskens/version0128

Version0128

Author: guidotijskens

MANIFEST.in

@@ -9,6 +9,17 @@ include libexec/oci-kvm-upgrade
 include libexec/oci-kvm-config.sh
 include libexec/oci-kvm-network-script
 include tests/*.py
+include tests/data/*.cfg
+include tests/data/tests/createattachdetachattachdetachdestroy/*.cfg
+include tests/data/tests/test_cli_kvm/*.cfg
+include tests/data/tests/test_cli_network_config/*.cfg
+include tests/data/tests/test_cli_network_config_attach/*.cfg
+include tests/data/tests/test_cli_network_config_configure/*.cfg
+include tests/data/tests/test_exec_helpers/*.cfg
+include tests/data/tests/test_exec_ocid/*.cfg
+include tests/data/tests/test_iscsiadm/*.cfg
+include tests/data/tests/test_network_helpers/*.cfg
+include tests/data/tests/test_oci_notify/*.cfg
 include data/*.service
 include data/oci-image-cleanup.conf
 include data/00-oci-utils.conf
@@ -22,5 +33,7 @@ include tools/build_image/scripts/*
 include tools/build_image/templates/*
 include tools/build_image/Makefile
 include tools/build_image/README.md
+include tools/*.py
+include tools/execution/*
 include buildrpm/*.spec
 include man/man?/*.[158]

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: oci-utils
-Version: 0.10.2
+Version: 0.12.7
 Summary: Oracle Cloud Infrastructure utilities
 Home-page: http://github.com/oracle/oci-utils/
 Author: Laszlo Peter
@@ -16,7 +16,7 @@ Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: System Administrators
 Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.6
 Classifier: Topic :: System :: Installation/Setup
 Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities

buildrpm/oci-utils.spec

@@ -1,6 +1,6 @@
 Name: oci-utils
-Version: 0.12.7
-Release: 1%{?dist}
+Version: 0.12.8
+Release: 0%{?dist}
 Url: http://cloud.oracle.com/iaas
 Summary: Oracle Cloud Infrastructure utilities
 License: UPL
@@ -18,34 +18,52 @@ BuildRequires: systemd
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 Requires: python3
-Requires: python3-daemon
-Requires: python3-sdnotify
+#
 Requires: xfsprogs
 Requires: cloud-utils-growpart
 # for lsblk
 Requires: util-linux
 # for iscsiadm
 Requires: iscsi-initiator-utils
-Requires: python36-oci-sdk
 #
-%if 0%{?rhel} == 7
-Requires: python36-netaddr
-%else
+%if 0%{?rhel} == 9
+Requires: python39-oci-sdk
+Requires: python3-netaddr
+Requires: python3-daemon
+Requires: python3-sdnotify
+%endif
+#
+%if 0%{?rhel} == 8
 Requires: network-scripts
 Requires: python3-netaddr
+Requires: python3-daemon
+Requires: python3-sdnotify
 %endif
-
+#
+%if 0%{?rhel} == 7
+Requires: python36-netaddr
+Requires: python36-oci-sdk
+Requires: python3-daemon
+Requires: python3-sdnotify
+%endif
+#
 %description
 A package with useful scripts for querying/validating the state of Oracle Cloud Infrastructure instances running Oracle Linux and facilitating some common configuration tasks.
 
 %package kvm
 Summary: Utilitizes for managing virtualization in Oracle Cloud Infrastructure
 Group: Development/Tools
 Requires: %{name} = %{version}-%{release}
-
-%if 0%{?rhel} >= 8
+#
+%if 0%{?rhel} == 9
+Requires: python3-libvirt
+%endif
+#
+%if 0%{?rhel} == 8
 Requires: python3-libvirt
-%else
+%endif
+#
+%if 0%{?rhel} == 7
 Requires: python36-libvirt
 %endif
 
@@ -66,14 +84,25 @@ Requires: util-linux
 Requires: parted
 Requires: bind-utils
 Requires: qemu-img >= 15:2.12
-# for upload and import
+#
+%if 0%{?rhel} == 9
+Requires: python3
+Requires: python39-oci-cli
+Requires: python3-pyyaml
+%endif
+#
+%if 0%{?rhel} == 8
+Requires: python3
 Requires: python36-oci-cli
-%if 0%{?rhel} == 7
-Requires: python36-pyyaml
-%else
 Requires: python3-pyyaml
+%endif
+#
+%if 0%{?rhel} == 7
 Requires: python36
+Requires: python36-pyyaml
+Requires: python36-oci-cli
 %endif
+#
 %description migrate
 Utilities for migrating on-premise guests to Oracle Cloud Infrastructure.
 
@@ -176,6 +205,18 @@ rm -rf %{buildroot}
 /opt/oci-utils/tests/__init__*
 
 %changelog
+* Wed Mar 30 2022 Guido Tijskens <guido.tijskens@oracle.com> -- 0.12.7-3
+- spec file fixed for ol9 builds of oci-kvm and oci-migrate
+- tests for instance distribution and version
+
+* Wed Mar 09 2022 Guido Tijskens <guido.tijskens@oracle.com> -- 0.12.7-2
+- LINUX-11994 oci-utils for OL9
+- adjust oci-kvm guest test
+- show-all option for oci-iscsi-config
+- LINUX-12111 oci-public-ip (oci-utils) does not show the reason why no public ip's are returned.
+- LINUX-12119 oci-public-ip does not have the correct ordering in "primary on top"
+- update oci-kvm
+
 * Wed Feb 16 2022 Guido Tijskens <guido.tijskens@oracle.com> -- 0.12.7-1
 - LINUX-12109 Local iSCSI info not available" after running oci-iscsi-config sync
 - LINUX-12114 oci-utils help info contains ref to python main module iso the command

lib/oci_utils/__init__.py

@@ -5,6 +5,7 @@
 # at http://oss.oracle.com/licenses/upl.
 
 import logging
+import re
 import os
 import os.path
 
@@ -136,6 +137,46 @@ def find_exec_in_path(exec_name):
     return result
 
 
+def is_root_user():
+    """
+    Verify if operator has root privileges.
+
+    Returns
+    -------
+        bool: True if root, False otherwise.
+    """
+    if os.geteuid() != 0:
+        return False
+    return True
+
+
+def get_os_release_data():
+    """
+    Collect information on the linux operating system and release.
+    Currently is only able to handle linux type os.
+
+    Returns
+    -------
+        ostype: str
+            The os type
+        major_release: str
+            the major release
+        dict: Dictionary containing the os and version data on success,
+            None otherwise.
+    """
+    osdata = '/etc/os-release'
+    try:
+        with open(osdata, 'r') as f:
+            osreleasedata = [line.strip() for line in f.read().splitlines() if '=' in line]
+        osdict = dict([re.sub(r'"', '', kv).split('=') for kv in osreleasedata])
+    except Exception as e:
+        return None, None, None
+    os_type = osdict['ID']
+    major_release = re.split('\\.', osdict['VERSION_ID'])[0]
+
+    return os_type, major_release, osdict
+
+
 def _set_proxy():
     """
     Set the proxy for OCI metadata service access.

lib/oci_utils/impl/migrate/oci-image-migrate-main.py

@@ -221,6 +221,51 @@ def qemu_img_version():
     return 0
 
 
+def get_os_release_data():
+    """
+    Collect information on the linux operating system and release.
+    Currently is only able to handle linux type os.
+
+    Returns
+    -------
+        ostype: str
+            The os type
+        major_release: str
+            the major release
+        dict: Dictionary containing the os and version data on success,
+            None otherwise.
+    """
+    osdata = '/etc/os-release'
+    try:
+        with open(osdata, 'r') as f:
+            osreleasedata = [line.strip() for line in f.read().splitlines() if '=' in line]
+        osdict = dict([re.sub(r'"', '', kv).split('=') for kv in osreleasedata])
+    except Exception as e:
+        return None, None, None
+    os_type = osdict['ID']
+    major_release = re.split('\\.', osdict['VERSION_ID'])[0]
+
+    return os_type, major_release, osdict
+
+
+def verify_support():
+    """
+    Verify if the instance os and release are supported to run this code.
+
+    Returns
+    -------
+        bool: True on success, False otherwise.
+    """
+    ostype, majorrelease, _ = get_os_release_data()
+    if ostype not in ['ol', 'redhat', 'centos']:
+        _logger.info('OS type %s is not supported.', ostype)
+        return False
+    if majorrelease not in ['7', '8']:
+        _logger.info('OS %s %s is not supported', ostype, majorrelease)
+        return False
+    return True
+
+
 def main():
     """
     Main
@@ -249,6 +294,10 @@ def main():
     else:
         exit_with_msg('  *** ERROR *** This program needs to be run with root privileges.')
     #
+    # Verify if instance is supported to run this code.
+    if not verify_support():
+        sys.exit(1)
+    #
     # Verbose mode is False by default
     migrate_data.verbose_flag = args.verbose_flag
     _logger.debug('Verbose level set to %s', migrate_data.verbose_flag)

lib/oci_utils/impl/oci-growfs-main.py

@@ -16,7 +16,7 @@
 import termios
 import tty
 
-from oci_utils import find_exec_in_path
+from oci_utils import is_root_user, find_exec_in_path
 from oci_utils.lsblk import lsblk_partition_data
 
 lc_all = 'en_US.UTF8'
@@ -140,45 +140,6 @@ def _read_yn(prompt, yn=True, waitenter=False, suppose_yes=False, suppose_no=Fal
     return bool(yn.upper() == 'Y')
 
 
-def is_root_user():
-    """
-    Verify if operator has root privileges.
-
-    Returns
-    -------
-        bool: True if root, False otherwise.
-    """
-    if os.geteuid() != 0:
-        _logger.error("This program needs to be run with root privileges.")
-        return False
-    return True
-
-
-# def find_exec_in_path(exec_name):
-#     """
-#     Find an executable in the path.
-#
-#     Parameters
-#     ----------
-#     exec_name: str
-#         The name of the executable.
-#
-#     Returns
-#     -------
-#        str: the full path of the executable.
-#     """
-#     path = os.getenv('PATH').split(':')
-#     result = None
-#     for rootdir in path:
-#         for root, folder, files in os.walk(rootdir):
-#             if exec_name in files:
-#                 result = os.path.join(root, exec_name)
-#             break
-#         if result:
-#             break
-#     return result
-
-
 def partition_growfs_X(partition_data, dry_run=True):
     """
     Expand a partition.
@@ -698,6 +659,7 @@ def main():
     #
     # root privileges are required.
     if not is_root_user():
+        _logger.error('This program needs to be run with root privileges')
         sys.exit(1)
     #
     # the command line.