fix naming and add fields for debugging

Author: QxBytes

network/networkutils/networkutils_linux.go

@@ -256,14 +256,14 @@ func (nu NetworkUtils) DisableRAForInterface(ifName string) error {
 	raFilePath := fmt.Sprintf(acceptRAV6File, ifName)
 	exist, err := platform.CheckIfFileExists(raFilePath)
 	if !exist {
-		logger.Error("accept_ra file doesn't exist with", zap.Error(err))
+		logger.Error("accept_ra file doesn't exist with", zap.Error(err), zap.String("ifName", ifName))
 		return nil
 	}
 
 	cmd := fmt.Sprintf(disableRACmd, ifName)
 	out, err := nu.plClient.ExecuteRawCommand(cmd)
 	if err != nil {
-		logger.Error("Diabling ra failed with", zap.Error(err), zap.Any("out", out))
+		logger.Error("Diabling ra failed with", zap.Error(err), zap.Any("out", out), zap.String("ifName", ifName))
 	}
 
 	return err

network/transparent_vlan_endpointclient_linux.go

@@ -114,7 +114,7 @@ func NewTransparentVlanEndpointClient(
 func (client *TransparentVlanEndpointClient) AddEndpoints(epInfo *EndpointInfo) error {
 	// VM Namespace
 	if err := client.ensureCleanPopulateVM(); err != nil {
-		return errors.Wrap(err, "failed to ensure both network namespace and vlan veth were present or both absent")
+		return errors.Wrap(err, "failed to ensure both network namespace and vlan interface were present or both absent")
 	}
 	if err := client.PopulateVM(epInfo); err != nil {
 		return err
@@ -131,7 +131,7 @@ func (client *TransparentVlanEndpointClient) AddEndpoints(epInfo *EndpointInfo)
 // Called from AddEndpoints, Namespace: VM and Vnet
 func (client *TransparentVlanEndpointClient) ensureCleanPopulateVM() error {
 	// Clean up vlan interface in the VM namespace and ensure the network namespace (if it exists) has a vlan interface
-	logger.Info("Checking if NS and vlan veth exists...")
+	logger.Info("Checking if NS and vlan interface exists...")
 	var existingErr error
 	client.vnetNSFileDescriptor, existingErr = client.netnsClient.GetFromName(client.vnetNSName)
 	if existingErr == nil {
@@ -146,7 +146,7 @@ func (client *TransparentVlanEndpointClient) ensureCleanPopulateVM() error {
 			logger.Info("vlan interface doesn't exist even though network namespace exists, deleting network namespace...", zap.String("message", vlanIfErr.Error()))
 			delErr := client.netnsClient.DeleteNamed(client.vnetNSName)
 			if delErr != nil {
-				return errors.Wrap(delErr, "failed to cleanup/delete ns after noticing vlan veth does not exist")
+				return errors.Wrap(delErr, "failed to cleanup/delete ns after noticing vlan interface does not exist")
 			}
 		}
 	}
@@ -196,7 +196,7 @@ func (client *TransparentVlanEndpointClient) setLinkNetNSAndConfirm(name string,
 		// retry checking in the namespace if the interface is not detected
 		return ExecuteInNS(client.nsClient, nsName, func() error {
 			_, ifDetectedErr := client.netioshim.GetNetworkInterfaceByName(name)
-			return errors.Wrap(ifDetectedErr, "failed to confirm veth moved in namespace")
+			return errors.Wrap(ifDetectedErr, "failed to confirm interface moved in namespace")
 		})
 	}, numRetries, sleepInMs)
 	if err != nil {
@@ -215,7 +215,7 @@ func (client *TransparentVlanEndpointClient) PopulateVM(epInfo *EndpointInfo) er
 	var existingErr error
 	client.vnetNSFileDescriptor, existingErr = client.netnsClient.GetFromName(client.vnetNSName)
 	// If the ns does not exist, the below code will trigger to create it
-	// This will also (we assume) mean the vlan veth does not exist
+	// This will also (we assume) mean the vlan interface does not exist
 	if existingErr != nil {
 		// We assume the only possible error is that the namespace doesn't exist
 		logger.Info("No existing NS detected. Creating the vnet namespace and switching to it", zap.String("message", existingErr.Error()))
@@ -234,15 +234,15 @@ func (client *TransparentVlanEndpointClient) PopulateVM(epInfo *EndpointInfo) er
 				logger.Info("[transparent vlan] removing vnet ns due to failure...")
 				err = client.netnsClient.DeleteNamed(client.vnetNSName)
 				if err != nil {
-					logger.Error("failed to cleanup/delete ns after failing to create vlan veth")
+					logger.Error("failed to cleanup/delete ns after failing to create vlan interface")
 				}
 			}
 		}()
 		if deleteNSIfNotNilErr != nil {
 			return errors.Wrap(deleteNSIfNotNilErr, "failed to set current ns to vm")
 		}
 
-		// Now create vlan veth
+		// Now create vlan interface
 		logger.Info("Create the host vlan link after getting eth0", zap.String("primaryHostIfName", client.primaryHostIfName))
 		// Get parent interface index. Index is consistent across libraries.
 		eth0, deleteNSIfNotNilErr := client.netioshim.GetNetworkInterfaceByName(client.primaryHostIfName)
@@ -258,7 +258,7 @@ func (client *TransparentVlanEndpointClient) PopulateVM(epInfo *EndpointInfo) er
 			VlanId:    client.vlanID,
 		}
 		logger.Info("Attempting to create link in VM NS", zap.String("vlanIfName", client.vlanIfName))
-		// Create vlan veth
+		// Create vlan interface
 		deleteNSIfNotNilErr = vishnetlink.LinkAdd(link)
 		if deleteNSIfNotNilErr != nil {
 			// ignore link already exists error
@@ -271,35 +271,35 @@ func (client *TransparentVlanEndpointClient) PopulateVM(epInfo *EndpointInfo) er
 		}
 		defer func() {
 			if deleteNSIfNotNilErr != nil {
-				logger.Info("removing vlan veth due to failure...")
+				logger.Info("removing vlan interface due to failure...")
 				if delErr := client.netlink.DeleteLink(client.vlanIfName); delErr != nil {
-					logger.Error("deleting vlan veth failed on addendpoint failure with", zap.Any("error:", delErr.Error()))
+					logger.Error("deleting vlan interface failed on addendpoint failure with", zap.Any("error:", delErr.Error()))
 				}
 			}
 		}()
 
 		// sometimes there is slight delay in interface creation. check if it exists
 		err = RunWithRetries(func() error {
 			_, err = client.netioshim.GetNetworkInterfaceByName(client.vlanIfName)
-			return errors.Wrap(err, "failed to get vlan veth")
+			return errors.Wrap(err, "failed to get vlan interface")
 		}, numRetries, sleepInMs)
 
 		if err != nil {
-			deleteNSIfNotNilErr = errors.Wrapf(err, "failed to get vlan veth interface:%s", client.vlanIfName)
+			deleteNSIfNotNilErr = errors.Wrapf(err, "failed to get vlan interface interface:%s", client.vlanIfName)
 			return deleteNSIfNotNilErr
 		}
 
 		deleteNSIfNotNilErr = client.netUtilsClient.DisableRAForInterface(client.vlanIfName)
 		if deleteNSIfNotNilErr != nil {
 			return errors.Wrap(deleteNSIfNotNilErr, "failed to disable router advertisements for vlan vnet link")
 		}
-		// vlan veth was created successfully, so move the vlan veth you created
+		// vlan interface was created successfully, so move the vlan interface you created
 		logger.Info("Move vlan link to vnet NS", zap.String("vlanIfName", client.vlanIfName), zap.Any("vnetNSFileDescriptor", uintptr(client.vnetNSFileDescriptor)))
 		deleteNSIfNotNilErr = client.setLinkNetNSAndConfirm(client.vlanIfName, uintptr(client.vnetNSFileDescriptor), client.vnetNSName)
 		if deleteNSIfNotNilErr != nil {
-			return errors.Wrap(deleteNSIfNotNilErr, "failed to move or detect vlan veth inside vnet namespace")
+			return errors.Wrap(deleteNSIfNotNilErr, "failed to move or detect vlan interface inside vnet namespace")
 		}
-		logger.Info("Moving vlan veth into namespace confirmed")
+		logger.Info("Moving vlan interface into namespace confirmed")
 	} else {
 		logger.Info("Existing NS detected. vlan interface should exist or namespace would've been deleted.", zap.String("vnetNSName", client.vnetNSName), zap.String("vlanIfName", client.vlanIfName))
 	}
@@ -373,7 +373,7 @@ func (client *TransparentVlanEndpointClient) PopulateVM(epInfo *EndpointInfo) er
 func (client *TransparentVlanEndpointClient) PopulateVnet(epInfo *EndpointInfo) error {
 	_, err := client.netioshim.GetNetworkInterfaceByName(client.vlanIfName)
 	if err != nil {
-		return errors.Wrap(err, "vlan veth doesn't exist")
+		return errors.Wrap(err, "vlan interface doesn't exist")
 	}
 	vnetVethIf, err := client.netioshim.GetNetworkInterfaceByName(client.vnetVethName)
 	if err != nil {
@@ -669,7 +669,7 @@ func (client *TransparentVlanEndpointClient) DeleteEndpointsImpl(ep *endpoint, _
 	// TODO: revist if this require in future.
 	//nolint gocritic
 	/*	if routesLeft <= numDefaultRoutes {
-			// Deletes default arp, default routes, vlan veth; there are two default routes
+			// Deletes default arp, default routes, vlan interface; there are two default routes
 			// so when we have <= numDefaultRoutes routes left, no containers use this namespace
 			log.Printf("[transparent vlan] Deleting namespace %s as no containers occupy it", client.vnetNSName)
 			delErr := client.netnsClient.DeleteNamed(client.vnetNSName)