Unit test get_disk_mapping_rescue_with_config error in AArch64

[Kevin Zhao]

nova.tests.unit.virt.libvirt.test_blockinfo.LibvirtBlockInfoTest.test_get_disk_mapping_rescue_with_config
---------------------------------------------------------------------------------------------------------

Captured traceback:
~~~~~~~~~~~~~~~~~~~
    Traceback (most recent call last):
      File "nova/tests/unit/virt/libvirt/test_blockinfo.py", line 265, in test_get_disk_mapping_rescue_with_config
        self.assertEqual(expect, mapping)
      File "/opt/stack/nova/.tox/py27/local/lib/python2.7/site-packages/testtools/testcase.py", line 411, in assertEqual
        self.assertThat(observed, matcher, message)
      File "/opt/stack/nova/.tox/py27/local/lib/python2.7/site-packages/testtools/testcase.py", line 498, in assertThat
        raise mismatch_error
    testtools.matchers._impl.MismatchError: !=:
    reference = {'disk': {'bus': 'virtio', 'dev': 'vdb', 'type': 'disk'},
     'disk.config.rescue': {'bus': 'ide', 'dev': 'hda', 'type': 'cdrom'},
     'disk.rescue': {'boot_index': '1',
                     'bus': 'virtio',
                     'dev': 'vda',
                     'type': 'disk'},
     'root': {'boot_index': '1', 'bus': 'virtio', 'dev': 'vda', 'type': 'disk'}}
    actual = {'disk': {'bus': 'virtio', 'dev': 'vdb', 'type': 'disk'},
     'disk.config.rescue': {'bus': 'scsi', 'dev': 'sda', 'type': 'cdrom'},
     'disk.rescue': {'boot_index': '1',
                     'bus': 'virtio',
                     'dev': 'vda',
                     'type': 'disk'},
     'root': {'boot_index': '1', 'bus': 'virtio', 'dev': 'vda', 'type': 'disk'}}

                            'type': 'disk', 'boot_index': '1'},

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/494156

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/494156
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=a7a04e273e477f13dea59c1c3b5aab8c41e041e5
Submitter: Zuul
Branch: master

commit a7a04e273e477f13dea59c1c3b5aab8c41e041e5
Author: Kevin Zhao <email address hidden>
Date: Mon Jan 8 13:40:02 2018 +0800

    Modify the test case of get_disk_mapping_rescue_with_config

    Now running the test on AArch64 will get mismatch error, since
    the default cdrom type on AArch64 is scsi, while the default cdrom
    on X86 is ide, so I tweak the test and add AArch64 support.

    Closes-bug: #1711093

    Change-Id: I552f164107824fa28bfb47974c737da7d0f47e15
    Signed-off-by: Kevin Zhao <email address hidden>

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/nova 17.0.0.0rc1 release candidate.