hasslesstech
/
devops-lab4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HiveMind changes

This commit is contained in:
Даниил Соколов-Рудаков 2025-02-18 09:47:50 +00:00 committed by Kirill
parent 78eda5f350
commit ea1b6c6ee7
6 changed files with 196 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/CommunicationControl/DevOpsProject.HiveMind.API/Controllers/HiveMindController.cs
View File

@ -1,49 +0,0 @@
using Asp.Versioning;
using DevOpsProject.HiveMind.Logic.Services.Interfaces;
using DevOpsProject.Shared.Configuration;
using DevOpsProject.Shared.Models;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
namespace DevOpsProject.HiveMind.API.Controllers
{
[ApiVersion("1.0")]
[ApiController]
[Route("api/v{version:apiVersion}")]
public class HiveMindController : Controller
{
private readonly IHiveMindService _hiveMindService;
private readonly IHiveMindMovingService _hiveMindMovingService;
public HiveMindController(IHiveMindService hiveMindService, IHiveMindMovingService hiveMindMovingService)
{
_hiveMindService = hiveMindService;
_hiveMindMovingService = hiveMindMovingService;
}
[HttpGet("ping")]
public IActionResult Ping(IOptionsSnapshot<HiveCommunicationConfig> config)
{
return Ok(new
{
Timestamp = DateTime.Now,
ID = config.Value.HiveID
});
}
[HttpPost("connect")]
public async Task<IActionResult> TriggerConnectHive()
{
await _hiveMindService.ConnectHive();
return Ok();
}
[HttpPost("command")]
public IActionResult MoveHideMind(MoveHiveMindCommand command)
{
_hiveMindMovingService.MoveToLocation(command.Location);
return Ok();
}
}
}

60
src/CommunicationControl/DevOpsProject.HiveMind.API/Program.cs
View File

