Refactor qos as options

2025-06-19 08:08:14 +08:00 · 2017-02-08 09:25:32 +08:00
parent 616ca4f730
commit caae826d77
29 changed files with 408 additions and 422 deletions
--- a/test/Ocelot.AcceptanceTests/AuthenticationTests.cs
+++ b/test/Ocelot.AcceptanceTests/AuthenticationTests.cs
@ -125,9 +125,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamScheme = _downstreamServiceScheme,
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                            AuthenticationOptions = new FileAuthenticationOptions
                            {
                                AdditionalScopes =  new List<string>(),
@ -168,9 +165,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamScheme = _downstreamServiceScheme,
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Post",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+                            
                            AuthenticationOptions = new FileAuthenticationOptions
                            {
                                AdditionalScopes =  new List<string>(),
@ -211,10 +206,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamScheme = _downstreamServiceScheme,
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Post",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
-                            AuthenticationOptions = new FileAuthenticationOptions
+                             AuthenticationOptions = new FileAuthenticationOptions
                            {
                                AdditionalScopes = new List<string>(),
                                Provider = "IdentityServer",
--- a/test/Ocelot.AcceptanceTests/AuthorisationTests.cs
+++ b/test/Ocelot.AcceptanceTests/AuthorisationTests.cs
@ -43,9 +43,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                            AuthenticationOptions = new FileAuthenticationOptions
                            {
                                AdditionalScopes =  new List<string>(),
--- a/test/Ocelot.AcceptanceTests/CachingTests.cs
+++ b/test/Ocelot.AcceptanceTests/CachingTests.cs
@ -37,9 +37,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                            FileCacheOptions = new FileCacheOptions
                            {
                                TtlSeconds = 100
@ -76,9 +73,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                            FileCacheOptions = new FileCacheOptions
                            {
                                TtlSeconds = 1
--- a/test/Ocelot.AcceptanceTests/CaseSensitiveRoutingTests.cs
+++ b/test/Ocelot.AcceptanceTests/CaseSensitiveRoutingTests.cs
@ -36,9 +36,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/products/{productId}",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000
                        }
                    }
            };
@ -67,9 +64,6 @@ namespace Ocelot.AcceptanceTests
                            UpstreamTemplate = "/products/{productId}",
                            UpstreamHttpMethod = "Get",
                            ReRouteIsCaseSensitive = false,
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                        }
                    }
            };
@ -98,9 +92,6 @@ namespace Ocelot.AcceptanceTests
                            UpstreamTemplate = "/products/{productId}",
                            UpstreamHttpMethod = "Get",
                            ReRouteIsCaseSensitive = true,
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000
                        }
                    }
            };
@ -129,9 +120,6 @@ namespace Ocelot.AcceptanceTests
                            UpstreamTemplate = "/PRODUCTS/{productId}",
                            UpstreamHttpMethod = "Get",
                            ReRouteIsCaseSensitive = true,
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                        }
                    }
            };
@ -160,9 +148,6 @@ namespace Ocelot.AcceptanceTests
                            UpstreamTemplate = "/products/{productId}",
                            UpstreamHttpMethod = "Get",
                            ReRouteIsCaseSensitive = true,
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                        }
                    }
            };
@ -191,9 +176,6 @@ namespace Ocelot.AcceptanceTests
                            UpstreamTemplate = "/PRODUCTS/{productId}",
                            UpstreamHttpMethod = "Get",
                            ReRouteIsCaseSensitive = true,
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000
                        }
                    }
            };
--- a/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs
+++ b/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs
@ -57,9 +57,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                            AuthenticationOptions = new FileAuthenticationOptions
                            {
                                AdditionalScopes = new List<string>
--- a/test/Ocelot.AcceptanceTests/ClaimsToQueryStringForwardingTests.cs
+++ b/test/Ocelot.AcceptanceTests/ClaimsToQueryStringForwardingTests.cs
@ -57,9 +57,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                            AuthenticationOptions = new FileAuthenticationOptions
                            {
                                AdditionalScopes = new List<string>
--- a/test/Ocelot.AcceptanceTests/CustomMiddlewareTests.cs
+++ b/test/Ocelot.AcceptanceTests/CustomMiddlewareTests.cs
@ -51,9 +51,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                        }
                    }
            };
