Enable multiple non-IP interface to be connected via tc redirect

e2e/multinet_test.go

@@ -9,72 +9,105 @@ import (
 	"testing"
 
 	"github.com/weaveworks/ignite/e2e/util"
+	api "github.com/weaveworks/ignite/pkg/apis/ignite"
+	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
+	igniteConstants "github.com/weaveworks/ignite/pkg/constants"
+	"github.com/weaveworks/ignite/pkg/dmlegacy"
+	"github.com/weaveworks/ignite/pkg/metadata"
+	"github.com/weaveworks/ignite/pkg/network"
+	"github.com/weaveworks/ignite/pkg/operations"
+	"github.com/weaveworks/ignite/pkg/providers"
+	igniteDocker "github.com/weaveworks/ignite/pkg/providers/docker"
+	"github.com/weaveworks/ignite/pkg/providers/ignite"
+	"github.com/weaveworks/ignite/pkg/runtime"
+	igniteUtil "github.com/weaveworks/ignite/pkg/util"
 	"gotest.tools/assert"
 )
 
-// TestMultipleInterface tests that a VM's can be configured with more than 1 interface
-func TestOneExtraInterface(t *testing.T) {
+var (
+	multinetVM  = "e2e-test-vm-multinet"
+	sanboxImage = "weaveworks/ignite:dev"
+	kernelImage = "weaveworks/ignite-kernel:5.4.108"
+	vmImage     = "weaveworks/ignite-ubuntu"
+)
+
+func startAsyncVM(t *testing.T, intfs []string) (*operations.VMChannels, string) {
+
 	assert.Assert(t, e2eHome != "", "IGNITE_E2E_HOME should be set")
+	igniteUtil.GenericCheckErr(providers.Populate(ignite.Preload))
 
-	vmName := "e2e-test-vm-multinet"
+	_ = igniteDocker.SetDockerRuntime()
+	_ = igniteDocker.SetDockerNetwork()
 
-	igniteCmd := util.NewCommand(t, igniteBin)
-	dockerCmd := util.NewCommand(t, "docker")
+	providers.RuntimeName = runtime.RuntimeDocker
+	providers.NetworkPluginName = network.PluginDockerBridge
+	_ = providers.Populate(ignite.Providers)
 
-	// Clone this repo in a new dir.
-	tempDir, err := ioutil.TempDir("", "ignite-multinet")
+	vm := providers.Client.VMs().New()
+	vm.Status.Runtime.Name = runtime.RuntimeDocker
+	vm.Status.Network.Plugin = network.PluginDockerBridge
+
+	ociRef, err := meta.NewOCIImageRef(sanboxImage)
 	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
+		t.Fatalf("Failed to parse OCI image ref %s: %s", sanboxImage, err)
 	}
-	defer os.RemoveAll(tempDir)
+	vm.Spec.Sandbox.OCI = ociRef
 
-	// Write a VM config with annotations
+	ociRef, err = meta.NewOCIImageRef(kernelImage)
+	if err != nil {
+		t.Fatalf("Failed to parse OCI image ref %s: %s", kernelImage, err)
+	}
+	vm.Spec.Kernel.OCI = ociRef
+	k, _ := operations.FindOrImportKernel(providers.Client, ociRef)
+	vm.SetKernel(k)
 
-	vmConfig := []byte(`---
-apiVersion: ignite.weave.works/v1alpha4
-kind: VM
-metadata:
-  name: e2e-test-vm-multinet
-  annotations:
-    "ignite.weave.works/interface/foo": "tc-redirect"
-spec:
-  image:
-    oci: weaveworks/ignite-ubuntu
-  cpus: 1
-  diskSize: 3GB
-  memory: 800MB
-  ssh: true
-`)
+	ociRef, err = meta.NewOCIImageRef(vmImage)
+	if err != nil {
+		t.Fatalf("Failed to parse OCI image ref %s: %s", vmImage, err)
+	}
+	img, err := operations.FindOrImportImage(providers.Client, ociRef)
+	if err != nil {
+		t.Fatalf("Failed to find OCI image ref %s: %s", ociRef, err)
+	}
+	vm.SetImage(img)
 
-	vmConfigPath := filepath.Join(tempDir, "my-vm.yaml")
-	assert.Check(t, ioutil.WriteFile(vmConfigPath, vmConfig, 0644), "failed to write VM config")
+	vm.Name = multinetVM
+	vm.Spec.SSH = &api.SSH{Generate: true}
 
-	// Clean-up the following VM.
-	defer igniteCmd.New().
-		With("rm", "-f", vmName).
-		Run()
+	_ = metadata.SetNameAndUID(vm, providers.Client)
 
-	// Run VM.
-	igniteCmd.New().
-		WithRuntime("docker").
-		WithNetwork("docker-bridge").
-		With("run").
-		With("--ssh").
-		With("--debug").
-		With("--wait=false").
-		With("--config=" + vmConfigPath).
-		Run()
+	for _, intf := range intfs {
+		vm.SetAnnotation(igniteConstants.IGNITE_INTERFACE_ANNOTATION+intf, "tc-redirect")
+	}
 
-	// Get the VM ID
-	idCmd := igniteCmd.New().
-		With("ps").
-		With("--filter").
-		With(fmt.Sprintf("{{.ObjectMeta.Name}}=%s", vmName)).
-		With("--template={{.ObjectMeta.UID}}")
+	_ = providers.Client.VMs().Set(vm)
 
-	idOut, idErr := idCmd.Cmd.CombinedOutput()
-	assert.Check(t, idErr, fmt.Sprintf("vm id not found: \n%q\n%s", idCmd.Cmd, idOut))
-	vmID := strings.TrimSuffix(string(idOut), "\n")
+	err = dmlegacy.AllocateAndPopulateOverlay(vm)
+	if err != nil {
+		t.Fatalf("Error AllocateAndPopulateOverlay: %s", err)
+	}
+
+	vmChans, err := operations.StartVMNonBlocking(vm, false)
+	if err != nil {
+		t.Fatalf("failed to start a VM: \n%q\n", err)
+	}
+
+	return vmChans, vm.GetUID().String()
+}
+
+// TestMultipleInterface tests that a VM's can be configured with more than 1 interface
+func TestOneExtraInterface(t *testing.T) {
+	assert.Assert(t, e2eHome != "", "IGNITE_E2E_HOME should be set")
+
+	igniteCmd := util.NewCommand(t, igniteBin)
+	dockerCmd := util.NewCommand(t, runtime.RuntimeDocker.String())
+
+	vmChans, vmID := startAsyncVM(t, []string{"foo"})
+
+	// Clean-up the following VM.
+	defer igniteCmd.New().
+		With("rm", "-f", multinetVM).
+		Run()
 
 	fooAddr := "aa:ca:e9:12:34:56"
 	dockerCmd.New().
@@ -87,8 +120,13 @@ spec:
 		With("ip", "link", "set", "foo", "address", fooAddr).
 		Run()
 
+	// check that the VM has started before trying exec
+	if err := <-vmChans.SpawnFinished; err != nil {
+		t.Fatalf("failed to start a VM: \n%q\n", err)
+	}
+
 	eth1Addr := igniteCmd.New().
-		With("exec", vmName).
+		With("exec", multinetVM).
 		With("cat", "/sys/class/net/eth1/address")
 
 	foundEth1Addr, _ := eth1Addr.Cmd.CombinedOutput()