From 789782c8707cbe9bc90ffe8107eb1c6edb330953 Mon Sep 17 00:00:00 2001 From: David Lievrouw Date: Wed, 10 Jul 2019 18:10:26 +0200 Subject: [PATCH] Add 'Name' property to ILoadBalancer, for future use in LoadBalancerFactory. --- src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs | 2 ++ src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs | 2 ++ src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs | 2 ++ src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs | 2 ++ src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs | 2 ++ test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs | 4 ++++ 6 files changed, 14 insertions(+) diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs b/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs index 775ed7ce..2429e158 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs @@ -84,5 +84,7 @@ namespace Ocelot.LoadBalancer.LoadBalancers public void Release(ServiceHostAndPort hostAndPort) { } + + public string Name => GetType().Name; } } diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs b/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs index 4f8ec2b7..6d74b686 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs @@ -10,5 +10,7 @@ namespace Ocelot.LoadBalancer.LoadBalancers Task> Lease(DownstreamContext context); void Release(ServiceHostAndPort hostAndPort); + + string Name { get; } } } diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs b/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs index ee7c0fdd..24d953e2 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs @@ -71,6 +71,8 @@ namespace Ocelot.LoadBalancer.LoadBalancers } } + public string Name => GetType().Name; + private Lease AddConnection(Lease lease) { return new Lease(lease.HostAndPort, lease.Connections + 1); diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs b/src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs index 112fd5bb..becf96b6 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs @@ -33,5 +33,7 @@ namespace Ocelot.LoadBalancer.LoadBalancers public void Release(ServiceHostAndPort hostAndPort) { } + + public string Name => GetType().Name; } } diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs b/src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs index 3500efe0..6be24f71 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs @@ -38,5 +38,7 @@ namespace Ocelot.LoadBalancer.LoadBalancers public void Release(ServiceHostAndPort hostAndPort) { } + + public string Name => GetType().Name; } } diff --git a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs index 57252b2b..6f5a50c1 100644 --- a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs +++ b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs @@ -164,6 +164,8 @@ namespace Ocelot.UnitTests.LoadBalancer { throw new NotImplementedException(); } + + public string Name => GetType().Name; } private class FakeRoundRobinLoadBalancer : ILoadBalancer @@ -177,6 +179,8 @@ namespace Ocelot.UnitTests.LoadBalancer { throw new NotImplementedException(); } + + public string Name => GetType().Name; } } }