@ -91,9 +88,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+
                        }
                    }
            };
@ -131,9 +126,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+
                        }
                    }
            };
@ -171,9 +164,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                        }
                    }
            };
@ -211,9 +201,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                        }
                    }
            };
@ -251,9 +238,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                        }
                    }
            };
--- a/test/Ocelot.AcceptanceTests/RequestIdTests.cs
+++ b/test/Ocelot.AcceptanceTests/RequestIdTests.cs
@ -40,10 +40,7 @@ namespace Ocelot.AcceptanceTests
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
                            RequestIdKey = _steps.RequestIdKey,
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
-                        }
+                         }
                    }
            };

@ -70,10 +67,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            RequestIdKey = _steps.RequestIdKey,
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+ 
                        }
                    }
            };
@ -101,11 +95,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamPort = 51879,
                            DownstreamScheme = "http",
                            DownstreamHost = "localhost",
-                            UpstreamTemplate = "/",
-                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+                            UpstreamTemplate = "/",  
                        }
                    },
                GlobalConfiguration = new FileGlobalConfiguration
--- a/test/Ocelot.AcceptanceTests/RoutingTests.cs
+++ b/test/Ocelot.AcceptanceTests/RoutingTests.cs
@ -46,9 +46,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamPort = 51879,
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+ 
                        }
                    }
            };
@ -77,9 +75,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamPort = 51879,
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+ 
                        }
                    }
            };
@ -108,9 +104,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamPort = 51879,
                            UpstreamTemplate = "/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+ 
                        }
                    }
            };
@ -139,9 +133,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamPort = 51879,
                            UpstreamTemplate = "/products/",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+ 
                        }
                    }
            };
@ -170,9 +162,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamPort = 51879,
                            UpstreamTemplate = "/products",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+ 
                        }
                    }
            };
@ -201,9 +191,11 @@ namespace Ocelot.AcceptanceTests
                            DownstreamPort = 51879,
                            UpstreamTemplate = "/products/{productId}",
                            UpstreamHttpMethod = "Get",
+                            QoSOptions = new FileQoSOptions()
+                            {
                            ExceptionsAllowedBeforeBreaking = 3,
                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+                            TimeoutValue = 5000 }
                        }
                    }
            };
@ -231,9 +223,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamPort = 51879,
                            UpstreamTemplate = "/products/{productId}",
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                        }
                    }
            };
@ -261,10 +250,7 @@ namespace Ocelot.AcceptanceTests
                            DownstreamPort = 51879,
                            DownstreamScheme = "http",
                            UpstreamTemplate = "/",
-                            UpstreamHttpMethod = "Post",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
+                            UpstreamHttpMethod = "Post", 
                        }
                    }
            };
@ -293,9 +279,6 @@ namespace Ocelot.AcceptanceTests
                            DownstreamHost = "localhost",
                            DownstreamPort = 51879,
                            UpstreamHttpMethod = "Get",
-                            ExceptionsAllowedBeforeBreaking = 3,
-                            DurationOfBreak =5,
-                            TimeoutValue = 5000,
                        }
                    }
            };
