Repository: mesos Updated Branches: refs/heads/1.4.x b625f9a0f -> f82cd43dc
Added port mappings in `NetworkInfo` as part of `state` endpoints. Review: https://reviews.apache.org/r/61866/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a7d8997c Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a7d8997c Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a7d8997c Branch: refs/heads/1.4.x Commit: a7d8997ccb4f40087f1503036cee03e2022e2d92 Parents: b625f9a Author: Deepak Goel <deepak.go...@gmail.com> Authored: Thu Aug 24 16:32:40 2017 -0700 Committer: Michael Park <mp...@apache.org> Committed: Wed Sep 20 06:05:57 2017 -0700 ---------------------------------------------------------------------- src/common/http.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a7d8997c/src/common/http.cpp ---------------------------------------------------------------------- diff --git a/src/common/http.cpp b/src/common/http.cpp index 43d674e..226fed4 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -270,6 +270,16 @@ JSON::Object model(const NetworkInfo& info) object.values["name"] = info.name(); } + if (info.port_mappings().size() > 0) { + JSON::Array array; + array.values.reserve(info.port_mappings().size()); // MESOS-2353 + foreach (const NetworkInfo::PortMapping& portMapping, + info.port_mappings()) { + array.values.push_back(JSON::protobuf(portMapping)); + } + object.values["port_mappings"] = std::move(array); + } + return object; } @@ -630,6 +640,15 @@ static void json(JSON::ObjectWriter* writer, const NetworkInfo& info) if (info.has_name()) { writer->field("name", info.name()); } + + if (info.port_mappings().size() > 0) { + writer->field("port_mappings", [&info](JSON::ArrayWriter* writer) { + foreach(const NetworkInfo::PortMapping& portMapping, + info.port_mappings()) { + writer->element(JSON::Protobuf(portMapping)); + } + }); + } }
