Skip to content

test: server test and integration test ipv6 #1049

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 2 commits into from
Jun 6, 2017
Merged

test: server test and integration test ipv6 #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3efd9fd
server test and integration test ipv6
hennna Jun 5, 2017
9839d59
Response to comments
hennna Jun 6, 2017
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
17 changes: 10 additions & 7 deletions test/config/integration/server_http2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"listeners": [
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"filters": [
{ "type": "read", "name": "echo", "config": {} }
]
},
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"filters": [
{
"type": "read",
Expand Down Expand Up @@ -88,7 +88,7 @@
}]
},
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"filters": [
{
"type": "read",
Expand Down Expand Up @@ -175,7 +175,7 @@
}]
},
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"filters": [
{ "type": "read", "name":
"tcp_proxy",
Expand All @@ -193,8 +193,8 @@
]
}],

"admin": { "access_log_path": "/dev/null", "address": "tcp://127.0.0.1:0" },
"statsd_local_udp_port": 8125,
"admin": { "access_log_path": "/dev/null", "address": "tcp://{{ ip_loopback_address }}:0" },
"statsd_udp_ip_address": "{{ ip_loopback_address }}:8125",
"statsd_tcp_cluster_name": "statsd",
"tracing": {
"http": {
Expand All @@ -221,20 +221,22 @@
"connect_timeout_ms": 5000,
"type": "static",
"lb_type": "round_robin",
"hosts": [{"url": "tcp://127.0.0.1:{{ upstream_0 }}"}]
"hosts": [{"url": "tcp://{{ ip_loopback_address }}:{{ upstream_0 }}"}]
},
{
"name": "cluster_2",
"connect_timeout_ms": 5000,
"type": "logical_dns",
"lb_type": "round_robin",
"dns_lookup_family": "{{ dns_lookup_family }}",
"hosts": [{"url": "tcp://localhost:{{ upstream_1 }}"}]
},
{
"name": "statsd",
"connect_timeout_ms": 5000,
"type": "strict_dns",
"lb_type": "round_robin",
"dns_lookup_family": "{{ dns_lookup_family }}",
"hosts": [{"url": "tcp://localhost:10009"}]
},
{
Expand All @@ -243,6 +245,7 @@
"connect_timeout_ms": 5000,
"type": "strict_dns",
"lb_type": "round_robin",
"dns_lookup_family": "{{ dns_lookup_family }}",
"hosts": [{"url": "tcp://localhost:10010"}]
}]
}
Expand Down
11 changes: 6 additions & 5 deletions test/config/integration/server_http2_upstream.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"listeners": [
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"filters": [
{
"type": "read",
Expand Down Expand Up @@ -82,7 +82,7 @@
}]
},
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"filters": [
{
"type": "read",
Expand Down Expand Up @@ -169,7 +169,7 @@
}]
},
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"filters": [
{
"type": "read",
Expand Down Expand Up @@ -255,7 +255,7 @@
}]
}],

"admin": { "access_log_path": "/dev/null", "address": "tcp://127.0.0.1:0" },
"admin": { "access_log_path": "/dev/null", "address": "tcp://{{ ip_loopback_address }}:0" },

"cluster_manager": {
"clusters": [
Expand All @@ -265,14 +265,15 @@
"type": "static",
"lb_type": "round_robin",
"features": "http2",
"hosts": [{"url": "tcp://127.0.0.1:{{ upstream_0 }}"}]
"hosts": [{"url": "tcp://{{ ip_loopback_address }}:{{ upstream_0 }}"}]
},
{
"name": "cluster_2",
"connect_timeout_ms": 5000,
"type": "strict_dns",
"lb_type": "round_robin",
"features": "http2",
"dns_lookup_family": "{{ dns_lookup_family }}",
"hosts": [{"url": "tcp://localhost:{{ upstream_1 }}"}]
}]
}
Expand Down
9 changes: 5 additions & 4 deletions test/config/integration/server_proxy_proto.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"listeners": [
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"use_proxy_proto": true,
"filters": [
{
Expand Down Expand Up @@ -82,8 +82,8 @@
}]
}],

"admin": { "access_log_path": "/dev/null", "address": "tcp://127.0.0.1:0" },
"statsd_local_udp_port": 8125,
"admin": { "access_log_path": "/dev/null", "address": "tcp://{{ ip_loopback_address }}:0" },
"statsd_udp_ip_address": "{{ ip_loopback_address }}:8125",

"cluster_manager": {
"clusters": [
Expand All @@ -92,13 +92,14 @@
"connect_timeout_ms": 5000,
"type": "static",
"lb_type": "round_robin",
"hosts": [{"url": "tcp://127.0.0.1:{{ upstream_0 }}"}]
"hosts": [{"url": "tcp://{{ ip_loopback_address }}:{{ upstream_0 }}"}]
},
{
"name": "cluster_2",
"connect_timeout_ms": 5000,
"type": "strict_dns",
"lb_type": "round_robin",
"dns_lookup_family": "{{ dns_lookup_family }}",
"hosts": [{"url": "tcp://localhost:11001"}]
}]
}
Expand Down
9 changes: 5 additions & 4 deletions test/config/integration/server_ssl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"listeners": [
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"ssl_context": {
"ca_cert_file": "{{ test_rundir }}/test/config/integration/certs/cacert.pem",
"cert_chain_file": "{{ test_rundir }}/test/config/integration/certs/servercert.pem",
Expand Down Expand Up @@ -89,8 +89,8 @@
}]
}],

