Merge pull request #142 from guidotijskens/version01260

guidotijskens · web-flow · commit 715be9e51c15 · 2022-02-17T15:14:05.000+01:00
oci-utils 0.12.7-1
diff --git a/buildrpm/oci-utils.spec b/buildrpm/oci-utils.spec
@@ -1,6 +1,6 @@
 Name: oci-utils
 Version: 0.12.7
-Release: 0%{?dist}
+Release: 1%{?dist}
 Url: http://cloud.oracle.com/iaas
 Summary: Oracle Cloud Infrastructure utilities
 License: UPL
@@ -176,6 +176,10 @@ rm -rf %{buildroot}
 /opt/oci-utils/tests/__init__*
 
 %changelog
+* 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
+
 * Thu Feb 10 2022 Guido Tijskens <guido.tijskens@oracle.com> -- 0.12.6-12
 - LINUX-12063 attach detach attach detach "is already detached" error
 
diff --git a/lib/oci_utils/cache.py b/lib/oci_utils/cache.py
@@ -125,7 +125,7 @@ def load_cache_11876(global_file, global_file_11876=None, user_file=None, max_ag
     else:
         # cache file does not yet exists
         _logger.debug('Cache file %s does not exist.', global_file)
-    return None, None
+    return 0, None
 
 
 def load_cache(global_file, user_file=None, max_age=None):
diff --git a/lib/oci_utils/impl/oci-growfs-main.py b/lib/oci_utils/impl/oci-growfs-main.py
@@ -33,9 +33,9 @@ def parse_args():
     -------
         The command line namespace
     """
-    parser = argparse.ArgumentParser(
-        description='Utility for expanding the root¶¶ filesystem to its configured size.',
-                    add_help=False)
+    parser = argparse.ArgumentParser(prog='oci-growfs',
+                                     description='Utility for expanding the root¶¶ filesystem to its configured size.',
+                                     add_help=False)
     group = parser.add_mutually_exclusive_group()
     group.add_argument('-y', '--yes',
                         action='store_true',
diff --git a/lib/oci_utils/impl/oci-iscsi-config-main.py b/lib/oci_utils/impl/oci-iscsi-config-main.py
@@ -132,7 +132,8 @@ def get_args_parser():
     -------
         The commandline argparse namespace.
     """
-    parser = argparse.ArgumentParser(description='Utility for listing or configuring iSCSI devices on an OCI instance.')
+    parser = argparse.ArgumentParser(prog='oci-iscsi-config',
+                                     description='Utility for listing or configuring iSCSI devices on an OCI instance.')
     subparser = parser.add_subparsers(dest='command')
     #
     # sync
@@ -757,6 +758,8 @@ def display_attached_volumes(oci_sess, iscsiadm_session, disks, output_mode, det
         _logger.debug('Cannot get all volumes of this instance : %s', str(e))
 
     if not iscsiadm_session and len(oci_vols) > 0:
+        #
+        # iscsiadm does not show volumes, oci_api.session does, attached volumes but not connected.
         print("Local iSCSI info not available.")
         print("List info from Cloud instead(No boot volume).")
         print("")
@@ -1869,6 +1872,20 @@ def get_max_volumes():
     return max_vol
 
 
+def get_iscsiadm_session():
+    """
+    Find the attached block volumes with exception of the boot volume.
+
+    Returns
+    -------
+        dict: the attached block volumes and their data.
+    """
+
+    all_volumes = iscsiadm.session()
+    iscsiadmsession = dict((iqn, all_volumes[iqn]) for iqn in all_volumes if 'boot:uefi' not in iqn)
+    return iscsiadmsession
+
+
 def do_oci_vol_attach_ocid(oci_session, compatibility_mode, volume_iqn, use_chap_secrets):
     """
     Collect data for attaching an iSCSI volume to this instance based on an ocid.
@@ -2196,6 +2213,9 @@ def main():
     #
     # collect iscsi volume information
     system_disks = lsblk.list_blk_dev()
+    #
+    # we are not touching boot volume in iscsi config
+    # iscsiadm_session = get_iscsiadm_session()
     iscsiadm_session = iscsiadm.session()
     #
     # the show option
diff --git a/lib/oci_utils/impl/oci-metadata-main.py b/lib/oci_utils/impl/oci-metadata-main.py
@@ -106,7 +106,8 @@ def parse_args():
     -------
         The argparse namespace.
     """
-    parser = argparse.ArgumentParser(description='Utility for displaying metadata for an instance running in '
+    parser = argparse.ArgumentParser(prog='oci-metadata',
+                                     description='Utility for displaying metadata for an instance running in '
                                                  'the Oracle Cloud Infrastructure.',
                                      add_help=False)
     parser.add_argument('-h', '--human-readable', action='store_true',
diff --git a/lib/oci_utils/impl/oci-network-config-main.py b/lib/oci_utils/impl/oci-network-config-main.py
@@ -62,7 +62,8 @@ def get_arg_parser():
     -------
         The argparse namespace.
     """
-    parser = argparse.ArgumentParser(description='Utility for configuring network interfaces on an instance running '
+    parser = argparse.ArgumentParser(prog='oci-network-config',
+                                     description='Utility for configuring network interfaces on an instance running '
                                                  'in the Oracle Cloud Infrastructure.')
     parser.add_argument('--quiet', '-q',
                         action='store_true',
diff --git a/lib/oci_utils/impl/oci-network-inspector-main.py b/lib/oci_utils/impl/oci-network-inspector-main.py
@@ -27,11 +27,9 @@ def parse_args():
     -------
         The argparse namespace.
     """
-    parser = argparse.ArgumentParser(description='Utility for exploring '
-                                                 'the network, its subnets '
-                                                 'and ips assigned for a '
-                                                 'given compartment or '
-                                                 'network.')
+    parser = argparse.ArgumentParser(prog='oci-network-inspector',
+                                     description='Utility for exploring the network, its subnets and ips assigned '
+                                                 'for a given compartment or network.')
     parser.add_argument('-C', '--compartment',
                         metavar='OCID',
                         action='store',
diff --git a/lib/oci_utils/impl/oci-notify-main.py b/lib/oci_utils/impl/oci-notify-main.py
@@ -79,7 +79,8 @@ def parse_args():
         extra_descr += '%s\n' % (helpline.replace('MAX_MESSAGE_TITLE_LEN', str(MAX_MESSAGE_TITLE_LEN))
                                  .replace('CHUNK_SIZE', str(CHUNK_SIZE))
                                  .replace('MAX_MESSAGE_CHUNKS', str(MAX_MESSAGE_CHUNKS)))
-    parser = argparse.ArgumentParser(description='%s' % extra_descr)
+    parser = argparse.ArgumentParser(prog='oci-notify',
+                                     description='%s' % extra_descr)
     sub_parser = parser.add_subparsers(dest='mode')
 
     config_parser = sub_parser.add_parser('config', help='Configure the notification server.')
diff --git a/lib/oci_utils/impl/oci-public-ip-main.py b/lib/oci_utils/impl/oci-public-ip-main.py
@@ -30,9 +30,10 @@ def parse_args():
     -------
         The command line namespace
     """
-    parser = argparse.ArgumentParser(
-        description='Utility for displaying the public IP address of the '
-                    'current OCI instance.', add_help=False)
+    parser = argparse.ArgumentParser(prog='oci-public-ip',
+                                     description='Utility for displaying the public IP address of the '
+                                                 'current OCI instance.',
+                                     add_help=False)
     group = parser.add_mutually_exclusive_group()
 
     # deprecated option
@@ -155,7 +156,8 @@ def main():
         for server in STUN_SERVERS:
             print(server)
         return 0
-
+    #
+    # Try to create a functional oci session
     _instance = None
     try:
         sess = oci_api.OCISession()
@@ -181,12 +183,12 @@ def main():
             _all_p_ips = [{'ip': v.get_public_ip(),
                            'vnic_name': v.get_display_name(),
                            'vnic_ocid': v.get_ocid()} for v in _instance.all_vnics() if v.get_public_ip()]
-            stun_log.debug('%s ips retreived from sdk information', len(_all_p_ips))
+            stun_log.debug('%s ips retrieved from sdk information', len(_all_p_ips))
             if len(_all_p_ips) == 0:
-                stun_log.debug('No ips found, might be due to missing privilges, trying with stun servers')
+                stun_log.info('No public ip(s) found from OCI, trying the stun servers.')
                 _instance=None
         except Exception as e:
-            stun_log.debug('Instance is missing privileges to collect ip data from OCI, falling back to stun servers.')
+            stun_log.info('Instance is missing privileges to collect ip data from OCI, falling back to stun servers.')
             _instance = None
 
     if _instance is None:
diff --git a/lib/oci_utils/impl/oci-volume-data-main.py b/lib/oci_utils/impl/oci-volume-data-main.py
@@ -23,7 +23,8 @@ def command_line():
     -------
         The commandline argparse namespace.
     """
-    parser = argparse.ArgumentParser(description='Tool to display the oci properties of an iscsi volume.')
+    parser = argparse.ArgumentParser(prog='oci-volume-data',
+                                     description='Tool to display the oci properties of an iscsi volume.')
     parser.add_argument('-k', '--key',
                         action='store',
                         required=True,
diff --git a/lib/oci_utils/impl/ocid-main.py b/lib/oci_utils/impl/ocid-main.py
@@ -133,7 +133,7 @@ def __init__(self, name, ocidfunc, context, sleeptime, repeat=True):
         self.thr_logger = logging.getLogger('oci-utils.ocid.workers.%s.%s' % (self.name, self.thread_name))
         # evt used to wait between iterations and for worker mgr to ask us to stop
         self.blocking_evt = threading.Event()
-        # evt used by worker mgr to wiat for first iteration to be completed
+        # evt used by worker mgr to wait for first iteration to be completed
         self.first_iteration_evt = threading.Event()
 
     def __str__(self):
@@ -764,13 +764,13 @@ def daemon_main(arguments):
         sys.exit(result)
 
     threads = start_threads(arguments, repeat=True)
-    __ocid_logger.debug('threads started')
+    __ocid_logger.debug('Threads started')
     # wait for every thread to complete the ocid func at least once
     for th in list(threads.keys()):
-        __ocid_logger.debug('waiting for first iteration of %s to complete', threads[th].getName())
+        __ocid_logger.debug('Waiting for first iteration of %s to complete', threads[th].getName())
         threads[th].wait_first_iteration()
 
-    __ocid_logger.debug('all threads finished the first iteration')
+    __ocid_logger.debug('All threads finished the first iteration')
 
     if os.path.exists('/var/run/ocid.fifo'):
         # should not happen, but ...
@@ -783,11 +783,11 @@ def daemon_main(arguments):
     __ocid_logger.debug('systemd notifier notified')
 
     try:
-        __ocid_logger.debug('selecting on signal...')
+        __ocid_logger.debug('Selecting on signal...')
         r, _, _ = select.select([os.open('/var/run/ocid.fifo', os.O_RDONLY | os.O_NONBLOCK)], [], [])
-        __ocid_logger.debug('out of selecting for [%s]', str(r))
+        __ocid_logger.debug('Out of selecting for [%s]', str(r))
     except Exception as e:
-        __ocid_logger.debug('error selecting: %s', str(e))
+        __ocid_logger.debug('Error selecting: %s', str(e))
 
     for th in list(threads.keys()):
         threads[th].request_stop()
diff --git a/lib/oci_utils/iscsiadm.py b/lib/oci_utils/iscsiadm.py
@@ -106,6 +106,7 @@ def discovery(ipaddr):
                     '-p', ipaddr + ':3260']
             _iscsi_logger.debug('Executing %s', _cmd)
             output = subprocess.check_output(_cmd, stderr=dev_null).decode('utf-8')
+            # _iscsi_logger.debug('%s output: %s', _cmd, output)
         iqns = []
         for line in output.splitlines():
             if 'iqn' not in line:
@@ -149,6 +150,7 @@ def session():
             _cmd = ['/usr/sbin/iscsiadm', '-m', 'session', '-P', '3']
             _iscsi_logger.debug('Executing %s', _cmd)
             output = subprocess.check_output(_cmd, stderr=dev_null).decode('utf-8')
+            # _iscsi_logger.debug('%s output: %s', _cmd, output)
         devices = {}
 
         device_info = {}
@@ -235,7 +237,8 @@ def attach(ipaddr, port, iqn, username=None, password=None, auto_startup=True):
                 '-T', iqn,
                 '-p', "%s:%s" % (ipaddr, port)]
         _iscsi_logger.debug('Executing %s', _cmd)
-        subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+        output = subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+        # _iscsi_logger.debug('%s output: %s', _cmd, output)
     except OSError as e:
         _iscsi_logger.error('Failed to execute /usr/sbin/iscsiadm: %s', str(e))
         return 404
@@ -254,7 +257,8 @@ def attach(ipaddr, port, iqn, username=None, password=None, auto_startup=True):
                     '-n', 'node.startup',
                     '-v', 'automatic']
             _iscsi_logger.debug('Executing %s', _cmd)
-            subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+            output = subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+            # _iscsi_logger.debug('%s output: %s', _cmd, output)
         except subprocess.CalledProcessError as e:
             logging.warning('Failed to set automatic startup set for iscsi volume %s', iqn)
             logging.warning('iscsiadm output: %s', e.output)
@@ -271,7 +275,8 @@ def attach(ipaddr, port, iqn, username=None, password=None, auto_startup=True):
                     '-n', 'node.session.auth.authmethod',
                     '-v', 'CHAP']
             _iscsi_logger.debug('Executing %s', _cmd)
-            subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+            output = subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+            # _iscsi_logger.debug('%s output: %s', _cmd, output)
 
             _cmd = ['/usr/sbin/iscsiadm',
                     '-m', 'node',
@@ -281,7 +286,8 @@ def attach(ipaddr, port, iqn, username=None, password=None, auto_startup=True):
                     '-n', 'node.session.auth.username',
                     '-v', username]
             _iscsi_logger.debug('Executing %s', _cmd)
-            subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+            output = subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+            # _iscsi_logger.debug('%s output: %s', _cmd, output)
 
             _cmd = ['/usr/sbin/iscsiadm',
                     '-m', 'node',
@@ -291,7 +297,8 @@ def attach(ipaddr, port, iqn, username=None, password=None, auto_startup=True):
                     '-n', 'node.session.auth.password',
                     '-v', password]
             _iscsi_logger.debug('Executing %s', _cmd)
-            subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+            output = subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+            # _iscsi_logger.debug('%s output: %s', _cmd, output)
         except subprocess.CalledProcessError as e:
             _iscsi_logger.error('Failed to update authentication settings')
             _iscsi_logger.info(e.output.decode('utf-8'))
@@ -305,7 +312,8 @@ def attach(ipaddr, port, iqn, username=None, password=None, auto_startup=True):
                 '-p', "%s:%s" % (ipaddr, port),
                 '-l']
         _iscsi_logger.debug('Executing %s', _cmd)
-        subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+        output = subprocess.check_output(_cmd, stderr=subprocess.STDOUT)
+        # _iscsi_logger.debug('%s output: %s', _cmd, output)
     except subprocess.CalledProcessError as e:
         _iscsi_logger.error('Failed to log in to iscsi volume: %s', error_message_from_code(e.returncode))
         _iscsi_logger.error('iscsiadm output: %s', e.output.decode('utf-8'))
@@ -344,15 +352,16 @@ def detach(ipaddr, port, iqn):
                 '-p', "%s:%s" % (ipaddr, port),
                 '-u']
         _iscsi_logger.debug('Executing %s', _cmd)
