From 4c764f3d2829d40ba177bcf517816f6818dba8e2 Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Mon, 8 Apr 2019 12:04:11 -0700 Subject: [PATCH 1/3] network: Make tcfilter model as default tcfilter requires no changes to the interface provided by the network plugin and supports a larger set of plugins. Fixes #1501 Signed-off-by: Archana Shinde --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 51e5fd0f97..224cb7fb3d 100644 --- a/Makefile +++ b/Makefile @@ -213,7 +213,7 @@ ifneq (,$(QEMUCMD)) # qemu-specific options (all should be suffixed by "_QEMU") DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi - DEFNETWORKMODEL_QEMU := macvtap + DEFNETWORKMODEL_QEMU := tcfilter KERNELNAME_QEMU = $(call MAKE_KERNEL_NAME,$(KERNELTYPE)) KERNELPATH_QEMU = $(KERNELDIR)/$(KERNELNAME_QEMU) endif From 749d84cd21525fc45849bc477a07ac36449a0b7e Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Fri, 12 Apr 2019 11:43:20 -0700 Subject: [PATCH 2/3] network: Change the package level network default Change the package level default network model to tcfilter. Signed-off-by: Archana Shinde --- virtcontainers/network.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtcontainers/network.go b/virtcontainers/network.go index 777d12fec2..73687d5836 100644 --- a/virtcontainers/network.go +++ b/virtcontainers/network.go @@ -110,7 +110,7 @@ func (n *NetInterworkingModel) SetModel(modelName string) error { // DefaultNetInterworkingModel is a package level default // that determines how the VM should be connected to the // the container network interface -var DefaultNetInterworkingModel = NetXConnectMacVtapModel +var DefaultNetInterworkingModel = NetXConnectTCFilterModel // Introduces constants related to networking const ( From 8874e25c4a952af78f7bc3bfcba0b9d7def8da4e Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Tue, 9 Apr 2019 02:04:44 -0700 Subject: [PATCH 3/3] cli: fix kata-check test We don't really require nested nor unrestricted_guest to run. And there is no point validating host cpu properties in UT. Fixes: #1508 Signed-off-by: Peng Tao --- cli/kata-check_amd64_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/kata-check_amd64_test.go b/cli/kata-check_amd64_test.go index 8cb06167fb..d41d320e96 100644 --- a/cli/kata-check_amd64_test.go +++ b/cli/kata-check_amd64_test.go @@ -215,7 +215,7 @@ func TestCheckCheckKernelModulesNoNesting(t *testing.T) { assert.NoError(err) assert.Equal(count, uint32(0)) - re := regexp.MustCompile(`\bwarning\b.*\bnested\b`) + re := regexp.MustCompile(`.*\bnested\b`) matches := re.FindAllStringSubmatch(buf.String(), -1) assert.NotEmpty(matches) } @@ -309,7 +309,7 @@ func TestCheckCheckKernelModulesNoUnrestrictedGuest(t *testing.T) { assert.NoError(err) assert.Equal(count, uint32(0)) - re := regexp.MustCompile(`\bwarning\b.*\bunrestricted_guest\b`) + re := regexp.MustCompile(`.*\bunrestricted_guest\b`) matches := re.FindAllStringSubmatch(buf.String(), -1) assert.NotEmpty(matches) }