Merge pull request lxc#456 from stgraber/ovn

Expose OVN logic router name in state API
stgraber · Jan 31, 2024 · ee90200 · ee90200
2 parents b217562 + ea39f32
commit ee90200
Show file tree

Hide file tree

Showing 16 changed files with 638 additions and 570 deletions.
diff --git a/cmd/incus/network.go b/cmd/incus/network.go
@@ -983,6 +983,9 @@ func (c *cmdNetworkInfo) Run(cmd *cobra.Command, args []string) error {
 		fmt.Println("")
 		fmt.Println(i18n.G("OVN:"))
 		fmt.Printf("  %s: %s\n", i18n.G("Chassis"), state.OVN.Chassis)
+		if client.HasExtension("network_state_ovn_lr") {
+			fmt.Printf("  %s: %s\n", i18n.G("Logical router"), state.OVN.LogicalRouter)
+		}
 	}
 
 	return nil

diff --git a/doc/api-extensions.md b/doc/api-extensions.md
@@ -2334,3 +2334,9 @@ It supports the value `stop`, `stateful-stop` and `force-stop`.
 ## `agent_config_drive`
 
 This introduces a new `agent:config` disk `source` which can be used to expose an ISO to the VM guest containing the agent and its configuration.
+
+## `network_state_ovn_lr`
+
+Adds a new `LogicalRouter` field to the `NetworkStateOVN` struct which is part of the `GET /1.0/networks/NAME/state` API.
+
+This is used to get the OVN logical router name.
diff --git a/doc/rest-api.yaml b/doc/rest-api.yaml
@@ -3310,8 +3310,14 @@ definitions:
         properties:
             chassis:
                 description: OVN network chassis name
+                example: server01
                 type: string
                 x-go-name: Chassis
+            logical_router:
+                description: OVN logical router name
+                example: incus-net1-lr
+                type: string
+                x-go-name: LogicalRouter
         type: object
         x-go-package: github.com/lxc/incus/shared/api
     NetworkStateVLAN:

diff --git a/internal/server/network/driver_ovn.go b/internal/server/network/driver_ovn.go
@@ -166,7 +166,10 @@ func (n *ovn) State() (*api.NetworkState, error) {
 		Mtu:       mtu,
 		State:     "up",
 		Type:      "broadcast",
-		OVN:       &api.NetworkStateOVN{Chassis: chassis},
+		OVN: &api.NetworkStateOVN{
+			Chassis:       chassis,
+			LogicalRouter: string(n.getRouterName()),
+		},
 	}, nil
 }
 

diff --git a/internal/version/api.go b/internal/version/api.go
@@ -394,6 +394,7 @@ var APIExtensions = []string{
 	"clustering_evacuation_stop_options",
 	"boot_host_shutdown_action",
 	"agent_config_drive",
+	"network_state_ovn_lr",
 }
 
 // APIExtensionsCount returns the number of available API extensions.