internal/server: allow creation of OVN network with no uplink

Closes: #1529

Signed-off-by: Winicius Silva <[email protected]>

Author: winiciusallan

internal/server/network/driver_ovn.go

@@ -134,6 +134,12 @@ func (n *ovn) Info() Info {
 }
 
 func (n *ovn) State() (*api.NetworkState, error) {
+	// Check if uplink exists
+	_, err := n.ovnnb.GetLogicalRouter(context.TODO(), n.getRouterName())
+	if err != nil && err == networkOVN.ErrNotFound {
+		return nil, nil
+	}
+
 	var addresses []api.NetworkStateAddress
 	IPv4Net, err := ParseIPCIDRToNet(n.config["ipv4.address"])
 	if err == nil {
@@ -2162,6 +2168,10 @@ func (n *ovn) setup(update bool) error {
 		return fmt.Errorf("Failed parsing router's internal port IPv6 Net: %w", err)
 	}
 
+	if (n.config["network"] != "none") && (routerIntPortIPv4 == nil || routerIntPortIPv6 == nil) {
+		return fmt.Errorf("The bridge addresses must be provided if has uplink network")
+	}
+
 	// Create chassis group.
 	err = n.ovnnb.CreateChassisGroup(context.TODO(), n.getChassisGroupName(), update)
 	if err != nil {
@@ -2172,16 +2182,17 @@ func (n *ovn) setup(update bool) error {
 		revert.Add(func() { _ = n.ovnnb.DeleteChassisGroup(context.TODO(), n.getChassisGroupName()) })
 	}
 
-	// Create logical router.
-	err = n.ovnnb.CreateLogicalRouter(context.TODO(), n.getRouterName(), update)
-	if err != nil {
-		return fmt.Errorf("Failed adding router: %w", err)
-	}
+	if n.config["network"] != "none" {
+		// Create logical router.
+		err = n.ovnnb.CreateLogicalRouter(context.TODO(), n.getRouterName(), update)
+		if err != nil {
+			return fmt.Errorf("Failed adding router: %w", err)
+		}
 
-	if !update {
-		revert.Add(func() { _ = n.ovnnb.DeleteLogicalRouter(context.TODO(), n.getRouterName()) })
+		if !update {
+			revert.Add(func() { _ = n.ovnnb.DeleteLogicalRouter(context.TODO(), n.getRouterName()) })
+		}
 	}
-
 	// Configure logical router.
 
 	// Generate external router port IPs (in CIDR format).
@@ -2401,10 +2412,6 @@ func (n *ovn) setup(update bool) error {
 		intSubnets = append(intSubnets, *routerIntPortIPv6Net)
 	}
 
-	if len(intRouterIPs) <= 0 {
-		return fmt.Errorf("No internal IPs defined for network router")
-	}
-
 	// Create internal logical switch if not updating.
 	err = n.ovnnb.CreateLogicalSwitch(context.TODO(), n.getIntSwitchName(), update)
 	if err != nil {
@@ -2551,22 +2558,24 @@ func (n *ovn) setup(update bool) error {
 		})
 	}
 
-	// Apply router security policy.
-	err = n.logicalRouterPolicySetup(n.ovnnb)
-	if err != nil {
-		return fmt.Errorf("Failed applying router security policy: %w", err)
-	}
-
-	// Create internal router port.
-	err = n.ovnnb.CreateLogicalRouterPort(context.TODO(), n.getRouterName(), n.getRouterIntPortName(), routerMAC, bridgeMTU, intRouterIPs, "", update)
-	if err != nil {
-		return fmt.Errorf("Failed adding internal router port: %w", err)
-	}
+	if n.config["network"] != "none" {
+		// Apply router security policy.
+		err = n.logicalRouterPolicySetup(n.ovnnb)
+		if err != nil {
+			return fmt.Errorf("Failed applying router security policy: %w", err)
+		}
+		fmt.Printf("entrei aqui linha 2575")
+		// Create internal router port.
+		err = n.ovnnb.CreateLogicalRouterPort(context.TODO(), n.getRouterName(), n.getRouterIntPortName(), routerMAC, bridgeMTU, intRouterIPs, "", update)
+		if err != nil {
+			return fmt.Errorf("Failed adding internal router port: %w", err)
+		}
 
-	if !update {
-		revert.Add(func() {
-			_ = n.ovnnb.DeleteLogicalRouterPort(context.TODO(), n.getRouterName(), n.getRouterIntPortName())
-		})
+		if !update {
+			revert.Add(func() {
+				_ = n.ovnnb.DeleteLogicalRouterPort(context.TODO(), n.getRouterName(), n.getRouterIntPortName())
+			})
+		}
 	}
 
 	// Configure DHCP option sets.
@@ -2658,40 +2667,42 @@ func (n *ovn) setup(update bool) error {
 		}
 	}
 
-	// Set IPv6 router advertisement settings.
-	if routerIntPortIPv6Net != nil {
-		adressMode := networkOVN.OVNIPv6AddressModeSLAAC
-		if dhcpV6Subnet != nil {
-			adressMode = networkOVN.OVNIPv6AddressModeDHCPStateless
-			if util.IsTrue(n.config["ipv6.dhcp.stateful"]) {
-				adressMode = networkOVN.OVNIPv6AddressModeDHCPStateful
+	if n.config["network"] != "none" {
+		// Set IPv6 router advertisement settings.
+		if routerIntPortIPv6Net != nil {
+			adressMode := networkOVN.OVNIPv6AddressModeSLAAC
+			if dhcpV6Subnet != nil {
+				adressMode = networkOVN.OVNIPv6AddressModeDHCPStateless
+				if util.IsTrue(n.config["ipv6.dhcp.stateful"]) {
+					adressMode = networkOVN.OVNIPv6AddressModeDHCPStateful
+				}
 			}
-		}
 
-		var recursiveDNSServer net.IP
-		if uplinkNet != nil && len(uplinkNet.dnsIPv6) > 0 {
-			recursiveDNSServer = uplinkNet.dnsIPv6[0] // OVN only supports 1 RA DNS server.
-		}
+			var recursiveDNSServer net.IP
+			if uplinkNet != nil && len(uplinkNet.dnsIPv6) > 0 {
+				recursiveDNSServer = uplinkNet.dnsIPv6[0] // OVN only supports 1 RA DNS server.
+			}
 
-		err = n.ovnnb.UpdateLogicalRouterPort(context.TODO(), n.getRouterIntPortName(), &networkOVN.OVNIPv6RAOpts{
-			AddressMode:        adressMode,
-			SendPeriodic:       true,
-			DNSSearchList:      n.getDNSSearchList(),
-			RecursiveDNSServer: recursiveDNSServer,
-			MTU:                bridgeMTU,
+			err = n.ovnnb.UpdateLogicalRouterPort(context.TODO(), n.getRouterIntPortName(), &networkOVN.OVNIPv6RAOpts{
+				AddressMode:        adressMode,
+				SendPeriodic:       true,
+				DNSSearchList:      n.getDNSSearchList(),
+				RecursiveDNSServer: recursiveDNSServer,
+				MTU:                bridgeMTU,
 
-			// Keep these low until we support DNS search domains via DHCPv4, as otherwise RA DNSSL
-			// won't take effect until advert after DHCPv4 has run on instance.
-			MinInterval: time.Duration(time.Second * 30),
-			MaxInterval: time.Duration(time.Minute * 1),
-		})
-		if err != nil {
-			return fmt.Errorf("Failed setting internal router port IPv6 advertisement settings: %w", err)
-		}
-	} else {
-		err = n.ovnnb.UpdateLogicalRouterPort(context.TODO(), n.getRouterIntPortName(), &networkOVN.OVNIPv6RAOpts{})
-		if err != nil {
-			return fmt.Errorf("Failed removing internal router port IPv6 advertisement settings: %w", err)
+				// Keep these low until we support DNS search domains via DHCPv4, as otherwise RA DNSSL
+				// won't take effect until advert after DHCPv4 has run on instance.
+				MinInterval: time.Duration(time.Second * 30),
+				MaxInterval: time.Duration(time.Minute * 1),
+			})
+			if err != nil {
+				return fmt.Errorf("Failed setting internal router port IPv6 advertisement settings: %w", err)
+			}
+		} else {
+			err = n.ovnnb.UpdateLogicalRouterPort(context.TODO(), n.getRouterIntPortName(), &networkOVN.OVNIPv6RAOpts{})
+			if err != nil {
+				return fmt.Errorf("Failed removing internal router port IPv6 advertisement settings: %w", err)
+			}
 		}
 	}