github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 11:06:21 +00:00
Code Issues Projects Releases Wiki Activity

golint: Refactor to reduce cyclomatic complexity

Browse Source 
Introduce function  getLinkForEndpoint to reduce cyclomatic
complexity.

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
This commit is contained in:
Archana Shinde 2018-09-28 15:52:31 -07:00
parent 417c1f07f9
commit def070d651
1 changed files with 27 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
virtcontainers/network.go
View File

@ -934,6 +934,21 @@ func createLink(netHandle *netlink.Handle, name string, expectedLink netlink.Lin
return newLink, fds, err return newLink, fds, err
} }
func getLinkForEndpoint(endpoint Endpoint, netHandle *netlink.Handle) (netlink.Link, error) {
var link netlink.Link
switch ep := endpoint.(type) {
case *VirtualEndpoint:
link = &netlink.Veth{}
case *BridgedMacvlanEndpoint:
link = &netlink.Macvlan{}
default:
return nil, fmt.Errorf("Unexpected endpointType %s", ep.Type())
}
return getLinkByName(netHandle, endpoint.NetworkPair().VirtIface.Name, link)
}
func getLinkByName(netHandle *netlink.Handle, name string, expectedLink netlink.Link) (netlink.Link, error) { func getLinkByName(netHandle *netlink.Handle, name string, expectedLink netlink.Link) (netlink.Link, error) {
link, err := netHandle.LinkByName(name) link, err := netHandle.LinkByName(name)
if err != nil { if err != nil {
@ -1081,23 +1096,11 @@ func tapNetworkPair(endpoint Endpoint, numCPUs uint32, disableVhostNet bool) err
} }
defer netHandle.Delete() defer netHandle.Delete()
var link netlink.Link
netPair := endpoint.NetworkPair() netPair := endpoint.NetworkPair()
switch ep := endpoint.(type) { link, err := getLinkForEndpoint(endpoint, netHandle)
case *VirtualEndpoint: if err != nil {
link, err = getLinkByName(netHandle, netPair.VirtIface.Name, &netlink.Veth{}) return err
if err != nil {
return fmt.Errorf("Could not get interface %s : %s", netPair.VirtIface.Name, err)
}
case *BridgedMacvlanEndpoint:
link, err = getLinkByName(netHandle, netPair.VirtIface.Name, &netlink.Macvlan{})
if err != nil {
return fmt.Errorf("Could not get interface %s : %s", netPair.VirtIface.Name, err)
}
default:
return fmt.Errorf("Unexpected endpointType %s", ep.Type())
} }
attrs := link.Attrs() attrs := link.Attrs()
@ -1206,20 +1209,9 @@ func bridgeNetworkPair(endpoint Endpoint, numCPUs uint32, disableVhostNet bool)
var attrs *netlink.LinkAttrs var attrs *netlink.LinkAttrs
var link netlink.Link var link netlink.Link
switch ep := endpoint.(type) { link, err = getLinkForEndpoint(endpoint, netHandle)
case *VirtualEndpoint: if err != nil {
link, err = getLinkByName(netHandle, netPair.VirtIface.Name, &netlink.Veth{}) return err
if err != nil {
return fmt.Errorf("Could not get interface %s : %s", netPair.VirtIface.Name, err)
}
case *BridgedMacvlanEndpoint:
link, err = getLinkByName(netHandle, netPair.VirtIface.Name, &netlink.Macvlan{})
if err != nil {
return fmt.Errorf("Could not get interface %s : %s", netPair.VirtIface.Name, err)
}
default:
return fmt.Errorf("Unexpected endpointType %s", ep.Type())
} }
attrs = link.Attrs() attrs = link.Attrs()
@ -1293,22 +1285,9 @@ func untapNetworkPair(endpoint Endpoint) error {
return fmt.Errorf("Could not remove TAP %s: %s", netPair.TAPIface.Name, err) return fmt.Errorf("Could not remove TAP %s: %s", netPair.TAPIface.Name, err)
} }
var link netlink.Link link, err := getLinkForEndpoint(endpoint, netHandle)
if err != nil {
switch ep := endpoint.(type) { return err
case *VirtualEndpoint:
link, err = getLinkByName(netHandle, netPair.VirtIface.Name, &netlink.Veth{})
if err != nil {
return fmt.Errorf("Could not get interface %s : %s", netPair.VirtIface.Name, err)
}
case *BridgedMacvlanEndpoint:
link, err = getLinkByName(netHandle, netPair.VirtIface.Name, &netlink.Macvlan{})
if err != nil {
return fmt.Errorf("Could not get interface %s : %s", netPair.VirtIface.Name, err)
}
default:
return fmt.Errorf("Unexpected endpointType %s", ep.Type())
} }
if err := netHandle.LinkSetDown(link); err != nil { if err := netHandle.LinkSetDown(link); err != nil {
@ -1359,22 +1338,9 @@ func unBridgeNetworkPair(endpoint Endpoint) error {
return fmt.Errorf("Could not remove TAP %s: %s", netPair.TAPIface.Name, err) return fmt.Errorf("Could not remove TAP %s: %s", netPair.TAPIface.Name, err)
} }
var link netlink.Link link, err := getLinkForEndpoint(endpoint, netHandle)
if err != nil {
switch ep := endpoint.(type) { return err
case *VirtualEndpoint:
link, err = getLinkByName(netHandle, netPair.VirtIface.Name, &netlink.Veth{})
if err != nil {
return fmt.Errorf("Could not get interface %s : %s", netPair.VirtIface.Name, err)
}
case *BridgedMacvlanEndpoint:
link, err = getLinkByName(netHandle, netPair.VirtIface.Name, &netlink.Macvlan{})
if err != nil {
return fmt.Errorf("Could not get interface %s : %s", netPair.VirtIface.Name, err)
}
default:
return fmt.Errorf("Unexpected endpointType %s", ep.Type())
} }
if err := netHandle.LinkSetDown(link); err != nil { if err := netHandle.LinkSetDown(link); err != nil {