Merge pull request #12860 from ramr/testfixes

Merged by openshift-bot

Author: OpenShift Bot

test/integration/router_test.go

@@ -114,7 +114,7 @@ func TestRouter(t *testing.T) {
 			name:              "non-secure",
 			serviceName:       "example",
 			endpoints:         []kapi.EndpointSubset{httpEndpoint},
-			routeAlias:        "www.example-unsecure.com",
+			routeAlias:        "unsecure.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "http",
@@ -126,7 +126,7 @@ func TestRouter(t *testing.T) {
 			name:              "non-secure-path",
 			serviceName:       "example-path",
 			endpoints:         []kapi.EndpointSubset{httpEndpoint},
-			routeAlias:        "www.example-unsecure.com",
+			routeAlias:        "unsecure.example.com",
 			routePath:         "/test",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
@@ -139,7 +139,7 @@ func TestRouter(t *testing.T) {
 			name:              "preferred-port",
 			serviceName:       "example-preferred-port",
 			endpoints:         []kapi.EndpointSubset{alternateHttpEndpoint, httpEndpoint},
-			routeAlias:        "www.example-unsecure.com",
+			routeAlias:        "pref.port.unsecure.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "http",
@@ -152,7 +152,7 @@ func TestRouter(t *testing.T) {
 			name:              "edge termination",
 			serviceName:       "example-edge",
 			endpoints:         []kapi.EndpointSubset{httpEndpoint},
-			routeAlias:        "www.example.com",
+			routeAlias:        "edge.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "https",
@@ -169,7 +169,7 @@ func TestRouter(t *testing.T) {
 			name:              "edge termination path",
 			serviceName:       "example-edge-path",
 			endpoints:         []kapi.EndpointSubset{httpEndpoint},
-			routeAlias:        "www.example.com",
+			routeAlias:        "edge.example.com",
 			routePath:         "/test",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
@@ -187,7 +187,7 @@ func TestRouter(t *testing.T) {
 			name:              "reencrypt",
 			serviceName:       "example-reencrypt",
 			endpoints:         []kapi.EndpointSubset{httpsEndpoint},
-			routeAlias:        "www.example.com",
+			routeAlias:        "reencrypt.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "https",
@@ -205,7 +205,7 @@ func TestRouter(t *testing.T) {
 			name:              "reencrypt-InsecureEdgePolicy",
 			serviceName:       "example-reencrypt",
 			endpoints:         []kapi.EndpointSubset{httpsEndpoint},
-			routeAlias:        "www.example.com",
+			routeAlias:        "allow.reencrypt.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "http",
@@ -224,7 +224,7 @@ func TestRouter(t *testing.T) {
 			name:              "reencrypt-destcacert",
 			serviceName:       "example-reencrypt-destcacert",
 			endpoints:         []kapi.EndpointSubset{httpsEndpoint},
-			routeAlias:        "www.example.com",
+			routeAlias:        "destcert.reencrypt.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "https",
@@ -239,7 +239,7 @@ func TestRouter(t *testing.T) {
 			name:              "reencrypt path",
 			serviceName:       "example-reencrypt-path",
 			endpoints:         []kapi.EndpointSubset{httpsEndpoint},
-			routeAlias:        "www.example.com",
+			routeAlias:        "reencrypt.example.com",
 			routePath:         "/test",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
@@ -258,7 +258,7 @@ func TestRouter(t *testing.T) {
 			name:              "passthrough termination",
 			serviceName:       "example-passthrough",
 			endpoints:         []kapi.EndpointSubset{httpsEndpoint},
-			routeAlias:        "www.example-passthrough.com",
+			routeAlias:        "passthrough.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "https",
@@ -272,7 +272,7 @@ func TestRouter(t *testing.T) {
 			name:              "websocket unsecure",
 			serviceName:       "websocket-unsecure",
 			endpoints:         []kapi.EndpointSubset{httpEndpoint},
-			routeAlias:        "www.example.com",
+			routeAlias:        "ws.unsecure.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "ws",
@@ -283,7 +283,7 @@ func TestRouter(t *testing.T) {
 			name:              "ws edge termination",
 			serviceName:       "websocket-edge",
 			endpoints:         []kapi.EndpointSubset{httpEndpoint},
-			routeAlias:        "www.example.com",
+			routeAlias:        "ws.edge.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "wss",
@@ -300,7 +300,7 @@ func TestRouter(t *testing.T) {
 			name:              "ws passthrough termination",
 			serviceName:       "websocket-passthrough",
 			endpoints:         []kapi.EndpointSubset{httpsEndpoint},
-			routeAlias:        "www.example.com",
+			routeAlias:        "ws.passthrough.example.com",
 			endpointEventType: watch.Added,
 			routeEventType:    watch.Added,
 			protocol:          "wss",