Added ContainerStatus.container_id to JSON endpoints. Review: https://reviews.apache.org/r/53467
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a0309709 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a0309709 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a0309709 Branch: refs/heads/master Commit: a0309709fa72a88d675a636cb78c4c6856dda04b Parents: bfd4486 Author: Jie Yu <yujie....@gmail.com> Authored: Fri Nov 4 00:39:25 2016 -0700 Committer: Jie Yu <yujie....@gmail.com> Committed: Mon Nov 7 17:05:40 2016 -0800 ---------------------------------------------------------------------- src/common/http.cpp | 8 ++++++++ src/tests/slave_tests.cpp | 11 +++++++++++ 2 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a0309709/src/common/http.cpp ---------------------------------------------------------------------- diff --git a/src/common/http.cpp b/src/common/http.cpp index fb8454a..42af330 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -245,6 +245,10 @@ JSON::Object model(const ContainerStatus& status) { JSON::Object object; + if (status.has_container_id()) { + object.values["container_id"] = JSON::protobuf(status.container_id()); + } + if (status.network_infos().size() > 0) { JSON::Array array; array.values.reserve(status.network_infos().size()); // MESOS-2353. @@ -509,6 +513,10 @@ void json(JSON::ObjectWriter* writer, const CommandInfo& command) static void json(JSON::ObjectWriter* writer, const ContainerStatus& status) { + if (status.has_container_id()) { + writer->field("container_id", JSON::Protobuf(status.container_id())); + } + if (status.network_infos().size() > 0) { writer->field("network_infos", status.network_infos()); } http://git-wip-us.apache.org/repos/asf/mesos/blob/a0309709/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index 8f1dbef..3d06c3a 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -2151,6 +2151,13 @@ TEST_F(SlaveTest, ContainersEndpoint) ContainerStatus containerStatus; + ContainerID parent; + ContainerID child; + parent.set_value("parent"); + child.set_value("child"); + child.mutable_parent()->CopyFrom(parent); + containerStatus.mutable_container_id()->CopyFrom(child); + CgroupInfo* cgroupInfo = containerStatus.mutable_cgroup_info(); CgroupInfo::NetCls* netCls = cgroupInfo->mutable_net_cls(); netCls->set_classid(42); @@ -2184,6 +2191,10 @@ TEST_F(SlaveTest, ContainersEndpoint) "\"mem_limit_bytes\":2048" "}," "\"status\":{" + "\"container_id\":{" + "\"parent\":{\"value\":\"parent\"}," + "\"value\":\"child\"" + "}," "\"cgroup_info\":{\"net_cls\":{\"classid\":42}}," "\"network_infos\":[{" "\"ip_addresses\":[{\"ip_address\":\"192.168.1.20\"}]"
