Update ContainerState.Termination to ContainerState.Terminated in pkg/api/types.go and pkg/api/v1/types.go

This commit is contained in:
Chao Xu
2015-05-27 15:02:11 -07:00
parent 677d0fdf87
commit 2f6e5e2e08
20 changed files with 217 additions and 169 deletions

View File

@@ -1712,7 +1712,7 @@ func stoppedState(cName string) api.ContainerStatus {
return api.ContainerStatus{
Name: cName,
State: api.ContainerState{
Termination: &api.ContainerStateTerminated{},
Terminated: &api.ContainerStateTerminated{},
},
}
}
@@ -1720,7 +1720,7 @@ func succeededState(cName string) api.ContainerStatus {
return api.ContainerStatus{
Name: cName,
State: api.ContainerState{
Termination: &api.ContainerStateTerminated{
Terminated: &api.ContainerStateTerminated{
ExitCode: 0,
},
},
@@ -1730,7 +1730,7 @@ func failedState(cName string) api.ContainerStatus {
return api.ContainerStatus{
Name: cName,
State: api.ContainerState{
Termination: &api.ContainerStateTerminated{
Terminated: &api.ContainerStateTerminated{
ExitCode: -1,
},
},
@@ -2577,7 +2577,7 @@ func TestValidateContainerStatus(t *testing.T) {
Running: &api.ContainerStateRunning{},
},
LastTerminationState: api.ContainerState{
Termination: &api.ContainerStateTerminated{},
Terminated: &api.ContainerStateTerminated{},
},
},
},
@@ -2588,7 +2588,7 @@ func TestValidateContainerStatus(t *testing.T) {
{
Name: containerName,
State: api.ContainerState{
Termination: &api.ContainerStateTerminated{},
Terminated: &api.ContainerStateTerminated{},
},
},
},