OVN external addresses on `lxc network list-allocations` #14210

hamistao · 2024-10-04T20:40:30Z

This also adds a network field to each network allocation, indicating to which network each allocated address belongs.
Closes #13412

Example:

$ lxc network list-allocations          
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
|       USED BY        |                  ADDRESS                   | NETWORK |   TYPE   | NAT  | HARDWARE ADDRESS  |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
| /1.0/networks/lxdbr0 | 10.26.240.1/24                             | lxdbr0  | network  | true |                   |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
| /1.0/networks/lxdbr0 | fd42:c38d:53ad:cf4f::1/64                  | lxdbr0  | network  | true |                   |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
| /1.0/networks/ovn    | 10.26.240.160/32                           | lxdbr0  | uplink   | true |                   |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
| /1.0/networks/ovn    | fd42:c38d:53ad:cf4f:216:3eff:fe9d:3aa8/128 | lxdbr0  | uplink   | true |                   |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
| /1.0/instances/env   | fd42:c38d:53ad:cf4f:216:3eff:fecd:31c5/128 | lxdbr0  | instance | true | 00:16:3e:cd:31:c5 |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
| /1.0/instances/vm1   | fd42:c38d:53ad:cf4f:216:3eff:fe92:5d6f/128 | lxdbr0  | instance | true | 00:16:3e:92:5d:6f |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
| /1.0/instances/env   | 10.26.240.157/32                           | lxdbr0  | instance | true | 00:16:3e:cd:31:c5 |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
| /1.0/networks/ovn    | 10.14.146.1/24                             | ovn     | network  | true |                   |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+
| /1.0/networks/ovn    | fd42:70da:489e:43ac::1/64                  | ovn     | network  | true |                   |
+----------------------+--------------------------------------------+---------+----------+------+-------------------+

github-actions · 2024-10-04T23:33:24Z

Heads up @mionaalex - the "Documentation" label was applied to this issue.

tomponline · 2024-10-07T09:59:23Z

there's a spelling error (either needs quoting or specified as OVN)

hamistao · 2024-10-07T11:07:30Z

@tomponline Sorry, could you please point out where the spelling error is?
Also, this is ready for a full review.
Tests were included in canonical/lxd-ci#308

tomponline · 2024-10-07T14:37:38Z

its in https://github.com/canonical/lxd/actions/runs/11188403618/job/31107114807?pr=14210

hamistao · 2024-10-08T19:20:42Z

@tomponline All green here, ready for a review!

