From 07fbd1ddab3e00f38ecb41938237a6be821fe96a Mon Sep 17 00:00:00 2001 From: Abin Shahab Date: Tue, 14 Oct 2014 02:59:14 +0000 Subject: [PATCH] Fixed formatting --- container/raw/handler.go | 6 +++--- container/raw/test_resources/cdesc.json | 14 ++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/container/raw/handler.go b/container/raw/handler.go index 1233e17d..781280f4 100644 --- a/container/raw/handler.go +++ b/container/raw/handler.go @@ -177,12 +177,12 @@ func (self *rawContainerHandler) GetStats() (*info.ContainerStats, error) { if self.network_interface != nil { n := network.NetworkState{VethHost: self.network_interface.VethHost, VethChild: self.network_interface.VethChild, NsPath: "unknown"} s := dockerlibcontainer.State{NetworkState: n} - stats, err = libcontainer.GetStats(self.cgroup, &s) + stats, err = libcontainer.GetStats(self.cgroup, &s) } else { - stats, err = libcontainer.GetStatsCgroupOnly(self.cgroup) + stats, err = libcontainer.GetStatsCgroupOnly(self.cgroup) } if err != nil { - return nil, err + return nil, err } // Get Filesystem information only for the root cgroup. if self.name == "/" { diff --git a/container/raw/test_resources/cdesc.json b/container/raw/test_resources/cdesc.json index 33c86735..713eb7e1 100644 --- a/container/raw/test_resources/cdesc.json +++ b/container/raw/test_resources/cdesc.json @@ -5,8 +5,6 @@ { "name": "10-10-10-27", "ip": "10.10.10.27/24", - "image": "registry.test.altiscale.com:5000/prometheus-init-201405270218", - "public_key": "/root/.ssh/authorized_keys", "publish": null, "gateway": null, "hostname": "10-10-10-27.local.altiscale.com", @@ -14,7 +12,6 @@ "init": null, "cpu": null, "memory": null, - "role": "compute_node", "net": null, "netinit": "false", "network_interface": { @@ -48,14 +45,7 @@ "permission": "rw" } ], - "host": { - "hostname": "localhost", - "ip": "127.0.0.1", - "bridge": "alti0", - "key": "" - }, - "id": "18a4585950db428e4d5a65c216a5d708d241254709626f4cb300ee963fb4b144", - "initpid": "10741" + "id": "18a4585950db428e4d5a65c216a5d708d241254709626f4cb300ee963fb4b144" } ] -} \ No newline at end of file +}