You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2018/05/09 11:33:48 UTC
[3/3] mesos git commit: Added token-based authentication to resource
provider tests.
Added token-based authentication to resource provider tests.
If compiled with SSL support, resource provider tests will use
authentication. The 'MockResourceProvider' has been updated to create a
JWT when started.
Review: https://reviews.apache.org/r/66934/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0f0909c8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0f0909c8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0f0909c8
Branch: refs/heads/master
Commit: 0f0909c89578dbe9ea23d5fa4d980712789a2c32
Parents: abc7665
Author: Jan Schlicht <ja...@mesosphere.io>
Authored: Wed May 9 12:41:09 2018 +0200
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Wed May 9 13:32:16 2018 +0200
----------------------------------------------------------------------
...agent_resource_provider_config_api_tests.cpp | 18 -------
src/tests/api_tests.cpp | 18 ++-----
src/tests/executor_http_api_tests.cpp | 1 -
src/tests/files_tests.cpp | 13 ++---
src/tests/logging_tests.cpp | 14 ++---
src/tests/master_slave_reconciliation_tests.cpp | 6 +--
src/tests/master_tests.cpp | 13 +----
src/tests/mesos.hpp | 30 +++++++++--
src/tests/metrics_tests.cpp | 13 ++---
src/tests/operation_reconciliation_tests.cpp | 10 +---
src/tests/resource_provider_manager_tests.cpp | 56 ++++----------------
src/tests/slave_tests.cpp | 26 ++-------
.../storage_local_resource_provider_tests.cpp | 54 -------------------
13 files changed, 72 insertions(+), 200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/agent_resource_provider_config_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/agent_resource_provider_config_api_tests.cpp b/src/tests/agent_resource_provider_config_api_tests.cpp
index 6ced582..7d4d3b9 100644
--- a/src/tests/agent_resource_provider_config_api_tests.cpp
+++ b/src/tests/agent_resource_provider_config_api_tests.cpp
@@ -297,9 +297,6 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_Add)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
Future<SlaveRegisteredMessage> slaveRegisteredMessage =
@@ -383,9 +380,6 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_IdempotentAdd)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
// Generate a pre-existing config.
@@ -452,9 +446,6 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_AddConflict)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
// Generate a pre-existing config.
@@ -514,9 +505,6 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_Update)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
// Generate a pre-existing config.
@@ -628,9 +616,6 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_IdempotentUpdate)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
// Generate a pre-existing config.
@@ -736,9 +721,6 @@ TEST_P(AgentResourceProviderConfigApiTest, ROOT_Remove)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
// Generate a pre-existing config.
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index 00cd91c..8436870 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -177,7 +177,6 @@ TEST_P(MasterAPITest, GetAgents)
FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
slave::Flags slaveFlags = CreateSlaveFlags();
- slaveFlags.authenticate_http_readwrite = false;
slaveFlags.hostname = "host";
slaveFlags.domain = createDomainInfo("region-xyz", "zone-456");
@@ -228,7 +227,7 @@ TEST_P(MasterAPITest, GetAgents)
updateAgentMessage = FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
- resourceProvider.start(endpointDetector, contentType, v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, contentType);
// Wait until the agent's resources have been updated to include the
// resource provider resources.
@@ -1024,10 +1023,6 @@ TEST_P(MasterAPITest, GetOperations)
slave::Flags slaveFlags = CreateSlaveFlags();
- // TODO(nfnt): Remove this once 'MockResourceProvider' supports
- // authentication.
- slaveFlags.authenticate_http_readwrite = false;
-
Try<Owned<cluster::Slave>> agent = StartSlave(detector.get(), slaveFlags);
ASSERT_SOME(agent);
@@ -1051,7 +1046,7 @@ TEST_P(MasterAPITest, GetOperations)
const ContentType contentType = GetParam();
- resourceProvider.start(endpointDetector, contentType, v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, contentType);
// Wait until the agent's resources have been updated to include the
// resource provider resources.
@@ -6826,7 +6821,6 @@ TEST_P(AgentAPITest, GetResourceProviders)
FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
slave::Flags slaveFlags = CreateSlaveFlags();
- slaveFlags.authenticate_http_readwrite = false;
Try<Owned<cluster::Slave>> slave = StartSlave(&detector, slaveFlags);
ASSERT_SOME(slave);
@@ -6863,7 +6857,7 @@ TEST_P(AgentAPITest, GetResourceProviders)
updateSlaveMessage = FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
- resourceProvider.start(endpointDetector, contentType, v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, contentType);
// Wait until the agent's resources have been updated to include the
// resource provider resources.
@@ -6913,10 +6907,6 @@ TEST_P(AgentAPITest, GetOperations)
slave::Flags slaveFlags = CreateSlaveFlags();
- // TODO(nfnt): Remove this once 'MockResourceProvider' supports
- // authentication.
- slaveFlags.authenticate_http_readwrite = false;
-
Try<Owned<cluster::Slave>> agent = StartSlave(detector.get(), slaveFlags);
ASSERT_SOME(agent);
@@ -6940,7 +6930,7 @@ TEST_P(AgentAPITest, GetOperations)
const ContentType contentType = GetParam();
- resourceProvider.start(endpointDetector, contentType, v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, contentType);
// Wait until the agent's resources have been updated to include the
// resource provider resources.
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/executor_http_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/executor_http_api_tests.cpp b/src/tests/executor_http_api_tests.cpp
index 51cca7a..a635e1a 100644
--- a/src/tests/executor_http_api_tests.cpp
+++ b/src/tests/executor_http_api_tests.cpp
@@ -96,7 +96,6 @@ protected:
// currently has SSL as a dependency, so this is only necessary if Mesos was
// built with SSL support.
flags.authenticate_http_executors = false;
- flags.jwt_secret_key = None();
#endif // USE_SSL_SOCKET
return flags;
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/files_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/files_tests.cpp b/src/tests/files_tests.cpp
index 4286e58..3e749de 100644
--- a/src/tests/files_tests.cpp
+++ b/src/tests/files_tests.cpp
@@ -40,8 +40,6 @@
#include "tests/mesos.hpp"
-namespace authentication = process::http::authentication;
-
using process::Future;
using process::Owned;
@@ -53,6 +51,8 @@ using process::http::Response;
using process::http::Unauthorized;
using process::http::authentication::Principal;
+using process::http::authentication::setAuthenticator;
+using process::http::authentication::unsetAuthenticator;
using std::string;
@@ -69,7 +69,7 @@ protected:
const string& realm,
const Credentials& credentials)
{
- Try<authentication::Authenticator*> authenticator =
+ Try<process::http::authentication::Authenticator*> authenticator =
BasicAuthenticatorFactory::create(realm, credentials);
ASSERT_SOME(authenticator);
@@ -78,9 +78,10 @@ protected:
realms.insert(realm);
// Pass ownership of the authenticator to libprocess.
- AWAIT_READY(authentication::setAuthenticator(
+ AWAIT_READY(setAuthenticator(
realm,
- Owned<authentication::Authenticator>(authenticator.get())));
+ Owned<process::http::authentication::Authenticator>(
+ authenticator.get())));
}
virtual void TearDown()
@@ -88,7 +89,7 @@ protected:
foreach (const string& realm, realms) {
// We need to wait in order to ensure that the operation completes before
// we leave `TearDown`. Otherwise, we may leak a mock object.
- AWAIT_READY(authentication::unsetAuthenticator(realm));
+ AWAIT_READY(unsetAuthenticator(realm));
}
realms.clear();
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/logging_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/logging_tests.cpp b/src/tests/logging_tests.cpp
index 886dcd0..1e2d09a 100644
--- a/src/tests/logging_tests.cpp
+++ b/src/tests/logging_tests.cpp
@@ -32,8 +32,6 @@
#include "tests/mesos.hpp"
-namespace authentication = process::http::authentication;
-
using mesos::http::authentication::BasicAuthenticatorFactory;
using process::http::BadRequest;
@@ -42,6 +40,9 @@ using process::http::OK;
using process::http::Response;
using process::http::Unauthorized;
+using process::http::authentication::setAuthenticator;
+using process::http::authentication::unsetAuthenticator;
+
namespace mesos {
namespace internal {
namespace tests {
@@ -53,7 +54,7 @@ protected:
const std::string& realm,
const Credentials& credentials)
{
- Try<authentication::Authenticator*> authenticator =
+ Try<process::http::authentication::Authenticator*> authenticator =
BasicAuthenticatorFactory::create(realm, credentials);
ASSERT_SOME(authenticator);
@@ -62,9 +63,10 @@ protected:
realms.insert(realm);
// Pass ownership of the authenticator to libprocess.
- AWAIT_READY(authentication::setAuthenticator(
+ AWAIT_READY(setAuthenticator(
realm,
- process::Owned<authentication::Authenticator>(authenticator.get())));
+ process::Owned<process::http::authentication::Authenticator>(
+ authenticator.get())));
}
virtual void TearDown()
@@ -72,7 +74,7 @@ protected:
foreach (const std::string& realm, realms) {
// We need to wait in order to ensure that the operation completes before
// we leave `TearDown`. Otherwise, we may leak a mock object.
- AWAIT_READY(authentication::unsetAuthenticator(realm));
+ AWAIT_READY(unsetAuthenticator(realm));
}
realms.clear();
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/master_slave_reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_slave_reconciliation_tests.cpp b/src/tests/master_slave_reconciliation_tests.cpp
index d09a235..064b4d4 100644
--- a/src/tests/master_slave_reconciliation_tests.cpp
+++ b/src/tests/master_slave_reconciliation_tests.cpp
@@ -455,9 +455,6 @@ TEST_F(
mesos::internal::slave::Flags slaveFlags = CreateSlaveFlags();
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
ASSERT_SOME(slave);
@@ -519,8 +516,7 @@ TEST_F(
ContentType contentType = ContentType::PROTOBUF;
- resourceProvider->start(
- endpointDetector, contentType, v1::DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, contentType);
// Wait until the agent's resources have been updated to include the
// resource provider resources.
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 0f6042c..6a0fa98 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -8646,7 +8646,6 @@ TEST_F(MasterTest, UpdateSlaveMessageWithPendingOffers)
FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
slave::Flags slaveFlags = CreateSlaveFlags();
- slaveFlags.authenticate_http_readwrite = false;
Try<Owned<cluster::Slave>> agent = StartSlave(detector.get(), slaveFlags);
ASSERT_SOME(agent);
@@ -8671,8 +8670,7 @@ TEST_F(MasterTest, UpdateSlaveMessageWithPendingOffers)
Owned<EndpointDetector> endpointDetector(
resource_provider::createEndpointDetector(agent.get()->pid));
- resourceProvider->start(
- endpointDetector, ContentType::PROTOBUF, v1::DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, ContentType::PROTOBUF);
AWAIT_READY(updateSlaveMessage);
ASSERT_TRUE(resourceProvider->info.has_id());
@@ -8765,10 +8763,6 @@ TEST_F(MasterTest, OperationUpdateDuringFailover)
slave::Flags slaveFlags = CreateSlaveFlags();
- // TODO(nfnt): Remove this once 'MockResourceProvider' supports
- // authentication.
- slaveFlags.authenticate_http_readwrite = false;
-
Future<UpdateSlaveMessage> updateSlaveMessage =
FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
@@ -8801,10 +8795,7 @@ TEST_F(MasterTest, OperationUpdateDuringFailover)
updateSlaveMessage = FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
- resourceProvider.start(
- endpointDetector,
- ContentType::PROTOBUF,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, ContentType::PROTOBUF);
AWAIT_READY(updateSlaveMessage);
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 37129cb..733344a 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -68,6 +68,8 @@
#include <stout/unreachable.hpp>
#include <stout/uuid.hpp>
+#include "authentication/executor/jwt_secret_generator.hpp"
+
#include "common/http.hpp"
#include "messages/messages.hpp" // For google::protobuf::Message.
@@ -3067,12 +3069,32 @@ public:
return driver->send(call);
}
- template <typename Credential>
void start(
process::Owned<mesos::internal::EndpointDetector> detector,
- ContentType contentType,
- const Credential& credential)
+ ContentType contentType)
{
+ Option<std::string> token;
+
+#ifdef USE_SSL_SOCKET
+ mesos::authentication::executor::JWTSecretGenerator secretGenerator(
+ DEFAULT_JWT_SECRET_KEY);
+
+ // For resource provider authentication the chosen claims don't matter,
+ // only the signature has to be valid.
+ // TODO(nfnt): Revisit this once there's authorization of resource provider
+ // API calls.
+ hashmap<std::string, std::string> claims;
+ claims["foo"] = "bar";
+
+ process::http::authentication::Principal principal(None(), claims);
+
+ process::Future<Secret> secret = secretGenerator.generate(principal);
+
+ AWAIT_READY(secret);
+
+ token = secret->value().data();
+#endif // USE_SSL_SOCKET
+
driver.reset(new Driver(
std::move(detector),
contentType,
@@ -3116,7 +3138,7 @@ public:
Source>::events,
this,
lambda::_1),
- None()));
+ token));
driver->start();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/metrics_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/metrics_tests.cpp b/src/tests/metrics_tests.cpp
index 55065cd..f5c6cc9 100644
--- a/src/tests/metrics_tests.cpp
+++ b/src/tests/metrics_tests.cpp
@@ -32,8 +32,6 @@
#include "tests/mesos.hpp"
-namespace authentication = process::http::authentication;
-
using mesos::http::authentication::BasicAuthenticatorFactory;
using mesos::internal::master::Master;
@@ -44,6 +42,8 @@ using mesos::master::detector::MasterDetector;
using process::Owned;
using process::http::authorization::AuthorizationCallbacks;
+using process::http::authentication::setAuthenticator;
+using process::http::authentication::unsetAuthenticator;
namespace mesos {
namespace internal {
@@ -56,7 +56,7 @@ protected:
const std::string& realm,
const Credentials& credentials)
{
- Try<authentication::Authenticator*> authenticator =
+ Try<process::http::authentication::Authenticator*> authenticator =
BasicAuthenticatorFactory::create(realm, credentials);
ASSERT_SOME(authenticator);
@@ -65,9 +65,10 @@ protected:
realms.insert(realm);
// Pass ownership of the authenticator to libprocess.
- AWAIT_READY(authentication::setAuthenticator(
+ AWAIT_READY(setAuthenticator(
realm,
- Owned<authentication::Authenticator>(authenticator.get())));
+ Owned<process::http::authentication::Authenticator>(
+ authenticator.get())));
}
virtual void TearDown()
@@ -75,7 +76,7 @@ protected:
foreach (const std::string& realm, realms) {
// We need to wait in order to ensure that the operation completes before
// we leave `TearDown`. Otherwise, we may leak a mock object.
- AWAIT_READY(authentication::unsetAuthenticator(realm));
+ AWAIT_READY(unsetAuthenticator(realm));
}
realms.clear();
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/operation_reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/operation_reconciliation_tests.cpp b/src/tests/operation_reconciliation_tests.cpp
index 39cf188..d0bc73b 100644
--- a/src/tests/operation_reconciliation_tests.cpp
+++ b/src/tests/operation_reconciliation_tests.cpp
@@ -80,9 +80,6 @@ TEST_P(OperationReconciliationTest, PendingOperation)
Owned<MasterDetector> detector = master.get()->createDetector();
mesos::internal::slave::Flags slaveFlags = CreateSlaveFlags();
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
ASSERT_SOME(slave);
@@ -118,7 +115,7 @@ TEST_P(OperationReconciliationTest, PendingOperation)
ContentType contentType = GetParam();
- resourceProvider->start(endpointDetector, contentType, DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, contentType);
// Wait until the agent's resources have been updated to include the
// resource provider resources.
@@ -666,9 +663,6 @@ TEST_P(OperationReconciliationTest, AgentPendingOperationAfterMasterFailover)
mesos::internal::slave::Flags slaveFlags = CreateSlaveFlags();
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), slaveFlags);
ASSERT_SOME(slave);
@@ -710,7 +704,7 @@ TEST_P(OperationReconciliationTest, AgentPendingOperationAfterMasterFailover)
ContentType contentType = GetParam();
- resourceProvider->start(endpointDetector, contentType, DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, contentType);
// Wait until the agent's resources have been updated to include the
// resource provider resources.
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/resource_provider_manager_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resource_provider_manager_tests.cpp b/src/tests/resource_provider_manager_tests.cpp
index c2045f2..77a59e4 100644
--- a/src/tests/resource_provider_manager_tests.cpp
+++ b/src/tests/resource_provider_manager_tests.cpp
@@ -74,7 +74,6 @@ using mesos::resource_provider::Registrar;
using mesos::resource_provider::RemoveResourceProvider;
using mesos::v1::resource_provider::Call;
-using mesos::v1::resource_provider::Driver;
using mesos::v1::resource_provider::Event;
using process::Clock;
@@ -103,18 +102,7 @@ namespace tests {
class ResourceProviderManagerHttpApiTest
: public MesosTest,
- public WithParamInterface<ContentType>
-{
-public:
- slave::Flags CreateSlaveFlags() override
- {
- slave::Flags slaveFlags = MesosTest::CreateSlaveFlags();
-
- slaveFlags.authenticate_http_readwrite = false;
-
- return slaveFlags;
- }
-};
+ public WithParamInterface<ContentType> {};
// The tests are parameterized by the content type of the request.
@@ -959,7 +947,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, ConvertResources)
const ContentType contentType = GetParam();
- resourceProvider.start(endpointDetector, contentType, v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, contentType);
// Wait until the agent's resources have been updated to include the
// resource provider resources.
@@ -1091,10 +1079,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
const ContentType contentType = GetParam();
- resourceProvider->start(
- endpointDetector,
- contentType,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, contentType);
// Wait until the agent's resources have been updated to include the
// resource provider resources. At this point the resource provider
@@ -1114,10 +1099,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
EXPECT_CALL(*resourceProvider, subscribed(_))
.WillOnce(FutureArg<0>(&subscribed1));
- resourceProvider->start(
- endpointDetector,
- contentType,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, contentType);
AWAIT_READY(subscribed1);
EXPECT_EQ(resourceProviderInfo.id(), subscribed1->provider_id());
@@ -1157,10 +1139,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
EXPECT_CALL(*resourceProvider, subscribed(_))
.WillOnce(FutureArg<0>(&subscribed2));
- resourceProvider->start(
- endpointDetector,
- contentType,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, contentType);
AWAIT_READY(subscribed2);
EXPECT_EQ(resourceProviderInfo.id(), subscribed2->provider_id());
@@ -1219,10 +1198,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, ResubscribeUnknownID)
const ContentType contentType = GetParam();
- resourceProvider->start(
- endpointDetector,
- contentType,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, contentType);
AWAIT_READY(disconnected);
}
@@ -1275,10 +1251,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, ResourceProviderDisconnect)
const ContentType contentType = GetParam();
- resourceProvider->start(
- endpointDetector,
- contentType,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, contentType);
{
// Wait until the agent's resources have been updated to include
@@ -1354,10 +1327,7 @@ TEST_F(ResourceProviderManagerHttpApiTest, ResourceProviderSubscribeDisconnect)
EXPECT_CALL(*resourceProvider1, subscribed(_))
.WillOnce(FutureArg<0>(&subscribed1));
- resourceProvider1->start(
- endpointDetector,
- ContentType::PROTOBUF,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider1->start(endpointDetector, ContentType::PROTOBUF);
AWAIT_READY(subscribed1);
@@ -1383,10 +1353,7 @@ TEST_F(ResourceProviderManagerHttpApiTest, ResourceProviderSubscribeDisconnect)
EXPECT_CALL(*resourceProvider2, subscribed(_))
.WillOnce(FutureArg<0>(&subscribed2));
- resourceProvider2->start(
- endpointDetector,
- ContentType::PROTOBUF,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider2->start(endpointDetector, ContentType::PROTOBUF);
AWAIT_READY(disconnected1);
AWAIT_READY(subscribed2);
@@ -1431,10 +1398,7 @@ TEST_F(ResourceProviderManagerHttpApiTest, Metrics)
EXPECT_CALL(*resourceProvider, subscribed(_))
.WillOnce(FutureArg<0>(&subscribed));
- resourceProvider->start(
- endpointDetector,
- ContentType::PROTOBUF,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider->start(endpointDetector, ContentType::PROTOBUF);
AWAIT_READY(subscribed);
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 9e39884..53c9630 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -10559,9 +10559,6 @@ TEST_F(SlaveTest, ResourceProviderSubscribe)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.resources = "cpus:2;mem:512;disk:512;ports:[]";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
StandaloneMasterDetector detector(master.get()->pid);
Try<Owned<cluster::Slave>> slave = StartSlave(&detector, slaveFlags);
ASSERT_SOME(slave);
@@ -10583,10 +10580,7 @@ TEST_F(SlaveTest, ResourceProviderSubscribe)
Owned<EndpointDetector> endpointDetector(
resource_provider::createEndpointDetector(slave.get()->pid));
- resourceProvider.start(
- endpointDetector,
- ContentType::PROTOBUF,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, ContentType::PROTOBUF);
AWAIT_READY(connected);
@@ -10666,13 +10660,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ResourceProviderPublishAll)
Owned<MasterDetector> detector = master.get()->createDetector();
- slave::Flags flags = CreateSlaveFlags();
- flags.authenticate_http_readwrite = false;
-
Future<UpdateSlaveMessage> updateSlaveMessage =
FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
- Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), flags);
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
ASSERT_SOME(slave);
AWAIT_READY(updateSlaveMessage);
@@ -10694,10 +10685,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ResourceProviderPublishAll)
updateSlaveMessage = FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
- resourceProvider.start(
- endpointDetector,
- ContentType::PROTOBUF,
- v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, ContentType::PROTOBUF);
AWAIT_READY(updateSlaveMessage);
@@ -10955,7 +10943,6 @@ TEST_F(SlaveTest, ResourceProviderReconciliation)
ASSERT_SOME(master);
slave::Flags slaveFlags = CreateSlaveFlags();
- slaveFlags.authenticate_http_readwrite = false;
Future<UpdateSlaveMessage> updateSlaveMessage =
FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
@@ -10990,8 +10977,7 @@ TEST_F(SlaveTest, ResourceProviderReconciliation)
updateSlaveMessage = FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
- resourceProvider.start(
- endpointDetector, ContentType::PROTOBUF, v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, ContentType::PROTOBUF);
AWAIT_READY(updateSlaveMessage);
@@ -11162,7 +11148,6 @@ TEST_F(SlaveTest, RunTaskResourceVersions)
ASSERT_SOME(master);
slave::Flags slaveFlags = CreateSlaveFlags();
- slaveFlags.authenticate_http_readwrite = false;
Future<UpdateSlaveMessage> updateSlaveMessage =
FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
@@ -11197,8 +11182,7 @@ TEST_F(SlaveTest, RunTaskResourceVersions)
updateSlaveMessage = FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
- resourceProvider.start(
- endpointDetector, ContentType::PROTOBUF, v1::DEFAULT_CREDENTIAL);
+ resourceProvider.start(endpointDetector, ContentType::PROTOBUF);
AWAIT_READY(updateSlaveMessage);
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f0909c8/src/tests/storage_local_resource_provider_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/storage_local_resource_provider_tests.cpp b/src/tests/storage_local_resource_provider_tests.cpp
index ccb114a..45cb389 100644
--- a/src/tests/storage_local_resource_provider_tests.cpp
+++ b/src/tests/storage_local_resource_provider_tests.cpp
@@ -288,9 +288,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_NoResource)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
// Since the local resource provider daemon is started after the agent
@@ -376,9 +373,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_ZeroSizedDisk)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
// Since the local resource provider daemon is started after the agent
@@ -443,9 +437,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_SmallDisk)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slaveFlags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -548,9 +539,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_NewProfile)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slaveFlags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -649,9 +637,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_CreateDestroyVolume)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slaveFlags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -828,9 +813,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_CreateDestroyVolumeRecovery)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slaveFlags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -1027,9 +1009,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_AgentRegisteredWithNewId)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slaveFlags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -1229,9 +1208,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_PublishResources)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slaveFlags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -1445,9 +1421,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_PublishResourcesRecovery)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slaveFlags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -1718,9 +1691,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_PublishResourcesReboot)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slaveFlags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -2032,9 +2002,6 @@ TEST_F(
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slaveFlags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -2299,9 +2266,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_ConvertPreExistingVolume)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
// Since the local resource provider daemon is started after the agent
@@ -2517,9 +2481,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_RetryOperationStatusUpdate)
slave::Flags flags = CreateSlaveFlags();
flags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- flags.authenticate_http_readwrite = false;
-
flags.resource_provider_config_dir = resourceProviderConfigDir;
flags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -2671,9 +2632,6 @@ TEST_F(
slave::Flags flags = CreateSlaveFlags();
flags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- flags.authenticate_http_readwrite = false;
-
flags.resource_provider_config_dir = resourceProviderConfigDir;
flags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -2837,9 +2795,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_Metrics)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
slave::Fetcher fetcher(slaveFlags);
@@ -2934,9 +2889,6 @@ TEST_F(StorageLocalResourceProviderTest, ROOT_ReconcileDroppedOperation)
slave::Flags slaveFlags = CreateSlaveFlags();
slaveFlags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- slaveFlags.authenticate_http_readwrite = false;
-
slaveFlags.resource_provider_config_dir = resourceProviderConfigDir;
Future<SlaveRegisteredMessage> slaveRegisteredMessage =
@@ -3141,9 +3093,6 @@ TEST_F(
slave::Flags flags = CreateSlaveFlags();
flags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- flags.authenticate_http_readwrite = false;
-
flags.resource_provider_config_dir = resourceProviderConfigDir;
flags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;
@@ -3329,9 +3278,6 @@ TEST_F(
slave::Flags flags = CreateSlaveFlags();
flags.isolation = "filesystem/linux";
- // Disable HTTP authentication to simplify resource provider interactions.
- flags.authenticate_http_readwrite = false;
-
flags.resource_provider_config_dir = resourceProviderConfigDir;
flags.disk_profile_adaptor = URI_DISK_PROFILE_ADAPTOR_NAME;