Skip to content

[test] convert lds api test config stubs to v2 #7021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 3 commits into from
May 22, 2019
Merged

[test] convert lds api test config stubs to v2 #7021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b583413
[test] convert lds api test config stubs to v2
derekargueta May 21, 2019
5dd956b
json -> yaml
derekargueta May 21, 2019
2bdfc13
Merge branch 'master' into dereka/lds-api-test-v2-config
derekargueta May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/server/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ envoy_cc_test(
"//test/config/integration/certs",
],
deps = [
"//source/common/config:utility_lib",
"//source/common/protobuf:utility_lib",
"//source/server:lds_api_lib",
"//test/mocks/server:server_mocks",
"//test/test_common:environment_lib",
Expand Down
47 changes: 22 additions & 25 deletions test/server/lds_api_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "envoy/api/v2/lds.pb.h"

#include "common/config/utility.h"
#include "common/http/message_impl.h"
#include "common/protobuf/utility.h"

#include "server/lds_api.h"

Expand Down Expand Up @@ -33,17 +33,16 @@ class LdsApiTest : public testing::Test {
}

void setup() {
const std::string config_json = R"EOF(
{
"api_type": "REST",
"cluster": "foo_cluster",
"refresh_delay_ms": 1000
}
const std::string config_yaml = R"EOF(
api_config_source:
api_type: REST
cluster_names:
- foo_cluster
refresh_delay: 1s
)EOF";

Json::ObjectSharedPtr config = Json::Factory::loadFromString(config_json);
envoy::api::v2::core::ConfigSource lds_config;
Config::Utility::translateLdsConfig(*config, lds_config);
MessageUtil::loadFromYaml(config_yaml, lds_config);
lds_config.mutable_api_config_source()->set_api_type(
envoy::api::v2::core::ApiConfigSource::REST);
Upstream::ClusterManager::ClusterInfoMap cluster_map;
Expand Down Expand Up @@ -159,17 +158,16 @@ TEST_F(LdsApiTest, ValidateFail) {
}

TEST_F(LdsApiTest, UnknownCluster) {
const std::string config_json = R"EOF(
{
"api_type": "REST",
"cluster": "foo_cluster",
"refresh_delay_ms": 1000
}
const std::string config_yaml = R"EOF(
api_config_source:
api_type: REST
cluster_names:
- foo_cluster
refresh_delay: 1s
)EOF";

Json::ObjectSharedPtr config = Json::Factory::loadFromString(config_json);
envoy::api::v2::core::ConfigSource lds_config;
Config::Utility::translateLdsConfig(*config, lds_config);
MessageUtil::loadFromYaml(config_yaml, lds_config);
Upstream::ClusterManager::ClusterInfoMap cluster_map;
EXPECT_CALL(cluster_manager_, clusters()).WillOnce(Return(cluster_map));
EXPECT_THROW_WITH_MESSAGE(
Expand Down Expand Up @@ -273,17 +271,16 @@ TEST_F(LdsApiTest, ValidateDuplicateListeners) {

TEST_F(LdsApiTest, BadLocalInfo) {
interval_timer_ = new Event::MockTimer(&dispatcher_);
const std::string config_json = R"EOF(
{
"api_type": "REST",
"cluster": "foo_cluster",
"refresh_delay_ms": 1000
}
const std::string config_yaml = R"EOF(
api_config_source:
api_type: REST
cluster_names:
- foo_cluster
refresh_delay: 1s
)EOF";

Json::ObjectSharedPtr config = Json::Factory::loadFromString(config_json);
envoy::api::v2::core::ConfigSource lds_config;
Config::Utility::translateLdsConfig(*config, lds_config);
MessageUtil::loadFromYaml(config_yaml, lds_config);
Upstream::ClusterManager::ClusterInfoMap cluster_map;
Upstream::MockClusterMockPrioritySet cluster;
cluster_map.emplace("foo_cluster", cluster);
Expand Down