More e2e damage from renaming "net" to "POD"

This stops the bleeding.  Will followup with a constant.
This commit is contained in:
Tim Hockin
2015-01-28 09:58:19 -08:00
parent 988d15943f
commit 60119db5d5
4 changed files with 14 additions and 14 deletions

View File

@@ -169,7 +169,7 @@ func (p *PodCache) computePodStatus(pod *api.Pod) (api.PodStatus, error) {
} else {
newStatus.Info = result.Status.Info
newStatus.Phase = getPhase(&pod.Spec, newStatus.Info)
if netContainerInfo, ok := newStatus.Info["net"]; ok {
if netContainerInfo, ok := newStatus.Info["POD"]; ok {
if netContainerInfo.PodIP != "" {
newStatus.PodIP = netContainerInfo.PodIP
}

View File

@@ -339,7 +339,7 @@ func TestFillPodStatus(t *testing.T) {
HostIP: "ip of machine",
PodIP: expectedIP,
Info: api.PodInfo{
"net": {
"POD": {
State: api.ContainerState{
Running: &api.ContainerStateRunning{
StartedAt: util.NewTime(expectedTime),
@@ -374,7 +374,7 @@ func TestFillPodInfoNoData(t *testing.T) {
Host: "machine",
HostIP: "ip of machine",
Info: api.PodInfo{
"net": {},
"POD": {},
},
},
nodes: []api.Node{*makeHealthyNode("machine")},