Ema has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318519
Change subject: cache_text varnishtest: set X-Carrier based on XCIP
......................................................................
cache_text varnishtest: set X-Carrier based on XCIP
Test setting X-Carrier based on XCIP using a test version of
carriers.json.
Bug: T131503
Change-Id: I94f79faa7a4e5cdd8ad7a12e22d7c29fe0fd2f9f
---
A modules/varnish/files/tests/carriers.json
A modules/varnish/files/tests/text/04-x-carrier.vtc
2 files changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/318519/1
diff --git a/modules/varnish/files/tests/carriers.json
b/modules/varnish/files/tests/carriers.json
new file mode 100644
index 0000000..00e67b5
--- /dev/null
+++ b/modules/varnish/files/tests/carriers.json
@@ -0,0 +1 @@
+{"42-02": ["93.184.216.34/32"]}
diff --git a/modules/varnish/files/tests/text/04-x-carrier.vtc
b/modules/varnish/files/tests/text/04-x-carrier.vtc
new file mode 100644
index 0000000..2960805
--- /dev/null
+++ b/modules/varnish/files/tests/text/04-x-carrier.vtc
@@ -0,0 +1,21 @@
+varnishtest "cache_text x-carrier"
+
+server s1 {
+ rxreq
+ txresp
+} -start
+
+varnish v1 -arg "-p cc_command='exec cc -fpic -shared -Wl,-x -L/usr/local/lib/
-o %o %s -lmaxminddb' -p vcc_allow_inline_c=true -p vcc_err_unref=false"
-vcl+backend {
+ backend vtc_backend {
+ .host = "${s1_addr}"; .port = "${s1_port}";
+ }
+
+ include "/usr/share/varnish/tests/wikimedia_text-frontend.vcl";
+} -start
+
+client c1 {
+ txreq -url "/" -hdr "Host: en.wikipedia.org" -hdr "X-Forwarded-Proto:
https" -hdr "X-Client-IP: 93.184.216.34" -hdr "X-Forwarded-For: 93.184.216.34"
+ rxresp
+ expect resp.status == 200
+ expect resp.http.X-Carrier == "42-02"
+} -run
--
To view, visit https://gerrit.wikimedia.org/r/318519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94f79faa7a4e5cdd8ad7a12e22d7c29fe0fd2f9f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