-        subprocess.check_call(_cmd, stderr=dev_null, stdout=dev_null)
+        output = subprocess.check_call(_cmd, stderr=dev_null, stdout=dev_null)
+        # _iscsi_logger.debug('%s output: %s', _cmd, output)
 
         _cmd = ['/usr/sbin/iscsiadm',
                 '-m', 'node',
                 '-o', 'delete',
                 '-T', iqn,
                 '-p', "%s:%s" % (ipaddr, port)]
         _iscsi_logger.debug('Executing %s', _cmd)
-        subprocess.check_call(_cmd, stderr=dev_null, stdout=dev_null)
+        output = subprocess.check_call(_cmd, stderr=dev_null, stdout=dev_null)
     except subprocess.CalledProcessError as e:
         _iscsi_logger.error('Error running iscsiadm command [%s]', str(e))
         return False
diff --git a/tests/automation/kvm/Makefile b/tests/automation/kvm/Makefile
@@ -14,7 +14,10 @@ HOSTLOCATION=host_instance
 GUESTLOCATON=guest_instance
 
 TERRAFORM4OCI=create_instance.py
-BINARIES=bin/$(TERRAFORM4OCI)
+CREATETESTVM=create_test_vm.py
+
+HOSTBINARIES=$(HOSTLOCATION)/bin/$(TERRAFORM4OCI)
+GUESTBINARIES=$(GUESTLOCATON)/bin/$(CREATETESTVM)
 
 BASEDATATF=$(HOSTLOCATION)/base_instance/data.tf
 BASEMAINTF=$(HOSTLOCATION)/base_instance/main.tf