"admin": { "access_log_path": "/dev/null", "address": "tcp://127.0.0.1:0" },
"statsd_local_udp_port": 8125,
"admin": { "access_log_path": "/dev/null", "address": "tcp://{{ ip_loopback_address }}:0" },
"statsd_udp_ip_address": "{{ ip_loopback_address }}:8125",

"cluster_manager": {
"clusters": [
Expand All @@ -103,7 +103,7 @@
},
"type": "static",
"lb_type": "round_robin",
"hosts": [{"url": "tcp://127.0.0.1:{{ upstream_0 }}"}]
"hosts": [{"url": "tcp://{{ ip_loopback_address }}:{{ upstream_0 }}"}]
},
{
"name": "cluster_2",
Expand All @@ -114,6 +114,7 @@
},
"type": "strict_dns",
"lb_type": "round_robin",
"dns_lookup_family": "{{ dns_lookup_family }}",
"hosts": [{"url": "tcp://localhost:{{ upstream_1 }}"}]
}]
}
Expand Down
6 changes: 3 additions & 3 deletions test/config/integration/server_uds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"listeners": [
{
"address": "tcp://127.0.0.1:0",
"address": "tcp://{{ ip_loopback_address }}:0",
"filters": [
{
"type": "read",
Expand Down Expand Up @@ -81,8 +81,8 @@
}]
}],

"admin": { "access_log_path": "/dev/null", "address": "tcp://127.0.0.1:0" },
"statsd_local_udp_port": 8125,
"admin": { "access_log_path": "/dev/null", "address": "tcp://{{ ip_loopback_address }}:0" },
"statsd_udp_ip_address": "{{ ip_loopback_address }}:8125",

"cluster_manager": {
"clusters": [
Expand Down
6 changes: 3 additions & 3 deletions test/integration/echo_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ class EchoIntegrationTest : public BaseIntegrationTest,
* Initializer for an individual test.
*/
void SetUp() override {
fake_upstreams_.emplace_back(new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, GetParam()));
fake_upstreams_.emplace_back(new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_));
registerPort("upstream_0", fake_upstreams_.back()->localAddress()->ip()->port());
fake_upstreams_.emplace_back(new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, GetParam()));
fake_upstreams_.emplace_back(new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_));
registerPort("upstream_1", fake_upstreams_.back()->localAddress()->ip()->port());
createTestServer("test/config/integration/echo_server.json", {"echo"});
}
Expand All @@ -37,7 +37,7 @@ TEST_P(EchoIntegrationTest, Hello) {
buffer, [&](Network::ClientConnection&, const Buffer::Instance& data) -> void {
response.append(TestUtility::bufferToString(data));
connection.close();
}, GetParam());
}, version_);

connection.run();
EXPECT_EQ("hello", response);
Expand Down
12 changes: 6 additions & 6 deletions test/integration/fake_upstream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,8 @@ FakeUpstream::FakeUpstream(const std::string& uds_path, FakeHttpConnection::Type
log().info("starting fake server on unix domain socket {}", uds_path);
}

static Network::ListenSocketPtr
makeTcpListenSocket(uint32_t port,
Network::Address::IpVersion version = Network::Address::IpVersion::v4) {
static Network::ListenSocketPtr makeTcpListenSocket(uint32_t port,
Network::Address::IpVersion version) {
return Network::ListenSocketPtr{new Network::TcpListenSocket(
Network::Utility::parseInternetAddressAndPort(
fmt::format("{}:{}", Network::Test::getAnyAddressUrlString(version), port)),
Expand All @@ -217,9 +216,10 @@ FakeUpstream::FakeUpstream(uint32_t port, FakeHttpConnection::Type type,
}

FakeUpstream::FakeUpstream(Ssl::ServerContext* ssl_ctx, uint32_t port,
FakeHttpConnection::Type type)
: FakeUpstream(ssl_ctx, makeTcpListenSocket(port), type) {
log().info("starting fake SSL server on port {}", this->localAddress()->ip()->port());
FakeHttpConnection::Type type, Network::Address::IpVersion version)
: FakeUpstream(ssl_ctx, makeTcpListenSocket(port, version), type) {
log().info("starting fake SSL server on port {}. Address version is {}",
this->localAddress()->ip()->port(), Network::Test::addressVersionAsString(version));
}

FakeUpstream::FakeUpstream(Ssl::ServerContext* ssl_ctx, Network::ListenSocketPtr&& listen_socket,
Expand Down
6 changes: 3 additions & 3 deletions test/integration/fake_upstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ typedef std::unique_ptr<FakeRawConnection> FakeRawConnectionPtr;
class FakeUpstream : Logger::Loggable<Logger::Id::testing>, public Network::FilterChainFactory {
public:
FakeUpstream(const std::string& uds_path, FakeHttpConnection::Type type);
FakeUpstream(uint32_t port, FakeHttpConnection::Type type,
Network::Address::IpVersion version = Network::Address::IpVersion::v4);
FakeUpstream(Ssl::ServerContext* ssl_ctx, uint32_t port, FakeHttpConnection::Type type);
FakeUpstream(uint32_t port, FakeHttpConnection::Type type, Network::Address::IpVersion version);
FakeUpstream(Ssl::ServerContext* ssl_ctx, uint32_t port, FakeHttpConnection::Type type,
Network::Address::IpVersion version);
~FakeUpstream();

FakeHttpConnection::Type httpType() { return http_type_; }
Expand Down
Loading