Merge ~raharper/curtin:fix/lvm-iscsi-dname-checks into curtin:master

[Ryan Harper]

vmtests: adjust lvm_iscsi dnames to match configuration

Previous to dname/bcache changes, we failed to check the correct dname
symlinks.

In test_lvm.py we included a test_dname override to prevent checking dname
on trusty but it failed to call the parent class if we weren't skipping.

Commit 12d7163cea8, make_dname, replaced all of the per-subclass checks
for trusty and added the SkipTest to the base class implementation which
then showed the error.

This change adjusts the dnames to match what's actually generated.

[Ryan Harper (raharper)]

https://jenkins.ubuntu.com/server/view/curtin/job/curtin-vmtest-devel-debug/56/console

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:ac79a4d939294a061b44fe135a4d419a4b40906a
https://jenkins.ubuntu.com/server/job/curtin-ci/908/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/908
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/908
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/908
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/908

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/908/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

Previous to dname/bcache changes, we failed to check the correct dname symlinks.

In test_lvm.py we included a test_dname override to prevent checking dname
on trusty but it failed to call the parent class if we weren't skipping.

Commit 12d7163cea870b7e76f36249ffc5eab7a29c5582, make_dname, replaced all of the
per-subclass checks for trusty and added the SkipTest to the base class
implementation which then showed the error.

This patch adjusts the dnames to match what's actually generated.

4f6e9e9... by Ryan Harper on 2018-04-22

Add debug logging to test_dname base class

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:4f6e9e9d203669a9921e9622f0c2f43fefb10dab
https://jenkins.ubuntu.com/server/job/curtin-ci/909/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/909
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/909
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/909
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/909

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/909/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

review: Approve

[Scott Moser (smoser)]

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/curtin/commit/?id=95813f2e

diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index e89c44e..9dd1a51 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -1289,9 +1289,12 @@ class VMBaseClass(TestCase):
         if not disk_to_check:
             disk_to_check = self.disk_to_check
         if disk_to_check is None:
+            logger.debug('test_dname: no disks to check')
             return
+        logger.debug('test_dname: checking disks: %s', disk_to_check)
         path = self.collect_path("ls_dname")
         if not os.path.exists(path):
+            logger.debug('test_dname: no "ls_dname" file: %s', path)
             return
         contents = util.load_file(path)
         for diskname, part in self.disk_to_check:
diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
index 6b247c5..e94fae3 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -29,8 +29,11 @@ class TestLvmIscsiAbs(TestLvmAbs, TestBasicIscsiAbs):
         'UUID=a98f706b-b064-4682-8eb2-6c2c1284060c': '/mnt/iscsi4',
     }
     disk_to_check = [('main_disk', 1),
-                     ('main_disk', 5),
-                     ('main_disk', 6),
+                     ('main_disk', 2),
+                     ('iscsi_disk1', 5),
+                     ('iscsi_disk1', 6),
+                     ('iscsi_disk2', 5),
+                     ('iscsi_disk2', 6),
                      ('vg1-lv1', 0),
                      ('vg1-lv2', 0),
                      ('vg2-lv3', 0),