github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-01 09:42:45 +00:00
Code Issues Projects Releases Wiki Activity

unit-test: Fix local test

Browse Source 
Simplify empty string proxy type handling and cast invalid proxy type to
ProxyType.

Fixes: #1312

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2019-02-28 17:21:52 -06:00
parent dbfd96583a
commit fcee080a2d
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virtcontainers/api_test.go
View File

@ -86,6 +86,8 @@ func newTestSandboxConfigNoop() SandboxConfig {
Containers: []ContainerConfig{container},
Annotations: sandboxAnnotations,
ProxyType: NoopProxyType,
}
return sandboxConfig
@ -122,6 +124,8 @@ func newTestSandboxConfigHyperstartAgent() SandboxConfig {
Containers: []ContainerConfig{container},
Annotations: sandboxAnnotations,
ProxyType: NoopProxyType,
}
return sandboxConfig
@ -163,6 +167,8 @@ func newTestSandboxConfigHyperstartAgentDefaultNetwork() SandboxConfig {
Containers: []ContainerConfig{container},
Annotations: sandboxAnnotations,
ProxyType: NoopProxyType,
}
return sandboxConfig
@ -184,6 +190,8 @@ func newTestSandboxConfigKataAgent() SandboxConfig {
AgentType: KataContainersAgent,
Annotations: sandboxAnnotations,
ProxyType: NoopProxyType,
}
return sandboxConfig
@ -2014,6 +2022,8 @@ func createNewSandboxConfig(hType HypervisorType, aType AgentType, aConfig inter
AgentConfig: aConfig,
NetworkConfig: netConfig,
ProxyType: NoopProxyType,
}
}

4
virtcontainers/proxy.go
View File

@ -109,6 +109,8 @@ func (pType *ProxyType) String() string {
// newProxy returns a proxy from a proxy type.
func newProxy(pType ProxyType) (proxy, error) {
switch pType {
case "":
return &kataBuiltInProxy{}, nil
case NoopProxyType:
return &noopProxy{}, nil
case NoProxyType:
@ -120,7 +122,7 @@ func newProxy(pType ProxyType) (proxy, error) {
case KataBuiltInProxyType:
return &kataBuiltInProxy{}, nil
default:
return &noopProxy{}, nil
return &noopProxy{}, fmt.Errorf("Invalid proxy type: %s", pType)
}
}

7
virtcontainers/vm.go
View File

@ -62,12 +62,7 @@ func setupProxy(h hypervisor, agent agent, config VMConfig, id string) (int, str
return -1, "", nil, err
}
// default to kata builtin proxy
proxyType := config.ProxyType
if len(proxyType.String()) == 0 {
proxyType = KataBuiltInProxyType
}
proxy, err := newProxy(proxyType)
proxy, err := newProxy(config.ProxyType)
if err != nil {
return -1, "", nil, err
}

2
virtcontainers/vm_test.go
View File

@ -102,7 +102,7 @@ func TestSetupProxy(t *testing.T) {
agent := &noopAgent{}
// wrong proxy type
config.ProxyType = "invalidProxyType"
config.ProxyType = ProxyType("invalidProxyType")
_, _, _, err := setupProxy(hypervisor, agent, config, "foobar")
assert.NotNil(err)