You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2021/07/15 01:16:38 UTC
[trafficcontrol] branch master updated: Expect redirect to
edge-cache-010 through 012,
not edge-cache-900 through edge-cache-902 (#5962)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new f45539b Expect redirect to edge-cache-010 through 012, not edge-cache-900 through edge-cache-902 (#5962)
f45539b is described below
commit f45539b9b7873f3d153fb13190e633ddb527e79f
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Wed Jul 14 19:16:25 2021 -0600
Expect redirect to edge-cache-010 through 012, not edge-cache-900 through edge-cache-902 (#5962)
* Remove edge-cache-900 through edge-cache-902 from mock CrConfig3
* Expect redirect to edge-cache-010 through 012, not edge-cache-900 through edge-cache-902
---
.../traffic_router/core/external/RouterTest.java | 6 +--
.../core/src/test/resources/publish/CrConfig3.json | 51 ----------------------
2 files changed, 3 insertions(+), 54 deletions(-)
diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/RouterTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/RouterTest.java
index 9b68e8d..232c4c7 100644
--- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/RouterTest.java
+++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/RouterTest.java
@@ -519,9 +519,9 @@ public class RouterTest {
assertThat(response.getStatusLine().getStatusCode(), equalTo(302));
String location = response.getFirstHeader("Location").getValue();
assertThat(location, isOneOf(
- "http://edge-cache-900.http-only-test.thecdn.example.com:8090/stuff?fakeClientIpAddress=12.34.56.78",
- "http://edge-cache-901.http-only-test.thecdn.example.com:8090/stuff?fakeClientIpAddress=12.34.56.78",
- "http://edge-cache-902.http-only-test.thecdn.example.com:8090/stuff?fakeClientIpAddress=12.34.56.78"
+ "http://edge-cache-010.http-only-test.thecdn.example.com:8090/stuff?fakeClientIpAddress=12.34.56.78",
+ "http://edge-cache-011.http-only-test.thecdn.example.com:8090/stuff?fakeClientIpAddress=12.34.56.78",
+ "http://edge-cache-012.http-only-test.thecdn.example.com:8090/stuff?fakeClientIpAddress=12.34.56.78"
));
}
diff --git a/traffic_router/core/src/test/resources/publish/CrConfig3.json b/traffic_router/core/src/test/resources/publish/CrConfig3.json
index ac25ab3..58521d5 100644
--- a/traffic_router/core/src/test/resources/publish/CrConfig3.json
+++ b/traffic_router/core/src/test/resources/publish/CrConfig3.json
@@ -491,57 +491,6 @@
"deliveryServices": {
"https-nocert": ["edge-cache-092.https-nocert.thecdn.example.com"]
}
- },
- "edge-cache-900": {
- "type": "EDGE",
- "profile": "EDGE_STATIC",
- "status": "REPORTED",
- "hashId": "edge-cache-900@xmpp.cdn.example.com",
- "fqdn": "edge-cache-900.thecdn.example.com",
- "port": "8090",
- "ip": "12.34.90.100",
- "ip6": "2001:dead:beef:1:C::1A/64",
- "cacheGroup": "cache-group-1",
- "locationId": "location-1",
- "hashCount": 1000,
- "interfaceName": "bond0",
- "deliveryServices": {
- "http-only-test": ["edge-cache-900.http-only-test.thecdn.example.com"]
- }
- },
- "edge-cache-901": {
- "type": "EDGE",
- "profile": "EDGE_STATIC",
- "status": "REPORTED",
- "hashId": "edge-cache-901@xmpp.cdn.example.com",
- "fqdn": "edge-cache-901.thecdn.example.com",
- "port": "8090",
- "ip": "12.34.90.101",
- "ip6": "2001:dead:beef:1:C::11/64",
- "cacheGroup": "cache-group-1",
- "locationId": "location-1",
- "hashCount": 1000,
- "interfaceName": "bond0",
- "deliveryServices": {
- "http-only-test": ["edge-cache-901.http-only-test.thecdn.example.com"]
- }
- },
- "edge-cache-902": {
- "type": "EDGE",
- "profile": "EDGE_STATIC",
- "status": "REPORTED",
- "hashId": "edge-cache-902@xmpp.cdn.example.com",
- "fqdn": "edge-cache-902.thecdn.example.com",
- "port": "8090",
- "ip": "12.34.90.102",
- "ip6": "2001:dead:beef:1:C::12/64",
- "cacheGroup": "cache-group-1",
- "locationId": "location-1",
- "hashCount": 1000,
- "interfaceName": "bond0",
- "deliveryServices": {
- "http-only-test": ["edge-cache-902.http-only-test.thecdn.example.com"]
- }
}
},
"contentRouters": {