elsloo closed pull request #2336: Update TR routes to point to 1.3 TO routes
URL: https://github.com/apache/incubator-trafficcontrol/pull/2336
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java
index e6a0c1947..e19a9d9a2 100644
---
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java
+++
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java
@@ -211,7 +211,7 @@ private JsonNode fetchKeyPairData(final CacheRegister
cacheRegister) {
final ObjectMapper mapper = new ObjectMapper();
try {
- final String keyUrl =
trafficOpsUtils.getUrl("keystore.api.url",
"https://${toHostname}/api/1.1/cdns/name/${cdnName}/dnsseckeys.json";);
+ final String keyUrl =
trafficOpsUtils.getUrl("keystore.api.url",
"https://${toHostname}/api/1.3/cdns/name/${cdnName}/dnsseckeys.json";);
final JsonNode config = cacheRegister.getConfig();
final int timeout = JsonUtils.optInt(config,
"keystore.fetch.timeout", 30000); // socket timeouts are in ms
final int retries = JsonUtils.optInt(config,
"keystore.fetch.retries", 5);
diff --git
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
index 74b0c4b4d..e8f519226 100644
---
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
+++
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
@@ -22,7 +22,7 @@
private static final Logger LOGGER =
Logger.getLogger(SteeringWatcher.class);
private SteeringRegistry steeringRegistry;
- public static final String DEFAULT_STEERING_DATA_URL =
"https://${toHostname}/internal/api/1.2/steering.json";;
+ public static final String DEFAULT_STEERING_DATA_URL =
"https://${toHostname}/internal/api/1.3/steering.json";;
public SteeringWatcher() {
setDatabaseUrl(DEFAULT_STEERING_DATA_URL);
diff --git
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java
index 58988e9ca..0c953f849 100644
---
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java
+++
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java
@@ -22,7 +22,7 @@
private static final Logger LOGGER =
Logger.getLogger(FederationsWatcher.class);
private FederationRegistry federationRegistry;
- public static final String DEFAULT_FEDERATION_DATA_URL =
"https://${toHostname}/internal/api/1.2/federations.json";;
+ public static final String DEFAULT_FEDERATION_DATA_URL =
"https://${toHostname}/internal/api/1.3/federations.json";;
public FederationsWatcher() {
setDatabaseUrl(DEFAULT_FEDERATION_DATA_URL);
}
diff --git
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java
index ae4525d94..fd2a7160f 100644
---
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java
+++
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java
@@ -76,7 +76,7 @@ public int fetchRawData(final StringBuilder stringBuilder) {
}
}
- final String certificatesUrl =
trafficOpsUtils.getUrl("certificate.api.url",
"https://${toHostname}/api/1.2/cdns/name/${cdnName}/sslkeys.json";);
+ final String certificatesUrl =
trafficOpsUtils.getUrl("certificate.api.url",
"https://${toHostname}/api/1.3/cdns/name/${cdnName}/sslkeys.json";);
try {
final ProtectedFetcher fetcher = new
ProtectedFetcher(trafficOpsUtils.getAuthUrl(),
trafficOpsUtils.getAuthJSON().toString(), 15000);
diff --git
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java
index e3c8c5744..781d00978 100644
---
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java
+++
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java
@@ -53,7 +53,7 @@ public JsonNode getAuthJSON() throws IOException {
}
public String getAuthUrl() {
- return getUrl("api.auth.url",
"https://${toHostname}/api/1.1/user/login";);
+ return getUrl("api.auth.url",
"https://${toHostname}/api/1.3/user/login";);
}
public String getUsername() {
diff --git
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java
index e6b6859ca..4a1e1ba55 100644
---
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java
+++
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java
@@ -56,7 +56,7 @@
public void before() throws Exception {
closeableHttpClient = HttpClientBuilder.create().build();
- String resourcePath = "internal/api/1.2/steering.json";
+ String resourcePath = "internal/api/1.3/steering.json";
InputStream inputStream =
getClass().getClassLoader().getResourceAsStream(resourcePath);
if (inputStream == null) {
diff --git
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java
index 3929a7a84..553130e29 100644
---
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java
+++
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java
@@ -119,7 +119,7 @@ public void run() {
path += ".json";
}
- if ("api/1.1/user/login".equals(path)) {
+ if ("api/1.3/user/login".equals(path)) {
try {
Headers headers =
httpExchange.getResponseHeaders();
headers.set("Set-Cookie", new
HttpCookie("mojolicious","fake-cookie").toString());
@@ -130,12 +130,12 @@ public void run() {
}
// Pretend that someone externally changed
steering.json data
- if (receivedSteeringPost &&
"internal/api/1.2/steering.json".equals(path)) {
- path =
"internal/api/1.2/steering2.json";
+ if (receivedSteeringPost &&
"internal/api/1.3/steering.json".equals(path)) {
+ path =
"internal/api/1.3/steering2.json";
}
// pretend certificates have not been updated
- if (!receivedCertificatesPost &&
"api/1.2/cdns/name/thecdn/sslkeys.json".equals(path)) {
+ if (!receivedCertificatesPost &&
"api/1.3/cdns/name/thecdn/sslkeys.json".equals(path)) {
path = path.replace("/sslkeys.json",
"/sslkeys-missing-1.json");
}
diff --git
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java
index 08aae21cc..38790b4ed 100644
---
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java
+++
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java
@@ -107,7 +107,7 @@
public void before() throws Exception {
ObjectMapper objectMapper = new ObjectMapper(new JsonFactory());
- String resourcePath = "internal/api/1.2/steering.json";
+ String resourcePath = "internal/api/1.3/steering.json";
InputStream inputStream =
getClass().getClassLoader().getResourceAsStream(resourcePath);
if (inputStream == null) {
diff --git
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
index b71f90978..785645708 100644
---
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
+++
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
@@ -137,7 +137,7 @@ public void setupCrConfig() throws IOException {
@Before
public void before() throws Exception {
- steeringDeliveryServiceId = setupSteering(targetDomains,
targetWeights, "internal/api/1.2/steering.json");
+ steeringDeliveryServiceId = setupSteering(targetDomains,
targetWeights, "internal/api/1.3/steering.json");
setupCrConfig();
httpClient =
HttpClientBuilder.create().disableRedirectHandling().build();
@@ -268,7 +268,7 @@ public void z_itemsMigrateFromSmallerToLargerBucket()
throws Exception {
Map<String, String> domains = new HashMap<>();
Map<String, Integer> weights = new HashMap<>();
- setupSteering(domains, weights,
"internal/api/1.2/steering2.json");
+ setupSteering(domains, weights,
"internal/api/1.3/steering2.json");
List<String> randomPaths = new ArrayList<>();
diff --git
a/traffic_router/core/src/test/resources/api/1.2/cdns/name/thecdn/sslkeys-missing-1.json
b/traffic_router/core/src/test/resources/api/1.3/cdns/name/thecdn/sslkeys-missing-1.json
similarity index 100%
rename from
traffic_router/core/src/test/resources/api/1.2/cdns/name/thecdn/sslkeys-missing-1.json
rename to
traffic_router/core/src/test/resources/api/1.3/cdns/name/thecdn/sslkeys-missing-1.json
diff --git
a/traffic_router/core/src/test/resources/api/1.2/cdns/name/thecdn/sslkeys.json
b/traffic_router/core/src/test/resources/api/1.3/cdns/name/thecdn/sslkeys.json
similarity index 100%
rename from
traffic_router/core/src/test/resources/api/1.2/cdns/name/thecdn/sslkeys.json
rename to
traffic_router/core/src/test/resources/api/1.3/cdns/name/thecdn/sslkeys.json
diff --git
a/traffic_router/core/src/test/resources/internal/api/1.2/federations.json
b/traffic_router/core/src/test/resources/internal/api/1.3/federations.json
similarity index 100%
rename from
traffic_router/core/src/test/resources/internal/api/1.2/federations.json
rename to
traffic_router/core/src/test/resources/internal/api/1.3/federations.json
diff --git
a/traffic_router/core/src/test/resources/internal/api/1.2/steering.json
b/traffic_router/core/src/test/resources/internal/api/1.3/steering.json
similarity index 100%
rename from
traffic_router/core/src/test/resources/internal/api/1.2/steering.json
rename to traffic_router/core/src/test/resources/internal/api/1.3/steering.json
diff --git
a/traffic_router/core/src/test/resources/internal/api/1.2/steering2.json
b/traffic_router/core/src/test/resources/internal/api/1.3/steering2.json
similarity index 100%
rename from
traffic_router/core/src/test/resources/internal/api/1.2/steering2.json
rename to traffic_router/core/src/test/resources/internal/api/1.3/steering2.json
diff --git a/traffic_router/core/src/test/resources/publish/CrConfig.json
b/traffic_router/core/src/test/resources/publish/CrConfig.json
index 395cb1751..6693a3073 100644
--- a/traffic_router/core/src/test/resources/publish/CrConfig.json
+++ b/traffic_router/core/src/test/resources/publish/CrConfig.json
@@ -1443,10 +1443,10 @@
}
},
"config": {
- "certificate.api.url":
"http://${toHostname}/api/1.2/cdns/name/${cdnName}/sslkeys.json";,
- "federationmapping.polling.url":
"http://${toHostname}/internal/api/1.2/federations.json";,
+ "certificate.api.url":
"http://${toHostname}/api/1.3/cdns/name/${cdnName}/sslkeys.json";,
+ "federationmapping.polling.url":
"http://${toHostname}/internal/api/1.3/federations.json";,
"federationmapping.polling.interval": "600000",
- "steeringmapping.polling.url":
"http://${toHostname}/internal/api/1.2/steering.json";,
+ "steeringmapping.polling.url":
"http://${toHostname}/internal/api/1.3/steering.json";,
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
@@ -1465,7 +1465,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed":
"http://testing-tm-01.cdn.example.com/some/path";,
- "keystore.auth.url": "http://localhost:3000/api/1.1/user/login";,
+ "keystore.auth.url": "http://localhost:3000/api/1.3/user/login";,
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
@@ -1478,7 +1478,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json";,
- "api.auth.url": "http://${toHostname}/api/1.1/user/login";,
+ "api.auth.url": "http://${toHostname}/api/1.3/user/login";,
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
diff --git a/traffic_router/core/src/test/resources/publish/CrConfig2.json
b/traffic_router/core/src/test/resources/publish/CrConfig2.json
index 45b263a42..d680ad86b 100644
--- a/traffic_router/core/src/test/resources/publish/CrConfig2.json
+++ b/traffic_router/core/src/test/resources/publish/CrConfig2.json
@@ -1201,10 +1201,10 @@
}
},
"config": {
- "certificate.api.url":
"http://${toHostname}/api/1.2/cdns/name/${cdnName}/sslkeys.json";,
- "federationmapping.polling.url":
"http://${toHostname}/internal/api/1.2/federations.json";,
+ "certificate.api.url":
"http://${toHostname}/api/1.3/cdns/name/${cdnName}/sslkeys.json";,
+ "federationmapping.polling.url":
"http://${toHostname}/internal/api/1.3/federations.json";,
"federationmapping.polling.interval": "600000",
- "steeringmapping.polling.url":
"http://${toHostname}/internal/api/1.2/steering.json";,
+ "steeringmapping.polling.url":
"http://${toHostname}/internal/api/1.3/steering.json";,
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
@@ -1223,7 +1223,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed":
"http://testing-tm-01.cdn.example.com/some/path";,
- "keystore.auth.url": "http://localhost:3000/api/1.1/user/login";,
+ "keystore.auth.url": "http://localhost:3000/api/1.3/user/login";,
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
@@ -1236,7 +1236,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json";,
- "api.auth.url": "http://${toHostname}/api/1.1/user/login";,
+ "api.auth.url": "http://${toHostname}/api/1.3/user/login";,
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
diff --git a/traffic_router/core/src/test/resources/publish/CrConfig3.json
b/traffic_router/core/src/test/resources/publish/CrConfig3.json
index 9f6c29bab..f6ced1519 100644
--- a/traffic_router/core/src/test/resources/publish/CrConfig3.json
+++ b/traffic_router/core/src/test/resources/publish/CrConfig3.json
@@ -1252,10 +1252,10 @@
}
},
"config": {
- "certificate.api.url":
"http://${toHostname}/api/1.2/cdns/name/${cdnName}/sslkeys.json";,
- "federationmapping.polling.url":
"http://${toHostname}/internal/api/1.2/federations.json";,
+ "certificate.api.url":
"http://${toHostname}/api/1.3/cdns/name/${cdnName}/sslkeys.json";,
+ "federationmapping.polling.url":
"http://${toHostname}/internal/api/1.3/federations.json";,
"federationmapping.polling.interval": "600000",
- "steeringmapping.polling.url":
"http://${toHostname}/internal/api/1.2/steering.json";,
+ "steeringmapping.polling.url":
"http://${toHostname}/internal/api/1.3/steering.json";,
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
@@ -1274,7 +1274,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed":
"http://testing-tm-01.cdn.example.com/some/path";,
- "keystore.auth.url": "http://localhost:3000/api/1.1/user/login";,
+ "keystore.auth.url": "http://localhost:3000/api/1.3/user/login";,
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
@@ -1287,7 +1287,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json";,
- "api.auth.url": "http://${toHostname}/api/1.1/user/login";,
+ "api.auth.url": "http://${toHostname}/api/1.3/user/login";,
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
diff --git a/traffic_router/core/src/test/resources/publish/CrConfig4.json
b/traffic_router/core/src/test/resources/publish/CrConfig4.json
index 644acf1ae..adfb1f00a 100644
--- a/traffic_router/core/src/test/resources/publish/CrConfig4.json
+++ b/traffic_router/core/src/test/resources/publish/CrConfig4.json
@@ -1201,10 +1201,10 @@
}
},
"config": {
- "certificate.api.url":
"http://${toHostname}/api/1.2/cdns/name/${cdnName}/sslkeys.json";,
- "federationmapping.polling.url":
"http://${toHostname}/internal/api/1.2/federations.json";,
+ "certificate.api.url":
"http://${toHostname}/api/1.3/cdns/name/${cdnName}/sslkeys.json";,
+ "federationmapping.polling.url":
"http://${toHostname}/internal/api/1.3/federations.json";,
"federationmapping.polling.interval": "600000",
- "steeringmapping.polling.url":
"http://${toHostname}/internal/api/1.2/steering.json";,
+ "steeringmapping.polling.url":
"http://${toHostname}/internal/api/1.3/steering.json";,
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
@@ -1223,7 +1223,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed":
"http://testing-tm-01.cdn.example.com/some/path";,
- "keystore.auth.url": "http://localhost:3000/api/1.1/user/login";,
+ "keystore.auth.url": "http://localhost:3000/api/1.3/user/login";,
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
@@ -1236,7 +1236,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json";,
- "api.auth.url": "http://${toHostname}/api/1.1/user/login";,
+ "api.auth.url": "http://${toHostname}/api/1.3/user/login";,
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
