Skip to content

Commit

Permalink
Add a 2nd CSMS to the Vanaheimr Overlay Networking tests. Redirect ch…
Browse files Browse the repository at this point in the history 
…arging station 3 BootNotifications within the gateway to CSMS 2.
  • Loading branch information
@ahzf
ahzf committed Jul 27, 2024
1 parent 2514348 commit 54471bd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 62 deletions.
30 changes: 12 additions & 18 deletions WWCP_OCPPv2.1/NetworkingNode/DataStructures/ForwardingDecision.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,45 +390,41 @@ public ForwardingDecision(TRequest Request,
#endregion


#region (static) FORWARD (LogMessage = null, RequestContext = null)
#region (static) FORWARD (LogMessage = null)

/// <summary>
/// FORWARD the request.
/// </summary>
/// <param name="LogMessage">An optional log message.</param>
/// <param name="RequestContext">The JSON-LD context of the request.</param>
public static ForwardingDecision<TRequest, TResponse> FORWARD(TRequest Request,
String? LogMessage = null,
JSONLDContext? RequestContext = null)
public static ForwardingDecision<TRequest, TResponse> FORWARD(TRequest Request,
NetworkingNode_Id? NewDestinationId = null,
String? LogMessage = null)

=> new (
Request,
ForwardingResults.FORWARD,
null,
null,
null,
//RequestContext,
NewDestinationId,
String.Empty,
null,
LogMessage
);

#endregion

#region (static) REJECT (LogMessage = null, RequestContext = null)
#region (static) REJECT (LogMessage = null)

/// <summary>
/// REJECT the request.
/// </summary>
/// <param name="RejectMessage">An optional REJECT message sent back to the sender.</param>
/// <param name="RejectDetails">Optional REJECT details sent back to the sender.</param>
/// <param name="LogMessage">An optional log message.</param>
/// <param name="RequestContext">The JSON-LD context of the request.</param>
public static ForwardingDecision<TRequest, TResponse> REJECT(TRequest Request,
String? RejectMessage = null,
JObject? RejectDetails = null,
String? LogMessage = null,
JSONLDContext? RequestContext = null)
public static ForwardingDecision<TRequest, TResponse> REJECT(TRequest Request,
String? RejectMessage = null,
JObject? RejectDetails = null,
String? LogMessage = null)

=> new (
Request,
Expand Down Expand Up @@ -471,19 +467,17 @@ public static ForwardingDecision<TRequest, TResponse> REJECT(TRequest Request,
#endregion


#region (static) REPLACE (Request, NewRequest, NewAction = null, NewDestinationId = null, LogMessage = null, RequestContext = null)
#region (static) REPLACE (Request, NewRequest, NewAction = null, NewDestinationId = null, LogMessage = null)

/// <summary>
/// REPLACE the request.
/// </summary>
/// <param name="LogMessage">An optional log message.</param>
/// <param name="RequestContext">The JSON-LD context of the request.</param>
public static ForwardingDecision<TRequest, TResponse> REPLACE(TRequest Request,
TRequest NewRequest,
String? NewAction = null,
NetworkingNode_Id? NewDestinationId = null,
String? LogMessage = null,
JSONLDContext? RequestContext = null)
String? LogMessage = null)

=> new (
Request,
Expand Down
9 changes: 3 additions & 6 deletions WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Forwarding/CS/Firmware/BootNotification.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@ await HandleErrors(
Connection,
request,
CancellationToken
)).
ToArray()
))
);

//ToDo: Find a good result!
Expand Down Expand Up @@ -245,8 +244,7 @@ await Task.WhenAll(
Connection,
request,
forwardingDecision
)).
ToArray()
))
);

}
Expand Down Expand Up @@ -285,8 +283,7 @@ await Task.WhenAll(
sentMessageResult.Connection,
request,
sentMessageResult.Result
)).
ToArray()
))
);

}
Expand Down
3 changes: 3 additions & 0 deletions WWCP_OCPPv2.1/NetworkingNode/OCPPAdapter/Forwarding/OCPPWebSocketAdapterFORWARD.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ public async Task ProcessJSONRequestMessage(OCPP_JSONRequestMessage JSONRequest

var newJSONRequestMessage = JSONRequestMessage.AppendToNetworkPath(parentNetworkingNode.Id);

if (forwardingDecision.NewDestinationId.HasValue)
newJSONRequestMessage = newJSONRequestMessage.ChangeNetworking(forwardingDecision.NewDestinationId.Value);

expectedResponses.TryAdd(
newJSONRequestMessage.RequestId,
new ResponseInfo(
Expand Down
38 changes: 0 additions & 38 deletions WWCP_OCPPv2.1_Gateway/TestGatewayNode.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,46 +527,8 @@ request.Ciphertext is not null
#endregion



// CS -> CSMS

#region OnBootNotification

OCPP.FORWARD.OnBootNotificationRequestFilter += (timestamp,
sender,
connection,
request,
cancellationToken) =>

Task.FromResult(
ForwardingDecision<CS.BootNotificationRequest, BootNotificationResponse>.FORWARD(request)
);

//Task.FromResult(
// ForwardingDecision<CS.BootNotificationRequest, BootNotificationResponse>.REPLACE(
// request,
// new CS.BootNotificationRequest(
// request.DestinationId,
// request.ChargingStation,
// request.Reason,
// request.SignKeys,
// request.SignInfos,
// request.Signatures,
// request.CustomData,
// request.RequestId,
// request.RequestTimestamp,
// request.RequestTimeout,
// request.EventTrackingId,
// request.NetworkPath,
// request.CancellationToken
// ),
// nameof(CS.BootNotificationRequest)[..^7],
// NetworkingNode_Id.Parse("/dev/null")
// )
//);

#endregion

#region OnAuthorize

OCPP.FORWARD.OnAuthorizeRequestFilter += (timestamp,
Expand Down

0 comments on commit 54471bd

Please sign in to comment.