Comment 25 for bug 1607714

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix merged to nova (stable/newton)

Reviewed: https://review.openstack.org/470348
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=70c44831a5cdf605365a0b60994e2a458907d27f
Submitter: Jenkins
Branch: stable/newton

commit 70c44831a5cdf605365a0b60994e2a458907d27f
Author: Matt Riedemann <email address hidden>
Date: Thu Feb 9 18:41:11 2017 -0500

    libvirt: fix and break up _test_attach_detach_interface

    The detach_interface flow in this test was broken because
    it wasn't mocking out domain.detachDeviceFlags so the xml
    it was expecting to be passed to that method wasn't actually
    being verified. The same thing is broken in test
    test_detach_interface_device_with_same_mac_address because
    it copies the other broken test code.

    This change breaks apart the monster attach/detach test method
    and converts the detach_interface portion to mock and fixes
    the broken assertion.

    test_detach_interface_device_with_same_mac_address is just
    fixed, not converted to mock.

    Conflicts:
          nova/tests/unit/virt/libvirt/test_driver.py

    NOTE(mriedem): The conflict is due to change
    I5c461a8242c51994d12ce9c6774d5f956232f950 not being in Newton.

    Change-Id: I6d9a975876c5652ef544c587f65b1bdd1543848b
    Related-Bug: #1607714
    (cherry picked from commit 1ecd71b08d14450e475dc9512d40828da6fcfe15)
    (cherry picked from commit c0820944ea8554f5b1db0d538781caf0e75b6b0e)