@ -1,17 +1,17 @@
using Asp.Versioning;
using Asp.Versioning.Builder;
using DevOpsProject.HiveMind.API.DI;
using DevOpsProject.HiveMind.API.Middleware;
using DevOpsProject.HiveMind.Logic.Services.Interfaces;
using DevOpsProject.Shared.Clients;
using DevOpsProject.Shared.Configuration;
using DevOpsProject.Shared.Models;
using Microsoft.Extensions.Options;
using Microsoft.OpenApi.Models;
using Polly;
using Polly.Extensions.Http;
using Serilog;
internal class Program
{
private static void Main(string[] args)
{
var builder = WebApplication.CreateBuilder(args);
builder.Host.UseSerilog((context, services, loggerConfig) =>
@ -34,13 +34,9 @@ internal class Program
options.SubstituteApiVersionInUrl = true;
});
// TODO: double check following approach
builder.Services.AddControllers().AddJsonOptions(options =>
{
options.JsonSerializerOptions.PropertyNamingPolicy = null;
});
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddAuthorization();
builder.Services.AddSwaggerGen(c =>
{
c.SwaggerDoc("v1", new OpenApiInfo { Title = "HiveMind - V1", Version = "v1.0" });
@ -49,11 +45,14 @@ internal class Program
builder.Services.Configure<HiveCommunicationConfig>(builder.Configuration.GetSection("CommunicationConfiguration"));
var communicationControlRetryPolicy = HttpPolicyExtensions
var communicationControlTelemetryPolicy = HttpPolicyExtensions
.HandleTransientHttpError()
.WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
builder.Services.AddHttpClient<HiveMindHttpClient>()
.AddPolicyHandler(communicationControlRetryPolicy);
.AddPolicyHandler(communicationControlTelemetryPolicy);
// register NAMED client for connect request
builder.Services.AddHttpClient("HiveConnectClient");
string corsPolicyName = "HiveMindCorsPolicy";
builder.Services.AddCors(options =>
@ -72,6 +71,21 @@ internal class Program
var app = builder.Build();
using (var scope = app.Services.CreateScope())
{
var logger = scope.ServiceProvider.GetRequiredService<ILogger<Program>>();
try
{
var hiveMindService = scope.ServiceProvider.GetRequiredService<IHiveMindService>();
await hiveMindService.ConnectHive();
}
catch (Exception ex)
{
logger.LogError($"Error occured while connecting Hive to Communication Control. \nException text: {ex.Message}");
System.Diagnostics.Process.GetCurrentProcess().Kill();
}
}
app.UseExceptionHandler();
// Configure the HTTP request pipeline.
@ -87,8 +101,26 @@ internal class Program
app.UseAuthorization();
app.MapControllers();
ApiVersionSet apiVersionSet = app.NewApiVersionSet()
.HasApiVersion(new ApiVersion(1))
.ReportApiVersions()
.Build();
RouteGroupBuilder groupBuilder = app.MapGroup("api/v{apiVersion:apiVersion}").WithApiVersionSet(apiVersionSet);
groupBuilder.MapGet("ping", (IOptionsSnapshot<HiveCommunicationConfig> config) =>
{
return Results.Ok(new
{
Timestamp = DateTime.Now,
ID = config.Value.HiveID
});
});
groupBuilder.MapPost("command", (MoveHiveMindCommand command, IHiveMindMovingService hiveMindMovingService) =>
{
hiveMindMovingService.MoveToLocation(command.Location);
return Results.Ok();
});
app.Run();
}
}

31
src/CommunicationControl/DevOpsProject.HiveMind.API/appsettings.json
View File

@ -1,4 +1,20 @@
{
"CommunicationConfiguration": {
"RequestSchema": "http",
"CommunicationControlIP": "localhost",
"CommunicationControlPort": 8080,
"CommunicationControlPath": "api/v1/hive",
"HiveIP": "localhost",
"HivePort": 5149,
"HiveID": "1",
"InitialLocation": {
"Latitude": 48.719547,
"Longitude": 38.092680
}
},
"AllowedHosts": "*",
"Urls": "http://0.0.0.0:5149",
"Serilog": {
"Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
"MinimumLevel": {
@ -31,19 +47,6 @@
"Application": "DevOpsProject.HiveMind",
"Environment": "Development"
}
},
"CommunicationConfiguration": {
"RequestSchema": "http",
"CommunicationControlIP": "localhost",
"CommunicationControlPort": 8080,
"CommunicationControlPath": "api/v1/hive",
"HiveIP": "localhost",
"HivePort": 5149,
"HiveID": "1",
"InitialLocation": {
"Latitude": 48.719547,
"Longitude": 38.092680
}
},
"AllowedHosts": "*"
}

11
src/CommunicationControl/DevOpsProject.HiveMind.Logic/DevOpsProject.HiveMind.Logic.csproj
View File

@ -7,6 +7,13 @@
</PropertyGroup>
<ItemGroup>
<Compile Remove="Models\**" />
<EmbeddedResource Remove="Models\**" />
<None Remove="Models\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
</ItemGroup>
@ -15,8 +22,4 @@
<ProjectReference Include="..\DevOpsProject.Shared\DevOpsProject.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Models\" />
</ItemGroup>
</Project>

43
src/CommunicationControl/DevOpsProject.HiveMind.Logic/Services/HiveMindService.cs
View File

@ -6,19 +6,23 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using System.Text.Json;
using DevOpsProject.HiveMind.Logic.State;
using System.Text;
using Polly;
namespace DevOpsProject.HiveMind.Logic.Services
{
public class HiveMindService : IHiveMindService
{
private readonly IHttpClientFactory _httpClientFactory;
private readonly HiveMindHttpClient _httpClient;
private readonly ILogger<HiveMindService> _logger;
private readonly HiveCommunicationConfig _communicationConfigurationOptions;
private Timer _telemetryTimer;
public HiveMindService(HiveMindHttpClient httpClient, ILogger<HiveMindService> logger, IOptionsSnapshot<HiveCommunicationConfig> communicationConfigurationOptions)
public HiveMindService(IHttpClientFactory httpClientFactory, HiveMindHttpClient httpClient, ILogger<HiveMindService> logger, IOptionsSnapshot<HiveCommunicationConfig> communicationConfigurationOptions)
{
_httpClient = httpClient;
_httpClientFactory = httpClientFactory;
_logger = logger;
_communicationConfigurationOptions = communicationConfigurationOptions.Value;
}
@ -32,15 +36,32 @@ namespace DevOpsProject.HiveMind.Logic.Services
HiveID = _communicationConfigurationOptions.HiveID
};
var connectResult = await _httpClient.SendCommunicationControlConnectAsync(_communicationConfigurationOptions.RequestSchema,
_communicationConfigurationOptions.CommunicationControlIP, _communicationConfigurationOptions.CommunicationControlPort,
_communicationConfigurationOptions.CommunicationControlPath, request);
var httpClient = _httpClientFactory.CreateClient("HiveConnectClient");
_logger.LogInformation($"Connect result for HiveID: {request.HiveID}: {connectResult}");
if (connectResult != null)
var uriBuilder = new UriBuilder
{
var hiveConnectResponse = JsonSerializer.Deserialize<HiveConnectResponse>(connectResult);
Scheme = _communicationConfigurationOptions.RequestSchema,
Host = _communicationConfigurationOptions.CommunicationControlIP,
Port = _communicationConfigurationOptions.CommunicationControlPort,
Path = $"{_communicationConfigurationOptions.CommunicationControlPath}/connect"
};
var jsonContent = new StringContent(JsonSerializer.Serialize(request), Encoding.UTF8, "application/json");
var retryPolicy = Policy.HandleResult<HttpResponseMessage>(r => !r.IsSuccessStatusCode)
.WaitAndRetryAsync(
10,
retryAttempt => TimeSpan.FromSeconds(2),
(result, timeSpan, retryCount, context) =>
{
_logger.LogWarning($"Connecting HiveID: {_communicationConfigurationOptions.HiveID}, retry attempt: {retryCount}. \nRequest URL: {uriBuilder.Uri}, request content: {jsonContent}");
});
var response = await retryPolicy.ExecuteAsync(() => httpClient.PostAsync(uriBuilder.Uri, jsonContent));
if (response.IsSuccessStatusCode)
{
var connectResponse = await response.Content.ReadAsStringAsync();
var hiveConnectResponse = JsonSerializer.Deserialize<HiveConnectResponse>(connectResponse);
if (hiveConnectResponse != null && hiveConnectResponse.ConnectResult)
{
@ -58,10 +79,10 @@ namespace DevOpsProject.HiveMind.Logic.Services
}
else
{
_logger.LogError($"Unable to connect Hive with ID: {request.HiveID}, Port: {request.HivePort}, IP: {request.HiveIP} to Communication Control. \n" +
$"Requested IP: {_communicationConfigurationOptions.CommunicationControlIP}, Port: {_communicationConfigurationOptions.HivePort}");
throw new Exception($"Failed to connect hive for HiveID: {request.HiveID}");
_logger.LogError($"Failed to connect hive, terminating process");
System.Diagnostics.Process.GetCurrentProcess().Kill();
}
}
public void StopAllTelemetry()

48
src/CommunicationControl/DevOpsProject/appsettings.json
View File

@ -1,4 +1,27 @@
{
"Redis": {
"ConnectionString": "localhost:6379",
"PublishChannel": "HiveChannel"
},
"RedisKeys": {
"HiveKey": "Hive"
},
"OperationalArea": {
"Latitude": 48.697189,
"Longitude": 38.066246,
"Radius_KM": 5,
"InitialHeight_KM": 1,
"InitialSpeed_KM": 5,
"TelemetryInterval_MS": 30000,
"PingInterval_MS": 15000
},
"CommunicationConfiguration": {
"RequestScheme": "http",
"HiveMindPath": "api/v1"
},
"AllowedHosts": "*",
"Urls": "http://0.0.0.0:8080",
"Serilog": {
"Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
"MinimumLevel": {
@ -31,28 +54,5 @@
"Application": "DevOpsProject.CommunicationControl",
"Environment": "Development"
}
},
"Redis": {
"ConnectionString": "localhost:6379",
"PublishChannel": "HiveChannel"
},
"RedisKeys": {
"HiveKey": "Hive"
},
"OperationalArea": {
"Latitude": 48.697189,
"Longitude": 38.066246,
"Radius_KM": 5,
"InitialHeight_KM": 1,
"InitialSpeed_KM": 5,
"TelemetryInterval_MS": 30000,
"PingInterval_MS": 15000
},
"CommunicationConfiguration": {
"RequestScheme": "http",
"HiveMindPath": "api/v1"
},
"AllowedHosts": "*",
"Urls": "http://0.0.0.0:8080"
}
}