--- a/test/Ocelot.AcceptanceTests/configuration.json
+++ b/test/Ocelot.AcceptanceTests/configuration.json
@ -1 +1 @@
-{"ReRoutes":[{"DownstreamPathTemplate":"41879/","UpstreamTemplate":"/","UpstreamHttpMethod":"Get","AuthenticationOptions":{"Provider":null,"ProviderRootUrl":null,"ScopeName":null,"RequireHttps":false,"AdditionalScopes":[],"ScopeSecret":null},"AddHeadersToRequest":{},"AddClaimsToRequest":{},"RouteClaimsRequirement":{},"AddQueriesToRequest":{},"RequestIdKey":null,"FileCacheOptions":{"TtlSeconds":0},"ReRouteIsCaseSensitive":false,"ServiceName":null,"DownstreamScheme":"http","DownstreamHost":"localhost","DownstreamPort":41879,"ExceptionsAllowedBeforeBreaking":3,"DurationOfBreak":5,"TimeoutValue":5000,"LoadBalancer":null}],"GlobalConfiguration":{"RequestIdKey":null,"ServiceDiscoveryProvider":{"Provider":null,"Host":null,"Port":0}}}
+{"ReRoutes":[{"DownstreamPathTemplate":"41879/","UpstreamTemplate":"/","UpstreamHttpMethod":"Get","AuthenticationOptions":{"Provider":null,"ProviderRootUrl":null,"ScopeName":null,"RequireHttps":false,"AdditionalScopes":[],"ScopeSecret":null},"AddHeadersToRequest":{},"AddClaimsToRequest":{},"RouteClaimsRequirement":{},"AddQueriesToRequest":{},"RequestIdKey":null,"FileCacheOptions":{"TtlSeconds":0},"ReRouteIsCaseSensitive":false,"ServiceName":null,"DownstreamScheme":"http","DownstreamHost":"localhost","DownstreamPort":41879,"QoSOptions":{"ExceptionsAllowedBeforeBreaking":0,"DurationOfBreak":0,"TimeoutValue":0},"LoadBalancer":null}],"GlobalConfiguration":{"RequestIdKey":null,"ServiceDiscoveryProvider":{"Provider":null,"Host":null,"Port":0}}}
--- a/test/Ocelot.ManualTest/configuration.json
+++ b/test/Ocelot.ManualTest/configuration.json
@ -1,268 +1,305 @@
 {
-    "ReRoutes": [
-      {
-        "DownstreamPathTemplate": "/",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "localhost",
-        "DownstreamPort": 52876,
-        "UpstreamTemplate": "/identityserverexample",
-        "UpstreamHttpMethod": "Get",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "AuthenticationOptions": {
-          "Provider": "IdentityServer",
-          "ProviderRootUrl": "http://localhost:52888",
-          "ScopeName": "api",
-          "AdditionalScopes": [
-            "openid",
-            "offline_access"
-          ],
-          "ScopeSecret": "secret"
-        },
-        "AddHeadersToRequest": {
-          "CustomerId": "Claims[CustomerId] > value",
-          "LocationId": "Claims[LocationId] > value",
-          "UserType": "Claims[sub] > value[0] > |",
-          "UserId": "Claims[sub] > value[1] > |"
-        },
-        "AddClaimsToRequest": {
-          "CustomerId": "Claims[CustomerId] > value",
-          "LocationId": "Claims[LocationId] > value",
-          "UserType": "Claims[sub] > value[0] > |",
-          "UserId": "Claims[sub] > value[1] > |"
-        },
-        "AddQueriesToRequest": {
-          "CustomerId": "Claims[CustomerId] > value",
-          "LocationId": "Claims[LocationId] > value",
-          "UserType": "Claims[sub] > value[0] > |",
-          "UserId": "Claims[sub] > value[1] > |"
-        },
-        "RouteClaimsRequirement": {
-          "UserType": "registered"
-        },
-        "RequestIdKey": "OcRequestId"
-      },
-      {
-        "DownstreamPathTemplate": "/posts",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/posts",
-        "UpstreamHttpMethod": "Get",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-      {
-        "DownstreamPathTemplate": "/posts/{postId}",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/posts/{postId}",
-        "UpstreamHttpMethod": "Get",
+  "ReRoutes": [
+    {
+      "DownstreamPathTemplate": "/",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "localhost",
+      "DownstreamPort": 52876,
+      "UpstreamTemplate": "/identityserverexample",
+      "UpstreamHttpMethod": "Get",
+      "QoSOptions": {
        "ExceptionsAllowedBeforeBreaking": 3,
        "DurationOfBreak": 10,
        "TimeoutValue": 5000
      },
-      {
-        "DownstreamPathTemplate": "/posts/{postId}/comments",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/posts/{postId}/comments",
-        "UpstreamHttpMethod": "Get",
+      "AuthenticationOptions": {
+        "Provider": "IdentityServer",
+        "ProviderRootUrl": "http://localhost:52888",
+        "ScopeName": "api",
+        "AdditionalScopes": [
+          "openid",
+          "offline_access"
+        ],
+        "ScopeSecret": "secret"
+      },
+      "AddHeadersToRequest": {
+        "CustomerId": "Claims[CustomerId] > value",
+        "LocationId": "Claims[LocationId] > value",
+        "UserType": "Claims[sub] > value[0] > |",
+        "UserId": "Claims[sub] > value[1] > |"
+      },
+      "AddClaimsToRequest": {
+        "CustomerId": "Claims[CustomerId] > value",
+        "LocationId": "Claims[LocationId] > value",
+        "UserType": "Claims[sub] > value[0] > |",
+        "UserId": "Claims[sub] > value[1] > |"
+      },
+      "AddQueriesToRequest": {
+        "CustomerId": "Claims[CustomerId] > value",
+        "LocationId": "Claims[LocationId] > value",
+        "UserType": "Claims[sub] > value[0] > |",
+        "UserId": "Claims[sub] > value[1] > |"
+      },
+      "RouteClaimsRequirement": {
+        "UserType": "registered"
+      },
+      "RequestIdKey": "OcRequestId"
+    },
+    {
+      "DownstreamPathTemplate": "/posts",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/posts",
+      "UpstreamHttpMethod": "Get",
+      "QoSOptions": {
        "ExceptionsAllowedBeforeBreaking": 3,
        "DurationOfBreak": 10,
        "TimeoutValue": 5000
-      },
-      {
-        "DownstreamPathTemplate": "/comments",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/comments",
-        "UpstreamHttpMethod": "Get",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      {
-        "DownstreamPathTemplate": "/posts",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/posts",
-        "UpstreamHttpMethod": "Post",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      {
-        "DownstreamPathTemplate": "/posts/{postId}",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/posts/{postId}",
-        "UpstreamHttpMethod": "Put",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      {
-        "DownstreamPathTemplate": "/posts/{postId}",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/posts/{postId}",
-        "UpstreamHttpMethod": "Patch",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      {
-        "DownstreamPathTemplate": "/posts/{postId}",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/posts/{postId}",
-        "UpstreamHttpMethod": "Delete",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      {
-        "DownstreamPathTemplate": "/api/products",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/products",
-        "UpstreamHttpMethod": "Get",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-        {
-            "DownstreamPathTemplate": "/api/products/{productId}",
-            "DownstreamScheme": "http",
-            "DownstreamHost": "jsonplaceholder.typicode.com",
-            "DownstreamPort": 80,
-            "UpstreamTemplate": "/products/{productId}",
-            "UpstreamHttpMethod": "Get",
-            "FileCacheOptions": { "TtlSeconds": 15 }
-        },
-      {
-        "DownstreamPathTemplate": "/api/products",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "products20161126090340.azurewebsites.net",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/products",
-        "UpstreamHttpMethod": "Post",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-      {
-        "DownstreamPathTemplate": "/api/products/{productId}",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "products20161126090340.azurewebsites.net",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/products/{productId}",
-        "UpstreamHttpMethod": "Put",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-      {
-        "DownstreamPathTemplate": "/api/products/{productId}",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "products20161126090340.azurewebsites.net",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/products/{productId}",
-        "UpstreamHttpMethod": "Delete",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-      {
-        "DownstreamPathTemplate": "/api/customers",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "customers20161126090811.azurewebsites.net",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/customers",
-        "UpstreamHttpMethod": "Get",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-      {
-        "DownstreamPathTemplate": "/api/customers/{customerId}",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "customers20161126090811.azurewebsites.net",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/customers/{customerId}",
-        "UpstreamHttpMethod": "Get",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-      {
-        "DownstreamPathTemplate": "/api/customers",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "customers20161126090811.azurewebsites.net",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/customers",
-        "UpstreamHttpMethod": "Post",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-      {
-        "DownstreamPathTemplate": "/api/customers/{customerId}",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "customers20161126090811.azurewebsites.net",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/customers/{customerId}",
-        "UpstreamHttpMethod": "Put",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-      {
-        "DownstreamPathTemplate": "/api/customers/{customerId}",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "customers20161126090811.azurewebsites.net",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/customers/{customerId}",
-        "UpstreamHttpMethod": "Delete",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
-      },
-      {
-        "DownstreamPathTemplate": "/posts",
-        "DownstreamScheme": "http",
-        "DownstreamHost": "jsonplaceholder.typicode.com",
-        "DownstreamPort": 80,
-        "UpstreamTemplate": "/posts/",
-        "UpstreamHttpMethod": "Get",
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000,
-        "FileCacheOptions": { "TtlSeconds": 15 }
      }
-    ],
-    "GlobalConfiguration": {
-        "RequestIdKey": "OcRequestId"
+    },
+    {
+      "DownstreamPathTemplate": "/posts/{postId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/posts/{postId}",
+      "UpstreamHttpMethod": "Get",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      }
+    },
+    {
+      "DownstreamPathTemplate": "/posts/{postId}/comments",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/posts/{postId}/comments",
+      "UpstreamHttpMethod": "Get",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      }
+    },
+    {
+      "DownstreamPathTemplate": "/comments",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/comments",
+      "UpstreamHttpMethod": "Get",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      }
+    },
+    {
+      "DownstreamPathTemplate": "/posts",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/posts",
+      "UpstreamHttpMethod": "Post",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      }
+    },
+    {
+      "DownstreamPathTemplate": "/posts/{postId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/posts/{postId}",
+      "UpstreamHttpMethod": "Put",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      }
+    },
+    {
+      "DownstreamPathTemplate": "/posts/{postId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/posts/{postId}",
+      "UpstreamHttpMethod": "Patch",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      }
+    },
+    {
+      "DownstreamPathTemplate": "/posts/{postId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/posts/{postId}",
+      "UpstreamHttpMethod": "Delete",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      }
+    },
+    {
+      "DownstreamPathTemplate": "/api/products",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/products",
+      "UpstreamHttpMethod": "Get",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      },
+      "FileCacheOptions": { "TtlSeconds": 15 }
+    },
+    {
+      "DownstreamPathTemplate": "/api/products/{productId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/products/{productId}",
+      "UpstreamHttpMethod": "Get",
+      "FileCacheOptions": { "TtlSeconds": 15 }
+    },
+    {
+      "DownstreamPathTemplate": "/api/products",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "products20161126090340.azurewebsites.net",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/products",
+      "UpstreamHttpMethod": "Post",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      }
+    },
+    {
+      "DownstreamPathTemplate": "/api/products/{productId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "products20161126090340.azurewebsites.net",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/products/{productId}",
+      "UpstreamHttpMethod": "Put",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      },
+      "FileCacheOptions": { "TtlSeconds": 15 }
+    },
+    {
+      "DownstreamPathTemplate": "/api/products/{productId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "products20161126090340.azurewebsites.net",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/products/{productId}",
+      "UpstreamHttpMethod": "Delete",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      },
+      "FileCacheOptions": { "TtlSeconds": 15 }
+    },
+    {
+      "DownstreamPathTemplate": "/api/customers",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "customers20161126090811.azurewebsites.net",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/customers",
+      "UpstreamHttpMethod": "Get",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      },
+      "FileCacheOptions": { "TtlSeconds": 15 }
+    },
+    {
+      "DownstreamPathTemplate": "/api/customers/{customerId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "customers20161126090811.azurewebsites.net",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/customers/{customerId}",
+      "UpstreamHttpMethod": "Get",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      },
+      "FileCacheOptions": { "TtlSeconds": 15 }
+    },
+    {
+      "DownstreamPathTemplate": "/api/customers",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "customers20161126090811.azurewebsites.net",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/customers",
+      "UpstreamHttpMethod": "Post",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      },
+      "FileCacheOptions": { "TtlSeconds": 15 }
+    },
+    {
+      "DownstreamPathTemplate": "/api/customers/{customerId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "customers20161126090811.azurewebsites.net",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/customers/{customerId}",
+      "UpstreamHttpMethod": "Put",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      },
+      "FileCacheOptions": { "TtlSeconds": 15 }
+    },
+    {
+      "DownstreamPathTemplate": "/api/customers/{customerId}",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "customers20161126090811.azurewebsites.net",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/customers/{customerId}",
+      "UpstreamHttpMethod": "Delete",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      },
+      "FileCacheOptions": { "TtlSeconds": 15 }
+    },
+    {
+      "DownstreamPathTemplate": "/posts",
+      "DownstreamScheme": "http",
+      "DownstreamHost": "jsonplaceholder.typicode.com",
+      "DownstreamPort": 80,
+      "UpstreamTemplate": "/posts/",
+      "UpstreamHttpMethod": "Get",
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 3,
+        "DurationOfBreak": 10,
+        "TimeoutValue": 5000
+      },
+      "FileCacheOptions": { "TtlSeconds": 15 }
    }
+  ],
+
+  "GlobalConfiguration": {
+    "RequestIdKey": "OcRequestId"
+  }
 }
