Rewrite test-cases to not use req.backend

bin/varnishtest/tests/b00026.vtc

@@ -29,13 +29,16 @@ varnish v1 -vcl {
 
 	sub vcl_recv {
 		if (req.url  == "from_backend") {
-			set req.backend = b1;
 			return(pass);
 		}
-		set req.backend = b2;
 	}
 	sub vcl_backend_fetch {
 		set bereq.first_byte_timeout = 2s;
+		if (bereq.url  == "from_backend") {
+			set bereq.backend = b1;
+		} else {
+			set bereq.backend = b2;
+		}
 	}
 } -start
 varnish v1 -cliok "param.set first_byte_timeout 0.5"

bin/varnishtest/tests/c00009.vtc

@@ -14,10 +14,13 @@ server s2 {
 
 varnish v1 -vcl+backend {
 	sub vcl_recv {
-		if (req.restarts == 0) {
-			set req.backend = s1;
+		set req.http.restarts = req.restarts;
+	}
+	sub vcl_backend_fetch {
+		if (bereq.http.restarts == "0") {
+			set bereq.backend = s1;
 		} else {
-			set req.backend = s2;
+			set bereq.backend = s2;
 		}
 	}
 

bin/varnishtest/tests/c00028.vtc

@@ -5,8 +5,8 @@ varnish v1 -vcl {
 		.host = "${bad_ip}"; .port = "9090";
 	}
 
-	sub vcl_recv {
-	    set req.backend = bad;
+	sub vcl_backend_fetch {
+	    set bereq.backend = bad;
 	}
 	sub vcl_error {
 	    return (restart);

bin/varnishtest/tests/c00038.vtc

@@ -17,11 +17,13 @@ varnish v1 -vcl+backend {
 		if (req.http.x-ignorebusy == "1") {
 			set req.hash_ignore_busy = true;
 		}
-		if (req.http.x-client == "1") {
-			set req.backend = s1;
+	}
+	sub vcl_backend_fetch {
+		if (bereq.http.x-client == "1") {
+			set bereq.backend = s1;
 		}
-		if (req.http.x-client == "2") {
-			set req.backend = s2;
+		if (bereq.http.x-client == "2") {
+			set bereq.backend = s2;
 		}
 	}
 } -start

bin/varnishtest/tests/c00043.vtc

@@ -16,9 +16,9 @@ server s2 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_recv {
-		if (req.http.bar) {
-			set req.backend = s2;
+	sub vcl_backend_fetch {
+		if (bereq.http.bar) {
+			set bereq.backend = s2;
 		}
 	}
 } -start

bin/varnishtest/tests/e00006.vtc

@@ -22,11 +22,11 @@ server s2 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_recv {
-		if (req.http.host == "bozz") {
-			set req.backend = s2;
+	sub vcl_backend_fetch {
+		if (bereq.http.host == "bozz") {
+			set bereq.backend = s2;
 		} else {
-			set req.backend = s1;
+			set bereq.backend = s1;
 		}
 	}
 	sub vcl_backend_response {

bin/varnishtest/tests/m00009.vtc

@@ -34,8 +34,8 @@ varnish v1 -vcl+backend {
 		rr.add_backend(s4);
 	}
 
-	sub vcl_recv {
-		set req.backend = rr.backend();
+	sub vcl_backend_fetch {
+		set bereq.backend = rr.backend();
 	}
 } -start
 

bin/varnishtest/tests/m00010.vtc

@@ -47,8 +47,8 @@ varnish v1 -vcl+backend {
 		rr3.add_backend(rr2.backend());
 	}
 
-	sub vcl_recv {
-		set req.backend = rr3.backend();
+	sub vcl_backend_fetch {
+		set bereq.backend = rr3.backend();
 	}
 } -start
 

bin/varnishtest/tests/r00255.vtc

@@ -10,7 +10,11 @@ server s1 {
 	    -body "012345\n"
 } -start
 
-varnish v1 -vcl+backend { sub vcl_recv {set req.backend = s1;} } -start
+varnish v1 -vcl+backend {
+	sub vcl_backend_fetch {
+		set bereq.backend = s1;
+	}
+} -start
 
 client c1 {
 	txreq -url "/"

bin/varnishtest/tests/r00263.vtc

@@ -16,8 +16,8 @@ varnish v1  -vcl {
 		cluster.add_backend(node3, 1);
 	}
 
-	sub vcl_recv {
-		set req.backend = cluster.backend();
+	sub vcl_backend_fetch {
+		set bereq.backend = cluster.backend();
 	}
 } -start
 

bin/varnishtest/tests/r00306.vtc

@@ -33,8 +33,8 @@ varnish v1 -vcl {
 		foo.add_backend(s2, 1);
 	}
 
-	sub vcl_recv {
-		set req.backend = foo.backend();
+	sub vcl_backend_fetch {
+		set bereq.backend = foo.backend();
 	}
 } -start
 

bin/varnishtest/tests/r00433.vtc

@@ -23,11 +23,11 @@ server s2 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_recv {
-		if (req.url == "/foo") {
-			set req.backend = s1;
+	sub vcl_backend_fetch {
+		if (bereq.url == "/foo") {
+			set bereq.backend = s1;
 		} else {
-			set req.backend = s2;
+			set bereq.backend = s2;
 		}
 	}
 

bin/varnishtest/tests/r00722.vtc

@@ -22,8 +22,8 @@ varnish v1 -vcl+backend {
 		foo.add_backend(b2, 1);
 		foo.add_backend(b3, 1);
 	}
-	sub vcl_recv {
-		set req.backend = foo.backend();
+	sub vcl_backend_fetch {
+		set bereq.backend = foo.backend();
 	}
 } -start
 

bin/varnishtest/tests/r00916.vtc

@@ -10,8 +10,8 @@ varnish v1 -errvcl {Symbol not found: 's-1' (expected type BACKEND)} {
 	sub s1 {
 	}
 	sub vcl_backend_response {
-	    if (req.backend == s-1){
-		set req.backend = s-1;
+	    if (bereq.backend == s-1){
+		set bereq.backend = s-1;
 	    }
 	}
 }

bin/varnishtest/tests/r01073.vtc

@@ -19,11 +19,13 @@ varnish v1 -vcl+backend {
 		if (req.http.x-hash-always-miss == "1") {
 			set req.hash_always_miss = true;
 		}
-		if (req.http.x-client == "1") {
-			set req.backend = s1;
+	}
+	sub vcl_backend_fetch {
+		if (bereq.http.x-client == "1") {
+			set bereq.backend = s1;
 		}
-		if (req.http.x-client == "2") {
-			set req.backend = s2;
+		if (bereq.http.x-client == "2") {
+			set bereq.backend = s2;
 		}
 	}
 } -start

bin/varnishtest/tests/r01144.vtc

@@ -11,9 +11,9 @@ varnish v1 -vcl+backend {
 		.host = "127.0.0.1";
 		.port = "54321";
 	}
-	sub vcl_recv {
-		if (req.url == "never") {
-			set req.backend = fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210;
+	sub vcl_backend_fetch {
+		if (bereq.url == "never") {
+			set bereq.backend = fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210;
 		}
 	}
 } -start
@@ -30,9 +30,9 @@ varnish v1 -errvcl {Expected ID got '0'} {
 		.host = "127.0.0.1";
 		.port = "54321";
 	}
-	sub vcl_recv {
-		if (req.url == "never") {
-			set req.backend = fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210;
+	sub vcl_backend_fetch {
+		if (bereq.url == "never") {
+			set bereq.backend = fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210;
 		}
 	}
 }

bin/varnishtest/tests/r01164.vtc

@@ -5,8 +5,8 @@ varnish v1 -vcl {
 		.host = "127.0.0.1";
 	}
 
-	sub vcl_recv {
-		set req.backend = storage_foo;
+	sub vcl_backend_fetch {
+		set bereq.backend = storage_foo;
 	}
 }
 
@@ -15,8 +15,8 @@ varnish v1 -vcl {
 		.host = "127.0.0.1";
 	}
 
-	sub vcl_recv {
-		set req.backend = storagefoo;
+	sub vcl_backend_fetch {
+		set bereq.backend = storagefoo;
 	}
 }
 

bin/varnishtest/tests/v00007.vtc

@@ -16,8 +16,8 @@ varnish v1 -vcl+backend {
 		foo.add_backend(s1, 1);
 	}
 
-	sub vcl_recv {
-		set req.backend = foo.backend();
+	sub vcl_backend_fetch {
+		set bereq.backend = foo.backend();
 	}
 } -start
 

bin/varnishtest/tests/v00009.vtc

@@ -33,8 +33,8 @@ varnish v1 -vcl+backend {
 		batman.add_backend(s4);
 	}
 
-	sub vcl_recv {
-		set req.backend = batman.backend();
+	sub vcl_backend_fetch {
+		set bereq.backend = batman.backend();
 	}
 } -start
 

bin/varnishtest/tests/v00014.vtc

@@ -27,7 +27,7 @@ varnish v1 -vcl {
 	}
 
 	sub vcl_recv {
-		if (std.healthy(req.backend)) {
+		if (std.healthy(default)) {
 			return(error(200,"Backend healthy"));
 		} else {
 			return(error(500,"Backend sick"));

bin/varnishtest/tests/v00016.vtc

@@ -84,8 +84,9 @@ varnish v1 -errvcl {Expression has type DURATION, expected BOOL} {
 }
 
 varnish v1 -errvcl {Operator > not possible on BACKEND} {
+	backend a { .host = "127.0.0.1"; }
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_recv { if (req.backend > b) { } }
+	sub vcl_recv { if (a > b) { } }
 }
 
 varnish v1 -errvcl {Symbol not found: 'req.hash' (expected type BOOL):} {

bin/varnishtest/tests/v00018.vtc

@@ -29,7 +29,7 @@ varnish v1 -errvcl {Expected '=' got '>>'} {
 
 varnish v1 -errvcl {Expected '=' got '+='} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_recv { set req.backend += b; }
+	sub vcl_backend_fetch { set bereq.backend += b; }
 }
 
 varnish v1 -errvcl {Expected '=' got '+='} {

bin/varnishtest/tests/v00022.vtc

@@ -43,9 +43,11 @@ varnish v1 -vcl+backend {
 	}
 
 	sub vcl_recv {
-		set req.backend = foo.backend();
 		return(pass);
 	}
+	sub vcl_backend_fetch {
+		set bereq.backend = foo.backend();
+	}
 } -start
 
 # NB: Do not change the number 1

bin/varnishtest/tests/v00026.vtc

@@ -25,9 +25,11 @@ varnish v1 -vcl+backend {
 	}
 
 	sub vcl_recv {
-		set req.backend = h1.backend(req.url);
 		return(pass);
 	}
+	sub vcl_backend_fetch {
+		set bereq.backend = h1.backend(bereq.url);
+	}
 
 } -start
 

bin/varnishtest/tests/v00027.vtc

@@ -20,9 +20,9 @@ varnish v1 -vcl {
 		.port = "${s2_port}";
 	}
 
-	sub vcl_recv {
-		if (req.url != req.url) {
-			set req.backend = s1;
+	sub vcl_backend_fetch {
+		if (bereq.url != bereq.url) {
+			set bereq.backend = s1;
 		}
 	}
 } -start

bin/varnishtest/tests/v00036.vtc

@@ -26,9 +26,11 @@ varnish v1 -vcl+backend {
 	}
 
         sub vcl_recv {
-                set req.backend = fb1.backend();
                 return (pass);
         }
+        sub vcl_backend_fetch {
+                set bereq.backend = fb1.backend();
+        }
 
 } -start