@@ -28,14 +31,20 @@ TFVERSION=$(HOSTLOCATION)/tf_scripts/version.tf
 TFOUTPUTTF=$(HOSTLOCATION)/tf_scripts/output.tf
 TFSCRIPTS=$(TFAPITF) $(TFDATATF) $(TFMAINTF) $(TFVERSION) $(TFOUTPUTTF)
 
+GUESTKICKSTARTBRIDGEOL7=$(GUESTLOCATON)/templates/kickstart_bridge_template_ol7
+GUESTKICKSTARTBRIDGEOL8=$(GUESTLOCATON)/templates/kickstart_bridge_template_ol8
+GUESTKICKSTARTDIRECTOL7=$(GUESTLOCATON)/templates/kickstart_direct_template_ol7
+GUESTKICKSTARTDIRECTOL8=$(GUESTLOCATON)/templates/kickstart_direct_template_ol8
+GUESTTEMPLATES=$(GUESTKICKSTARTBRIDGEOL7) $(GUESTKICKSTARTBRIDGEOL8) $(GUESTKICKSTARTDIRECTOL7) $(GUESTKICKSTARTDIRECTOL8)
+
 INITIALSCRIPT=$(HOSTLOCATION)/scripts/initial_config.sh
 SHSCRIPTS=$(INITIALSCRIPT)
 #
 # files involved
