Updated Mesos for the fromLinkDevice method. Review: https://reviews.apache.org/r/31473
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3febf57d Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3febf57d Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3febf57d Branch: refs/heads/master Commit: 3febf57ddc1671fe6d7f3207b9a9bcc89cc58224 Parents: 1b39122 Author: Evelina Dumitrescu <[email protected]> Authored: Tue Mar 10 11:19:20 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Tue Mar 10 11:19:21 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/isolators/network/port_mapping.cpp | 2 +- src/tests/port_mapping_tests.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/3febf57d/src/slave/containerizer/isolators/network/port_mapping.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/network/port_mapping.cpp b/src/slave/containerizer/isolators/network/port_mapping.cpp index 7a38735..aebc528 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/isolators/network/port_mapping.cpp @@ -1056,7 +1056,7 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) // Get the host IP network, MAC and default gateway. Result<net::IPNetwork> hostIPNetwork = - net::fromLinkDevice(eth0.get(), AF_INET); + net::IPNetwork::fromLinkDevice(eth0.get(), AF_INET); if (!hostIPNetwork.isSome()) { return Error( http://git-wip-us.apache.org/repos/asf/mesos/blob/3febf57d/src/tests/port_mapping_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/port_mapping_tests.cpp b/src/tests/port_mapping_tests.cpp index dd00b6f..82f98a4 100644 --- a/src/tests/port_mapping_tests.cpp +++ b/src/tests/port_mapping_tests.cpp @@ -193,7 +193,8 @@ protected: cleanup(eth0, lo); // Get host IP address. - Result<net::IPNetwork> _hostIPNetwork = net::fromLinkDevice(eth0, AF_INET); + Result<net::IPNetwork> _hostIPNetwork = + net::IPNetwork::fromLinkDevice(eth0, AF_INET); CHECK_SOME(_hostIPNetwork) << "Failed to retrieve the host public IP network from " << eth0 << ": "
