oci-utils 0.12.6-12c

Author: guido tijskens

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

@@ -761,6 +761,7 @@ def display_attached_volumes(oci_sess, iscsiadm_session, disks, output_mode, det
         print("List info from Cloud instead(No boot volume).")
         print("")
         _display_oci_volume_list(oci_vols, output_mode, details, truncate)
+        return
 
     _cols = ['Target',
              'Volume Name',
@@ -846,6 +847,7 @@ def display_attached_volumes(oci_sess, iscsiadm_session, disks, output_mode, det
             iscsi_dev_printer.rowBreak()
         iscsi_dev_printer.printFooter()
         iscsi_dev_printer.finish()
+    return
 
 
 # def display_detached_iscsi_device(iqn, targets, attach_failed=()):

tests/test_cli_network_config_attach.py

@@ -142,7 +142,8 @@ def test_attach_detach_vnic(self):
             time.sleep(self.waittime)
             vn_ocid = self._get_vnic_ocid(self.vnic_name)
             new_ipv4 = _get_ip_from_response(create_data)[0]
-            self.assertEqual(subprocess.check_output([self.oci_net_config, 'detach-vnic', '--ocid', vn_ocid]).decode('utf-8'), '')
+            detach_data = subprocess.check_output([self.oci_net_config, 'detach-vnic', '--ocid', vn_ocid]).decode('utf-8')
+            self.assertIn('is detached', detach_data, '')
             time.sleep(self.waittime)
         except Exception as e:
             self.fail('Execution oci-network-config attach detach has failed: %s' % str(e))
@@ -160,14 +161,17 @@ def test_add_remove_secondary_ip_0(self):
             self.assertIn('Creating', subprocess.check_output([self.oci_net_config, 'attach-vnic', '--name', self.vnic_name]).decode('utf-8'), 'attach vnic failed')
             time.sleep(self.waittime)
             vn_ocid = self._get_vnic_ocid(self.vnic_name)
-            response = subprocess.check_output([self.oci_net_config, 'add-secondary-addr, --ocid', vn_ocid]).decode('utf-8'),
-            self.assertIn('Provisioning secondary private IP', response, 'adding secondary ip failed')
-            new_ip = _get_ip_from_response(response)[0]
+            response = subprocess.check_output([self.oci_net_config, 'add-secondary-addr','--ocid', vn_ocid]).decode('utf-8').splitlines()
+            self.assertIn('Provisioning secondary private', response[0], 'adding secondary ip failed')
+            new_ip = _get_ip_from_response(response[0])
             time.sleep(self.waittime)
-            self.assertIn('Deconfigure secondary private IP', subprocess.check_output([self.oci_net_config, 'remove-secondary-addr', '--ip-address', new_ip]).decode('utf-8'), 'remove secondary ip failed')
+            response = subprocess.check_output([self.oci_net_config, 'remove-secondary-addr', '--ip-address', new_ip]).decode('utf-8').splitlines()
+            self.assertIn('Deconfigure secondary private', response[0], 'remove secondary ip failed')
             time.sleep(self.waittime)
-            self.assertEqual(subprocess.check_output([self.oci_net_config, 'detach-vnic', '--ocid', vn_ocid]).decode('utf-8'), '')
+            detach_data = subprocess.check_output([self.oci_net_config, 'detach-vnic', '--ocid', vn_ocid]).decode('utf-8')
+            self.assertIn('is detached', detach_data, '')
             time.sleep(self.waittime)
+
         except Exception as e:
             self.fail('Execution oci-network-config attach detach has failed: %s' % str(e))