-FILELIST=Makefile README.md $(BINARIES) $(BASES) $(TFSCRIPTS) $(SHSCRIPTS)
+FILELIST=Makefile README.md $(HOSTBINARIES) $(GUESTBINARIES) $(BASES) $(TFSCRIPTS) $(SHSCRIPTS) $(GUESTTEMPLATES)
 #
 TARGET=create_instance
-VERSION=0.8 Oct 26 2021
+VERSION=0.9_Feb_15_2022
 WRITE=@echo
 CREATETAR=tar -cjvf
 EXPANDTAR=tar -xjvf
diff --git a/tests/test_cli_iscsi_config_more.py b/tests/test_cli_iscsi_config_more.py
@@ -428,12 +428,12 @@ def test_createattach_iscsidetach_attach_detach_destroy(self):
             time.sleep(self.waittime)
             #
             # attach iqn
-            cmd_d = [self.iscsi_config_path, 'attach', '--iqns', new_iqn]
-            attach_volume_data = subprocess.check_output(cmd_d).decode('utf-8').splitlines()
-            _show_res('Attach Volume', attach_volume_data)
-            time.sleep(self.waittime)
-            volume_data = self._get_iscsi_show()
-            time.sleep(self.waittime)
+            # cmd_d = [self.iscsi_config_path, 'attach', '--iqns', new_iqn]
+            # attach_volume_data = subprocess.check_output(cmd_d).decode('utf-8').splitlines()
+            # _show_res('Attach Volume', attach_volume_data)
+            # time.sleep(self.waittime)
+            # volume_data = self._get_iscsi_show()
+            # time.sleep(self.waittime)
             #
             # detach
             cmd_e = [self.iscsi_config_path, 'detach', '--iqns', new_iqn]
