Skip to content

Commit

Permalink
Merge "libvirt: remove redundant and broken iscsi volume test"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Apr 25, 2017
2 parents 5450cea + 620e630 commit a3038b6
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions nova/tests/unit/virt/libvirt/volume/test_iscsi.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,6 @@
class LibvirtISCSIVolumeDriverTestCase(
test_volume.LibvirtISCSIVolumeBaseTestCase):

# TODO(mriedem): move this to os-brick
def test_iscsiadm_discover_parsing(self):
# Ensure that parsing iscsiadm discover ignores cruft.

targets = [
["192.168.204.82:3260,1",
("iqn.2010-10.org.openstack:volume-"
"f9b12623-6ce3-4dac-a71f-09ad4249bdd3")],
["192.168.204.82:3261,1",
("iqn.2010-10.org.openstack:volume-"
"f9b12623-6ce3-4dac-a71f-09ad4249bdd4")]]

# This slight wonkiness brought to you by pep8, as the actual
# example output runs about 97 chars wide.
sample_input = """Loading iscsi modules: done
Starting iSCSI initiator service: done
Setting up iSCSI targets: unused
%s %s
%s %s
""" % (targets[0][0], targets[0][1], targets[1][0], targets[1][1])
driver = iscsi.LibvirtISCSIVolumeDriver("none")
out = driver.connector._get_target_portals_from_iscsiadm_output(
sample_input)
self.assertEqual(targets, out)

def test_libvirt_iscsi_driver(self, transport=None):
libvirt_driver = iscsi.LibvirtISCSIVolumeDriver(self.fake_host)
self.assertIsInstance(libvirt_driver.connector,
Expand Down

0 comments on commit a3038b6

Please sign in to comment.