--- a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs
+++ b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs
@ -29,7 +29,6 @@ namespace Ocelot.UnitTests.LoadBalancer
        private readonly HttpClient _client;
        private HttpResponseMessage _result;
        private HostAndPort _hostAndPort;
-        private OkResponse<Ocelot.Request.Request> _request;
        private OkResponse<string> _downstreamUrl;
        private OkResponse<DownstreamRoute> _downstreamRoute;
        private ErrorResponse<ILoadBalancer> _getLoadBalancerHouseError;
--- a/test/Ocelot.UnitTests/Request/HttpRequestBuilderMiddlewareTests.cs
+++ b/test/Ocelot.UnitTests/Request/HttpRequestBuilderMiddlewareTests.cs
@ -19,6 +19,7 @@ using Ocelot.Request.Middleware;
 using Ocelot.Responses;
 using TestStack.BDDfy;
 using Xunit;
+using Ocelot.Configuration;

 namespace Ocelot.UnitTests.Request
 {
@ -72,7 +73,7 @@ namespace Ocelot.UnitTests.Request

            this.Given(x => x.GivenTheDownStreamUrlIs("any old string"))
                .And(x => x.GivenTheDownStreamRouteIs(downstreamRoute))
-                .And(x => x.GivenTheRequestBuilderReturns(new Ocelot.Request.Request(new HttpRequestMessage(), new CookieContainer(),new Values.QoS(3, 8 ,5000, Polly.Timeout.TimeoutStrategy.Pessimistic))))
+                .And(x => x.GivenTheRequestBuilderReturns(new Ocelot.Request.Request(new HttpRequestMessage(), new CookieContainer(), true, new QoSOptions(3, 8 ,5000, Polly.Timeout.TimeoutStrategy.Pessimistic))))
                .When(x => x.WhenICallTheMiddleware())
                .Then(x => x.ThenTheScopedDataRepositoryIsCalledCorrectly())
                .BDDfy();
@ -91,7 +92,7 @@ namespace Ocelot.UnitTests.Request
            _request = new OkResponse<Ocelot.Request.Request>(request);
            _requestBuilder
                .Setup(x => x.Build(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<IHeaderDictionary>(),
-                It.IsAny<IRequestCookieCollection>(), It.IsAny<QueryString>(), It.IsAny<string>(), It.IsAny<Ocelot.RequestId.RequestId>(),It.IsAny<Values.QoS>()))
+                It.IsAny<IRequestCookieCollection>(), It.IsAny<QueryString>(), It.IsAny<string>(), It.IsAny<Ocelot.RequestId.RequestId>(),It.IsAny<bool>(), It.IsAny<QoSOptions>()))
                .ReturnsAsync(_request);
        }

