kvm tests

Author: guido tijskens

buildrpm/oci-utils.spec

@@ -182,6 +182,17 @@ rm -rf %{buildroot}
 /opt/oci-utils/tests/__init__*
 
 %changelog
+* Fri Aug 27 2021 Guido Tijskens <guido.tijskens@oracle.com> -- 0.12.5.9
+- LINUX-11457: public API oci_api missing get_object_storage_client
+
+* Tue Aug 24 2021 Guido Tijskens <guido.tijskens@oracle.com> -- 0.12.5-8
+- LINUX-11441: add --yes flag to delete-network in oci-kvm
+- LINUX-11442: oci-kvm create network fails with 'numerical result out of range when name > 14 characters
+- LINUX-11443: oci-kvm create-pool on nfs fails with python3 string error
+
+* Thu Aug 12 2021 Guido Tijskens <guido.tijskens@oracle.com> -- 0.12.5-7
+- LINUX-7304: KVM image script alignment
+
 * Wed Aug 11 2021 Guido Tijskens <guido.tijskens@oracle.com> -- 0.12.5-6
 - LINUX-1742: oci-public-ip reports errors when python-oci-sdk is installed but not set up
 - LINUX-9425: oci-iscsi-config attach -I fails on iqn's

data/00-oci-utils.conf

@@ -26,7 +26,7 @@
 ; enabled=true
 
 ; Resize boot and iSCSI volumes automatically.  Set to false to disable this
-; function of ocid; defautl = true
+; function of ocid; default = true
 ; auto_resize=true
 ;
 ; Number of seconds to sleep between scans; default = 60
@@ -57,4 +57,4 @@
 ; Number of seconds to sleep between refresh attempts
 ; refresh_interval=600
 [ocid]
-; debug=true
+; debug=true

lib/oci_utils/__init__.py

@@ -32,6 +32,7 @@
     'cwl': 'cwl - uk-cardiff-1 (Newport, UK)',
     'dxb': 'dxb - me-dubai-1 (Duabi, UAE)',
     'gru': 'gru - sa-saopaulo-1 (Sao Paulo, Brazil)',
+    'vcp': 'vcp - sa-vinhedo-1 (Vinhedo, Brazil)',
     'hyd': 'hyd - ap-hyderabad-1 (Hyderabad, India)',
     'icn': 'icn - ap-seoul-1 (Seoul, South Korea)',
     'jed': 'jed - me-jeddah-1 (Jeddah, Saoudi Arabia)',

lib/oci_utils/impl/__init__.py

@@ -161,8 +161,10 @@ def setup_logging(forceDebug=False):
     else:
         if forceDebug:
             try:
-                handler = logging.handlers.RotatingFileHandler(
-                    '/var/tmp/oci-utils.log', mode='a', maxBytes=1024 * 1024, backupCount=3)
+                handler = logging.handlers.RotatingFileHandler('/var/tmp/oci-utils.log',
+                                                               mode='a',
+                                                               maxBytes=1024 * 1024,
+                                                               backupCount=3)
                 handler.setFormatter(formatter)
                 handler.setLevel(logging.NOTSET)
             except Exception as _:

lib/oci_utils/impl/oci-iscsi-config-main.py

@@ -866,7 +866,7 @@ def api_display_available_block_volumes(sess, compartments, show_all, output_mod
         compartement ocid(s)
     show_all: bool
         display all volumes. By default display only not-attached  ones
-    output_mode : informtion display mode
+    output_mode : information display mode
     details : display detailed information ?
     truncate: truncate text?
 
@@ -1002,10 +1002,10 @@ def get_volume_by_iqn(sess, iqn):
     try:
         if bool(sess):
             get_volume_by_iqn.all_this_instance_volume = sess.this_instance().all_volumes()
-            for v in get_volume_by_iqn.all_this_instance_volume:
-                if v.get_iqn() == iqn:
-                    _logger.debug('Found %s', str(v))
-                    return v
+            for volume in get_volume_by_iqn.all_this_instance_volume:
+                if volume.get_iqn() == iqn:
+                    _logger.debug('Found %s', str(volume))
+                    return volume
         else:
             _logger.info('Unable to get volume ocid and display name for iqn %s, ', iqn)
     except Exception as e:

lib/oci_utils/impl/oci-network-config-main.py

@@ -368,11 +368,15 @@ def _display_subnet(_, subnet):
 def do_show_information(vnic_utils, mode, details=False):
     """
     Display network information
-    parameter
-    ---------
-        vnic_utils : instance ov VNICUtil
-        mode : output mode (text,parsable etc...)
-        details : display detailed information ?
+
+    Parameters
+    ----------
+        vnic_utils : instance of VNICUtils
+
+        mode : str
+            output mode (text,parsable etc...)
+        details : bool
+            display detailed information ?
     """
 
     sess = get_oci_api_session()

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

@@ -82,12 +82,15 @@ def parse_args():
                                  .replace('MAX_MESSAGE_CHUNKS', str(MAX_MESSAGE_CHUNKS)))
     parser = argparse.ArgumentParser(description='%s' % extra_descr)
     sub_parser = parser.add_subparsers(dest='mode')
