network: simplify signature of podNICFactory

Signed-off-by: Dan Kenigsberg <[email protected]>
bk201 · Mar 5, 2021 · 995acd5 · 995acd5
1 parent be4c288
commit 995acd5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/pkg/virt-launcher/virtwrap/network/network.go b/pkg/virt-launcher/virtwrap/network/network.go
@@ -98,10 +98,7 @@ func SetupPodNetworkPhase1(vmi *v1.VirtualMachineInstance, pid int, cacheFactory
 		if err != nil {
 			return err
 		}
-		podnic, err := podNICFactory(network, cacheFactory)
-		if err != nil {
-			return err
-		}
+		podnic := podNICFactory(cacheFactory)
 		podInterfaceName := getPodInterfaceName(networks, cniNetworks, iface.Name)
 		err = podNIC.PlugPhase1(podnic, vmi, &vmi.Spec.Domain.Devices.Interfaces[i], network, podInterfaceName, pid)
 		if err != nil {
@@ -122,10 +119,7 @@ func SetupPodNetworkPhase2(vmi *v1.VirtualMachineInstance, domain *api.Domain, c
 		if err != nil {
 			return err
 		}
-		podnic, err := podNICFactory(network, cacheFactory)
-		if err != nil {
-			return err
-		}
+		podnic := podNICFactory(cacheFactory)
 		podInterfaceName := getPodInterfaceName(networks, cniNetworks, iface.Name)
 		err = podNIC.PlugPhase2(podnic, vmi, &vmi.Spec.Domain.Devices.Interfaces[i], network, domain, podInterfaceName)
 		if err != nil {
@@ -135,6 +129,6 @@ func SetupPodNetworkPhase2(vmi *v1.VirtualMachineInstance, domain *api.Domain, c
 	return nil
 }
 
-func newpodNIC(network *v1.Network, cacheFactory cache.InterfaceCacheFactory) (podNIC, error) {
-	return &podNICImpl{cacheFactory: cacheFactory}, nil
+func newpodNIC(cacheFactory cache.InterfaceCacheFactory) podNIC {
+	return &podNICImpl{cacheFactory: cacheFactory}
 }
diff --git a/pkg/virt-launcher/virtwrap/network/network_test.go b/pkg/virt-launcher/virtwrap/network/network_test.go
@@ -51,8 +51,8 @@ var _ = Describe("Network", func() {
 
 	Context("interface configuration", func() {
 		It("should configure bridged pod networking by default", func() {
-			podNICFactory = func(network *v1.Network, cacheFactory cache.InterfaceCacheFactory) (podNIC, error) {
-				return mockpodNIC, nil
+			podNICFactory = func(cacheFactory cache.InterfaceCacheFactory) podNIC {
+				return mockpodNIC
 			}
 			vm := newVMIBridgeInterface("testnamespace", "testVmName")
 			iface := v1.DefaultBridgeNetworkInterface()
@@ -68,8 +68,8 @@ var _ = Describe("Network", func() {
 			Expect(err).To(BeNil())
 		})
 		It("should configure networking with multus", func() {
-			podNICFactory = func(network *v1.Network, cacheFactory cache.InterfaceCacheFactory) (podNIC, error) {
-				return mockpodNIC, nil
+			podNICFactory = func(cacheFactory cache.InterfaceCacheFactory) podNIC {
+				return mockpodNIC
 			}
 			const multusInterfaceName = "net1"
 			vm := newVMIBridgeInterface("testnamespace", "testVmName")
@@ -87,8 +87,8 @@ var _ = Describe("Network", func() {
 			Expect(err).To(BeNil())
 		})
 		It("should configure networking with multus and a default multus network", func() {
-			podNICFactory = func(network *v1.Network, cacheFactory cache.InterfaceCacheFactory) (podNIC, error) {
-				return mockpodNIC, nil
+			podNICFactory = func(cacheFactory cache.InterfaceCacheFactory) podNIC {
+				return mockpodNIC
 			}
 
 			vm := newVMIBridgeInterface("testnamespace", "testVmName")