--- a/test/Ocelot.UnitTests/Request/RequestBuilderTests.cs
+++ b/test/Ocelot.UnitTests/Request/RequestBuilderTests.cs
@ -10,6 +10,7 @@ using Ocelot.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
+using Ocelot.Configuration;

 namespace Ocelot.UnitTests.Request
 {
@ -25,7 +26,8 @@ namespace Ocelot.UnitTests.Request
        private readonly IRequestCreator _requestCreator;
        private Response<Ocelot.Request.Request> _result;
        private Ocelot.RequestId.RequestId _requestId;
-        private Ocelot.Values.QoS _qos;
+        private bool _isQos;
+        private QoSOptions _qos;

        public RequestBuilderTests()
        {
@ -38,7 +40,7 @@ namespace Ocelot.UnitTests.Request
        {
            this.Given(x => x.GivenIHaveHttpMethod("GET"))
                .And(x => x.GivenIHaveDownstreamUrl("http://www.bbc.co.uk"))
-                .And(x=> x.GivenTheQos(new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
+                .And(x=> x.GivenTheQos(true,new QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
                .When(x => x.WhenICreateARequest())
                .And(x => x.ThenTheCorrectDownstreamUrlIsUsed("http://www.bbc.co.uk/"))
                .BDDfy();
@ -49,7 +51,7 @@ namespace Ocelot.UnitTests.Request
        {
            this.Given(x => x.GivenIHaveHttpMethod("POST"))
                .And(x => x.GivenIHaveDownstreamUrl("http://www.bbc.co.uk"))
-                .And(x => x.GivenTheQos(new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
+                .And(x => x.GivenTheQos(true,new QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))

                .When(x => x.WhenICreateARequest())
                .And(x => x.ThenTheCorrectHttpMethodIsUsed(HttpMethod.Post))
@ -63,7 +65,7 @@ namespace Ocelot.UnitTests.Request
                .And(x => x.GivenIHaveDownstreamUrl("http://www.bbc.co.uk"))
                .And(x => x.GivenIHaveTheHttpContent(new StringContent("Hi from Tom")))
                .And(x => x.GivenTheContentTypeIs("application/json"))
-                              .And(x => x.GivenTheQos(new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
+                              .And(x => x.GivenTheQos(true, new QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))

                              .When(x => x.WhenICreateARequest())
               .And(x => x.ThenTheCorrectContentIsUsed(new StringContent("Hi from Tom")))
@ -77,7 +79,7 @@ namespace Ocelot.UnitTests.Request
                .And(x => x.GivenIHaveDownstreamUrl("http://www.bbc.co.uk"))
                .And(x => x.GivenIHaveTheHttpContent(new StringContent("Hi from Tom")))
                .And(x => x.GivenTheContentTypeIs("application/json"))
-                .And(x => x.GivenTheQos(new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
+                .And(x => x.GivenTheQos(true, new QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))

               .When(x => x.WhenICreateARequest())
               .And(x => x.ThenTheCorrectContentHeadersAreUsed(new HeaderDictionary
@ -96,7 +98,7 @@ namespace Ocelot.UnitTests.Request
                .And(x => x.GivenIHaveDownstreamUrl("http://www.bbc.co.uk"))
                .And(x => x.GivenIHaveTheHttpContent(new StringContent("Hi from Tom")))
                .And(x => x.GivenTheContentTypeIs("application/json; charset=utf-8"))
-                                .And(x => x.GivenTheQos(new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
+                                .And(x => x.GivenTheQos(true, new QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))

               .When(x => x.WhenICreateARequest())
               .And(x => x.ThenTheCorrectContentHeadersAreUsed(new HeaderDictionary
@ -117,7 +119,7 @@ namespace Ocelot.UnitTests.Request
                {
                    {"ChopSticks", "Bubbles" }
                }))
-                                .And(x => x.GivenTheQos(new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
+                                .And(x => x.GivenTheQos(true, new QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))

                .When(x => x.WhenICreateARequest())
                .And(x => x.ThenTheCorrectHeadersAreUsed(new HeaderDictionary
@ -136,7 +138,7 @@ namespace Ocelot.UnitTests.Request
                .And(x => x.GivenIHaveDownstreamUrl("http://www.bbc.co.uk"))
                .And(x => x.GivenTheHttpHeadersAre(new HeaderDictionary()))
                .And(x => x.GivenTheRequestIdIs(new Ocelot.RequestId.RequestId("RequestId", requestId)))
-                              .And(x => x.GivenTheQos(new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
+                              .And(x => x.GivenTheQos(true, new QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
  .When(x => x.WhenICreateARequest())
                .And(x => x.ThenTheCorrectHeadersAreUsed(new HeaderDictionary
                {
@ -155,7 +157,7 @@ namespace Ocelot.UnitTests.Request
                    {"RequestId", "534534gv54gv45g" }
                }))
                .And(x => x.GivenTheRequestIdIs(new Ocelot.RequestId.RequestId("RequestId", Guid.NewGuid().ToString())))
-                               .And(x => x.GivenTheQos(new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
+                               .And(x => x.GivenTheQos(true, new QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
 .When(x => x.WhenICreateARequest())
                .And(x => x.ThenTheCorrectHeadersAreUsed(new HeaderDictionary
                {
@ -175,7 +177,7 @@ namespace Ocelot.UnitTests.Request
                .And(x => x.GivenIHaveDownstreamUrl("http://www.bbc.co.uk"))
                .And(x => x.GivenTheHttpHeadersAre(new HeaderDictionary()))
                .And(x => x.GivenTheRequestIdIs(new Ocelot.RequestId.RequestId(requestIdKey, requestIdValue)))
-                              .And(x => x.GivenTheQos(new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
+                              .And(x => x.GivenTheQos(true, new QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic)))
  .When(x => x.WhenICreateARequest())
                .And(x => x.ThenTheRequestIdIsNotInTheHeaders())
                .BDDfy();
@ -186,8 +188,9 @@ namespace Ocelot.UnitTests.Request
            _requestId = requestId;
        }

-        private void GivenTheQos(Ocelot.Values.QoS qos)
+        private void GivenTheQos(bool isQos, QoSOptions qos)
        {
+            _isQos = isQos;
            _qos = qos;
        }

@ -301,7 +304,7 @@ namespace Ocelot.UnitTests.Request
        private void WhenICreateARequest()
        {
            _result = _requestCreator.Build(_httpMethod, _downstreamUrl, _content?.ReadAsStreamAsync().Result, _headers,
-                _cookies, _query, _contentType, _requestId, _qos).Result;
+                _cookies, _query, _contentType, _requestId,_isQos,_qos).Result;
        }


--- a/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs
+++ b/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs
@ -61,7 +61,7 @@ namespace Ocelot.UnitTests.Requester
        [Fact]
        public void should_call_scoped_data_repository_correctly()
        {
-            this.Given(x => x.GivenTheRequestIs(new Ocelot.Request.Request(new HttpRequestMessage(),new CookieContainer(), new Values.QoS(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic))))
+            this.Given(x => x.GivenTheRequestIs(new Ocelot.Request.Request(new HttpRequestMessage(),new CookieContainer(),true, new Ocelot.Configuration.QoSOptions(3, 8, 5000, Polly.Timeout.TimeoutStrategy.Pessimistic))))
                .And(x => x.GivenTheRequesterReturns(new HttpResponseMessage()))
                .And(x => x.GivenTheScopedRepoReturns())
                .When(x => x.WhenICallTheMiddleware())
--- a/test/Ocelot.UnitTests/ServiceDiscovery/ConfigurationServiceProviderTests.cs
+++ b/test/Ocelot.UnitTests/ServiceDiscovery/ConfigurationServiceProviderTests.cs
@ -10,7 +10,6 @@ namespace Ocelot.UnitTests.ServiceDiscovery
    public class ConfigurationServiceProviderTests
    {
        private ConfigurationServiceProvider _serviceProvider;
-        private HostAndPort _hostAndPort;
        private List<Service> _result;
        private List<Service> _expected;