Edit: Tests went back to failing :(
Still pretty sure they are failing for reasons outside the scope of this PR, so feel free to take a look here when you can

tomponline · 2024-10-09T07:24:12Z

please can you rebase

hamistao · 2024-10-10T05:05:45Z

@tomponline Now rebased and all green, ready for a review when you have the time
As a reminedr, tests are included in canonical/lxd-ci#308

tomponline · 2024-10-14T10:29:18Z

doc/api-extensions.md

@@ -2501,3 +2501,9 @@ Expands APIs under `/1.0/auth` to include:
  The caller must provide a base64 encoded x509 certificate in the `certificate` field of the request body.
  Fine-grained TLS identities may update their own certificate.
  To update the certificate of another identity, the caller must have `can_edit` on the identity.
+
+## `list_ovn_uplink_allocations`


Should be called something like network_allocations_ovn_uplink so it aligns with "thing_feature" style and with the earlier "network_allocations" extension.

tomponline · 2024-10-14T10:31:34Z

lxd/network/driver_bridge.go

@@ -3483,7 +3483,7 @@ func (n *bridge) Leases(projectName string, clientType request.ClientType) ([]ap
 						v := network.Config[k]
 						if v != "" {
 							leases = append(leases, api.NetworkLease{
-								Hostname: fmt.Sprintf("%s-%s.uplink", projectName, network.Name),
+								Hostname: fmt.Sprintf("%s/%s.uplink", projectName, network.Name),


/ is not valid character to include in hostname values.

Also its an API break.

lxd/network_allocations.go

tomponline · 2024-10-14T10:36:06Z

doc/rest-api.yaml

@@ -3127,24 +3127,28 @@ definitions:
            e.g, instance, network forward, load-balancer, network...
        properties:
            addresses:
-                description: The network address of the allocation (in CIDR format)
+                description: The network address of the allocation (in CIDR format).


Looking at the existing rest-api.yaml the vast majority of description entries do not end with fullstop.

I tend to check what is the most consistent existing format before changing something like this.

It looks like we should be removing all full stops from end of these descriptions rather than adding them.

Sorry about that, I just followed the first other example I found instead of looking at many instances

tomponline

some changes to be made, and i think we should discuss the project issue together.

Please can you flag any API breaks in the future just in case I dont notice them. thanks!

tomponline · 2024-10-17T08:02:30Z

How are you doing with this @hamistao ?

hamistao · 2024-10-17T11:57:03Z

@tomponline Tests passing and ready for a review, sorry for the delay

Signed-off-by: hamistao <[email protected]>

This populates the new `HostProject` field accordingly and also supports calling `Leases` with an empty project name, which returns leases from all projects. Signed-off-by: hamistao <[email protected]>

This is needed to also show leases for instances that are in project other than the network's project. Signed-off-by: hamistao <[email protected]>

This also uses the correct project for instance leases, instead of assuming the instance is always on the same project as the network. Signed-off-by: hamistao <[email protected]>

Also puts a full stop in comments Signed-off-by: hamistao <[email protected]>

Signed-off-by: hamistao <[email protected]>

tomponline

Ta!

) Depending on canonical/lxd#14210

github-actions bot added Documentation Documentation needs updating API Changes to the REST API labels Oct 4, 2024

hamistao mentioned this pull request Oct 5, 2024

Test OVN external addresses show on lxc network list-allocations canonical/lxd-ci#308

Merged

hamistao marked this pull request as ready for review October 7, 2024 10:15

hamistao force-pushed the list-ovn-routers branch 4 times, most recently from 96a7b1e to ebd8e3a Compare October 8, 2024 17:10

hamistao force-pushed the list-ovn-routers branch 2 times, most recently from fd0798c to 3d5c988 Compare October 9, 2024 02:27

hamistao force-pushed the list-ovn-routers branch 5 times, most recently from 41082b4 to 4e4612e Compare October 9, 2024 23:01

tomponline reviewed Oct 14, 2024

View reviewed changes

lxd/network_allocations.go Outdated Show resolved Hide resolved

tomponline reviewed Oct 14, 2024

View reviewed changes

tomponline requested changes Oct 14, 2024

View reviewed changes

hamistao force-pushed the list-ovn-routers branch 3 times, most recently from 79bafa2 to 5545914 Compare October 15, 2024 12:53

hamistao marked this pull request as draft October 16, 2024 05:01

hamistao force-pushed the list-ovn-routers branch 7 times, most recently from 213603a to 1fdf2d6 Compare October 17, 2024 05:16

hamistao force-pushed the list-ovn-routers branch from 1fdf2d6 to 7aa4291 Compare October 17, 2024 11:05

hamistao added 13 commits October 17, 2024 09:06

api: network_allocations_ovn_uplink API extension

16d3267

Signed-off-by: hamistao <[email protected]>

shared/api: Add Project field to leases

f4ced89

Signed-off-by: hamistao <[email protected]>

lxc/network/driver_ovn: Adapt Leases for ovn network

54a0a96

This populates the new `HostProject` field accordingly and also supports calling `Leases` with an empty project name, which returns leases from all projects. Signed-off-by: hamistao <[email protected]>

lxc/network/driver_bridge: Adapt Leases for bridge network

5d29802

This populates the new `HostProject` field accordingly and also supports calling `Leases` with an empty project name, which returns leases from all projects. Signed-off-by: hamistao <[email protected]>

lxd/network_allocations: Get leases from all projects

29990ce

This is needed to also show leases for instances that are in project other than the network's project. Signed-off-by: hamistao <[email protected]>

lxd/network_allocations: Include OVN uplink allocations

3fcdc76

This also uses the correct project for instance leases, instead of assuming the instance is always on the same project as the network. Signed-off-by: hamistao <[email protected]>

shared/api: Add Network to NetworkAllocations

c2080bd

Also puts a full stop in comments Signed-off-by: hamistao <[email protected]>

lxd/network_allocations: Populate Network field

cb2b230

Signed-off-by: hamistao <[email protected]>

lxc: Show allocation network

18a8a33

Signed-off-by: hamistao <[email protected]>

doc: Run make update-api

650098a

Signed-off-by: hamistao <[email protected]>

i18n: Update translation templates.

4e99424

Signed-off-by: hamistao <[email protected]>

i18n: Update translations.

5d5a884

Signed-off-by: hamistao <[email protected]>

test: Test showing instances from different projects

7dd9908

Signed-off-by: hamistao <[email protected]>

hamistao force-pushed the list-ovn-routers branch from 7aa4291 to 7dd9908 Compare October 17, 2024 12:07

tomponline marked this pull request as ready for review October 17, 2024 12:11

tomponline approved these changes Oct 17, 2024

View reviewed changes

tomponline merged commit 2199e24 into canonical:main Oct 17, 2024
27 checks passed

tomponline added a commit to canonical/lxd-ci that referenced this pull request Nov 5, 2024

Test OVN external addresses show on lxc network list-allocations (#308

2c3c5db

) Depending on canonical/lxd#14210

hamistao deleted the list-ovn-routers branch November 22, 2024 17:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OVN external addresses on `lxc network list-allocations` #14210

OVN external addresses on `lxc network list-allocations` #14210

hamistao commented Oct 4, 2024 •

edited

Loading

github-actions bot commented Oct 4, 2024

tomponline commented Oct 7, 2024

hamistao commented Oct 7, 2024 •

edited

Loading

tomponline commented Oct 7, 2024

hamistao commented Oct 8, 2024 •

edited

Loading

tomponline commented Oct 9, 2024

hamistao commented Oct 10, 2024 •

edited

Loading

tomponline Oct 14, 2024

tomponline Oct 14, 2024

tomponline Oct 14, 2024

hamistao Oct 14, 2024

tomponline left a comment

tomponline commented Oct 17, 2024

hamistao commented Oct 17, 2024

tomponline left a comment

OVN external addresses on lxc network list-allocations #14210

OVN external addresses on lxc network list-allocations #14210

Conversation

hamistao commented Oct 4, 2024 • edited Loading

github-actions bot commented Oct 4, 2024

tomponline commented Oct 7, 2024

hamistao commented Oct 7, 2024 • edited Loading

tomponline commented Oct 7, 2024

hamistao commented Oct 8, 2024 • edited Loading

tomponline commented Oct 9, 2024

hamistao commented Oct 10, 2024 • edited Loading

tomponline Oct 14, 2024

Choose a reason for hiding this comment

tomponline Oct 14, 2024

Choose a reason for hiding this comment

tomponline Oct 14, 2024

Choose a reason for hiding this comment

hamistao Oct 14, 2024

Choose a reason for hiding this comment

tomponline left a comment

Choose a reason for hiding this comment

tomponline commented Oct 17, 2024

hamistao commented Oct 17, 2024

tomponline left a comment

Choose a reason for hiding this comment

OVN external addresses on `lxc network list-allocations` #14210

OVN external addresses on `lxc network list-allocations` #14210

hamistao commented Oct 4, 2024 •

edited

Loading

hamistao commented Oct 7, 2024 •

edited

Loading

hamistao commented Oct 8, 2024 •

edited

Loading

hamistao commented Oct 10, 2024 •

edited

Loading