~cgrabowski/maas:fix_vlan_discovery_3.2

Branch merges

Propose for merging

Merged into maas:3.2

Alberto Donato (community): Approve on 2022-06-20

MAAS Lander: Approve on 2022-06-17

Diff: 71 lines (+7/-15)

3 files modified

src/maasserver/models/interface.py (+2/-10)
src/maasserver/models/tests/test_interface.py (+2/-2)
src/maasserver/models/tests/test_node.py (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

14202cb... by Christian Grabowski on 2022-06-17

update report_neighbours test

(cherry picked from commit 50f817870f78b6fadfe6f7c0e371d92ef7a93d0c)

71deab0... by Christian Grabowski on 2022-06-17

ignore observed vlan if already exists

(cherry picked from commit 717044811f229360753ea10ff32f91ea897f16ec)

dd168ee... by Alberto Donato on 2022-06-15

962449ecd backport: set the IP address, not the ID in exclude list

IDs were erroneously added to the list of IPs to exclude. This was not failing
before because the netaddr library was accepting "entry in network" with entry
being an integer (which gets silently converted to an IP).
Newer netaddr versions actually blow up on this.
The exclude list was intended to contain actual addresses, not database IDs.

3267def... by Christian Grabowski on 2022-06-09

Prepare for 3.2.0 RC1 release

63d4556... by Alberto Donato on 2022-06-09

move performance tests so they're easier to select/skip for runners

    Drop the marker for performance tests and move them under src/maasperf.
    bin/pytest doesn't look there by default, while the bin/test.perf runner only runs tests under that tree.

    (cherry picked from commit fa5728e6ad5e902f01bfc2d0cd85e021c6b85bd7)

a3a9891... by Anton Troyanov on 2022-06-09

fix: LP:1978121

(cherry picked from commit 6176efa5311b0908c33f81f5ce9417fd48916e1b)

78b211c... by Anton Troyanov on 2022-06-09

fix: LP:1978072

(cherry picked from commit 62936012cc482228f6df828bd047cc639707d59d)

072e44b... by Anton Troyanov on 2022-06-09

fix(redfish): backport redfish fixes to 3.2

fix: LP:1977864

(cherry picked from commit 2a809b6738e209e55b27c597f8182afbf8241662)

fix: LP:1977866

(cherry picked from commit c0bf73e7678b79b7de50c3bd3223c54198d0c5e0)

fix: LP:1977942

(cherry picked from commit b67298258b44c20ab0b95bb89eb53e08299c4ca8)

fix: LP:1977951

(cherry picked from commit 51eb53d51c86d1551feaf6ace317d043ee0deba5)

d42be34... by Anton Troyanov on 2022-06-07

feat(redfish): detect redfish in bmc_config

(cherry picked from commit 7d11ef2c4af03b65bf8be988a370b99c81bcaedf)

LP:1977822 fix wrong method name

(cherry picked from commit 0ffc9a9491d69f71b94a83b6975c2517fec69f40)

7eaf62b... by Anton Troyanov on 2022-06-07

feat(tests): fake pci and usb devices for network

Create devices under pci and usb when creating neworks in order to fully replicate machine-resources output.

(cherry picked from commit 9772187c7b87957ce54de09952eb45725408b98c)