github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-15 16:13:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #604 from jcvenegas/remove-not-Num-var

Browse Source 
vc: Remove unused variable NumInterfaces
This commit is contained in:
zhangwei_cs 2018-08-20 10:06:30 +08:00 committed by GitHub
commit d748b26f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
virtcontainers/api_test.go
View File

@ -152,9 +152,7 @@ func newTestSandboxConfigHyperstartAgentCNMNetwork() SandboxConfig {
PostStopHooks: []Hook{},
}
netConfig := NetworkConfig{
NumInterfaces: len(hooks.PreStartHooks),
}
netConfig := NetworkConfig{}
sandboxConfig := SandboxConfig{
ID: testSandboxID,
@ -1980,9 +1978,7 @@ func createNewSandboxConfig(hType HypervisorType, aType AgentType, aConfig inter
HypervisorPath: "/usr/bin/qemu-system-x86_64",
}
netConfig := NetworkConfig{
NumInterfaces: 1,
}
netConfig := NetworkConfig{}
return SandboxConfig{
ID: testSandboxID,

1
virtcontainers/documentation/api/1.0/api.md
View File

@ -276,7 +276,6 @@ const (
// NetworkConfig is the network configuration related to a network.
type NetworkConfig struct {
NetNSPath string
NumInterfaces int
InterworkingModel NetInterworkingModel
}
```

4
virtcontainers/hack/virtc/main.go
View File

@ -176,9 +176,7 @@ func buildSandboxConfig(context *cli.Context) (vc.SandboxConfig, error) {
return vc.SandboxConfig{}, err
}
netConfig := vc.NetworkConfig{
NumInterfaces: 1,
}
netConfig := vc.NetworkConfig{}
switch *agentType {
case vc.HyperstartAgent:

1
virtcontainers/network.go
View File

@ -142,7 +142,6 @@ type NetworkInterfacePair struct {
// NetworkConfig is the network configuration related to a network.
type NetworkConfig struct {
NetNSPath string
NumInterfaces int
InterworkingModel NetInterworkingModel
}

3
virtcontainers/pkg/oci/utils.go
View File

@ -357,9 +357,6 @@ func networkConfig(ocispec CompatOCISpec, config RuntimeConfig) (vc.NetworkConfi
continue
}
// Bug: This is not the interface count
// It is just an indication that you need networking
netConf.NumInterfaces = 1
if n.Path != "" {
netConf.NetNSPath = n.Path
}

4
virtcontainers/pkg/oci/utils_test.go
View File

@ -211,9 +211,7 @@ func TestMinimalSandboxConfig(t *testing.T) {
DeviceInfos: expectedDeviceInfo,
}
expectedNetworkConfig := vc.NetworkConfig{
NumInterfaces: 1,
}
expectedNetworkConfig := vc.NetworkConfig{}
expectedSandboxConfig := vc.SandboxConfig{
ID: containerID,