add optional bridge ip (nanovms#1567)

Author: eyberg

cmd/flags_run_local_instance.go

@@ -19,23 +19,24 @@ import (
 
 // RunLocalInstanceCommandFlags consolidates all command flags required to run a local instance in one struct
 type RunLocalInstanceCommandFlags struct {
-	Accel          bool
-	Bridged        bool
-	BridgeName     string
-	Debug          bool
-	Force          bool
-	GDBPort        int
-	MissingFiles   bool
-	NoTrace        []string
-	Ports          []string
-	SkipBuild      bool
-	Memory         string
-	Smp            int
-	SyscallSummary bool
-	TapName        string
-	Trace          bool
-	Verbose        bool
-	Arch           string
+	Accel           bool
+	Bridged         bool
+	BridgeName      string
+	BridgeIPAddress string
+	Debug           bool
+	Force           bool
+	GDBPort         int
+	MissingFiles    bool
+	NoTrace         []string
+	Ports           []string
+	SkipBuild       bool
+	Memory          string
+	Smp             int
+	SyscallSummary  bool
+	TapName         string
+	Trace           bool
+	Verbose         bool
+	Arch            string
 }
 
 // MergeToConfig overrides configuration passed by argument with command flags values
@@ -100,6 +101,10 @@ func (flags *RunLocalInstanceCommandFlags) MergeToConfig(c *types.Config) error
 		c.RunConfig.BridgeName = flags.BridgeName
 	}
 
+	if flags.BridgeIPAddress != "" {
+		c.RunConfig.BridgeIPAddress = flags.BridgeIPAddress
+	}
+
 	if len(flags.NoTrace) > 0 {
 		c.NoTrace = flags.NoTrace
 	}
@@ -236,6 +241,11 @@ func NewRunLocalInstanceCommandFlags(cmdFlags *pflag.FlagSet) (flags *RunLocalIn
 		exitWithError(err.Error())
 	}
 
+	flags.BridgeIPAddress, err = cmdFlags.GetString("bridgeipaddress")
+	if err != nil {
+		exitWithError(err.Error())
+	}
+
 	flags.Trace, err = cmdFlags.GetBool("trace")
 	if err != nil {
 		exitWithError(err.Error())
@@ -260,6 +270,7 @@ func PersistRunLocalInstanceCommandFlags(cmdFlags *pflag.FlagSet) {
 	cmdFlags.BoolP("verbose", "v", false, "verbose")
 	cmdFlags.BoolP("bridged", "b", false, "bridge networking")
 	cmdFlags.StringP("bridgename", "", "", "bridge name")
+	cmdFlags.StringP("bridgeipaddress", "", "", "bridge ip address")
 	cmdFlags.StringP("tapname", "t", "", "tap device name")
 	cmdFlags.BoolP("skipbuild", "s", false, "skip building image")
 	cmdFlags.Bool("accel", true, "use cpu virtualization extension")

cmd/run_local_instance.go

@@ -29,6 +29,7 @@ func RunLocalInstance(c *types.Config) (err error) {
 	tapDeviceName := c.RunConfig.TapName
 	bridged := c.RunConfig.Bridged
 	ipaddress := c.RunConfig.IPAddress
+	bridgeipaddress := c.RunConfig.BridgeIPAddress
 	netmask := c.RunConfig.NetMask
 
 	bridgeName := c.RunConfig.BridgeName
@@ -39,7 +40,7 @@ func RunLocalInstance(c *types.Config) (err error) {
 	networkService := network.NewIprouteNetworkService()
 
 	if tapDeviceName != "" {
-		err = network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, ipaddress, netmask)
+		err = network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, ipaddress, netmask, bridgeipaddress)
 		if err != nil {
 			return
 		}

network/setup_network_interfaces.go

@@ -26,7 +26,7 @@ type Service interface {
 }
 
 // SetupNetworkInterfaces changes network configuration to support requirements
-func SetupNetworkInterfaces(network Service, tapDeviceName string, bridgeName string, ipaddress string, netmask string) error {
+func SetupNetworkInterfaces(network Service, tapDeviceName string, bridgeName string, ipaddress string, netmask string, bridgeipaddress string) error {
 
 	tapExists, err := network.CheckNetworkInterfaceExists(tapDeviceName)
 	if err != nil {
@@ -55,9 +55,14 @@ func SetupNetworkInterfaces(network Service, tapDeviceName string, bridgeName st
 		}
 
 		if ipaddress != "" {
+
 			ip := net.ParseIP(ipaddress).To4()
+
 			ip[3] = byte(66) // 66 is a random IP
 			bridgeIP := ip.String()
+			if bridgeipaddress != "" {
+				bridgeIP = net.ParseIP(bridgeipaddress).To4().String()
+			}
 
 			currentBridgeIP, err := network.GetNetworkInterfaceIP(bridgeName)
 			if err != nil {

network/setup_network_interfaces_test.go

@@ -34,7 +34,7 @@ func TestSetupNetworkInterfaces(t *testing.T) {
 			TurnNIUp(tapDeviceName).
 			Return("success", nil)
 
-		network.SetupNetworkInterfaces(networkService, tapDeviceName, "", "", "")
+		network.SetupNetworkInterfaces(networkService, tapDeviceName, "", "", "", "")
 	})
 
 	t.Run("should not create tap or turn it on if it already exists and is active", func(t *testing.T) {
@@ -51,7 +51,7 @@ func TestSetupNetworkInterfaces(t *testing.T) {
 			IsNIUp(tapDeviceName).
 			Return(true, nil)
 
-		network.SetupNetworkInterfaces(networkService, tapDeviceName, "", "", "")
+		network.SetupNetworkInterfaces(networkService, tapDeviceName, "", "", "", "")
 	})
 
 	t.Run("should turn the tap up if it exists and is not active", func(t *testing.T) {
@@ -73,7 +73,7 @@ func TestSetupNetworkInterfaces(t *testing.T) {
 			TurnNIUp(tapDeviceName).
 			Return("success", nil)
 
-		network.SetupNetworkInterfaces(networkService, tapDeviceName, "", "", "")
+		network.SetupNetworkInterfaces(networkService, tapDeviceName, "", "", "", "")
 	})
 
 	t.Run("should create bridge and turn it up if it does not exist and add tap to bridge network", func(t *testing.T) {
@@ -121,7 +121,7 @@ func TestSetupNetworkInterfaces(t *testing.T) {
 			IsNIUp(tapDeviceName).
 			Return(true, nil)
 
-		network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, "", "")
+		network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, "", "", "")
 	})
 
 	t.Run("should set IP in bridge if it already exists", func(t *testing.T) {
@@ -169,7 +169,7 @@ func TestSetupNetworkInterfaces(t *testing.T) {
 			IsNIUp(tapDeviceName).
 			Return(true, nil)
 
-		network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, "192.168.1.100", "255.255.255.0")
+		network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, "192.168.1.100", "255.255.255.0", "")
 	})
 
 	t.Run("should not set IP in bridge if it is already set", func(t *testing.T) {
@@ -207,7 +207,7 @@ func TestSetupNetworkInterfaces(t *testing.T) {
 			IsNIUp(tapDeviceName).
 			Return(true, nil)
 
-		network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, "192.168.1.100", "255.255.255.0")
+		network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, "192.168.1.100", "255.255.255.0", "")
 	})
 
 }

provider/onprem/onprem_instance.go

@@ -62,6 +62,7 @@ func (p *OnPrem) createInstance(ctx *lepton.Context) (string, error) {
 		bridged := c.RunConfig.Bridged
 		ipaddress := c.RunConfig.IPAddress
 		netmask := c.RunConfig.NetMask
+		bridgeipaddress := c.RunConfig.BridgeIPAddress
 
 		bridgeName := c.RunConfig.BridgeName
 		if bridged && bridgeName == "" {
@@ -71,7 +72,7 @@ func (p *OnPrem) createInstance(ctx *lepton.Context) (string, error) {
 		networkService := network.NewIprouteNetworkService()
 
 		if tapDeviceName != "" {
-			err := network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, ipaddress, netmask)
+			err := network.SetupNetworkInterfaces(networkService, tapDeviceName, bridgeName, ipaddress, netmask, bridgeipaddress)
 			if err != nil {
 				return "", err
 			}

types/config.go

@@ -291,6 +291,10 @@ type RunConfig struct {
 	// in use. This also enables KVM acceleration.
 	Bridged bool `json:",omitempty"`
 
+	// BridgeIPAddress is an optional ip address for a bridge when used
+	// w/ops run.
+	BridgeIPAddress string `json:",omitempty"`
+
 	// BridgeName
 	BridgeName string `json:",omitempty"`