You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2017/07/05 19:27:17 UTC
[3/3] mesos git commit: Replaced use of `net::IPNetwork` by
`net::IP::Network` in Mesos.
Replaced use of `net::IPNetwork` by `net::IP::Network` in Mesos.
Review: https://reviews.apache.org/r/59739/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9b69c093
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9b69c093
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9b69c093
Branch: refs/heads/master
Commit: 9b69c09310cdb6d7cfca1284f60c3f1b422c77cc
Parents: ec1f15e
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Wed Jul 5 11:38:14 2017 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Wed Jul 5 11:40:32 2017 -0700
----------------------------------------------------------------------
.../mesos/isolators/network/cni/cni.cpp | 4 +-
.../cni/plugins/port_mapper/port_mapper.cpp | 2 +-
src/tests/containerizer/cni_isolator_tests.cpp | 44 ++++++++++----------
src/tests/utils.cpp | 16 +++----
src/tests/utils.hpp | 2 +-
5 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9b69c093/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
index b386fbe..831bc7d 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
@@ -964,7 +964,7 @@ Future<Nothing> NetworkCniIsolatorProcess::_isolate(
if (network.cniNetworkInfo.isSome() && network.cniNetworkInfo->has_ip4()) {
// IP are always stored in CIDR notation so need to retrieve the
// address without the subnet mask.
- Try<net::IPNetwork> ip = net::IPNetwork::parse(
+ Try<net::IP::Network> ip = net::IP::Network::parse(
network.cniNetworkInfo->ip4().ip(),
AF_INET);
@@ -1375,7 +1375,7 @@ Future<ContainerStatus> NetworkCniIsolatorProcess::status(
if (containerNetwork.cniNetworkInfo->has_ip4()) {
// Remove prefix length from IP address.
- Try<net::IPNetwork> ip = net::IPNetwork::parse(
+ Try<net::IP::Network> ip = net::IP::Network::parse(
containerNetwork.cniNetworkInfo->ip4().ip(), AF_INET);
if (ip.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/9b69c093/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
index ce79562..43cf3e4 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
@@ -405,7 +405,7 @@ Try<string, PluginError> PortMapper::handleAddCommand()
// The IP from `delegateResult->ip4().ip()` is in CIDR notation. We
// need to strip out the netmask.
- Try<net::IPNetwork> ip = net::IPNetwork::parse(
+ Try<net::IP::Network> ip = net::IP::Network::parse(
delegateResult->ip4().ip(),
AF_INET);
http://git-wip-us.apache.org/repos/asf/mesos/blob/9b69c093/src/tests/containerizer/cni_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cni_isolator_tests.cpp b/src/tests/containerizer/cni_isolator_tests.cpp
index 17afdf4..96e3e9e 100644
--- a/src/tests/containerizer/cni_isolator_tests.cpp
+++ b/src/tests/containerizer/cni_isolator_tests.cpp
@@ -111,9 +111,9 @@ public:
cniPluginDir = path::join(sandbox.get(), "plugins");
cniConfigDir = path::join(sandbox.get(), "configs");
- Try<net::IPNetwork> hostIPNetwork = getNonLoopbackIP();
+ Try<net::IP::Network> hostNetwork = getNonLoopbackIP();
- ASSERT_SOME(hostIPNetwork);
+ ASSERT_SOME(hostNetwork);
// Get the first external name server.
Try<string> read = os::read("/etc/resolv.conf");
@@ -148,8 +148,8 @@ public:
echo " }"
echo "}"
)~",
- hostIPNetwork->address(),
- hostIPNetwork->prefix(),
+ hostNetwork->address(),
+ hostNetwork->prefix(),
nameServer.get()).get());
ASSERT_SOME(result);
@@ -992,8 +992,8 @@ TEST_F(CniIsolatorTest, ROOT_OverrideHostname)
// the right settings in /etc/resolv.conf.
TEST_F(CniIsolatorTest, ROOT_VerifyResolverConfig)
{
- Try<net::IPNetwork> hostIPNetwork = getNonLoopbackIP();
- ASSERT_SOME(hostIPNetwork);
+ Try<net::IP::Network> hostNetwork = getNonLoopbackIP();
+ ASSERT_SOME(hostNetwork);
Try<string> mockPlugin = strings::format(
R"~(
@@ -1019,8 +1019,8 @@ TEST_F(CniIsolatorTest, ROOT_VerifyResolverConfig)
echo ' }'
echo '}'
)~",
- hostIPNetwork.get().address(),
- hostIPNetwork.get().prefix());
+ hostNetwork.get().address(),
+ hostNetwork.get().prefix());
ASSERT_SOME(mockPlugin);
@@ -1110,8 +1110,8 @@ TEST_F(CniIsolatorTest, ROOT_VerifyResolverConfig)
// that glibc accepts by using it to ping a host.
TEST_F(CniIsolatorTest, ROOT_INTERNET_VerifyResolverConfig)
{
- Try<net::IPNetwork> hostIPNetwork = getNonLoopbackIP();
- ASSERT_SOME(hostIPNetwork);
+ Try<net::IP::Network> hostNetwork = getNonLoopbackIP();
+ ASSERT_SOME(hostNetwork);
// Note: We set a dummy nameserver IP address followed by the
// Google anycast address. We also set the resolver timeout
@@ -1141,8 +1141,8 @@ TEST_F(CniIsolatorTest, ROOT_INTERNET_VerifyResolverConfig)
echo ' }'
echo '}'
)~",
- hostIPNetwork.get().address(),
- hostIPNetwork.get().prefix());
+ hostNetwork.get().address(),
+ hostNetwork.get().prefix());
ASSERT_SOME(mockPlugin);
@@ -1441,24 +1441,24 @@ TEST_P(DefaultExecutorCniTest, ROOT_VerifyContainerIP)
const v1::AgentID& agentId = offer.agent_id();
// The command tests if the MESOS_CONTAINER_IP is the same as the
- // `hostIPNetwork.address` which is what the mock CNI plugin would have
+ // `hostnetwork.address` which is what the mock CNI plugin would have
// setup for the container.
//
// If the container is running on the host network we set the IP to
// slave's PID, which is effectively the `LIBPROCESS_IP` that the
// `DefaultExecutor` is going to see. If, however, the container is
// running on a CNI network we choose the first non-loopback
- // address as `hostIPNetwork` since the mock CNI plugin
+ // address as `hostNetwork` since the mock CNI plugin
// would set the container's IP to this address.
- Try<net::IPNetwork> hostIPNetwork = net::IPNetwork::create(
+ Try<net::IP::Network> hostNetwork = net::IP::Network::create(
slave.get()->pid.address.ip,
32);
if (networkInfo.isSome()) {
- hostIPNetwork = getNonLoopbackIP();
+ hostNetwork = getNonLoopbackIP();
}
- ASSERT_SOME(hostIPNetwork);
+ ASSERT_SOME(hostNetwork);
string command = strings::format(
R"~(
@@ -1468,8 +1468,8 @@ TEST_P(DefaultExecutorCniTest, ROOT_VerifyContainerIP)
else
exit 1
fi)~",
- stringify(hostIPNetwork->address()),
- stringify(hostIPNetwork->address())).get();
+ stringify(hostNetwork->address()),
+ stringify(hostNetwork->address())).get();
v1::TaskInfo taskInfo = v1::createTask(
agentId,
@@ -1671,15 +1671,15 @@ TEST_F(CniIsolatorPortMapperTest, ROOT_INTERNET_CURL_PortMapper)
// Try connecting to the nginx server on port 80 through a
// non-loopback IP address on `hostPort`.
- Try<net::IPNetwork> hostIPNetwork = getNonLoopbackIP();
- ASSERT_SOME(hostIPNetwork);
+ Try<net::IP::Network> hostNetwork = getNonLoopbackIP();
+ ASSERT_SOME(hostNetwork);
// `TASK_RUNNING` does not guarantee that the service is running.
// Hence, we need to re-try the service multiple times.
Duration waited = Duration::zero();
do {
Try<string> connect = os::shell(
- "curl -I http://" + stringify(hostIPNetwork->address()) +
+ "curl -I http://" + stringify(hostNetwork->address()) +
":" + stringify(hostPort));
if (connect.isSome()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/9b69c093/src/tests/utils.cpp
----------------------------------------------------------------------
diff --git a/src/tests/utils.cpp b/src/tests/utils.cpp
index 053976d..b2c9d68 100644
--- a/src/tests/utils.cpp
+++ b/src/tests/utils.cpp
@@ -192,7 +192,7 @@ string getWebUIDir()
}
-Try<net::IPNetwork> getNonLoopbackIP()
+Try<net::IP::Network> getNonLoopbackIP()
{
Try<set<string>> links = net::links();
if (links.isError()) {
@@ -202,18 +202,18 @@ Try<net::IPNetwork> getNonLoopbackIP()
}
foreach (const string& link, links.get()) {
- Result<net::IPNetwork> hostIPNetwork =
- net::IPNetwork::fromLinkDevice(link, AF_INET);
+ Result<net::IP::Network> hostNetwork =
+ net::IP::Network::fromLinkDevice(link, AF_INET);
- if (hostIPNetwork.isError()) {
+ if (hostNetwork.isError()) {
return Error(
"Unable to find a non-loopback address: " +
- hostIPNetwork.error());
+ hostNetwork.error());
}
- if (hostIPNetwork.isSome() &&
- (hostIPNetwork.get() != net::IPNetwork::LOOPBACK_V4())) {
- return hostIPNetwork.get();
+ if (hostNetwork.isSome() &&
+ (hostNetwork.get() != net::IP::Network::LOOPBACK_V4())) {
+ return hostNetwork.get();
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/9b69c093/src/tests/utils.hpp
----------------------------------------------------------------------
diff --git a/src/tests/utils.hpp b/src/tests/utils.hpp
index a2ae43c..b2f22cd 100644
--- a/src/tests/utils.hpp
+++ b/src/tests/utils.hpp
@@ -83,7 +83,7 @@ std::string getWebUIDir();
Try<uint16_t> getFreePort();
// Get a non-loopback IP available on this host.
-Try<net::IPNetwork> getNonLoopbackIP();
+Try<net::IP::Network> getNonLoopbackIP();
} // namespace tests {
} // namespace internal {