tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 18:28:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ServiceProviderConfigurationScheme' of https://github.com/DavidLievrouw/Ocelot into DavidLievrouw-ServiceProviderConfigurationScheme

Browse Source
This commit is contained in:
TomPallister
2020-04-12 17:44:57 +01:00
parent 2f97913f41 20fd3e01ba
commit c8c3d128f6
26 changed files with 89 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
View File

@ -24,6 +24,7 @@ namespace Ocelot.AcceptanceTests
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "consul",
Port = 8500
@ -66,6 +67,7 @@ namespace Ocelot.AcceptanceTests
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "consul",
Port = 8500

1
test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
View File

@ -60,6 +60,7 @@ namespace Ocelot.AcceptanceTests
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}

8
test/Ocelot.AcceptanceTests/ConsulConfigurationInConsulTests.cs
View File

@ -61,6 +61,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@ -91,6 +92,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@ -123,6 +125,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@ -152,6 +155,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@ -184,6 +188,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@ -214,6 +219,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@ -274,6 +280,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "http",
Host = "localhost",
Port = consulPort
},
@ -295,6 +302,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}

1
test/Ocelot.AcceptanceTests/ConsulWebSocketTests.cs
View File

@ -83,6 +83,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "http",
Host = "localhost",
Port = consulPort,
Type = "consul"

7
test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
View File

@ -81,6 +81,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@ -137,6 +138,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@ -180,6 +182,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "http",
Host = "localhost",
Port = consulPort
},
@ -243,6 +246,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
},
@ -302,6 +306,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort,
Token = token
@ -372,6 +377,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@ -437,6 +443,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort,
Type = "PollConsul",

4
test/Ocelot.AcceptanceTests/SslTests.cs
View File

@ -6,7 +6,7 @@ namespace Ocelot.AcceptanceTests
using System.Collections.Generic;
using System.Net;
using TestStack.BDDfy;
using Xunit;
using Xunit;
public class SslTests : IDisposable
{
@ -118,4 +118,4 @@ namespace Ocelot.AcceptanceTests
_steps.Dispose();
}
}
}
}

1
test/Ocelot.AcceptanceTests/TwoDownstreamServicesTests.cs
View File

@ -74,6 +74,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "https",
Host = "localhost",
Port = consulPort
}