+
     config_parser = sub_parser.add_parser('config', help='Configure the notification server.')
-    message_parser = sub_parser.add_parser('message', help='Send a message.')
+
     config_parser.add_argument(action='store',
                                dest='notification_ocid',
                                type=str,
                                help='The ocid of the notification topic.')
+
+    message_parser = sub_parser.add_parser('message', help='Send a message.')
     message_parser.add_argument('-t', '--title',
                                 action='store',
                                 dest='message_title',
@@ -449,7 +452,7 @@ def _read_oci_config(fname, profile='DEFAULT'):
             oci_config = oci_sdk.config.from_file(full_fname, profile)
             return oci_config
         except oci_sdk.exceptions.ConfigFileNotFound as e:
-            _logger.debug("Unable to read OCI config file: %s", str(e))
+            _logger.debug('Unable to read OCI config file: %s', str(e))
             raise Exception('Unable to read OCI config file') from e
 
     def get_auth_method(self, authentication_method=None):
@@ -524,7 +527,7 @@ def _proxy_authenticate(self):
         """
         _logger.debug('_proxy_authenticate')
         if os.geteuid() != 0:
-            raise Exception("Must be root to use Proxy authentication")
+            raise Exception('Must be root to use Proxy authentication')
 
         sdk_user = OCIUtilsConfiguration.get('auth', 'oci_sdk_user')
         try:
@@ -533,8 +536,8 @@ def _proxy_authenticate(self):
             self._identity_client = oci_sdk.identity.IdentityClient(self._oci_config)
             self._ons_client = oci_sdk.ons.NotificationDataPlaneClient(config=self._oci_config)
         except Exception as e:
-            _logger.debug("Proxy authentication failed: %s", str(e))
-            raise Exception("Proxy authentication failed") from e
+            _logger.debug('Proxy authentication failed: %s', str(e))
+            raise Exception('Proxy authentication failed') from e
 
     def _direct_authenticate(self):
         """
@@ -556,7 +559,7 @@ def _direct_authenticate(self):
             self._ons_client = oci_sdk.ons.NotificationDataPlaneClient(config=self._oci_config)
         except Exception as e:
             _logger.debug('Direct authentication failed: %s', str(e))
-            raise Exception("Direct authentication failed") from e
+            raise Exception('Direct authentication failed') from e
 
     def _ip_authenticate(self):
         """
@@ -758,17 +761,19 @@ def send_message_chunk(self, chunk, nb, nbtot):
             _logger.debug('_Send chunk %d of %d', nb, nbtot)
             if nbtot <= 1:
                 _logger.info("Publishing message '%s: %s'", self._instance_name, self._title)
+                thistitle = self._title
             else:
                 _logger.info("Publishing message '[%d/%d] %s: %s'", nb, nbtot, self._instance_name, self._title)
+                thistitle = self._title + ' [%d/%d]' % (nb,nbtot)
             _message_details = oci_sdk.ons.models.MessageDetails(body=chunk, title=self._instance_name
                                                                                    + ':'
-                                                                                   + 'self._title)
+                                                                                   + thistitle)
             request_id = uuid.uuid4().hex
             _logger.debug('Message request id: %s', request_id)
             publish_message_response = self._ons_client.publish_message(topic_id=self._topic,
                                                                         message_details=_message_details,
                                                                         opc_request_id=request_id,
-                                                                        message_type="RAW_TEXT")
+                                                                        message_type='RAW_TEXT')
             if nbtot <= 1:
                 _logger.info("Published message '%s: %s'", self._instance_name, self._title)
             else:

lib/oci_utils/impl/row_printer.py

@@ -85,14 +85,12 @@ def __init__(self, **kargs):
         self.printer = kargs.get('printer', sys.stdout)
 
     def printHeader(self):
-        """
-        prints the header of the array
-        depend of the implementation
+        """ Prints the header of the array, depend of the implementation
         """
 
     def printRow(self, o):
         """
-        prints a new row
+        Prints a new row
         o can be an arbitrary instance on which all columns attribute will be called
         if o is an dictionnary columns attribute are used as key of the dictionnary
         if o is a list all elements' string representation will be printed in order
@@ -131,7 +129,7 @@ def _getValueForColumn(self, columnIdx, _object):
         :param _object: Object as accepted by printRow
         raise LookupError is value cannot be found
 
-        If current column attribut is a function , call it with _object
+        If current column attribute is a function , call it with _object
         If _object is a list or a tuple, returns the columnIdx'th element of it
         If _object is a dictionary, returns the value associated with key defined in column attribute
         If _object is a Object