Merge pull request #177 from smira/network-conf

Allow parsed CNI config to be passed in

Author: kzys

network.go

@@ -227,11 +227,18 @@ type NetworkInterface struct {
 // Currently, CNIConfiguration can only be specified for VMs that have a
 // single network interface.
 type CNIConfiguration struct {
-	// NetworkName (required) corresponds to the "name" parameter in the
-	// CNI spec's Network Configuration List structure. It selects the name
+	// NetworkName (either NetworkName or NetworkConfig are required)
+	// corresponds to the "name" parameter in the CNI spec's
+	// Network Configuration List structure. It selects the name
 	// of the network whose configuration will be used when invoking CNI.
 	NetworkName string
 
+	// NetworkConfig (either NetworkName or NetworkConfig are required)
+	// replaces the NetworkName with parsed CNI network configuration
+	// skipping the requirement to store network config file in CNI
+	// configuration directory.
+	NetworkConfig *libcni.NetworkConfigList
+
 	// IfName (optional) corresponds to the CNI_IFNAME parameter as specified
 	// in the CNI spec. It generally specifies the name of the interface to be
 	// created by a CNI plugin being invoked.
@@ -282,8 +289,12 @@ type CNIConfiguration struct {
 }
 
 func (cniConf CNIConfiguration) validate() error {
-	if cniConf.NetworkName == "" {
-		return errors.Errorf("must specify NetworkName in CNIConfiguration: %+v", cniConf)
+	if cniConf.NetworkName == "" && cniConf.NetworkConfig == nil {
+		return errors.Errorf("must specify either NetworkName or NetworkConfig in CNIConfiguration: %+v", cniConf)
+	}
+
+	if cniConf.NetworkName != "" && cniConf.NetworkConfig != nil {
+		return errors.Errorf("must not specify both NetworkName and NetworkConfig in CNIConfiguration: %+v", cniConf)
 	}
 
 	return nil
@@ -317,10 +328,16 @@ func (cniConf CNIConfiguration) invokeCNI(ctx context.Context, logger *log.Entry
 
 	cniPlugin := libcni.NewCNIConfigWithCacheDir(cniConf.BinPath, cniConf.CacheDir, nil)
 
-	networkConf, err := libcni.LoadConfList(cniConf.ConfDir, cniConf.NetworkName)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to load CNI configuration from dir %q for network %q",
-			cniConf.ConfDir, cniConf.NetworkName), cleanupFuncs
+	networkConf := cniConf.NetworkConfig
+
+	var err error
+
+	if networkConf == nil {
+		networkConf, err = libcni.LoadConfList(cniConf.ConfDir, cniConf.NetworkName)
+		if err != nil {
+			return nil, errors.Wrapf(err, "failed to load CNI configuration from dir %q for network %q",
+				cniConf.ConfDir, cniConf.NetworkName), cleanupFuncs
+		}
 	}
 
 	runtimeConf := cniConf.asCNIRuntimeConf()

network_test.go

@@ -24,6 +24,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/containernetworking/cni/libcni"
 	models "github.com/firecracker-microvm/firecracker-go-sdk/client/models"
 	"github.com/firecracker-microvm/firecracker-go-sdk/fctesting"
 	"github.com/sparrc/go-ping"
@@ -238,7 +239,15 @@ func TestNetworkInterfacesValidationFails_BothSpecified(t *testing.T) {
 	assert.Error(t, err, "invalid network config with both static and cni configuration did not result in validation error")
 }
 
-func TestNetworkMachineCNI(t *testing.T) {
+func TestNetworkMachineCNIWithConfFile(t *testing.T) {
+	testNetworkMachineCNI(t, true)
+}
+
+func TestNetworkMachineCNIWithParsedConfig(t *testing.T) {
+	testNetworkMachineCNI(t, false)
+}
+
+func testNetworkMachineCNI(t *testing.T, useConfFile bool) {
 	if testing.Short() {
 		t.Skip()
 	}
@@ -281,10 +290,23 @@ func TestNetworkMachineCNI(t *testing.T) {
   ]
 }`, networkName)
 
+	var networkConf *libcni.NetworkConfigList
+
 	cniConfPath := filepath.Join(cniConfDir, fmt.Sprintf("%s.conflist", networkName))
-	require.NoError(t,
-		ioutil.WriteFile(cniConfPath, []byte(cniConf), 0666), // broad permissions for tests
-		"failed to write cni conf file")
+	if useConfFile {
+		require.NoError(t,
+			ioutil.WriteFile(cniConfPath, []byte(cniConf), 0666), // broad permissions for tests
+			"failed to write cni conf file")
+	} else {
+		// make sure config file doesn't exist
+		err := os.Remove(cniConfPath)
+		if err != nil && !os.IsNotExist(err) {
+			require.NoError(t, err, "failed to delete cni conf file")
+		}
+
+		networkConf, err = libcni.ConfListFromBytes([]byte(cniConf))
+		require.NoError(t, err, "cni conf should parse")
+	}
 
 	numVMs := 10
 	vmIPs := make(chan string, numVMs)
@@ -304,7 +326,7 @@ func TestNetworkMachineCNI(t *testing.T) {
 		ctx, cancel := context.WithCancel(context.Background())
 		// NewMachine cannot be in the goroutine below, since go-openapi/runtime has a globally-shared mutable logger...
 		// https://github.com/go-openapi/runtime/blob/553c9d1fb273d9550562d9f76949a413af265138/client/runtime.go#L463
-		m := newCNIMachine(t, ctx, firecrackerSockPath, rootfsPath, cniConfDir, cniCacheDir, networkName, ifName, vmID, cniBinPath)
+		m := newCNIMachine(t, ctx, firecrackerSockPath, rootfsPath, cniConfDir, cniCacheDir, networkName, ifName, vmID, cniBinPath, networkConf)
 
 		go func(ctx context.Context, cancel func(), m *Machine, vmID string) {
 			defer vmWg.Done()
@@ -357,12 +379,17 @@ func newCNIMachine(t *testing.T,
 	ifName,
 	vmID string,
 	cniBinPath []string,
+	networkConf *libcni.NetworkConfigList,
 ) *Machine {
 	rootfsBytes, err := ioutil.ReadFile(testRootfs)
 	require.NoError(t, err, "failed to read rootfs file")
 	err = ioutil.WriteFile(rootfsPath, rootfsBytes, 0666)
 	require.NoError(t, err, "failed to copy vm rootfs to %s", rootfsPath)
 
+	if networkConf != nil {
+		networkName = ""
+	}
+
 	cmd := VMCommandBuilder{}.
 		WithSocketPath(firecrackerSockPath).
 		WithBin(getFirecrackerBinaryPath()).
@@ -386,12 +413,13 @@ func newCNIMachine(t *testing.T,
 		},
 		NetworkInterfaces: []NetworkInterface{{
 			CNIConfiguration: &CNIConfiguration{
-				ConfDir:     cniConfDir,
-				BinPath:     cniBinPath,
-				CacheDir:    cniCacheDir,
-				NetworkName: networkName,
-				IfName:      ifName,
-				VMIfName:    "eth0",
+				ConfDir:       cniConfDir,
+				BinPath:       cniBinPath,
+				CacheDir:      cniCacheDir,
+				NetworkName:   networkName,
+				NetworkConfig: networkConf,
+				IfName:        ifName,
+				VMIfName:      "eth0",
 			},
 		}},
 		VMID: vmID,