~troyanov/maas:fix-2003940-3.3

Branch merges

Propose for merging

Merged into maas:3.3

MAAS Lander: Approve on 2023-04-27

Anton Troyanov: Approve on 2023-04-27

Diff: 73 lines (+33/-3)

2 files modified

src/maasserver/websockets/handlers/machine.py (+15/-3)
src/maasserver/websockets/handlers/tests/test_machine.py (+18/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

478dc73... by Anton Troyanov on 2023-04-27

fix(ws): incorrect storage amount

Combining multiple aggregations with annotate() will yield the wrong results
because joins are used instead of subqueries.

See related Django bug: https://code.djangoproject.com/ticket/10060

Resolves LP:2003940

f9e9b8f... by Eline Maaike De Weerd on 2023-04-14

Update error msgs concerning setting of MAAS URL with correct command for snap
(cherry picked from commit e23e1477affc0aa067b5fa9f59baeeee1b857f65)

9197ee9... by Eline Maaike De Weerd on 2023-04-13

included subnet ids with vlan returns
(please check if it's doing the right thing, was unsure about bug description)
(cherry picked from commit 7e48dfa48c83eddfed5f24e29bdb365881dc1024)

a73a6e2... by Alberto Donato on 2023-04-05

Prepare for 3.3.2 release

491be06... by Anton Troyanov on 2023-03-21

chore(cli): include str(SSLError) in CommandError

(cherry picked from commit 054c51921c64b02def247d8b0c8d7a7b4d1b2616)

0b8aef9... by Anton Troyanov on 2023-03-21

fix(cli): reuse existing CA cert

Resolves LP:2012139

(cherry picked from commit ca3a5d0826694d0d12ff9ab93f813e2be446cb2e)

48d1232... by Anton Troyanov on 2023-03-21

fix(cli): follow maascli import boundaries

- Remove provisioningserver related import
- Move maasserver.vault to a local import
- Update utilities/check-imports for maascli

Resolves LP:1986590

(cherry picked from commit 1f7965043fb2c1586f7d4ba17d3645ffa5a0f8e2)

85d3f6f... by Christian Grabowski on 2023-03-17

ensure needsDNSUpdate is true when there were queued updates
(cherry picked from commit 229f33899ba06b9067067b63b5c72689ab7a44e0)

e78feb4... by Anton Troyanov on 2023-03-17

chore(cli): print SSLError.reason

(cherry picked from commit 1dc51ed9092eb3fcaa8d5bc9f6ec8ee1f886c80e)

0c8cb90... by Anton Troyanov on 2023-03-16

fix(region): use $http_host to read Host header

$http_name
arbitrary request header field;

the last part of a variable name is the field name converted to lower case
with dashes replaced by underscores

Resolves LP:2009186

(cherry picked from commit eff39899eab1331f712aa8c4f9f2004f9aded683)