Improvements to OVN interconnect

cmd/incusd/network_integrations.go

@@ -735,11 +735,13 @@ func networkIntegrationValidate(integrationType string, inUse bool, oldConfig ma
 
 		// gendoc:generate(entity=network_integration, group=ovn, key=ovn.transit.pattern)
 		// Specify a Pongo2 template string that represents the transit switch name.
-		// This template gets access to the project name (`projectName`), integration name (`integrationName`) and network name (`networkName`).
+		// This template gets access to the project name (`projectName`),
+		// integration name (`integrationName`), network name (`networkName`)
+		// and peer name (`peerName`).
 		//
 		// ---
 		//  type: string
-		//  defaultdesc: `ts-incus-{{ integrationName }}-{{ projectName }}-{{ networkname }}`
+		//  defaultdesc: `ts-incus-{{ integrationName }}-{{ projectName }}-{{ networkName }}`
 		//  shortdesc: Template for the transit switch name
 		"ovn.transit.pattern": validate.IsAny,
 	}

doc/api-extensions.md

@@ -2578,3 +2578,7 @@ The following new configuration options are introduced:
 ## `oidc_scopes`
 
 This introduces a new `oidc.scopes` server configuration key which can take a comma separate list of OIDC scopes to request from the identity provider.
+
+## `network_integrations_peer_name`
+
+This extends `ovn.transit.pattern` to allow `peerName` as a template variable.

doc/config_options.txt

@@ -1548,11 +1548,13 @@ User keys can be used in search.
 ```
 
 ```{config:option} ovn.transit.pattern network_integration-ovn
-:defaultdesc: "`ts-incus-{{ integrationName }}-{{ projectName }}-{{ networkname }}`"
+:defaultdesc: "`ts-incus-{{ integrationName }}-{{ projectName }}-{{ networkName }}`"
 :shortdesc: "Template for the transit switch name"
 :type: "string"
 Specify a Pongo2 template string that represents the transit switch name.
-This template gets access to the project name (`projectName`), integration name (`integrationName`) and network name (`networkName`).
+This template gets access to the project name (`projectName`),
+integration name (`integrationName`), network name (`networkName`)
+and peer name (`peerName`).
 
 ```
 

internal/server/metadata/configuration.json

@@ -1707,8 +1707,8 @@
 					},
 					{
 						"ovn.transit.pattern": {
-							"defaultdesc": "`ts-incus-{{ integrationName }}-{{ projectName }}-{{ networkname }}`",
-							"longdesc": "Specify a Pongo2 template string that represents the transit switch name.\nThis template gets access to the project name (`projectName`), integration name (`integrationName`) and network name (`networkName`).\n",
+							"defaultdesc": "`ts-incus-{{ integrationName }}-{{ projectName }}-{{ networkName }}`",
+							"longdesc": "Specify a Pongo2 template string that represents the transit switch name.\nThis template gets access to the project name (`projectName`),\nintegration name (`integrationName`), network name (`networkName`)\nand peer name (`peerName`).\n",
 							"shortdesc": "Template for the transit switch name",
 							"type": "string"
 						}

internal/server/network/driver_ovn.go

@@ -5650,6 +5650,7 @@ func (n *ovn) remotePeerCreate(peer api.NetworkPeersPost) error {
 		"projectName":     n.project,
 		"networkName":     n.name,
 		"integrationName": integration.Name,
+		"peerName":        peer.Name,
 	})
 	if err != nil {
 		return err
@@ -5668,9 +5669,16 @@ func (n *ovn) remotePeerCreate(peer api.NetworkPeersPost) error {
 
 	reverter.Add(func() { _ = n.ovnnb.DeleteChassisGroup(ctx, cgName) })
 
+	// Seed the stable random number generator with the transit switch name.
+	// This should cause a reasonable spread of networks on the available IC gateway chassis.
+	r, err := localUtil.GetStableRandomGenerator(tsNameRendered)
+	if err != nil {
+		return fmt.Errorf("Failed generating stable random chassis group priority: %w", err)
+	}
+
 	// Assign some priorities.
-	for i, gateway := range gateways {
-		err = n.ovnnb.SetChassisGroupPriority(ctx, cgName, gateway, 10+i)
+	for _, gateway := range gateways {
+		err = n.ovnnb.SetChassisGroupPriority(ctx, cgName, gateway, r.Intn(ovnChassisPriorityMax+1))
 		if err != nil {
 			return err
 		}
@@ -6115,6 +6123,7 @@ func (n *ovn) remotePeerDelete(peer *api.NetworkPeer) error {
 		"projectName":     n.project,
 		"networkName":     n.name,
 		"integrationName": integration.Name,
+		"peerName":        peer.Name,
 	})
 	if err != nil {
 		return err

internal/version/api.go

@@ -436,6 +436,7 @@ var APIExtensions = []string{
 	"qemu_raw_qmp",
 	"network_load_balancer_health_check",
 	"oidc_scopes",
+	"network_integrations_peer_name",
 }
 
 // APIExtensionsCount returns the number of available API extensions.