From dc25584d0fe7863639ce8e494f48aedd723d95fb Mon Sep 17 00:00:00 2001 From: Neeraj Date: Thu, 11 Mar 2021 11:49:59 +0530 Subject: [PATCH 01/46] Adding feature to edit/delete/update isl bfd properties Resolves:#3920 --- .../org/openkilda/constants/IConstants.java | 11 +- .../controller/SwitchController.java | 65 +++++++++ .../openkilda/helper/RestClientManager.java | 26 ++++ .../service/SwitchIntegrationService.java | 84 +++++++++++ .../openkilda/log/constants/ActivityType.java | 4 +- .../org/openkilda/model/BfdProperties.java | 36 +++++ .../model/BfdPropertiesEndpoint.java | 39 ++++++ .../openkilda/model/LinkBfdProperties.java | 40 ++++++ .../org/openkilda/model/NetworkEndpoint.java | 37 +++++ .../org/openkilda/service/SwitchService.java | 15 ++ .../ui/src/app/common/constants/constants.ts | 7 + .../app/common/services/isl-detail.service.ts | 1 + .../app/common/services/isl-list.service.ts | 30 ++++ .../isl/isl-detail/isl-detail.component.html | 75 ++++++++++ .../isl/isl-detail/isl-detail.component.ts | 130 ++++++++++++++++-- 15 files changed, 584 insertions(+), 16 deletions(-) create mode 100644 src-gui/src/main/java/org/openkilda/model/BfdProperties.java create mode 100644 src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java create mode 100644 src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java create mode 100644 src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java diff --git a/src-gui/src/main/java/org/openkilda/constants/IConstants.java b/src-gui/src/main/java/org/openkilda/constants/IConstants.java index 08c8f290c07..625c655e736 100644 --- a/src-gui/src/main/java/org/openkilda/constants/IConstants.java +++ b/src-gui/src/main/java/org/openkilda/constants/IConstants.java @@ -173,6 +173,8 @@ private NorthBoundUrl() { public static final String GET_SWITCH_PORT_PROPERTY = VERSION_TWO + "/switches/{switch_id}" + "/ports/{port}/properties"; public static final String UPDATE_SWITCH_LOCATION = VERSION_TWO + "/switches/{switch_id}"; + public static final String GET_LINK_BFD_PROPERTIES = VERSION_TWO + + "/links/{src-switch}_{src-port}/{dst-switch}_{dst-port}/bfd"; } public final class OpenTsDbUrl { @@ -298,12 +300,16 @@ private Permission() { public static final String SW_SWITCH_METERS = "sw_switch_meters"; - public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; - public static final String SAML_SETTING = "saml_setting"; + public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; + public static final String TOPOLOGY_WORLD_MAP_VIEW = "topology_world_map_view"; + + public static final String ISL_UPDATE_BFD_PROPERTIES = "isl_update_bfd_properties"; + public static final String ISL_DELETE_BFD = "isl_delete_bfd"; + } public final class Settings { @@ -315,7 +321,6 @@ private Settings() { public static final String TOPOLOGY_SETTING = "topology_setting"; } - public interface SamlUrl { public static final String SAML = "/saml/"; diff --git a/src-gui/src/main/java/org/openkilda/controller/SwitchController.java b/src-gui/src/main/java/org/openkilda/controller/SwitchController.java index 31c1b172d35..91eea66a31b 100644 --- a/src-gui/src/main/java/org/openkilda/controller/SwitchController.java +++ b/src-gui/src/main/java/org/openkilda/controller/SwitchController.java @@ -23,8 +23,10 @@ import org.openkilda.integration.model.response.ConfiguredPort; import org.openkilda.log.ActivityLogger; import org.openkilda.log.constants.ActivityType; +import org.openkilda.model.BfdProperties; import org.openkilda.model.FlowInfo; import org.openkilda.model.IslLinkInfo; +import org.openkilda.model.LinkBfdProperties; import org.openkilda.model.LinkMaxBandwidth; import org.openkilda.model.LinkParametersDto; import org.openkilda.model.LinkProps; @@ -410,4 +412,67 @@ public class SwitchController { activityLogger.log(ActivityType.UPDATE_SWITCH_LOCATION, switchId); return serviceSwitch.updateSwitchLocation(switchId, switchLocation); } + + /** + * Gets the link BFD properties. + * + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + * @return the link Bfd properties + */ + @RequestMapping(value = "/links/bfd", method = RequestMethod.GET) + @ResponseStatus(HttpStatus.OK) + public @ResponseBody LinkBfdProperties readBfdProperties(@RequestParam(value = "src_switch", + required = false) final String srcSwitch, @RequestParam(value = "src_port", + required = false) final String srcPort, @RequestParam(value = "dst_switch", + required = false) final String dstSwitch, @RequestParam(value = "dst_port", + required = false) final String dstPort) { + return serviceSwitch.getLinkBfdProperties(srcSwitch, srcPort, dstSwitch, dstPort); + } + + /** + * Updates the link BFD properties. + * + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + * @return the link Bfd properties + */ + @RequestMapping(value = "/links/bfd", method = RequestMethod.PUT) + @ResponseStatus(HttpStatus.OK) + @Permissions(values = IConstants.Permission.ISL_UPDATE_BFD_PROPERTIES) + public @ResponseBody LinkBfdProperties updateBfdProperties(@RequestParam(value = "src_switch", + required = true) final String srcSwitch, @RequestParam(value = "src_port", + required = true) final String srcPort, @RequestParam(value = "dst_switch", + required = true) final String dstSwitch, @RequestParam(value = "dst_port", + required = true) final String dstPort, @RequestBody(required = true) BfdProperties properties) { + activityLogger.log(ActivityType.UPDATE_ISL_BFD_PROPERTIES, "Src_SW_" + srcSwitch + "\nSrc_PORT_" + + srcPort + "\nDst_SW_" + dstSwitch + "\nDst_PORT_" + + dstPort + "\nProperties_" + properties); + return serviceSwitch.updateLinkBfdProperties(srcSwitch, srcPort, dstSwitch, dstPort, properties); + } + + /** + * Delete link BFD. + * + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + */ + @RequestMapping(value = "/links/bfd", method = RequestMethod.DELETE) + @ResponseStatus(HttpStatus.OK) + @Permissions(values = IConstants.Permission.ISL_DELETE_BFD) + public @ResponseBody String deleteLinkBfd(@RequestParam(value = "src_switch", + required = true) final String srcSwitch, @RequestParam(value = "src_port", + required = true) final String srcPort, @RequestParam(value = "dst_switch", + required = true) final String dstSwitch, @RequestParam(value = "dst_port", + required = true) final String dstPort) { + activityLogger.log(ActivityType.DELETE_ISL_BFD, "Src_SW_" + srcSwitch + "\nSrc_PORT_" + + srcPort + "\nDst_SW_" + dstSwitch + "\nDst_PORT_" + dstPort); + return serviceSwitch.deleteLinkBfd(srcSwitch, srcPort, dstSwitch, dstPort); + } } diff --git a/src-gui/src/main/java/org/openkilda/helper/RestClientManager.java b/src-gui/src/main/java/org/openkilda/helper/RestClientManager.java index bc456d79b27..039a6e7c40c 100644 --- a/src-gui/src/main/java/org/openkilda/helper/RestClientManager.java +++ b/src-gui/src/main/java/org/openkilda/helper/RestClientManager.java @@ -393,4 +393,30 @@ public static boolean isValidResponse(final HttpResponse response) { } } } + + /** + * Checks if is delete link bfd valid response. + * + * @param response the response + * @return true, if is valid response + */ + public static boolean isDeleteBfdValidResponse(final HttpResponse response) { + LOGGER.debug("[isValidResponse] Response Code " + response.getStatusLine().getStatusCode()); + boolean isValid = response.getStatusLine().getStatusCode() >= HttpStatus.OK.value() + && response.getStatusLine().getStatusCode() < HttpStatus.MULTIPLE_CHOICES.value(); + if (isValid) { + return true; + } else { + try { + String content = IoUtil.toString(response.getEntity().getContent()); + LOGGER.warn("Found invalid Response. Status Code: " + response.getStatusLine().getStatusCode() + + ", content: " + content); + throw new InvalidResponseException(response.getStatusLine().getStatusCode(), content); + } catch (IOException exception) { + LOGGER.warn("Error occurred while vaildating response", exception); + throw new InvalidResponseException(HttpError.INTERNAL_ERROR.getCode(), + HttpError.INTERNAL_ERROR.getMessage()); + } + } + } } diff --git a/src-gui/src/main/java/org/openkilda/integration/service/SwitchIntegrationService.java b/src-gui/src/main/java/org/openkilda/integration/service/SwitchIntegrationService.java index 6a699ed12c4..ac80521a45a 100644 --- a/src-gui/src/main/java/org/openkilda/integration/service/SwitchIntegrationService.java +++ b/src-gui/src/main/java/org/openkilda/integration/service/SwitchIntegrationService.java @@ -30,8 +30,10 @@ import org.openkilda.integration.model.PortConfiguration; import org.openkilda.integration.model.response.ConfiguredPort; import org.openkilda.integration.model.response.IslLink; +import org.openkilda.model.BfdProperties; import org.openkilda.model.FlowInfo; import org.openkilda.model.IslLinkInfo; +import org.openkilda.model.LinkBfdProperties; import org.openkilda.model.LinkMaxBandwidth; import org.openkilda.model.LinkParametersDto; import org.openkilda.model.LinkProps; @@ -777,4 +779,86 @@ public SwitchInfo updateSwitchLocation(String switchId, SwitchLocation switchLoc } return null; } + + /** + * Gets the link Bfd properties. + * + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + * @return the link Bfd properties + */ + public LinkBfdProperties getLinkBfdProperties(String srcSwitch, String srcPort, String dstSwitch, String dstPort) { + try { + HttpResponse response = restClientManager.invoke( + applicationProperties.getNbBaseUrl() + IConstants.NorthBoundUrl.GET_LINK_BFD_PROPERTIES + .replace("{src-switch}", srcSwitch).replace("{src-port}", srcPort) + .replace("{dst-switch}", dstSwitch).replace("{dst-port}", dstPort), HttpMethod.GET, + "", "application/json", + applicationService.getAuthHeader()); + if (RestClientManager.isValidResponse(response)) { + return restClientManager.getResponse(response, LinkBfdProperties.class); + } + } catch (InvalidResponseException e) { + LOGGER.error("Error occurred while reading link bfd properties", e); + throw new InvalidResponseException(e.getCode(), e.getResponse()); + } + return null; + } + + /** + * Updates the link Bfd properties. + * + * @return the LinkBfdProperties + */ + public LinkBfdProperties updateLinkBfdProperties(String srcSwitch, String srcPort, String dstSwitch, + String dstPort, BfdProperties properties) { + try { + HttpResponse response = restClientManager.invoke( + applicationProperties.getNbBaseUrl() + IConstants.NorthBoundUrl.GET_LINK_BFD_PROPERTIES + .replace("{src-switch}", srcSwitch).replace("{src-port}", srcPort) + .replace("{dst-switch}", dstSwitch).replace("{dst-port}", dstPort), HttpMethod.PUT, + objectMapper.writeValueAsString(properties), "application/json", + applicationService.getAuthHeader()); + if (RestClientManager.isValidResponse(response)) { + return restClientManager.getResponse(response, LinkBfdProperties.class); + } + } catch (InvalidResponseException e) { + LOGGER.error("Error occurred while updating link bfd properties", e); + throw new InvalidResponseException(e.getCode(), e.getResponse()); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + return null; + } + + /** + * Deletes link bfd. + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + * + * @return LinkBfdProperties + */ + public String deleteLinkBfd(String srcSwitch, String srcPort, String dstSwitch, String dstPort) { + try { + HttpResponse response = restClientManager.invoke( + applicationProperties.getNbBaseUrl() + IConstants.NorthBoundUrl.GET_LINK_BFD_PROPERTIES + .replace("{src-switch}", srcSwitch).replace("{src-port}", srcPort) + .replace("{dst-switch}", dstSwitch).replace("{dst-port}", dstPort), HttpMethod.DELETE, + "", "application/json", + applicationService.getAuthHeader()); + if (RestClientManager.isDeleteBfdValidResponse(response)) { + return restClientManager.getResponse(response, String.class); + } + } catch (InvalidResponseException e) { + LOGGER.error("Error occured while deleting link bfd", e); + throw new InvalidResponseException(e.getCode(), e.getResponse()); + } catch (UnsupportedOperationException e) { + e.printStackTrace(); + } + return null; + } } diff --git a/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java b/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java index 9d9dd512970..e6f9788dbca 100644 --- a/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java +++ b/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java @@ -61,7 +61,9 @@ public enum ActivityType { DELETE_SWITCH(40L), UPDATE_ISL_BFD_FLAG(41L), UPDATE_SW_PORT_PROPERTIES(42L), - UPDATE_SWITCH_LOCATION(43L); + UPDATE_SWITCH_LOCATION(43L), + UPDATE_ISL_BFD_PROPERTIES(44L), + DELETE_ISL_BFD(45L); private Long id; private ActivityTypeEntity activityTypeEntity; diff --git a/src-gui/src/main/java/org/openkilda/model/BfdProperties.java b/src-gui/src/main/java/org/openkilda/model/BfdProperties.java new file mode 100644 index 00000000000..ef842b87abd --- /dev/null +++ b/src-gui/src/main/java/org/openkilda/model/BfdProperties.java @@ -0,0 +1,36 @@ +/* Copyright 2019 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import lombok.Data; + +@JsonSerialize +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class BfdProperties { + + @JsonProperty("interval_ms") + private Long intervalMs; + + @JsonProperty("multiplier") + private Short multiplier; +} diff --git a/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java b/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java new file mode 100644 index 00000000000..55726b7cd98 --- /dev/null +++ b/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java @@ -0,0 +1,39 @@ +/* Copyright 2019 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import lombok.Data; + +@JsonSerialize +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class BfdPropertiesEndpoint { + + @JsonProperty("endpoint") + private NetworkEndpoint endpoint; + + @JsonProperty("properties") + private BfdProperties properties; + + @JsonProperty("status") + private String status; +} diff --git a/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java b/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java new file mode 100644 index 00000000000..a2539223081 --- /dev/null +++ b/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java @@ -0,0 +1,40 @@ +/* Copyright 2019 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import lombok.Data; + +@JsonSerialize +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class LinkBfdProperties { + + @JsonProperty("properties") + private BfdProperties properties; + + @JsonProperty("effective_source") + private BfdPropertiesEndpoint effectiveSource; + + @JsonProperty("effective_destination") + private BfdPropertiesEndpoint effectiveDestination; + +} diff --git a/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java b/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java new file mode 100644 index 00000000000..1c202cd0d1f --- /dev/null +++ b/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java @@ -0,0 +1,37 @@ +/* Copyright 2019 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import lombok.Data; + +@JsonSerialize +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class NetworkEndpoint { + + @JsonProperty("switch-id") + private String switchId; + + @JsonProperty("port-id") + private int port; + +} diff --git a/src-gui/src/main/java/org/openkilda/service/SwitchService.java b/src-gui/src/main/java/org/openkilda/service/SwitchService.java index 902a6552ca6..cd2c07f4f0a 100644 --- a/src-gui/src/main/java/org/openkilda/service/SwitchService.java +++ b/src-gui/src/main/java/org/openkilda/service/SwitchService.java @@ -28,8 +28,10 @@ import org.openkilda.integration.service.SwitchIntegrationService; import org.openkilda.integration.source.store.SwitchStoreService; import org.openkilda.integration.source.store.dto.InventorySwitch; +import org.openkilda.model.BfdProperties; import org.openkilda.model.FlowInfo; import org.openkilda.model.IslLinkInfo; +import org.openkilda.model.LinkBfdProperties; import org.openkilda.model.LinkMaxBandwidth; import org.openkilda.model.LinkParametersDto; import org.openkilda.model.LinkProps; @@ -597,4 +599,17 @@ public SwitchInfo updateSwitchLocation(String switchId, SwitchLocation switchLoc return switchIntegrationService.updateSwitchLocation(switchId, switchLocation); } + public LinkBfdProperties getLinkBfdProperties(String srcSwitch, String srcPort, String dstSwitch, String dstPort) { + return switchIntegrationService.getLinkBfdProperties(srcSwitch, srcPort, dstSwitch, dstPort); + } + + public LinkBfdProperties updateLinkBfdProperties(String srcSwitch, String srcPort, String dstSwitch, + String dstPort, BfdProperties properties) { + return switchIntegrationService.updateLinkBfdProperties(srcSwitch, srcPort, dstSwitch, dstPort, properties); + } + + public String deleteLinkBfd(String srcSwitch, String srcPort, String dstSwitch, String dstPort) { + return switchIntegrationService.deleteLinkBfd(srcSwitch, srcPort, dstSwitch, dstPort); + } + } diff --git a/src-gui/ui/src/app/common/constants/constants.ts b/src-gui/ui/src/app/common/constants/constants.ts index 0208fa1c8ae..ad1594677e3 100644 --- a/src-gui/ui/src/app/common/constants/constants.ts +++ b/src-gui/ui/src/app/common/constants/constants.ts @@ -144,5 +144,12 @@ export const MessageObj = { provider_deleted_success:"Provider deleted successfully", switch_updated_success:"Switch location updated successfully.", switch_updated_error:"Error in updating switch location.", + delete_bfd_properties:"Deleting BFD properties.", + updating_bfd_properties:'Updating BFD properties values.', + updating_bfd_properties_success:'BFD Properties updated successfully.', + updating_bfd_properties_error:"Error in updating BFD properties.", + BFD_properties_deleted:"BFD properties deleted successfully.", + error_BFD_properties_delete:"Error in deleting BFD properties.", + delete_isl_bfd_not_authorised:"You are not authorised to delete the ISL BFD Properties." } \ No newline at end of file diff --git a/src-gui/ui/src/app/common/services/isl-detail.service.ts b/src-gui/ui/src/app/common/services/isl-detail.service.ts index 1f426c83a8a..2670611360e 100644 --- a/src-gui/ui/src/app/common/services/isl-detail.service.ts +++ b/src-gui/ui/src/app/common/services/isl-detail.service.ts @@ -20,6 +20,7 @@ export class IslDetailService { getISLFlowsList(query? : any) : Observable{ return this.httpClient.get(`${environment.apiEndPoint}/switch/links/flows`,{params:query}); } + getIslLatencyfromGraph(src_switch,src_port,dst_switch,dst_port,from,to,frequency){ return this.httpClient.get( `${ diff --git a/src-gui/ui/src/app/common/services/isl-list.service.ts b/src-gui/ui/src/app/common/services/isl-list.service.ts index 2c99c1582b2..22cd1f4bb43 100644 --- a/src-gui/ui/src/app/common/services/isl-list.service.ts +++ b/src-gui/ui/src/app/common/services/isl-list.service.ts @@ -80,4 +80,34 @@ export class IslListService { const url = `${environment.apiEndPoint}/switch/link/props`; return this.httpClient.put(url,requestPayload); } + + getLinkBFDProperties(src_switch, src_port, dst_switch, dst_port){ + let date = new Date().getTime(); + return this.httpClient.get(`${environment.apiEndPoint}/switch/links/bfd?src_switch=${src_switch}&src_port=${src_port}&dst_switch=${dst_switch}&dst_port=${dst_port}&_=${date}`); + + } + updateLinkBFDProperties(data,src_switch, src_port, dst_switch, dst_port){ + const url = `${environment.apiEndPoint}/switch/links/bfd?src_switch=${src_switch}&src_port=${src_port}&dst_switch=${dst_switch}&dst_port=${dst_port}`; + return this.httpClient.put(url,data); + } + deleteLinkBFDProperties(data,successRes,errorRes){ + const url = `${environment.apiEndPoint}/switch/links/bfd?src_switch=${data.src_switch}&src_port=${data.src_port}&dst_switch=${data.dst_switch}&dst_port=${data.dst_port}`; + let token = this.cookieManager.get('XSRF-TOKEN') as string; + var xhr = new XMLHttpRequest(); + xhr.withCredentials = false; + xhr.addEventListener("readystatechange", function () { + if (this.readyState == 4 && this.status == 200) { + successRes(JSON.parse(this.responseText)); + }else if(this.readyState == 4 && this.status >= 300){ + errorRes(JSON.parse(this.responseText)); + } + }); + + xhr.open("DELETE", url); + xhr.setRequestHeader("Content-Type", "application/json"); + if (token !== null) { + xhr.setRequestHeader( "X-XSRF-TOKEN" , token); + } + xhr.send(); + } } diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html index 73fbc8514c6..c8e3a46697d 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html @@ -33,6 +33,18 @@
SOURCE DETAILS
{{src_switch_name }} +
+ +
+ {{bfdPropertyData.effective_source.properties['interval_ms']}} +
+
+
+ +
+ {{bfdPropertyData.effective_source.properties['multiplier']}} +
+
@@ -72,6 +84,18 @@
DESTINATION DETAILS {{dst_switch_name}} +
+ +
+ {{bfdPropertyData.effective_destination.properties['interval_ms']}} +
+
+
+ +
+ {{bfdPropertyData.effective_destination.properties['multiplier']}} +
+
@@ -199,6 +223,57 @@
ISL DETAILS
+ +
+
BFD PROPERTIES
+
+
+ +
+
+ + +
+
+ + +
+
+
+ Update + Cancel +
+ +
+
+ +
+ +
+
BFD PROPERTIES + Edit + Update + + Delete +
+
+
+ +
+ +
+ {{bfdPropertyData.properties['interval_ms']}} +
+
+
+ +
+ {{bfdPropertyData.properties['multiplier']}} +
+
+
+
+
    diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts index 10548e53b27..47ed2ebff30 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts @@ -47,11 +47,13 @@ import { FlowsService } from 'src/app/common/services/flows.service'; evacuate:boolean=false; under_maintenance:boolean=false; loadingData = true; + isBFDEdit:any=false; dataSet:any; available_bandwidth:string = ''; default_max_bandwidth=''; max_bandwidth :any = ''; detailDataObservable : any; + bfdPropertyData : any; src_switch_name: string; dst_switch_name: string; graphDataForwardUrl: string; @@ -78,6 +80,7 @@ import { FlowsService } from 'src/app/common/services/flows.service'; graphMetrics = []; flowGraphMetrics=[]; autoReloadTimerId = null; + bfdPropForm:FormGroup; islForm: FormGroup; showCostEditing: boolean = false; showBandwidthEditing : boolean = false; @@ -156,10 +159,8 @@ import { FlowsService } from 'src/app/common/services/flows.service'; auto_reload_time: ["", Validators.compose([Validators.pattern("[0-9]*")])] }); this.graphMetrics = this.dygraphService.getPortMetricData(); - this.flowGraphMetrics = this.dygraphService.getFlowMetricData(); - - - } + this.flowGraphMetrics = this.dygraphService.getFlowMetricData(); +} getIslDetailData(src_switch,src_port,dst_switch,dst_port){ this.loaderService.show(MessageObj.loading_isl); @@ -214,6 +215,26 @@ import { FlowsService } from 'src/app/common/services/flows.service'; },error=>{ this.toastr.error(MessageObj.no_cost_data_returned,'Error'); }); + + this.islListService.getLinkBFDProperties(this.src_switch, this.src_port, this.dst_switch, this.dst_port).subscribe((data : any) =>{ + if(data!= null){ + this.bfdPropertyData = data; + this.bfdPropForm = this.formBuiler.group({ + interval_ms: [this.bfdPropertyData.interval_ms, Validators.min(0)], + multiplier:[this.bfdPropertyData.multiplier,Validators.min(0)] + }); + } + else{ + this.bfdPropertyData = {}; + this.bfdPropForm = this.formBuiler.group({ + interval_ms: [0, Validators.min(0)], + multiplier:[0,Validators.min(0)] + }); + } + + },error=>{ + this.toastr.error(MessageObj.no_cost_data_returned,'Error'); + }); }else{ this.loaderService.hide(); this.toastr.error(MessageObj.no_isl,'Error'); @@ -677,8 +698,7 @@ get f() { if (formdata.timezone == "UTC") { convertedStartDate = moment(new Date(formdata.fromDate)).add(-60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); - convertedEndDate = moment(new Date(formdata.toDate)).add(60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); - + convertedEndDate = moment(new Date(formdata.toDate)).add(60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); } @@ -789,10 +809,10 @@ get f() { this.loaderService.hide(); if(this.filterForm.value.graph_type === 'stackedgraph'){ this.islDataService.changeIslFlowStackedGraph(this.currentGraphData); - this.islDataService.IslFlowStackedGraph.subscribe(message => this.message = message); + this.islDataService.IslFlowStackedGraph.subscribe(message => this.message = message); }else{ - this.islDataService.changeIslFlowGraph(this.currentGraphData); - this.islDataService.IslFlowGraph.subscribe(message => this.message = message); + this.islDataService.changeIslFlowGraph(this.currentGraphData); + this.islDataService.IslFlowGraph.subscribe(message => this.message = message); } } @@ -829,7 +849,6 @@ get f() { if (formdata.timezone == "UTC") { convertedStartDate = moment(new Date(formdata.fromDate)).add(-60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); convertedEndDate = moment(new Date(formdata.toDate)).add(60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); - } @@ -966,11 +985,48 @@ get f() { }); } - deleteISL(){ + editBFDProperties(){ + this.isBFDEdit = true; + } + + updateBFDProperties(){ + if (this.bfdPropForm.invalid) { + this.toastr.error("Please enter valid value for Interval and multiplier."); + return; + } + + const modalRef = this.modalService.open(ModalconfirmationComponent); + modalRef.componentInstance.title = "Confirmation"; + modalRef.componentInstance.content = 'Are you sure you want to change the BFD Properties'; + + modalRef.result.then((response) => { + if(response && response == true){ + this.loaderService.show(MessageObj.updating_bfd_properties); + let interval_ms = this.bfdPropForm.value.interval_ms; + let multiplier = this.bfdPropForm.value.multiplier; + var data = {interval_ms:interval_ms,multiplier:multiplier}; + this.islListService.updateLinkBFDProperties(data,this.src_switch, this.src_port, this.dst_switch, this.dst_port).subscribe((response: any) => { + this.loaderService.hide(); + this.toastr.success(MessageObj.updating_bfd_properties_success,'Success'); + this.isBFDEdit = false; + },error => { + this.loaderService.hide(); + this.isBFDEdit = false; + if(error.status == '500'){ + this.toastr.error(error.error['error-message'],'Error! '); + }else{ + this.toastr.error(MessageObj.updating_bfd_properties_error,'Error'); + } + }) + } + }); + } + deleteBFDProperties(){ + let is2FaEnabled = localStorage.getItem('is2FaEnabled') var self = this; const modalReff = this.modalService.open(ModalconfirmationComponent); - modalReff.componentInstance.title = "Delete ISL"; + modalReff.componentInstance.title = "Delete BFD Properties"; modalReff.componentInstance.content = 'Are you sure you want to perform delete action ?'; modalReff.result.then((response) => { @@ -980,6 +1036,56 @@ get f() { modalRef.componentInstance.emitService.subscribe( otp => { + if (otp) { + this.loaderService.show(MessageObj.delete_bfd_properties); + var data = { + src_switch:this.src_switch, + src_port:this.src_port, + dst_switch:this.dst_switch, + dst_port:this.dst_port, + code:otp + } + this.modalService.dismissAll(); + this.islListService.deleteLinkBFDProperties(data,response => { + this.toastr.success(MessageObj.BFD_properties_deleted, "Success!"); + this.loaderService.hide(); + }, error => { + this.loaderService.hide(); + var message = (error && error['error-auxiliary-message']) ? error['error-auxiliary-message'] :MessageObj.error_BFD_properties_delete; + this.toastr.error(message, "Error!"); + }) + } else { + this.toastr.error(MessageObj.otp_not_detected, "Error!"); + } + }, + error => { + } + ); + }else{ + const modalRef2 = this.modalService.open(ModalComponent); + modalRef2.componentInstance.title = "Warning"; + modalRef2.componentInstance.content = MessageObj.delete_isl_bfd_not_authorised; + } + } + }); + } + + cancelEditBFDProperties(){ + this.isBFDEdit = false; + } + deleteISL(){ + let is2FaEnabled = localStorage.getItem('is2FaEnabled') + var self = this; + const modalReff = this.modalService.open(ModalconfirmationComponent); + modalReff.componentInstance.title = "Delete ISL"; + modalReff.componentInstance.content = 'Are you sure you want to perform delete action ?'; + + modalReff.result.then((response) => { + if(response && response == true){ + if(is2FaEnabled == 'true'){ + const modalRef = this.modalService.open(OtpComponent); + modalRef.componentInstance.emitService.subscribe( + otp => { if (otp) { this.loaderService.show(MessageObj.deleting_isl); var data = { From 7bd25c9d29d7c2331a9aa5e1ed6fe95abe841779 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Tue, 23 Mar 2021 15:16:05 +0530 Subject: [PATCH 02/46] Improvement in login system to defend brute force attack Resolves:#3564 --- .../org/openkilda/constants/IConstants.java | 35 ++++++- .../java/org/openkilda/constants/Status.java | 7 +- .../openkilda/log/constants/ActivityType.java | 7 +- .../CustomAuthenticationProvider.java | 73 ++++++++++++++- .../service/ApplicationSettingService.java | 6 ++ .../ApplicationSettingsValidator.java | 20 ++++ .../controller/UserController.java | 21 +++++ .../usermanagement/dao/entity/UserEntity.java | 43 +++++++++ .../usermanagement/service/UserService.java | 14 +++ .../main/resources/db/import-script_32.sql | 23 +++++ .../ui/src/app/common/constants/constants.ts | 11 +++ .../src/app/common/services/common.service.ts | 6 ++ .../settings/session/session.component.html | 46 +++++++++ .../settings/session/session.component.ts | 93 +++++++++++++++++++ 14 files changed, 395 insertions(+), 10 deletions(-) create mode 100644 src-gui/src/main/resources/db/import-script_32.sql diff --git a/src-gui/src/main/java/org/openkilda/constants/IConstants.java b/src-gui/src/main/java/org/openkilda/constants/IConstants.java index 08c8f290c07..cbc0b80cf37 100644 --- a/src-gui/src/main/java/org/openkilda/constants/IConstants.java +++ b/src-gui/src/main/java/org/openkilda/constants/IConstants.java @@ -74,10 +74,33 @@ private SessionTimeout() { public static Integer DEFAULT_TIME_IN_MINUTE = 45; } + public static final class InvalidLoginAttempt { + private InvalidLoginAttempt() { + + } + + public static Integer INVALID_LOGIN_ATTEMPTS_COUNT; + + public static Integer DEFAULT_INVALID_LOGIN_ATTEMPTS_COUNT = 5; + } + + public static final class UserAccUnlockTime { + private UserAccUnlockTime() { + + } + + public static Integer USER_ACCOUNT_UNLOCK_TIME; + + public static Integer DEFAULT_USER_ACCOUNT_UNLOCK_TIME = 60; + } + + public enum ApplicationSetting { SESSION_TIMEOUT(String.valueOf(SessionTimeout.DEFAULT_TIME_IN_MINUTE)), SWITCH_NAME_STORAGE_TYPE( - StorageType.FILE_STORAGE.name()); + StorageType.FILE_STORAGE.name()), INVALID_LOGIN_ATTEMPT(String.valueOf(InvalidLoginAttempt + .DEFAULT_INVALID_LOGIN_ATTEMPTS_COUNT)), USER_ACCOUNT_UNLOCK_TIME( + String.valueOf(UserAccUnlockTime.DEFAULT_USER_ACCOUNT_UNLOCK_TIME)); final String value; @@ -173,6 +196,8 @@ private NorthBoundUrl() { public static final String GET_SWITCH_PORT_PROPERTY = VERSION_TWO + "/switches/{switch_id}" + "/ports/{port}/properties"; public static final String UPDATE_SWITCH_LOCATION = VERSION_TWO + "/switches/{switch_id}"; + public static final String GET_LINK_BFD_PROPERTIES = VERSION_TWO + + "/links/{src-switch}_{src-port}/{dst-switch}_{dst-port}/bfd"; } public final class OpenTsDbUrl { @@ -298,12 +323,17 @@ private Permission() { public static final String SW_SWITCH_METERS = "sw_switch_meters"; - public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; + public static final String UM_USER_ACCOUNT_UNLOCK = "um_user_account_unlock"; public static final String SAML_SETTING = "saml_setting"; + public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; + public static final String TOPOLOGY_WORLD_MAP_VIEW = "topology_world_map_view"; + + public static final String ISL_UPDATE_BFD_PROPERTIES = "isl_update_bfd_properties"; + public static final String ISL_DELETE_BFD = "isl_delete_bfd"; } public final class Settings { @@ -315,7 +345,6 @@ private Settings() { public static final String TOPOLOGY_SETTING = "topology_setting"; } - public interface SamlUrl { public static final String SAML = "/saml/"; diff --git a/src-gui/src/main/java/org/openkilda/constants/Status.java b/src-gui/src/main/java/org/openkilda/constants/Status.java index 2b9bbc49bdf..dc0cf5a82d2 100644 --- a/src-gui/src/main/java/org/openkilda/constants/Status.java +++ b/src-gui/src/main/java/org/openkilda/constants/Status.java @@ -1,4 +1,4 @@ -/* Copyright 2018 Telstra Open Source +/* Copyright 2019 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,9 @@ public enum Status { /** The active. */ ACTIVE("ACT"), /** The inactive. */ - INACTIVE("INA"); - /** The expired. */ + INACTIVE("INA"), + /** The locked. */ + LOCK("LCK"); private String code; diff --git a/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java b/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java index 9d9dd512970..dff7a2db0aa 100644 --- a/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java +++ b/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java @@ -61,7 +61,12 @@ public enum ActivityType { DELETE_SWITCH(40L), UPDATE_ISL_BFD_FLAG(41L), UPDATE_SW_PORT_PROPERTIES(42L), - UPDATE_SWITCH_LOCATION(43L); + CONFIG_INVALID_LOGIN_ATTEMPT_COUNT(46L), + CONFIG_USER_ACCOUNT_UNLOCK_TIME(47L), + UNLOCK_USER_ACCOUNT(48L), + UPDATE_SWITCH_LOCATION(43L), + UPDATE_ISL_BFD_PROPERTIES(44L), + DELETE_ISL_BFD(45L); private Long id; private ActivityTypeEntity activityTypeEntity; diff --git a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java index 79cfa793ba1..f12ccc0583d 100644 --- a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java +++ b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java @@ -15,23 +15,33 @@ package org.openkilda.security; +import org.openkilda.constants.IConstants.ApplicationSetting; +import org.openkilda.constants.Status; import org.openkilda.exception.InvalidOtpException; import org.openkilda.exception.OtpRequiredException; import org.openkilda.exception.TwoFaKeyNotSetException; +import org.openkilda.service.ApplicationSettingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.LockedException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.core.Authentication; -import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.usermanagement.dao.entity.UserEntity; import org.usermanagement.dao.repository.UserRepository; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Date; + public class CustomAuthenticationProvider extends DaoAuthenticationProvider { @Autowired private UserRepository userRepository; + + @Autowired + private ApplicationSettingService applicationSettingService; /* * (non-Javadoc) @@ -48,10 +58,20 @@ public Authentication authenticate(final Authentication auth) String verificationCode = customWebAuthenticationDetails.getVerificationCode(); UserEntity user = userRepository.findByUsernameIgnoreCase(auth.getName()); if (user == null || !user.getActiveFlag()) { - throw new UsernameNotFoundException("User '" + auth.getName() + "' does not exist"); + throw new BadCredentialsException("Login failed; Invalid email or password."); + } + String loginCount = null; + String unlockTime = null; + if (user.getUserId() != 1) { + loginCount = applicationSettingService.getApplicationSetting(ApplicationSetting.INVALID_LOGIN_ATTEMPT); + unlockTime = applicationSettingService.getApplicationSetting(ApplicationSetting + .USER_ACCOUNT_UNLOCK_TIME); + if (!user.getStatusEntity().getStatus().equalsIgnoreCase("ACTIVE")) { + checkUserLoginAttempts(user, loginCount, unlockTime); + } } try { - Authentication result = super.authenticate(auth); + final Authentication result = super.authenticate(auth); if (user.getIs2FaEnabled()) { if (!user.getIs2FaConfigured() && !customWebAuthenticationDetails.isConfigure2Fa()) { throw new TwoFaKeyNotSetException(); @@ -65,8 +85,55 @@ public Authentication authenticate(final Authentication auth) } return new UsernamePasswordAuthenticationToken(user, result.getCredentials(), result.getAuthorities()); } catch (BadCredentialsException e) { + if (user.getUserId() != 1) { + updateInvalidLoginAttempts(user, loginCount, unlockTime); + } throw new BadCredentialsException(e.getMessage()); } + + } + + private void checkUserLoginAttempts(UserEntity user, String value, String accUnlockTime) { + if (user.getFailedLoginCount() != null) { + Date loginTime = user.getFailedLoginTime(); + Calendar cal = Calendar.getInstance(); + cal.setTime(loginTime); + cal.add(Calendar.MINUTE, Integer.valueOf(user.getUnlockTime())); + Date time = Calendar.getInstance().getTime(); + if (cal.getTime().after(time)) { + Date calTime = cal.getTime(); + long unlockTime = calTime.getTime() - time.getTime(); + long diffMinutes = unlockTime / (60 * 1000); + long minutes = diffMinutes + 1; + throw new LockedException("User account is locked, will be unlocked after " + + minutes + " minute(s)"); + } else { + user.setStatusEntity(Status.ACTIVE.getStatusEntity()); + user.setFailedLoginCount(null); + user.setUnlockTime(null); + user.setLoginTime(new Timestamp(System.currentTimeMillis())); + userRepository.save(user); + } + } + } + + private void updateInvalidLoginAttempts(UserEntity entity, String value, String accUnlockTime) { + Integer loginCount = entity.getFailedLoginCount(); + if (loginCount != null) { + if (loginCount + 1 >= Integer.valueOf(value)) { + entity.setFailedLoginCount(loginCount + 1); + entity.setUnlockTime(Integer.valueOf(accUnlockTime)); + entity.setFailedLoginTime(new Timestamp(System.currentTimeMillis())); + entity.setStatusEntity(Status.getStatusByCode(Status.LOCK.getCode()).getStatusEntity()); + userRepository.save(entity); + throw new LockedException("User account is locked for " + + Integer.valueOf(accUnlockTime) + " minute(s)"); + } + entity.setFailedLoginCount(loginCount + 1); + } else { + entity.setFailedLoginCount(1); + } + userRepository.save(entity); } /* diff --git a/src-gui/src/main/java/org/openkilda/service/ApplicationSettingService.java b/src-gui/src/main/java/org/openkilda/service/ApplicationSettingService.java index a918869c498..3bfe84e45e7 100644 --- a/src-gui/src/main/java/org/openkilda/service/ApplicationSettingService.java +++ b/src-gui/src/main/java/org/openkilda/service/ApplicationSettingService.java @@ -88,6 +88,12 @@ public void saveOrUpdateApplicationSetting(final ApplicationSetting applicationS } else if (applicationSetting == ApplicationSetting.SWITCH_NAME_STORAGE_TYPE) { IConstants.STORAGE_TYPE_FOR_SWITCH_NAME = StorageType.get(value); activityLogger.log(ActivityType.CONFIG_SWITCH_NAME_STORAGE_TYPE, value); + } else if (applicationSetting == ApplicationSetting.INVALID_LOGIN_ATTEMPT) { + IConstants.InvalidLoginAttempt.INVALID_LOGIN_ATTEMPTS_COUNT = Integer.valueOf(value); + activityLogger.log(ActivityType.CONFIG_INVALID_LOGIN_ATTEMPT_COUNT, value); + } else if (applicationSetting == ApplicationSetting.USER_ACCOUNT_UNLOCK_TIME) { + activityLogger.log(ActivityType.CONFIG_USER_ACCOUNT_UNLOCK_TIME, value); + IConstants.UserAccUnlockTime.USER_ACCOUNT_UNLOCK_TIME = Integer.valueOf(value); } applicationSettingEntity.setValue(value); applicationSettingEntity.setUpdatedDate(new Date()); diff --git a/src-gui/src/main/java/org/openkilda/validator/ApplicationSettingsValidator.java b/src-gui/src/main/java/org/openkilda/validator/ApplicationSettingsValidator.java index 3b483b651b5..7d7b68f36c5 100644 --- a/src-gui/src/main/java/org/openkilda/validator/ApplicationSettingsValidator.java +++ b/src-gui/src/main/java/org/openkilda/validator/ApplicationSettingsValidator.java @@ -64,6 +64,26 @@ public void validate(final ApplicationSetting type, final String value) { throw new RequestValidationException(messageUtil .getAttributeNotvalid(ApplicationSetting.SWITCH_NAME_STORAGE_TYPE.name())); } + } else if (type == ApplicationSetting.INVALID_LOGIN_ATTEMPT) { + try { + if (Integer.valueOf(value) < 1) { + throw new RequestValidationException(messageUtil + .getAttributeNotvalid(ApplicationSetting.INVALID_LOGIN_ATTEMPT.name())); + } + } catch (NumberFormatException ex) { + throw new RequestValidationException(messageUtil + .getAttributeNotvalid(ApplicationSetting.INVALID_LOGIN_ATTEMPT.name())); + } + } else if (type == ApplicationSetting.USER_ACCOUNT_UNLOCK_TIME) { + try { + if (Integer.valueOf(value) < 1) { + throw new RequestValidationException(messageUtil + .getAttributeNotvalid(ApplicationSetting.USER_ACCOUNT_UNLOCK_TIME.name())); + } + } catch (NumberFormatException ex) { + throw new RequestValidationException(messageUtil + .getAttributeNotvalid(ApplicationSetting.USER_ACCOUNT_UNLOCK_TIME.name())); + } } } } diff --git a/src-gui/src/main/java/org/usermanagement/controller/UserController.java b/src-gui/src/main/java/org/usermanagement/controller/UserController.java index b8fd44251f5..5741114eaf7 100644 --- a/src-gui/src/main/java/org/usermanagement/controller/UserController.java +++ b/src-gui/src/main/java/org/usermanagement/controller/UserController.java @@ -18,6 +18,8 @@ import org.openkilda.auth.context.ServerContext; import org.openkilda.auth.model.Permissions; import org.openkilda.constants.IConstants; +import org.openkilda.log.ActivityLogger; +import org.openkilda.log.constants.ActivityType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,6 +63,9 @@ public class UserController { @Autowired private ServerContext serverContext; + + @Autowired + private ActivityLogger activityLogger; /** * Gets the users by role id. @@ -265,4 +270,20 @@ public boolean validateOtp(@RequestBody final UserInfo userInfo, final HttpServl public UserInfo getLoggedInUserInfo() throws AccessDeniedException { return userService.getLoggedInUserInfo(); } + + /** + * Unlock user account. + * + * @param userId the user id + * @return the userInfo + */ + @ResponseStatus(HttpStatus.OK) + @RequestMapping(value = "/unlock/account/{user_id}", method = RequestMethod.PUT) + @Permissions(values = { IConstants.Permission.UM_USER_ACCOUNT_UNLOCK }) + public Message unlockUserAccount(@PathVariable("user_id") final Long userId) { + activityLogger.log(ActivityType.UNLOCK_USER_ACCOUNT, String.valueOf(userId)); + LOGGER.info("Reset user account. (userId: " + userId + ")"); + userService.unlockUserAccount(userId); + return new Message("User account activated successfully"); + } } diff --git a/src-gui/src/main/java/org/usermanagement/dao/entity/UserEntity.java b/src-gui/src/main/java/org/usermanagement/dao/entity/UserEntity.java index 4d1e59143e3..f8f66f45b50 100644 --- a/src-gui/src/main/java/org/usermanagement/dao/entity/UserEntity.java +++ b/src-gui/src/main/java/org/usermanagement/dao/entity/UserEntity.java @@ -66,6 +66,15 @@ public class UserEntity extends BaseEntity implements Serializable { @Column(name = "LOGOUT_TIME") private Date logoutTime; + + @Column(name = "FAILED_LOGIN_TIME") + private Date failedLoginTime; + + @Column(name = "FAILED_LOGIN_COUNT") + private Integer failedLoginCount; + + @Column(name = "UNLOCK_TIME") + private Integer unlockTime; @Column(name = "ACTIVE_FLAG") private String activeFlag; @@ -116,6 +125,40 @@ public Set getRoles() { public void setRoles(final Set roles) { this.roles = roles; } + + /** + * Gets the failed login count. + * + * @return the failed login count + */ + public Integer getFailedLoginCount() { + return failedLoginCount; + } + + /** + * Sets the failed login count. + * + * @param failedLoginCount the failed login count + */ + public void setFailedLoginCount(Integer failedLoginCount) { + this.failedLoginCount = failedLoginCount; + } + + public Date getFailedLoginTime() { + return failedLoginTime; + } + + public void setFailedLoginTime(Date failedLoginTime) { + this.failedLoginTime = failedLoginTime; + } + + public Integer getUnlockTime() { + return unlockTime; + } + + public void setUnlockTime(Integer unlockTime) { + this.unlockTime = unlockTime; + } /** * Gets the user id. diff --git a/src-gui/src/main/java/org/usermanagement/service/UserService.java b/src-gui/src/main/java/org/usermanagement/service/UserService.java index f7e647eaa93..4d23cc94d27 100644 --- a/src-gui/src/main/java/org/usermanagement/service/UserService.java +++ b/src-gui/src/main/java/org/usermanagement/service/UserService.java @@ -582,6 +582,20 @@ public UserInfo getLoggedInUserInfo() throws AccessDeniedException { userInfo.setPermissions(requestContext.getPermissions()); return userInfo; } + + /** + * Unlock user account. + * + * @param userId the user id + */ + public void unlockUserAccount(Long userId) { + UserEntity userEntity = userValidator.validateUserId(userId); + userEntity.setStatusEntity(Status.ACTIVE.getStatusEntity()); + userEntity.setFailedLoginCount(null); + userEntity.setUnlockTime(null); + userEntity.setLoginTime(new Timestamp(System.currentTimeMillis())); + userRepository.save(userEntity); + } /** * Adds user information in session. diff --git a/src-gui/src/main/resources/db/import-script_32.sql b/src-gui/src/main/resources/db/import-script_32.sql new file mode 100644 index 00000000000..1f98856453a --- /dev/null +++ b/src-gui/src/main/resources/db/import-script_32.sql @@ -0,0 +1,23 @@ +INSERT INTO "VERSION" (Version_ID, Version_Number, Version_Deployment_Date) +VALUES (32, 32, CURRENT_TIMESTAMP); + +INSERT INTO "KILDA_PERMISSION" (PERMISSION_ID, PERMISSION, IS_EDITABLE, IS_ADMIN_PERMISSION, STATUS_ID, CREATED_BY, CREATED_DATE, UPDATED_BY, UPDATED_DATE,DESCRIPTION) VALUES + (362, 'um_user_account_unlock', false, false, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 'Permission to unlock user account'); + +INSERT INTO "ROLE_PERMISSION" (ROLE_ID,PERMISSION_ID) VALUES + (2, 362); + +INSERT INTO "ACTIVITY_TYPE" (activity_type_id, activity_name) VALUES + (46, 'CONFIG_INVALID_LOGIN_ATTEMPT_COUNT'), + (47, 'CONFIG_USER_ACCOUNT_UNLOCK_TIME'), + (48, 'UNLOCK_USER_ACCOUNT'); + +INSERT INTO "APPLICATION_SETTING" (id, setting_type, setting_value) VALUES (3, 'invalid_login_attempt', '5'); +INSERT INTO "APPLICATION_SETTING" (id, setting_type, setting_value) VALUES (4, 'user_account_unlock_time', '60'); + +INSERT INTO "KILDA_STATUS" (status_id, STATUS_CODE, STATUS) VALUES + (3, 'LCK', 'Lock'); + + + + diff --git a/src-gui/ui/src/app/common/constants/constants.ts b/src-gui/ui/src/app/common/constants/constants.ts index 0208fa1c8ae..c3e12d59467 100644 --- a/src-gui/ui/src/app/common/constants/constants.ts +++ b/src-gui/ui/src/app/common/constants/constants.ts @@ -70,6 +70,10 @@ export const MessageObj = { session_setting_saved:"Session setting saved", saving_switch_name_store_setting:"Saving switch name source setting", switch_name_store_setting_saved:"Switch name source saved", + user_unlock_time_setting_saved:"User unlock time setting saved", + saving_unlock_time_setting:"Saving user unlock time setting", + saving_login_attempt_setting:"Saving login attempt setting", + user_login_attempt_setting_saved:"User login attempt setting saved", loading_switch_store:"Loading switch store settings", saving_switch_store:"Saving switch store settings", saved_switch_store:"Switch store settings saved successfully", @@ -144,5 +148,12 @@ export const MessageObj = { provider_deleted_success:"Provider deleted successfully", switch_updated_success:"Switch location updated successfully.", switch_updated_error:"Error in updating switch location.", + delete_bfd_properties:"Deleting BFD properties.", + updating_bfd_properties:'Updating BFD properties values.', + updating_bfd_properties_success:'BFD Properties updated successfully.', + updating_bfd_properties_error:"Error in updating BFD properties.", + BFD_properties_deleted:"BFD properties deleted successfully.", + error_BFD_properties_delete:"Error in deleting BFD properties.", + delete_isl_bfd_not_authorised:"You are not authorised to delete the ISL BFD Properties." } \ No newline at end of file diff --git a/src-gui/ui/src/app/common/services/common.service.ts b/src-gui/ui/src/app/common/services/common.service.ts index 84ae8eb979d..6f7e8247411 100644 --- a/src-gui/ui/src/app/common/services/common.service.ts +++ b/src-gui/ui/src/app/common/services/common.service.ts @@ -172,6 +172,12 @@ export class CommonService { saveSwitchNameSourceSettings(value){ return this.httpClient.patch(`${environment.apiEndPoint}/settings/SWITCH_NAME_STORAGE_TYPE`,value); } + saveInvalidLoginAttemptSettings(value){ + return this.httpClient.patch(`${environment.apiEndPoint}/settings/INVALID_LOGIN_ATTEMPT`,value); + } + saveUserAccountUnlockTimeSettings(value){ + return this.httpClient.patch(`${environment.apiEndPoint}/settings/USER_ACCOUNT_UNLOCK_TIME`,value); + } getAllSettings(){ return this.httpClient.get(`${environment.apiEndPoint}/settings`); } diff --git a/src-gui/ui/src/app/modules/settings/session/session.component.html b/src-gui/ui/src/app/modules/settings/session/session.component.html index 1178d23ad75..76522857d86 100644 --- a/src-gui/ui/src/app/modules/settings/session/session.component.html +++ b/src-gui/ui/src/app/modules/settings/session/session.component.html @@ -44,5 +44,51 @@
    SWITCH NAME SETTINGS
+ + +
+
LOGIN ATTEMPT SETTINGS
+
+
+
+
+
+ + + +
+   +   +   +
+
+
+
+
+
+
+ + +
+
USER ACCOUNT UNLOCK SETTINGS
+
+
+
+
+
+ + + +
+   +   +   +
+
+
+
+
+
+
\ No newline at end of file diff --git a/src-gui/ui/src/app/modules/settings/session/session.component.ts b/src-gui/ui/src/app/modules/settings/session/session.component.ts index d846feb7cfd..eca0477fbf7 100644 --- a/src-gui/ui/src/app/modules/settings/session/session.component.ts +++ b/src-gui/ui/src/app/modules/settings/session/session.component.ts @@ -16,11 +16,17 @@ import { MessageObj } from 'src/app/common/constants/constants'; export class SessionComponent implements OnInit, AfterViewInit, OnChanges,DoCheck { sessionForm: FormGroup; switchNameSourceForm:FormGroup; + userUnlockForm:FormGroup; + loginAttemptForm:FormGroup; switchNameSourceTypes:any; isEdit = false; isSwitchNameSourcEdit = false; + isloginAttemptEdit = false; + isUserUnlockEdit = false; initialVal = null; initialNameSource = null; + intialLoginAttemptValue = null; + initialUserUnlockValue = null; constructor( private formBuilder: FormBuilder, private commonService: CommonService, @@ -47,6 +53,15 @@ export class SessionComponent implements OnInit, AfterViewInit, OnChanges,DoChec switch_name_source: ["FILE_STORAGE"] }); this.switchNameSourceForm.disable(); + + this.loginAttemptForm = this.formBuilder.group({ + login_attempt: [""] + }); + this.loginAttemptForm.disable(); + this.userUnlockForm = this.formBuilder.group({ + user_unlock_time: [""] + }); + this.userUnlockForm.disable(); } @@ -59,6 +74,10 @@ export class SessionComponent implements OnInit, AfterViewInit, OnChanges,DoChec this.switchNameSourceTypes = responseList[1]; this.switchNameSourceForm.setValue({"switch_name_source":settings['SWITCH_NAME_STORAGE_TYPE'] || 'FILE_STORAGE'}); this.initialNameSource = settings['SWITCH_NAME_STORAGE_TYPE'] || 'FILE_STORAGE'; + this.intialLoginAttemptValue = settings['INVALID_LOGIN_ATTEMPT'] || 5; + this.loginAttemptForm.setValue({"login_attempt":settings['INVALID_LOGIN_ATTEMPT']}); + this.initialUserUnlockValue = settings['USER_ACCOUNT_UNLOCK_TIME'] || 60; + this.userUnlockForm.setValue({"user_unlock_time":settings['USER_ACCOUNT_UNLOCK_TIME']}); this.loaderService.hide(); },error=>{ var errorMsg = error && error.error && error.error['error-auxiliary-message'] ? error.error['error-auxiliary-message']:'Api response error'; @@ -165,4 +184,78 @@ export class SessionComponent implements OnInit, AfterViewInit, OnChanges,DoChec this.switchNameSourceForm.disable(); } + saveUserUnlockTimeSetting(){ + let unlock_time = this.userUnlockForm.controls['user_unlock_time'].value; + if(unlock_time == ''){ + return false; + } + const modalReff = this.modalService.open(ModalconfirmationComponent); + modalReff.componentInstance.title = "Confirmation"; + modalReff.componentInstance.content = 'Are you sure you want to save user unlock time settings ?'; + modalReff.result.then((response) => { + if(response && response == true){ + this.loaderService.show(MessageObj.saving_unlock_time_setting); + this.commonService.saveUserAccountUnlockTimeSettings(unlock_time).subscribe((response)=>{ + this.toastrService.success(MessageObj.user_unlock_time_setting_saved,'Success'); + this.loaderService.hide(); + this.initialUserUnlockValue = this.userUnlockForm.controls['user_unlock_time'].value; + this.isUserUnlockEdit = false; + this.userUnlockForm.disable(); + },error=>{ + var errorMsg = error && error.error && error.error['error-auxiliary-message'] ? error.error['error-auxiliary-message']:'Unable to save'; + this.toastrService.error(errorMsg,'Error'); + this.loaderService.hide(); + }); + } + }); + } + + editUserUnlockTimeSetting(){ + this.isUserUnlockEdit = true; + this.userUnlockForm.enable(); + } + + cancelUserUnlockTimeSetting(){ + this.userUnlockForm.setValue({"user_unlock_time":this.initialUserUnlockValue}); + this.isUserUnlockEdit = false; + this.userUnlockForm.disable(); + } + + + saveLoginAttemptSetting(){ + let login_attempt = this.loginAttemptForm.controls['login_attempt'].value; + if(login_attempt == ''){ + return false; + } + const modalReff = this.modalService.open(ModalconfirmationComponent); + modalReff.componentInstance.title = "Confirmation"; + modalReff.componentInstance.content = 'Are you sure you want to save user login attempt settings ?'; + modalReff.result.then((response) => { + if(response && response == true){ + this.loaderService.show(MessageObj.saving_login_attempt_setting); + this.commonService.saveInvalidLoginAttemptSettings(login_attempt).subscribe((response)=>{ + this.toastrService.success(MessageObj.user_login_attempt_setting_saved,'Success'); + this.loaderService.hide(); + this.intialLoginAttemptValue = this.loginAttemptForm.controls['login_attempt'].value; + this.isloginAttemptEdit = false; + this.loginAttemptForm.disable(); + },error=>{ + var errorMsg = error && error.error && error.error['error-auxiliary-message'] ? error.error['error-auxiliary-message']:'Unable to save'; + this.toastrService.error(errorMsg,'Error'); + this.loaderService.hide(); + }); + } + }); + } + + editLoginAttemptSetting(){ + this.isloginAttemptEdit = true; + this.loginAttemptForm.enable(); + } + + cancelLoginAttemptSetting(){ + this.loginAttemptForm.setValue({"login_attempt":this.intialLoginAttemptValue}); + this.isloginAttemptEdit = false; + this.loginAttemptForm.disable(); + } } From 6c255585b78941a5f32e372ea210d8c8d71389af Mon Sep 17 00:00:00 2001 From: Neeraj Date: Tue, 23 Mar 2021 15:18:42 +0530 Subject: [PATCH 03/46] -adding db script file --- .../main/resources/db/import-script_31.sql | 14 ++++++ .../isl/isl-detail/isl-detail.component.html | 48 ++++++++++--------- 2 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 src-gui/src/main/resources/db/import-script_31.sql diff --git a/src-gui/src/main/resources/db/import-script_31.sql b/src-gui/src/main/resources/db/import-script_31.sql new file mode 100644 index 00000000000..63d8754fd1a --- /dev/null +++ b/src-gui/src/main/resources/db/import-script_31.sql @@ -0,0 +1,14 @@ +INSERT INTO "VERSION" (Version_ID, Version_Number, Version_Deployment_Date) +VALUES (31, 31, CURRENT_TIMESTAMP); + +INSERT INTO "ACTIVITY_TYPE" (activity_type_id, activity_name) VALUES + (44, 'UPDATE_ISL_BFD_PROPERTIES'), + (45, 'DELETE_ISL_BFD'); + +INSERT INTO "KILDA_PERMISSION" (PERMISSION_ID, PERMISSION, IS_EDITABLE, IS_ADMIN_PERMISSION, STATUS_ID, CREATED_BY, CREATED_DATE, UPDATED_BY, UPDATED_DATE,DESCRIPTION) VALUES + (360, 'isl_update_bfd_properties', false, false, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 'Permission to update isl bfd properties'), + (361, 'isl_delete_bfd', false, false, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 'Permission to delete isl bfd'); + +INSERT INTO "ROLE_PERMISSION" (ROLE_ID,PERMISSION_ID) VALUES + (2, 360), + (2, 361); \ No newline at end of file diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html index c8e3a46697d..9a0dfae065d 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html @@ -224,30 +224,32 @@
ISL DETAILS
-
-
BFD PROPERTIES
-
-
- -
-
- - -
-
- - -
-
-
- Update - Cancel -
- -
-
+
+
+
BFD PROPERTIES
+
+
+ +
+
+ + +
+
+ + +
+
+
+ Update + Cancel +
+ +
+
-
+
+
BFD PROPERTIES From 1d11605b8cbeabb2e7dc05cbd5084b5db6423290 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Wed, 24 Mar 2021 18:54:11 +0530 Subject: [PATCH 04/46] - adding feature to unblock user --- .../ui/src/app/common/constants/constants.ts | 2 ++ .../src/app/common/services/user.service.ts | 5 +++++ .../users/user-list/user-list.component.html | 1 + .../users/user-list/user-list.component.ts | 21 +++++++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/src-gui/ui/src/app/common/constants/constants.ts b/src-gui/ui/src/app/common/constants/constants.ts index c3e12d59467..9052db6e862 100644 --- a/src-gui/ui/src/app/common/constants/constants.ts +++ b/src-gui/ui/src/app/common/constants/constants.ts @@ -128,6 +128,8 @@ export const MessageObj = { user_deleted:"User removed successfully!", updating_user_status:"Updating user status", user_status_updated:"User status changed successfully!", + unblok_user:"Unblocking user", + user_unblocked:"User account is unblokced successfully", resetting_password:"Resetting Password", reset_pwd_mail_sent:"Reset password email sent successfully!", resetting_pwd_by_admin:"Resetting password by admin", diff --git a/src-gui/ui/src/app/common/services/user.service.ts b/src-gui/ui/src/app/common/services/user.service.ts index 08eb9617a5e..69734e663af 100644 --- a/src-gui/ui/src/app/common/services/user.service.ts +++ b/src-gui/ui/src/app/common/services/user.service.ts @@ -99,4 +99,9 @@ const httpOptions = { return this.http.patch(`${this.configUrl}/user/settings`,payload); } + unblockUser(Id){ + const url = `${this.configUrl}/user/unlock/account/${Id}`; + return this.http.put(url,{}); + } + } \ No newline at end of file diff --git a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html index 1e03ecef1a5..e693e172032 100644 --- a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html +++ b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html @@ -35,6 +35,7 @@ + diff --git a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.ts b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.ts index 7198642b02e..87a8b106551 100644 --- a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.ts +++ b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.ts @@ -210,6 +210,27 @@ export class UserListComponent implements OnDestroy, OnInit, AfterViewInit{ }); } + /* + Method: unblockUser + Description: Unblock a user if blocked by failed login attempts + */ + unblockUser(id){ + const modalRef = this.modalService.open(ModalconfirmationComponent); + modalRef.componentInstance.title = "Confirmation"; + modalRef.componentInstance.content = 'Are you sure you want to unblock this user ?'; + + modalRef.result.then((response) => { + if(response && response == true){ + this.loaderService.show(MessageObj.unblok_user); + this.userService.unblockUser(id).subscribe(user => { + this.toastr.success(MessageObj.user_unblocked,'Success') + this.getUsers(); + + }); + } + }); + } + /* Method: resetpassword Description: Reset the user password and send an email with updated imformation. From 4cd7a5308f4be2fd431c2cb36f77121fe6bd8c2c Mon Sep 17 00:00:00 2001 From: Neeraj Date: Thu, 25 Mar 2021 10:53:19 +0530 Subject: [PATCH 05/46] -adding permission to unblock user --- .../usermanagement/users/user-list/user-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html index e693e172032..7614a06db89 100644 --- a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html +++ b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html @@ -35,7 +35,7 @@ - + From cdbe711e8c28b34d64eb5724a07f8966ce3ce9b0 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Thu, 8 Apr 2021 16:04:39 +0530 Subject: [PATCH 06/46] - implemented some design changes in setting screen --- .../settings/session/session.component.html | 98 ++++++++++--------- 1 file changed, 52 insertions(+), 46 deletions(-) diff --git a/src-gui/ui/src/app/modules/settings/session/session.component.html b/src-gui/ui/src/app/modules/settings/session/session.component.html index 76522857d86..a6bda8cdc2c 100644 --- a/src-gui/ui/src/app/modules/settings/session/session.component.html +++ b/src-gui/ui/src/app/modules/settings/session/session.component.html @@ -1,7 +1,30 @@
-
-
SESSION SETTINGS
+ +
+
SWITCH NAME SETTINGS
+
+
+
+
+
+ + +
+   +   +   +
+
+
+
+
+
+
+
+
USER SETTINGS
@@ -18,39 +41,8 @@
SESSION SETTINGS
-
-
-
- -
-
SWITCH NAME SETTINGS
-
-
-
-
-
- - -
-   -   -   -
-
-
-
-
-
-
- - -
-
LOGIN ATTEMPT SETTINGS
-
-
-
+ +
@@ -64,19 +56,11 @@
LOGIN ATTEMPT SETTINGS
-
-
-
- - -
-
USER ACCOUNT UNLOCK SETTINGS
-
-
-
+ +
- +
@@ -87,8 +71,30 @@
USER ACCOUNT UNLOCK SETTINGS
+ +
+
+
+ + + +
\ No newline at end of file From 0443eefed3958111e33641548832fd8a9c2f8e37 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Mon, 12 Apr 2021 13:08:50 +0530 Subject: [PATCH 07/46] -adding functionality to email notification to user if account blocked --- .../CustomAuthenticationProvider.java | 24 + .../org/usermanagement/util/MailUtils.java | 17 +- src-gui/src/main/resources/mail.properties | 1 + .../webapp/ui/templates/mail/accountBlock.vm | 444 ++++++++++++++++++ 4 files changed, 485 insertions(+), 1 deletion(-) create mode 100644 src-gui/src/main/webapp/ui/templates/mail/accountBlock.vm diff --git a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java index f12ccc0583d..cdadca16401 100644 --- a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java +++ b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java @@ -22,6 +22,8 @@ import org.openkilda.exception.TwoFaKeyNotSetException; import org.openkilda.service.ApplicationSettingService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.LockedException; @@ -30,18 +32,31 @@ import org.springframework.security.core.Authentication; import org.usermanagement.dao.entity.UserEntity; import org.usermanagement.dao.repository.UserRepository; +import org.usermanagement.service.MailService; +import org.usermanagement.service.TemplateService; +import org.usermanagement.util.MailUtils; import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; +import java.util.Map; public class CustomAuthenticationProvider extends DaoAuthenticationProvider { + private static final Logger LOGGER = LoggerFactory.getLogger(CustomAuthenticationProvider.class); + + @Autowired + private MailUtils mailUtils; + @Autowired private UserRepository userRepository; @Autowired private ApplicationSettingService applicationSettingService; + + @Autowired + private MailService mailService; /* * (non-Javadoc) @@ -126,6 +141,15 @@ private void updateInvalidLoginAttempts(UserEntity entity, String value, String entity.setFailedLoginTime(new Timestamp(System.currentTimeMillis())); entity.setStatusEntity(Status.getStatusByCode(Status.LOCK.getCode()).getStatusEntity()); userRepository.save(entity); +// try { + Map map = new HashMap(); + map.put("name", entity.getName()); + map.put("time", accUnlockTime); + mailService.send(entity.getEmail(), mailUtils.getSubjectAccountBlock(), + TemplateService.Template.ACCOUNT_BLOCK, map); +// } catch (Exception e) { +// LOGGER.warn("User account block email failed for username:'" + entity.getUsername()); +// } throw new LockedException("User account is locked for " + Integer.valueOf(accUnlockTime) + " minute(s)"); } diff --git a/src-gui/src/main/java/org/usermanagement/util/MailUtils.java b/src-gui/src/main/java/org/usermanagement/util/MailUtils.java index 9c0ae0fbe9e..fbcfa579264 100644 --- a/src-gui/src/main/java/org/usermanagement/util/MailUtils.java +++ b/src-gui/src/main/java/org/usermanagement/util/MailUtils.java @@ -39,8 +39,23 @@ public class MailUtils { @Value("${subject.change.password}") private String subjectChangePassword; + @Value("${subject.account.block}") + private String subjectAccountBlock; - public String getSubjectAccountUsername() { + + public String getSubjectAccountBlock() { + return subjectAccountBlock; + } + + + + public void setSubjectAccountBlock(String subjectAccountBlock) { + this.subjectAccountBlock = subjectAccountBlock; + } + + + + public String getSubjectAccountUsername() { return subjectAccountUsername; } diff --git a/src-gui/src/main/resources/mail.properties b/src-gui/src/main/resources/mail.properties index 01786f574c1..c6e34188942 100644 --- a/src-gui/src/main/resources/mail.properties +++ b/src-gui/src/main/resources/mail.properties @@ -3,3 +3,4 @@ subject.account.password=Account password subject.reset.password=Reset Password subject.reset.twofa=Reset 2FA subject.change.password=Change Password +subject.account.block=Account Blocked diff --git a/src-gui/src/main/webapp/ui/templates/mail/accountBlock.vm b/src-gui/src/main/webapp/ui/templates/mail/accountBlock.vm new file mode 100644 index 00000000000..6a2987a8286 --- /dev/null +++ b/src-gui/src/main/webapp/ui/templates/mail/accountBlock.vm @@ -0,0 +1,444 @@ + + + + + Set up a new password for [Product Name] + + + + + + + + + + + + + + \ No newline at end of file From d58f8b80336b2d2b07808692b06a6a48bfa946d5 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Mon, 12 Apr 2021 13:43:07 +0530 Subject: [PATCH 08/46] adding missing code --- .../main/java/org/usermanagement/service/TemplateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-gui/src/main/java/org/usermanagement/service/TemplateService.java b/src-gui/src/main/java/org/usermanagement/service/TemplateService.java index de6615f5f76..31526d86134 100644 --- a/src-gui/src/main/java/org/usermanagement/service/TemplateService.java +++ b/src-gui/src/main/java/org/usermanagement/service/TemplateService.java @@ -35,6 +35,6 @@ public interface TemplateService { * Enum of templates. */ enum Template { - RESET_ACCOUNT_PASSWORD, ACCOUNT_USERNAME, ACCOUNT_PASSWORD, RESET_2FA, CHANGE_PASSWORD; + RESET_ACCOUNT_PASSWORD, ACCOUNT_USERNAME, ACCOUNT_PASSWORD, RESET_2FA, CHANGE_PASSWORD, ACCOUNT_BLOCK; } } From 0cded97e8386df77d95a4acd9238b0e5f0b927e9 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Mon, 12 Apr 2021 14:16:06 +0530 Subject: [PATCH 09/46] fixed checkstyle issues --- .../security/CustomAuthenticationProvider.java | 18 +++++++++--------- .../org/usermanagement/util/MailUtils.java | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java index cdadca16401..6e8daac73f5 100644 --- a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java +++ b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java @@ -141,15 +141,15 @@ private void updateInvalidLoginAttempts(UserEntity entity, String value, String entity.setFailedLoginTime(new Timestamp(System.currentTimeMillis())); entity.setStatusEntity(Status.getStatusByCode(Status.LOCK.getCode()).getStatusEntity()); userRepository.save(entity); -// try { - Map map = new HashMap(); - map.put("name", entity.getName()); - map.put("time", accUnlockTime); - mailService.send(entity.getEmail(), mailUtils.getSubjectAccountBlock(), - TemplateService.Template.ACCOUNT_BLOCK, map); -// } catch (Exception e) { -// LOGGER.warn("User account block email failed for username:'" + entity.getUsername()); -// } + try { + Map map = new HashMap(); + map.put("name", entity.getName()); + map.put("time", accUnlockTime); + mailService.send(entity.getEmail(), mailUtils.getSubjectAccountBlock(), + TemplateService.Template.ACCOUNT_BLOCK, map); + } catch (Exception e) { + LOGGER.warn("User account block email failed for username:'" + entity.getUsername()); + } throw new LockedException("User account is locked for " + Integer.valueOf(accUnlockTime) + " minute(s)"); } diff --git a/src-gui/src/main/java/org/usermanagement/util/MailUtils.java b/src-gui/src/main/java/org/usermanagement/util/MailUtils.java index fbcfa579264..976a0f47f70 100644 --- a/src-gui/src/main/java/org/usermanagement/util/MailUtils.java +++ b/src-gui/src/main/java/org/usermanagement/util/MailUtils.java @@ -44,18 +44,18 @@ public class MailUtils { public String getSubjectAccountBlock() { - return subjectAccountBlock; - } - + return subjectAccountBlock; + } + - public void setSubjectAccountBlock(String subjectAccountBlock) { - this.subjectAccountBlock = subjectAccountBlock; - } + public void setSubjectAccountBlock(String subjectAccountBlock) { + this.subjectAccountBlock = subjectAccountBlock; + } - public String getSubjectAccountUsername() { + public String getSubjectAccountUsername() { return subjectAccountUsername; } From ee55251d611226769723e4c6367220239c983541 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Tue, 13 Apr 2021 14:06:50 +0530 Subject: [PATCH 10/46] -adding missing code for email --- .../java/org/openkilda/controller/LoginController.java | 10 +++++++--- .../service/impl/VelocityTemplateService.java | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src-gui/src/main/java/org/openkilda/controller/LoginController.java b/src-gui/src/main/java/org/openkilda/controller/LoginController.java index 0ae4ea176cd..e63bd553609 100644 --- a/src-gui/src/main/java/org/openkilda/controller/LoginController.java +++ b/src-gui/src/main/java/org/openkilda/controller/LoginController.java @@ -1,4 +1,4 @@ -/* Copyright 2018 Telstra Open Source +/* Copyright 2019 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.LockedException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -120,7 +121,7 @@ public ModelAndView authenticate(@RequestParam("username") String username, SecurityContextHolder.getContext().setAuthentication(authenticate); userService.updateLoginDetail(username); } else { - error = "Invalid email or password"; + error = "Login failed; Invalid email or password."; LOGGER.warn("Authentication failure for user: '" + username + "'"); modelAndView.setViewName(IConstants.View.REDIRECT_LOGIN); } @@ -155,7 +156,10 @@ public ModelAndView authenticate(@RequestParam("username") String username, } } catch (BadCredentialsException e) { LOGGER.warn("Authentication failure", e); - error = "Invalid email or password"; + error = "Login failed; Invalid email or password."; + modelAndView.setViewName(IConstants.View.REDIRECT_LOGIN); + } catch (LockedException e) { + error = e.getMessage(); modelAndView.setViewName(IConstants.View.REDIRECT_LOGIN); } catch (Exception e) { LOGGER.warn("Authentication failure", e); diff --git a/src-gui/src/main/java/org/usermanagement/service/impl/VelocityTemplateService.java b/src-gui/src/main/java/org/usermanagement/service/impl/VelocityTemplateService.java index f75c3fd7665..d0a040d53fd 100644 --- a/src-gui/src/main/java/org/usermanagement/service/impl/VelocityTemplateService.java +++ b/src-gui/src/main/java/org/usermanagement/service/impl/VelocityTemplateService.java @@ -51,6 +51,7 @@ private void init() { templates.put(Template.ACCOUNT_PASSWORD, "ui/templates/mail/accountPassword.vm"); templates.put(Template.RESET_2FA, "ui/templates/mail/reset2fa.vm"); templates.put(Template.CHANGE_PASSWORD, "ui/templates/mail/changePassword.vm"); + templates.put(Template.ACCOUNT_BLOCK, "ui/templates/mail/accountBlock.vm"); } From 22f1d31eafefc08d95515aded2d925c83148c23d Mon Sep 17 00:00:00 2001 From: Neeraj Date: Tue, 13 Apr 2021 17:35:25 +0530 Subject: [PATCH 11/46] removed commented code --- .../settings/session/session.component.html | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src-gui/ui/src/app/modules/settings/session/session.component.html b/src-gui/ui/src/app/modules/settings/session/session.component.html index a6bda8cdc2c..f8ee1b853a2 100644 --- a/src-gui/ui/src/app/modules/settings/session/session.component.html +++ b/src-gui/ui/src/app/modules/settings/session/session.component.html @@ -75,26 +75,6 @@
USER SETTINGS
- - -
\ No newline at end of file From e32a01897886d23d3ff5708bdaded219bedc662a Mon Sep 17 00:00:00 2001 From: Swati Sharma Date: Wed, 14 Apr 2021 12:00:30 +0530 Subject: [PATCH 12/46] updated documentation in code --- src-gui/src/main/java/org/openkilda/constants/Status.java | 2 +- .../src/main/java/org/openkilda/controller/LoginController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src-gui/src/main/java/org/openkilda/constants/Status.java b/src-gui/src/main/java/org/openkilda/constants/Status.java index dc0cf5a82d2..232f04a978c 100644 --- a/src-gui/src/main/java/org/openkilda/constants/Status.java +++ b/src-gui/src/main/java/org/openkilda/constants/Status.java @@ -1,4 +1,4 @@ -/* Copyright 2019 Telstra Open Source +/* Copyright 2018 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src-gui/src/main/java/org/openkilda/controller/LoginController.java b/src-gui/src/main/java/org/openkilda/controller/LoginController.java index e63bd553609..12f93fdfcef 100644 --- a/src-gui/src/main/java/org/openkilda/controller/LoginController.java +++ b/src-gui/src/main/java/org/openkilda/controller/LoginController.java @@ -1,4 +1,4 @@ -/* Copyright 2019 Telstra Open Source +/* Copyright 2018 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From c3d93a4993da1601d8480bce354571f6211916a6 Mon Sep 17 00:00:00 2001 From: Swati Sharma Date: Wed, 14 Apr 2021 12:15:40 +0530 Subject: [PATCH 13/46] updated documentation in code --- src-gui/src/main/java/org/openkilda/model/BfdProperties.java | 2 +- .../main/java/org/openkilda/model/BfdPropertiesEndpoint.java | 2 +- .../src/main/java/org/openkilda/model/LinkBfdProperties.java | 2 +- src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src-gui/src/main/java/org/openkilda/model/BfdProperties.java b/src-gui/src/main/java/org/openkilda/model/BfdProperties.java index ef842b87abd..6eb96380f90 100644 --- a/src-gui/src/main/java/org/openkilda/model/BfdProperties.java +++ b/src-gui/src/main/java/org/openkilda/model/BfdProperties.java @@ -1,4 +1,4 @@ -/* Copyright 2019 Telstra Open Source +/* Copyright 2021 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java b/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java index 55726b7cd98..c2ea3272dbc 100644 --- a/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java +++ b/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java @@ -1,4 +1,4 @@ -/* Copyright 2019 Telstra Open Source +/* Copyright 2021 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java b/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java index a2539223081..70fcaeb3dd1 100644 --- a/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java +++ b/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java @@ -1,4 +1,4 @@ -/* Copyright 2019 Telstra Open Source +/* Copyright 2021 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java b/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java index 1c202cd0d1f..1273233fdfd 100644 --- a/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java +++ b/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java @@ -1,4 +1,4 @@ -/* Copyright 2019 Telstra Open Source +/* Copyright 2021 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 1036ff8bfd4c5c906d11924327bc6aa866ff77ba Mon Sep 17 00:00:00 2001 From: Swati Sharma Date: Wed, 14 Apr 2021 13:50:39 +0530 Subject: [PATCH 14/46] removed unwanted block from build.gradle --- src-gui/build.gradle | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src-gui/build.gradle b/src-gui/build.gradle index b22e01915a8..64705b34cdc 100644 --- a/src-gui/build.gradle +++ b/src-gui/build.gradle @@ -70,12 +70,7 @@ dependencies { group = 'org.openkilda' description = 'OpenKilda-GUI' - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } -} +sourceCompatibility = '1.8' tasks.withType(JavaCompile) { options.encoding = 'UTF-8' From c7eeae1c8b2940cd8104ed650f96284885be06fb Mon Sep 17 00:00:00 2001 From: Neeraj Date: Thu, 11 Mar 2021 11:49:59 +0530 Subject: [PATCH 15/46] Adding feature to edit/delete/update isl bfd properties Resolves:#3920 --- .../org/openkilda/constants/IConstants.java | 10 +- .../controller/SwitchController.java | 65 +++++++++ .../openkilda/helper/RestClientManager.java | 26 ++++ .../service/SwitchIntegrationService.java | 84 +++++++++++ .../openkilda/log/constants/ActivityType.java | 4 +- .../org/openkilda/model/BfdProperties.java | 36 +++++ .../model/BfdPropertiesEndpoint.java | 39 ++++++ .../openkilda/model/LinkBfdProperties.java | 40 ++++++ .../org/openkilda/model/NetworkEndpoint.java | 37 +++++ .../org/openkilda/service/SwitchService.java | 15 ++ .../ui/src/app/common/constants/constants.ts | 7 + .../app/common/services/isl-detail.service.ts | 1 + .../app/common/services/isl-list.service.ts | 30 ++++ .../isl/isl-detail/isl-detail.component.html | 75 ++++++++++ .../isl/isl-detail/isl-detail.component.ts | 130 ++++++++++++++++-- 15 files changed, 584 insertions(+), 15 deletions(-) create mode 100644 src-gui/src/main/java/org/openkilda/model/BfdProperties.java create mode 100644 src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java create mode 100644 src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java create mode 100644 src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java diff --git a/src-gui/src/main/java/org/openkilda/constants/IConstants.java b/src-gui/src/main/java/org/openkilda/constants/IConstants.java index 2b69b69bb7d..c7c7fbfd908 100644 --- a/src-gui/src/main/java/org/openkilda/constants/IConstants.java +++ b/src-gui/src/main/java/org/openkilda/constants/IConstants.java @@ -174,6 +174,8 @@ private NorthBoundUrl() { public static final String GET_SWITCH_PORT_PROPERTY = VERSION_TWO + "/switches/{switch_id}" + "/ports/{port}/properties"; public static final String UPDATE_SWITCH_LOCATION = VERSION_TWO + "/switches/{switch_id}"; + public static final String GET_LINK_BFD_PROPERTIES = VERSION_TWO + + "/links/{src-switch}_{src-port}/{dst-switch}_{dst-port}/bfd"; } public final class OpenTsDbUrl { @@ -299,11 +301,15 @@ private Permission() { public static final String SW_SWITCH_METERS = "sw_switch_meters"; - public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; - public static final String SAML_SETTING = "saml_setting"; + public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; + public static final String TOPOLOGY_WORLD_MAP_VIEW = "topology_world_map_view"; + + public static final String ISL_UPDATE_BFD_PROPERTIES = "isl_update_bfd_properties"; + + public static final String ISL_DELETE_BFD = "isl_delete_bfd"; } public final class Settings { diff --git a/src-gui/src/main/java/org/openkilda/controller/SwitchController.java b/src-gui/src/main/java/org/openkilda/controller/SwitchController.java index 31c1b172d35..91eea66a31b 100644 --- a/src-gui/src/main/java/org/openkilda/controller/SwitchController.java +++ b/src-gui/src/main/java/org/openkilda/controller/SwitchController.java @@ -23,8 +23,10 @@ import org.openkilda.integration.model.response.ConfiguredPort; import org.openkilda.log.ActivityLogger; import org.openkilda.log.constants.ActivityType; +import org.openkilda.model.BfdProperties; import org.openkilda.model.FlowInfo; import org.openkilda.model.IslLinkInfo; +import org.openkilda.model.LinkBfdProperties; import org.openkilda.model.LinkMaxBandwidth; import org.openkilda.model.LinkParametersDto; import org.openkilda.model.LinkProps; @@ -410,4 +412,67 @@ public class SwitchController { activityLogger.log(ActivityType.UPDATE_SWITCH_LOCATION, switchId); return serviceSwitch.updateSwitchLocation(switchId, switchLocation); } + + /** + * Gets the link BFD properties. + * + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + * @return the link Bfd properties + */ + @RequestMapping(value = "/links/bfd", method = RequestMethod.GET) + @ResponseStatus(HttpStatus.OK) + public @ResponseBody LinkBfdProperties readBfdProperties(@RequestParam(value = "src_switch", + required = false) final String srcSwitch, @RequestParam(value = "src_port", + required = false) final String srcPort, @RequestParam(value = "dst_switch", + required = false) final String dstSwitch, @RequestParam(value = "dst_port", + required = false) final String dstPort) { + return serviceSwitch.getLinkBfdProperties(srcSwitch, srcPort, dstSwitch, dstPort); + } + + /** + * Updates the link BFD properties. + * + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + * @return the link Bfd properties + */ + @RequestMapping(value = "/links/bfd", method = RequestMethod.PUT) + @ResponseStatus(HttpStatus.OK) + @Permissions(values = IConstants.Permission.ISL_UPDATE_BFD_PROPERTIES) + public @ResponseBody LinkBfdProperties updateBfdProperties(@RequestParam(value = "src_switch", + required = true) final String srcSwitch, @RequestParam(value = "src_port", + required = true) final String srcPort, @RequestParam(value = "dst_switch", + required = true) final String dstSwitch, @RequestParam(value = "dst_port", + required = true) final String dstPort, @RequestBody(required = true) BfdProperties properties) { + activityLogger.log(ActivityType.UPDATE_ISL_BFD_PROPERTIES, "Src_SW_" + srcSwitch + "\nSrc_PORT_" + + srcPort + "\nDst_SW_" + dstSwitch + "\nDst_PORT_" + + dstPort + "\nProperties_" + properties); + return serviceSwitch.updateLinkBfdProperties(srcSwitch, srcPort, dstSwitch, dstPort, properties); + } + + /** + * Delete link BFD. + * + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + */ + @RequestMapping(value = "/links/bfd", method = RequestMethod.DELETE) + @ResponseStatus(HttpStatus.OK) + @Permissions(values = IConstants.Permission.ISL_DELETE_BFD) + public @ResponseBody String deleteLinkBfd(@RequestParam(value = "src_switch", + required = true) final String srcSwitch, @RequestParam(value = "src_port", + required = true) final String srcPort, @RequestParam(value = "dst_switch", + required = true) final String dstSwitch, @RequestParam(value = "dst_port", + required = true) final String dstPort) { + activityLogger.log(ActivityType.DELETE_ISL_BFD, "Src_SW_" + srcSwitch + "\nSrc_PORT_" + + srcPort + "\nDst_SW_" + dstSwitch + "\nDst_PORT_" + dstPort); + return serviceSwitch.deleteLinkBfd(srcSwitch, srcPort, dstSwitch, dstPort); + } } diff --git a/src-gui/src/main/java/org/openkilda/helper/RestClientManager.java b/src-gui/src/main/java/org/openkilda/helper/RestClientManager.java index bc456d79b27..039a6e7c40c 100644 --- a/src-gui/src/main/java/org/openkilda/helper/RestClientManager.java +++ b/src-gui/src/main/java/org/openkilda/helper/RestClientManager.java @@ -393,4 +393,30 @@ public static boolean isValidResponse(final HttpResponse response) { } } } + + /** + * Checks if is delete link bfd valid response. + * + * @param response the response + * @return true, if is valid response + */ + public static boolean isDeleteBfdValidResponse(final HttpResponse response) { + LOGGER.debug("[isValidResponse] Response Code " + response.getStatusLine().getStatusCode()); + boolean isValid = response.getStatusLine().getStatusCode() >= HttpStatus.OK.value() + && response.getStatusLine().getStatusCode() < HttpStatus.MULTIPLE_CHOICES.value(); + if (isValid) { + return true; + } else { + try { + String content = IoUtil.toString(response.getEntity().getContent()); + LOGGER.warn("Found invalid Response. Status Code: " + response.getStatusLine().getStatusCode() + + ", content: " + content); + throw new InvalidResponseException(response.getStatusLine().getStatusCode(), content); + } catch (IOException exception) { + LOGGER.warn("Error occurred while vaildating response", exception); + throw new InvalidResponseException(HttpError.INTERNAL_ERROR.getCode(), + HttpError.INTERNAL_ERROR.getMessage()); + } + } + } } diff --git a/src-gui/src/main/java/org/openkilda/integration/service/SwitchIntegrationService.java b/src-gui/src/main/java/org/openkilda/integration/service/SwitchIntegrationService.java index 6a699ed12c4..ac80521a45a 100644 --- a/src-gui/src/main/java/org/openkilda/integration/service/SwitchIntegrationService.java +++ b/src-gui/src/main/java/org/openkilda/integration/service/SwitchIntegrationService.java @@ -30,8 +30,10 @@ import org.openkilda.integration.model.PortConfiguration; import org.openkilda.integration.model.response.ConfiguredPort; import org.openkilda.integration.model.response.IslLink; +import org.openkilda.model.BfdProperties; import org.openkilda.model.FlowInfo; import org.openkilda.model.IslLinkInfo; +import org.openkilda.model.LinkBfdProperties; import org.openkilda.model.LinkMaxBandwidth; import org.openkilda.model.LinkParametersDto; import org.openkilda.model.LinkProps; @@ -777,4 +779,86 @@ public SwitchInfo updateSwitchLocation(String switchId, SwitchLocation switchLoc } return null; } + + /** + * Gets the link Bfd properties. + * + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + * @return the link Bfd properties + */ + public LinkBfdProperties getLinkBfdProperties(String srcSwitch, String srcPort, String dstSwitch, String dstPort) { + try { + HttpResponse response = restClientManager.invoke( + applicationProperties.getNbBaseUrl() + IConstants.NorthBoundUrl.GET_LINK_BFD_PROPERTIES + .replace("{src-switch}", srcSwitch).replace("{src-port}", srcPort) + .replace("{dst-switch}", dstSwitch).replace("{dst-port}", dstPort), HttpMethod.GET, + "", "application/json", + applicationService.getAuthHeader()); + if (RestClientManager.isValidResponse(response)) { + return restClientManager.getResponse(response, LinkBfdProperties.class); + } + } catch (InvalidResponseException e) { + LOGGER.error("Error occurred while reading link bfd properties", e); + throw new InvalidResponseException(e.getCode(), e.getResponse()); + } + return null; + } + + /** + * Updates the link Bfd properties. + * + * @return the LinkBfdProperties + */ + public LinkBfdProperties updateLinkBfdProperties(String srcSwitch, String srcPort, String dstSwitch, + String dstPort, BfdProperties properties) { + try { + HttpResponse response = restClientManager.invoke( + applicationProperties.getNbBaseUrl() + IConstants.NorthBoundUrl.GET_LINK_BFD_PROPERTIES + .replace("{src-switch}", srcSwitch).replace("{src-port}", srcPort) + .replace("{dst-switch}", dstSwitch).replace("{dst-port}", dstPort), HttpMethod.PUT, + objectMapper.writeValueAsString(properties), "application/json", + applicationService.getAuthHeader()); + if (RestClientManager.isValidResponse(response)) { + return restClientManager.getResponse(response, LinkBfdProperties.class); + } + } catch (InvalidResponseException e) { + LOGGER.error("Error occurred while updating link bfd properties", e); + throw new InvalidResponseException(e.getCode(), e.getResponse()); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + return null; + } + + /** + * Deletes link bfd. + * @param srcSwitch the src switch + * @param srcPort the src port + * @param dstSwitch the dst switch + * @param dstPort the dst port + * + * @return LinkBfdProperties + */ + public String deleteLinkBfd(String srcSwitch, String srcPort, String dstSwitch, String dstPort) { + try { + HttpResponse response = restClientManager.invoke( + applicationProperties.getNbBaseUrl() + IConstants.NorthBoundUrl.GET_LINK_BFD_PROPERTIES + .replace("{src-switch}", srcSwitch).replace("{src-port}", srcPort) + .replace("{dst-switch}", dstSwitch).replace("{dst-port}", dstPort), HttpMethod.DELETE, + "", "application/json", + applicationService.getAuthHeader()); + if (RestClientManager.isDeleteBfdValidResponse(response)) { + return restClientManager.getResponse(response, String.class); + } + } catch (InvalidResponseException e) { + LOGGER.error("Error occured while deleting link bfd", e); + throw new InvalidResponseException(e.getCode(), e.getResponse()); + } catch (UnsupportedOperationException e) { + e.printStackTrace(); + } + return null; + } } diff --git a/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java b/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java index 9d9dd512970..e6f9788dbca 100644 --- a/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java +++ b/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java @@ -61,7 +61,9 @@ public enum ActivityType { DELETE_SWITCH(40L), UPDATE_ISL_BFD_FLAG(41L), UPDATE_SW_PORT_PROPERTIES(42L), - UPDATE_SWITCH_LOCATION(43L); + UPDATE_SWITCH_LOCATION(43L), + UPDATE_ISL_BFD_PROPERTIES(44L), + DELETE_ISL_BFD(45L); private Long id; private ActivityTypeEntity activityTypeEntity; diff --git a/src-gui/src/main/java/org/openkilda/model/BfdProperties.java b/src-gui/src/main/java/org/openkilda/model/BfdProperties.java new file mode 100644 index 00000000000..ef842b87abd --- /dev/null +++ b/src-gui/src/main/java/org/openkilda/model/BfdProperties.java @@ -0,0 +1,36 @@ +/* Copyright 2019 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import lombok.Data; + +@JsonSerialize +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class BfdProperties { + + @JsonProperty("interval_ms") + private Long intervalMs; + + @JsonProperty("multiplier") + private Short multiplier; +} diff --git a/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java b/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java new file mode 100644 index 00000000000..55726b7cd98 --- /dev/null +++ b/src-gui/src/main/java/org/openkilda/model/BfdPropertiesEndpoint.java @@ -0,0 +1,39 @@ +/* Copyright 2019 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import lombok.Data; + +@JsonSerialize +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class BfdPropertiesEndpoint { + + @JsonProperty("endpoint") + private NetworkEndpoint endpoint; + + @JsonProperty("properties") + private BfdProperties properties; + + @JsonProperty("status") + private String status; +} diff --git a/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java b/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java new file mode 100644 index 00000000000..a2539223081 --- /dev/null +++ b/src-gui/src/main/java/org/openkilda/model/LinkBfdProperties.java @@ -0,0 +1,40 @@ +/* Copyright 2019 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import lombok.Data; + +@JsonSerialize +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class LinkBfdProperties { + + @JsonProperty("properties") + private BfdProperties properties; + + @JsonProperty("effective_source") + private BfdPropertiesEndpoint effectiveSource; + + @JsonProperty("effective_destination") + private BfdPropertiesEndpoint effectiveDestination; + +} diff --git a/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java b/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java new file mode 100644 index 00000000000..1c202cd0d1f --- /dev/null +++ b/src-gui/src/main/java/org/openkilda/model/NetworkEndpoint.java @@ -0,0 +1,37 @@ +/* Copyright 2019 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import lombok.Data; + +@JsonSerialize +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class NetworkEndpoint { + + @JsonProperty("switch-id") + private String switchId; + + @JsonProperty("port-id") + private int port; + +} diff --git a/src-gui/src/main/java/org/openkilda/service/SwitchService.java b/src-gui/src/main/java/org/openkilda/service/SwitchService.java index 902a6552ca6..cd2c07f4f0a 100644 --- a/src-gui/src/main/java/org/openkilda/service/SwitchService.java +++ b/src-gui/src/main/java/org/openkilda/service/SwitchService.java @@ -28,8 +28,10 @@ import org.openkilda.integration.service.SwitchIntegrationService; import org.openkilda.integration.source.store.SwitchStoreService; import org.openkilda.integration.source.store.dto.InventorySwitch; +import org.openkilda.model.BfdProperties; import org.openkilda.model.FlowInfo; import org.openkilda.model.IslLinkInfo; +import org.openkilda.model.LinkBfdProperties; import org.openkilda.model.LinkMaxBandwidth; import org.openkilda.model.LinkParametersDto; import org.openkilda.model.LinkProps; @@ -597,4 +599,17 @@ public SwitchInfo updateSwitchLocation(String switchId, SwitchLocation switchLoc return switchIntegrationService.updateSwitchLocation(switchId, switchLocation); } + public LinkBfdProperties getLinkBfdProperties(String srcSwitch, String srcPort, String dstSwitch, String dstPort) { + return switchIntegrationService.getLinkBfdProperties(srcSwitch, srcPort, dstSwitch, dstPort); + } + + public LinkBfdProperties updateLinkBfdProperties(String srcSwitch, String srcPort, String dstSwitch, + String dstPort, BfdProperties properties) { + return switchIntegrationService.updateLinkBfdProperties(srcSwitch, srcPort, dstSwitch, dstPort, properties); + } + + public String deleteLinkBfd(String srcSwitch, String srcPort, String dstSwitch, String dstPort) { + return switchIntegrationService.deleteLinkBfd(srcSwitch, srcPort, dstSwitch, dstPort); + } + } diff --git a/src-gui/ui/src/app/common/constants/constants.ts b/src-gui/ui/src/app/common/constants/constants.ts index 0208fa1c8ae..ad1594677e3 100644 --- a/src-gui/ui/src/app/common/constants/constants.ts +++ b/src-gui/ui/src/app/common/constants/constants.ts @@ -144,5 +144,12 @@ export const MessageObj = { provider_deleted_success:"Provider deleted successfully", switch_updated_success:"Switch location updated successfully.", switch_updated_error:"Error in updating switch location.", + delete_bfd_properties:"Deleting BFD properties.", + updating_bfd_properties:'Updating BFD properties values.', + updating_bfd_properties_success:'BFD Properties updated successfully.', + updating_bfd_properties_error:"Error in updating BFD properties.", + BFD_properties_deleted:"BFD properties deleted successfully.", + error_BFD_properties_delete:"Error in deleting BFD properties.", + delete_isl_bfd_not_authorised:"You are not authorised to delete the ISL BFD Properties." } \ No newline at end of file diff --git a/src-gui/ui/src/app/common/services/isl-detail.service.ts b/src-gui/ui/src/app/common/services/isl-detail.service.ts index 1f426c83a8a..2670611360e 100644 --- a/src-gui/ui/src/app/common/services/isl-detail.service.ts +++ b/src-gui/ui/src/app/common/services/isl-detail.service.ts @@ -20,6 +20,7 @@ export class IslDetailService { getISLFlowsList(query? : any) : Observable{ return this.httpClient.get(`${environment.apiEndPoint}/switch/links/flows`,{params:query}); } + getIslLatencyfromGraph(src_switch,src_port,dst_switch,dst_port,from,to,frequency){ return this.httpClient.get( `${ diff --git a/src-gui/ui/src/app/common/services/isl-list.service.ts b/src-gui/ui/src/app/common/services/isl-list.service.ts index 2c99c1582b2..22cd1f4bb43 100644 --- a/src-gui/ui/src/app/common/services/isl-list.service.ts +++ b/src-gui/ui/src/app/common/services/isl-list.service.ts @@ -80,4 +80,34 @@ export class IslListService { const url = `${environment.apiEndPoint}/switch/link/props`; return this.httpClient.put(url,requestPayload); } + + getLinkBFDProperties(src_switch, src_port, dst_switch, dst_port){ + let date = new Date().getTime(); + return this.httpClient.get(`${environment.apiEndPoint}/switch/links/bfd?src_switch=${src_switch}&src_port=${src_port}&dst_switch=${dst_switch}&dst_port=${dst_port}&_=${date}`); + + } + updateLinkBFDProperties(data,src_switch, src_port, dst_switch, dst_port){ + const url = `${environment.apiEndPoint}/switch/links/bfd?src_switch=${src_switch}&src_port=${src_port}&dst_switch=${dst_switch}&dst_port=${dst_port}`; + return this.httpClient.put(url,data); + } + deleteLinkBFDProperties(data,successRes,errorRes){ + const url = `${environment.apiEndPoint}/switch/links/bfd?src_switch=${data.src_switch}&src_port=${data.src_port}&dst_switch=${data.dst_switch}&dst_port=${data.dst_port}`; + let token = this.cookieManager.get('XSRF-TOKEN') as string; + var xhr = new XMLHttpRequest(); + xhr.withCredentials = false; + xhr.addEventListener("readystatechange", function () { + if (this.readyState == 4 && this.status == 200) { + successRes(JSON.parse(this.responseText)); + }else if(this.readyState == 4 && this.status >= 300){ + errorRes(JSON.parse(this.responseText)); + } + }); + + xhr.open("DELETE", url); + xhr.setRequestHeader("Content-Type", "application/json"); + if (token !== null) { + xhr.setRequestHeader( "X-XSRF-TOKEN" , token); + } + xhr.send(); + } } diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html index 73fbc8514c6..c8e3a46697d 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html @@ -33,6 +33,18 @@
SOURCE DETAILS
{{src_switch_name }} +
+ +
+ {{bfdPropertyData.effective_source.properties['interval_ms']}} +
+
+
+ +
+ {{bfdPropertyData.effective_source.properties['multiplier']}} +
+
@@ -72,6 +84,18 @@
DESTINATION DETAILS {{dst_switch_name}} +
+ +
+ {{bfdPropertyData.effective_destination.properties['interval_ms']}} +
+
+
+ +
+ {{bfdPropertyData.effective_destination.properties['multiplier']}} +
+
@@ -199,6 +223,57 @@
ISL DETAILS
+ +
+
BFD PROPERTIES
+
+
+ +
+
+ + +
+
+ + +
+
+
+ Update + Cancel +
+ +
+
+ +
+ +
+
BFD PROPERTIES + Edit + Update + + Delete +
+
+
+ +
+ +
+ {{bfdPropertyData.properties['interval_ms']}} +
+
+
+ +
+ {{bfdPropertyData.properties['multiplier']}} +
+
+
+
+
    diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts index 10548e53b27..47ed2ebff30 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts @@ -47,11 +47,13 @@ import { FlowsService } from 'src/app/common/services/flows.service'; evacuate:boolean=false; under_maintenance:boolean=false; loadingData = true; + isBFDEdit:any=false; dataSet:any; available_bandwidth:string = ''; default_max_bandwidth=''; max_bandwidth :any = ''; detailDataObservable : any; + bfdPropertyData : any; src_switch_name: string; dst_switch_name: string; graphDataForwardUrl: string; @@ -78,6 +80,7 @@ import { FlowsService } from 'src/app/common/services/flows.service'; graphMetrics = []; flowGraphMetrics=[]; autoReloadTimerId = null; + bfdPropForm:FormGroup; islForm: FormGroup; showCostEditing: boolean = false; showBandwidthEditing : boolean = false; @@ -156,10 +159,8 @@ import { FlowsService } from 'src/app/common/services/flows.service'; auto_reload_time: ["", Validators.compose([Validators.pattern("[0-9]*")])] }); this.graphMetrics = this.dygraphService.getPortMetricData(); - this.flowGraphMetrics = this.dygraphService.getFlowMetricData(); - - - } + this.flowGraphMetrics = this.dygraphService.getFlowMetricData(); +} getIslDetailData(src_switch,src_port,dst_switch,dst_port){ this.loaderService.show(MessageObj.loading_isl); @@ -214,6 +215,26 @@ import { FlowsService } from 'src/app/common/services/flows.service'; },error=>{ this.toastr.error(MessageObj.no_cost_data_returned,'Error'); }); + + this.islListService.getLinkBFDProperties(this.src_switch, this.src_port, this.dst_switch, this.dst_port).subscribe((data : any) =>{ + if(data!= null){ + this.bfdPropertyData = data; + this.bfdPropForm = this.formBuiler.group({ + interval_ms: [this.bfdPropertyData.interval_ms, Validators.min(0)], + multiplier:[this.bfdPropertyData.multiplier,Validators.min(0)] + }); + } + else{ + this.bfdPropertyData = {}; + this.bfdPropForm = this.formBuiler.group({ + interval_ms: [0, Validators.min(0)], + multiplier:[0,Validators.min(0)] + }); + } + + },error=>{ + this.toastr.error(MessageObj.no_cost_data_returned,'Error'); + }); }else{ this.loaderService.hide(); this.toastr.error(MessageObj.no_isl,'Error'); @@ -677,8 +698,7 @@ get f() { if (formdata.timezone == "UTC") { convertedStartDate = moment(new Date(formdata.fromDate)).add(-60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); - convertedEndDate = moment(new Date(formdata.toDate)).add(60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); - + convertedEndDate = moment(new Date(formdata.toDate)).add(60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); } @@ -789,10 +809,10 @@ get f() { this.loaderService.hide(); if(this.filterForm.value.graph_type === 'stackedgraph'){ this.islDataService.changeIslFlowStackedGraph(this.currentGraphData); - this.islDataService.IslFlowStackedGraph.subscribe(message => this.message = message); + this.islDataService.IslFlowStackedGraph.subscribe(message => this.message = message); }else{ - this.islDataService.changeIslFlowGraph(this.currentGraphData); - this.islDataService.IslFlowGraph.subscribe(message => this.message = message); + this.islDataService.changeIslFlowGraph(this.currentGraphData); + this.islDataService.IslFlowGraph.subscribe(message => this.message = message); } } @@ -829,7 +849,6 @@ get f() { if (formdata.timezone == "UTC") { convertedStartDate = moment(new Date(formdata.fromDate)).add(-60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); convertedEndDate = moment(new Date(formdata.toDate)).add(60, 'seconds').format("YYYY-MM-DD-HH:mm:ss"); - } @@ -966,11 +985,48 @@ get f() { }); } - deleteISL(){ + editBFDProperties(){ + this.isBFDEdit = true; + } + + updateBFDProperties(){ + if (this.bfdPropForm.invalid) { + this.toastr.error("Please enter valid value for Interval and multiplier."); + return; + } + + const modalRef = this.modalService.open(ModalconfirmationComponent); + modalRef.componentInstance.title = "Confirmation"; + modalRef.componentInstance.content = 'Are you sure you want to change the BFD Properties'; + + modalRef.result.then((response) => { + if(response && response == true){ + this.loaderService.show(MessageObj.updating_bfd_properties); + let interval_ms = this.bfdPropForm.value.interval_ms; + let multiplier = this.bfdPropForm.value.multiplier; + var data = {interval_ms:interval_ms,multiplier:multiplier}; + this.islListService.updateLinkBFDProperties(data,this.src_switch, this.src_port, this.dst_switch, this.dst_port).subscribe((response: any) => { + this.loaderService.hide(); + this.toastr.success(MessageObj.updating_bfd_properties_success,'Success'); + this.isBFDEdit = false; + },error => { + this.loaderService.hide(); + this.isBFDEdit = false; + if(error.status == '500'){ + this.toastr.error(error.error['error-message'],'Error! '); + }else{ + this.toastr.error(MessageObj.updating_bfd_properties_error,'Error'); + } + }) + } + }); + } + deleteBFDProperties(){ + let is2FaEnabled = localStorage.getItem('is2FaEnabled') var self = this; const modalReff = this.modalService.open(ModalconfirmationComponent); - modalReff.componentInstance.title = "Delete ISL"; + modalReff.componentInstance.title = "Delete BFD Properties"; modalReff.componentInstance.content = 'Are you sure you want to perform delete action ?'; modalReff.result.then((response) => { @@ -980,6 +1036,56 @@ get f() { modalRef.componentInstance.emitService.subscribe( otp => { + if (otp) { + this.loaderService.show(MessageObj.delete_bfd_properties); + var data = { + src_switch:this.src_switch, + src_port:this.src_port, + dst_switch:this.dst_switch, + dst_port:this.dst_port, + code:otp + } + this.modalService.dismissAll(); + this.islListService.deleteLinkBFDProperties(data,response => { + this.toastr.success(MessageObj.BFD_properties_deleted, "Success!"); + this.loaderService.hide(); + }, error => { + this.loaderService.hide(); + var message = (error && error['error-auxiliary-message']) ? error['error-auxiliary-message'] :MessageObj.error_BFD_properties_delete; + this.toastr.error(message, "Error!"); + }) + } else { + this.toastr.error(MessageObj.otp_not_detected, "Error!"); + } + }, + error => { + } + ); + }else{ + const modalRef2 = this.modalService.open(ModalComponent); + modalRef2.componentInstance.title = "Warning"; + modalRef2.componentInstance.content = MessageObj.delete_isl_bfd_not_authorised; + } + } + }); + } + + cancelEditBFDProperties(){ + this.isBFDEdit = false; + } + deleteISL(){ + let is2FaEnabled = localStorage.getItem('is2FaEnabled') + var self = this; + const modalReff = this.modalService.open(ModalconfirmationComponent); + modalReff.componentInstance.title = "Delete ISL"; + modalReff.componentInstance.content = 'Are you sure you want to perform delete action ?'; + + modalReff.result.then((response) => { + if(response && response == true){ + if(is2FaEnabled == 'true'){ + const modalRef = this.modalService.open(OtpComponent); + modalRef.componentInstance.emitService.subscribe( + otp => { if (otp) { this.loaderService.show(MessageObj.deleting_isl); var data = { From add6977bdcbd5c48bf36a62fc86aa9749278adb5 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Tue, 23 Mar 2021 15:18:42 +0530 Subject: [PATCH 16/46] -adding db script file --- .../main/resources/db/import-script_31.sql | 14 ++++++ .../isl/isl-detail/isl-detail.component.html | 48 ++++++++++--------- 2 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 src-gui/src/main/resources/db/import-script_31.sql diff --git a/src-gui/src/main/resources/db/import-script_31.sql b/src-gui/src/main/resources/db/import-script_31.sql new file mode 100644 index 00000000000..63d8754fd1a --- /dev/null +++ b/src-gui/src/main/resources/db/import-script_31.sql @@ -0,0 +1,14 @@ +INSERT INTO "VERSION" (Version_ID, Version_Number, Version_Deployment_Date) +VALUES (31, 31, CURRENT_TIMESTAMP); + +INSERT INTO "ACTIVITY_TYPE" (activity_type_id, activity_name) VALUES + (44, 'UPDATE_ISL_BFD_PROPERTIES'), + (45, 'DELETE_ISL_BFD'); + +INSERT INTO "KILDA_PERMISSION" (PERMISSION_ID, PERMISSION, IS_EDITABLE, IS_ADMIN_PERMISSION, STATUS_ID, CREATED_BY, CREATED_DATE, UPDATED_BY, UPDATED_DATE,DESCRIPTION) VALUES + (360, 'isl_update_bfd_properties', false, false, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 'Permission to update isl bfd properties'), + (361, 'isl_delete_bfd', false, false, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 'Permission to delete isl bfd'); + +INSERT INTO "ROLE_PERMISSION" (ROLE_ID,PERMISSION_ID) VALUES + (2, 360), + (2, 361); \ No newline at end of file diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html index c8e3a46697d..9a0dfae065d 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html @@ -224,30 +224,32 @@
    ISL DETAILS
-
-
BFD PROPERTIES
-
-
- -
-
- - -
-
- - -
-
-
- Update - Cancel -
- -
-
+
+
+
BFD PROPERTIES
+
+
+ +
+
+ + +
+
+ + +
+
+
+ Update + Cancel +
+ +
+
-
+
+
BFD PROPERTIES From 80322ae7dd56fe2b78e85a73c7be479a48a8adaf Mon Sep 17 00:00:00 2001 From: Neeraj Date: Tue, 23 Mar 2021 15:16:05 +0530 Subject: [PATCH 17/46] Improvement in login system to defend brute force attack Resolves:#3564 --- .../org/openkilda/constants/IConstants.java | 35 ++++++- .../java/org/openkilda/constants/Status.java | 7 +- .../openkilda/log/constants/ActivityType.java | 7 +- .../CustomAuthenticationProvider.java | 73 ++++++++++++++- .../service/ApplicationSettingService.java | 6 ++ .../ApplicationSettingsValidator.java | 20 ++++ .../controller/UserController.java | 21 +++++ .../usermanagement/dao/entity/UserEntity.java | 43 +++++++++ .../usermanagement/service/UserService.java | 14 +++ .../main/resources/db/import-script_32.sql | 23 +++++ .../ui/src/app/common/constants/constants.ts | 11 +++ .../src/app/common/services/common.service.ts | 6 ++ .../settings/session/session.component.html | 46 +++++++++ .../settings/session/session.component.ts | 93 +++++++++++++++++++ 14 files changed, 396 insertions(+), 9 deletions(-) create mode 100644 src-gui/src/main/resources/db/import-script_32.sql diff --git a/src-gui/src/main/java/org/openkilda/constants/IConstants.java b/src-gui/src/main/java/org/openkilda/constants/IConstants.java index 2b69b69bb7d..0a3d63dc590 100644 --- a/src-gui/src/main/java/org/openkilda/constants/IConstants.java +++ b/src-gui/src/main/java/org/openkilda/constants/IConstants.java @@ -74,10 +74,33 @@ private SessionTimeout() { public static Integer DEFAULT_TIME_IN_MINUTE = 45; } + public static final class InvalidLoginAttempt { + private InvalidLoginAttempt() { + + } + + public static Integer INVALID_LOGIN_ATTEMPTS_COUNT; + + public static Integer DEFAULT_INVALID_LOGIN_ATTEMPTS_COUNT = 5; + } + + public static final class UserAccUnlockTime { + private UserAccUnlockTime() { + + } + + public static Integer USER_ACCOUNT_UNLOCK_TIME; + + public static Integer DEFAULT_USER_ACCOUNT_UNLOCK_TIME = 60; + } + + public enum ApplicationSetting { SESSION_TIMEOUT(String.valueOf(SessionTimeout.DEFAULT_TIME_IN_MINUTE)), SWITCH_NAME_STORAGE_TYPE( - StorageType.FILE_STORAGE.name()); + StorageType.FILE_STORAGE.name()), INVALID_LOGIN_ATTEMPT(String.valueOf(InvalidLoginAttempt + .DEFAULT_INVALID_LOGIN_ATTEMPTS_COUNT)), USER_ACCOUNT_UNLOCK_TIME( + String.valueOf(UserAccUnlockTime.DEFAULT_USER_ACCOUNT_UNLOCK_TIME)); final String value; @@ -174,6 +197,8 @@ private NorthBoundUrl() { public static final String GET_SWITCH_PORT_PROPERTY = VERSION_TWO + "/switches/{switch_id}" + "/ports/{port}/properties"; public static final String UPDATE_SWITCH_LOCATION = VERSION_TWO + "/switches/{switch_id}"; + public static final String GET_LINK_BFD_PROPERTIES = VERSION_TWO + + "/links/{src-switch}_{src-port}/{dst-switch}_{dst-port}/bfd"; } public final class OpenTsDbUrl { @@ -299,11 +324,17 @@ private Permission() { public static final String SW_SWITCH_METERS = "sw_switch_meters"; - public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; + public static final String UM_USER_ACCOUNT_UNLOCK = "um_user_account_unlock"; public static final String SAML_SETTING = "saml_setting"; + public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; + public static final String TOPOLOGY_WORLD_MAP_VIEW = "topology_world_map_view"; + + public static final String ISL_UPDATE_BFD_PROPERTIES = "isl_update_bfd_properties"; + + public static final String ISL_DELETE_BFD = "isl_delete_bfd"; } public final class Settings { diff --git a/src-gui/src/main/java/org/openkilda/constants/Status.java b/src-gui/src/main/java/org/openkilda/constants/Status.java index 2b9bbc49bdf..dc0cf5a82d2 100644 --- a/src-gui/src/main/java/org/openkilda/constants/Status.java +++ b/src-gui/src/main/java/org/openkilda/constants/Status.java @@ -1,4 +1,4 @@ -/* Copyright 2018 Telstra Open Source +/* Copyright 2019 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,9 @@ public enum Status { /** The active. */ ACTIVE("ACT"), /** The inactive. */ - INACTIVE("INA"); - /** The expired. */ + INACTIVE("INA"), + /** The locked. */ + LOCK("LCK"); private String code; diff --git a/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java b/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java index 9d9dd512970..dff7a2db0aa 100644 --- a/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java +++ b/src-gui/src/main/java/org/openkilda/log/constants/ActivityType.java @@ -61,7 +61,12 @@ public enum ActivityType { DELETE_SWITCH(40L), UPDATE_ISL_BFD_FLAG(41L), UPDATE_SW_PORT_PROPERTIES(42L), - UPDATE_SWITCH_LOCATION(43L); + CONFIG_INVALID_LOGIN_ATTEMPT_COUNT(46L), + CONFIG_USER_ACCOUNT_UNLOCK_TIME(47L), + UNLOCK_USER_ACCOUNT(48L), + UPDATE_SWITCH_LOCATION(43L), + UPDATE_ISL_BFD_PROPERTIES(44L), + DELETE_ISL_BFD(45L); private Long id; private ActivityTypeEntity activityTypeEntity; diff --git a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java index 79cfa793ba1..f12ccc0583d 100644 --- a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java +++ b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java @@ -15,23 +15,33 @@ package org.openkilda.security; +import org.openkilda.constants.IConstants.ApplicationSetting; +import org.openkilda.constants.Status; import org.openkilda.exception.InvalidOtpException; import org.openkilda.exception.OtpRequiredException; import org.openkilda.exception.TwoFaKeyNotSetException; +import org.openkilda.service.ApplicationSettingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.LockedException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.core.Authentication; -import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.usermanagement.dao.entity.UserEntity; import org.usermanagement.dao.repository.UserRepository; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Date; + public class CustomAuthenticationProvider extends DaoAuthenticationProvider { @Autowired private UserRepository userRepository; + + @Autowired + private ApplicationSettingService applicationSettingService; /* * (non-Javadoc) @@ -48,10 +58,20 @@ public Authentication authenticate(final Authentication auth) String verificationCode = customWebAuthenticationDetails.getVerificationCode(); UserEntity user = userRepository.findByUsernameIgnoreCase(auth.getName()); if (user == null || !user.getActiveFlag()) { - throw new UsernameNotFoundException("User '" + auth.getName() + "' does not exist"); + throw new BadCredentialsException("Login failed; Invalid email or password."); + } + String loginCount = null; + String unlockTime = null; + if (user.getUserId() != 1) { + loginCount = applicationSettingService.getApplicationSetting(ApplicationSetting.INVALID_LOGIN_ATTEMPT); + unlockTime = applicationSettingService.getApplicationSetting(ApplicationSetting + .USER_ACCOUNT_UNLOCK_TIME); + if (!user.getStatusEntity().getStatus().equalsIgnoreCase("ACTIVE")) { + checkUserLoginAttempts(user, loginCount, unlockTime); + } } try { - Authentication result = super.authenticate(auth); + final Authentication result = super.authenticate(auth); if (user.getIs2FaEnabled()) { if (!user.getIs2FaConfigured() && !customWebAuthenticationDetails.isConfigure2Fa()) { throw new TwoFaKeyNotSetException(); @@ -65,8 +85,55 @@ public Authentication authenticate(final Authentication auth) } return new UsernamePasswordAuthenticationToken(user, result.getCredentials(), result.getAuthorities()); } catch (BadCredentialsException e) { + if (user.getUserId() != 1) { + updateInvalidLoginAttempts(user, loginCount, unlockTime); + } throw new BadCredentialsException(e.getMessage()); } + + } + + private void checkUserLoginAttempts(UserEntity user, String value, String accUnlockTime) { + if (user.getFailedLoginCount() != null) { + Date loginTime = user.getFailedLoginTime(); + Calendar cal = Calendar.getInstance(); + cal.setTime(loginTime); + cal.add(Calendar.MINUTE, Integer.valueOf(user.getUnlockTime())); + Date time = Calendar.getInstance().getTime(); + if (cal.getTime().after(time)) { + Date calTime = cal.getTime(); + long unlockTime = calTime.getTime() - time.getTime(); + long diffMinutes = unlockTime / (60 * 1000); + long minutes = diffMinutes + 1; + throw new LockedException("User account is locked, will be unlocked after " + + minutes + " minute(s)"); + } else { + user.setStatusEntity(Status.ACTIVE.getStatusEntity()); + user.setFailedLoginCount(null); + user.setUnlockTime(null); + user.setLoginTime(new Timestamp(System.currentTimeMillis())); + userRepository.save(user); + } + } + } + + private void updateInvalidLoginAttempts(UserEntity entity, String value, String accUnlockTime) { + Integer loginCount = entity.getFailedLoginCount(); + if (loginCount != null) { + if (loginCount + 1 >= Integer.valueOf(value)) { + entity.setFailedLoginCount(loginCount + 1); + entity.setUnlockTime(Integer.valueOf(accUnlockTime)); + entity.setFailedLoginTime(new Timestamp(System.currentTimeMillis())); + entity.setStatusEntity(Status.getStatusByCode(Status.LOCK.getCode()).getStatusEntity()); + userRepository.save(entity); + throw new LockedException("User account is locked for " + + Integer.valueOf(accUnlockTime) + " minute(s)"); + } + entity.setFailedLoginCount(loginCount + 1); + } else { + entity.setFailedLoginCount(1); + } + userRepository.save(entity); } /* diff --git a/src-gui/src/main/java/org/openkilda/service/ApplicationSettingService.java b/src-gui/src/main/java/org/openkilda/service/ApplicationSettingService.java index a918869c498..3bfe84e45e7 100644 --- a/src-gui/src/main/java/org/openkilda/service/ApplicationSettingService.java +++ b/src-gui/src/main/java/org/openkilda/service/ApplicationSettingService.java @@ -88,6 +88,12 @@ public void saveOrUpdateApplicationSetting(final ApplicationSetting applicationS } else if (applicationSetting == ApplicationSetting.SWITCH_NAME_STORAGE_TYPE) { IConstants.STORAGE_TYPE_FOR_SWITCH_NAME = StorageType.get(value); activityLogger.log(ActivityType.CONFIG_SWITCH_NAME_STORAGE_TYPE, value); + } else if (applicationSetting == ApplicationSetting.INVALID_LOGIN_ATTEMPT) { + IConstants.InvalidLoginAttempt.INVALID_LOGIN_ATTEMPTS_COUNT = Integer.valueOf(value); + activityLogger.log(ActivityType.CONFIG_INVALID_LOGIN_ATTEMPT_COUNT, value); + } else if (applicationSetting == ApplicationSetting.USER_ACCOUNT_UNLOCK_TIME) { + activityLogger.log(ActivityType.CONFIG_USER_ACCOUNT_UNLOCK_TIME, value); + IConstants.UserAccUnlockTime.USER_ACCOUNT_UNLOCK_TIME = Integer.valueOf(value); } applicationSettingEntity.setValue(value); applicationSettingEntity.setUpdatedDate(new Date()); diff --git a/src-gui/src/main/java/org/openkilda/validator/ApplicationSettingsValidator.java b/src-gui/src/main/java/org/openkilda/validator/ApplicationSettingsValidator.java index 3b483b651b5..7d7b68f36c5 100644 --- a/src-gui/src/main/java/org/openkilda/validator/ApplicationSettingsValidator.java +++ b/src-gui/src/main/java/org/openkilda/validator/ApplicationSettingsValidator.java @@ -64,6 +64,26 @@ public void validate(final ApplicationSetting type, final String value) { throw new RequestValidationException(messageUtil .getAttributeNotvalid(ApplicationSetting.SWITCH_NAME_STORAGE_TYPE.name())); } + } else if (type == ApplicationSetting.INVALID_LOGIN_ATTEMPT) { + try { + if (Integer.valueOf(value) < 1) { + throw new RequestValidationException(messageUtil + .getAttributeNotvalid(ApplicationSetting.INVALID_LOGIN_ATTEMPT.name())); + } + } catch (NumberFormatException ex) { + throw new RequestValidationException(messageUtil + .getAttributeNotvalid(ApplicationSetting.INVALID_LOGIN_ATTEMPT.name())); + } + } else if (type == ApplicationSetting.USER_ACCOUNT_UNLOCK_TIME) { + try { + if (Integer.valueOf(value) < 1) { + throw new RequestValidationException(messageUtil + .getAttributeNotvalid(ApplicationSetting.USER_ACCOUNT_UNLOCK_TIME.name())); + } + } catch (NumberFormatException ex) { + throw new RequestValidationException(messageUtil + .getAttributeNotvalid(ApplicationSetting.USER_ACCOUNT_UNLOCK_TIME.name())); + } } } } diff --git a/src-gui/src/main/java/org/usermanagement/controller/UserController.java b/src-gui/src/main/java/org/usermanagement/controller/UserController.java index b8fd44251f5..5741114eaf7 100644 --- a/src-gui/src/main/java/org/usermanagement/controller/UserController.java +++ b/src-gui/src/main/java/org/usermanagement/controller/UserController.java @@ -18,6 +18,8 @@ import org.openkilda.auth.context.ServerContext; import org.openkilda.auth.model.Permissions; import org.openkilda.constants.IConstants; +import org.openkilda.log.ActivityLogger; +import org.openkilda.log.constants.ActivityType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,6 +63,9 @@ public class UserController { @Autowired private ServerContext serverContext; + + @Autowired + private ActivityLogger activityLogger; /** * Gets the users by role id. @@ -265,4 +270,20 @@ public boolean validateOtp(@RequestBody final UserInfo userInfo, final HttpServl public UserInfo getLoggedInUserInfo() throws AccessDeniedException { return userService.getLoggedInUserInfo(); } + + /** + * Unlock user account. + * + * @param userId the user id + * @return the userInfo + */ + @ResponseStatus(HttpStatus.OK) + @RequestMapping(value = "/unlock/account/{user_id}", method = RequestMethod.PUT) + @Permissions(values = { IConstants.Permission.UM_USER_ACCOUNT_UNLOCK }) + public Message unlockUserAccount(@PathVariable("user_id") final Long userId) { + activityLogger.log(ActivityType.UNLOCK_USER_ACCOUNT, String.valueOf(userId)); + LOGGER.info("Reset user account. (userId: " + userId + ")"); + userService.unlockUserAccount(userId); + return new Message("User account activated successfully"); + } } diff --git a/src-gui/src/main/java/org/usermanagement/dao/entity/UserEntity.java b/src-gui/src/main/java/org/usermanagement/dao/entity/UserEntity.java index 834e0d380f4..4170de1a659 100644 --- a/src-gui/src/main/java/org/usermanagement/dao/entity/UserEntity.java +++ b/src-gui/src/main/java/org/usermanagement/dao/entity/UserEntity.java @@ -68,6 +68,15 @@ public class UserEntity extends BaseEntity implements Serializable { @Column(name = "LOGOUT_TIME", nullable = true) private Date logoutTime; + + @Column(name = "FAILED_LOGIN_TIME") + private Date failedLoginTime; + + @Column(name = "FAILED_LOGIN_COUNT") + private Integer failedLoginCount; + + @Column(name = "UNLOCK_TIME") + private Integer unlockTime; @Column(name = "ACTIVE_FLAG") private String activeFlag; @@ -119,6 +128,40 @@ public void setRoles(final Set roles) { this.roles = roles; } + /** + * Gets the failed login count. + * + * @return the failed login count + */ + public Integer getFailedLoginCount() { + return failedLoginCount; + } + + /** + * Sets the failed login count. + * + * @param failedLoginCount the failed login count + */ + public void setFailedLoginCount(Integer failedLoginCount) { + this.failedLoginCount = failedLoginCount; + } + + public Date getFailedLoginTime() { + return failedLoginTime; + } + + public void setFailedLoginTime(Date failedLoginTime) { + this.failedLoginTime = failedLoginTime; + } + + public Integer getUnlockTime() { + return unlockTime; + } + + public void setUnlockTime(Integer unlockTime) { + this.unlockTime = unlockTime; + } + /** * Gets the user id. * diff --git a/src-gui/src/main/java/org/usermanagement/service/UserService.java b/src-gui/src/main/java/org/usermanagement/service/UserService.java index f7e647eaa93..4d23cc94d27 100644 --- a/src-gui/src/main/java/org/usermanagement/service/UserService.java +++ b/src-gui/src/main/java/org/usermanagement/service/UserService.java @@ -582,6 +582,20 @@ public UserInfo getLoggedInUserInfo() throws AccessDeniedException { userInfo.setPermissions(requestContext.getPermissions()); return userInfo; } + + /** + * Unlock user account. + * + * @param userId the user id + */ + public void unlockUserAccount(Long userId) { + UserEntity userEntity = userValidator.validateUserId(userId); + userEntity.setStatusEntity(Status.ACTIVE.getStatusEntity()); + userEntity.setFailedLoginCount(null); + userEntity.setUnlockTime(null); + userEntity.setLoginTime(new Timestamp(System.currentTimeMillis())); + userRepository.save(userEntity); + } /** * Adds user information in session. diff --git a/src-gui/src/main/resources/db/import-script_32.sql b/src-gui/src/main/resources/db/import-script_32.sql new file mode 100644 index 00000000000..1f98856453a --- /dev/null +++ b/src-gui/src/main/resources/db/import-script_32.sql @@ -0,0 +1,23 @@ +INSERT INTO "VERSION" (Version_ID, Version_Number, Version_Deployment_Date) +VALUES (32, 32, CURRENT_TIMESTAMP); + +INSERT INTO "KILDA_PERMISSION" (PERMISSION_ID, PERMISSION, IS_EDITABLE, IS_ADMIN_PERMISSION, STATUS_ID, CREATED_BY, CREATED_DATE, UPDATED_BY, UPDATED_DATE,DESCRIPTION) VALUES + (362, 'um_user_account_unlock', false, false, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 'Permission to unlock user account'); + +INSERT INTO "ROLE_PERMISSION" (ROLE_ID,PERMISSION_ID) VALUES + (2, 362); + +INSERT INTO "ACTIVITY_TYPE" (activity_type_id, activity_name) VALUES + (46, 'CONFIG_INVALID_LOGIN_ATTEMPT_COUNT'), + (47, 'CONFIG_USER_ACCOUNT_UNLOCK_TIME'), + (48, 'UNLOCK_USER_ACCOUNT'); + +INSERT INTO "APPLICATION_SETTING" (id, setting_type, setting_value) VALUES (3, 'invalid_login_attempt', '5'); +INSERT INTO "APPLICATION_SETTING" (id, setting_type, setting_value) VALUES (4, 'user_account_unlock_time', '60'); + +INSERT INTO "KILDA_STATUS" (status_id, STATUS_CODE, STATUS) VALUES + (3, 'LCK', 'Lock'); + + + + diff --git a/src-gui/ui/src/app/common/constants/constants.ts b/src-gui/ui/src/app/common/constants/constants.ts index 0208fa1c8ae..c3e12d59467 100644 --- a/src-gui/ui/src/app/common/constants/constants.ts +++ b/src-gui/ui/src/app/common/constants/constants.ts @@ -70,6 +70,10 @@ export const MessageObj = { session_setting_saved:"Session setting saved", saving_switch_name_store_setting:"Saving switch name source setting", switch_name_store_setting_saved:"Switch name source saved", + user_unlock_time_setting_saved:"User unlock time setting saved", + saving_unlock_time_setting:"Saving user unlock time setting", + saving_login_attempt_setting:"Saving login attempt setting", + user_login_attempt_setting_saved:"User login attempt setting saved", loading_switch_store:"Loading switch store settings", saving_switch_store:"Saving switch store settings", saved_switch_store:"Switch store settings saved successfully", @@ -144,5 +148,12 @@ export const MessageObj = { provider_deleted_success:"Provider deleted successfully", switch_updated_success:"Switch location updated successfully.", switch_updated_error:"Error in updating switch location.", + delete_bfd_properties:"Deleting BFD properties.", + updating_bfd_properties:'Updating BFD properties values.', + updating_bfd_properties_success:'BFD Properties updated successfully.', + updating_bfd_properties_error:"Error in updating BFD properties.", + BFD_properties_deleted:"BFD properties deleted successfully.", + error_BFD_properties_delete:"Error in deleting BFD properties.", + delete_isl_bfd_not_authorised:"You are not authorised to delete the ISL BFD Properties." } \ No newline at end of file diff --git a/src-gui/ui/src/app/common/services/common.service.ts b/src-gui/ui/src/app/common/services/common.service.ts index 84ae8eb979d..6f7e8247411 100644 --- a/src-gui/ui/src/app/common/services/common.service.ts +++ b/src-gui/ui/src/app/common/services/common.service.ts @@ -172,6 +172,12 @@ export class CommonService { saveSwitchNameSourceSettings(value){ return this.httpClient.patch(`${environment.apiEndPoint}/settings/SWITCH_NAME_STORAGE_TYPE`,value); } + saveInvalidLoginAttemptSettings(value){ + return this.httpClient.patch(`${environment.apiEndPoint}/settings/INVALID_LOGIN_ATTEMPT`,value); + } + saveUserAccountUnlockTimeSettings(value){ + return this.httpClient.patch(`${environment.apiEndPoint}/settings/USER_ACCOUNT_UNLOCK_TIME`,value); + } getAllSettings(){ return this.httpClient.get(`${environment.apiEndPoint}/settings`); } diff --git a/src-gui/ui/src/app/modules/settings/session/session.component.html b/src-gui/ui/src/app/modules/settings/session/session.component.html index 1178d23ad75..76522857d86 100644 --- a/src-gui/ui/src/app/modules/settings/session/session.component.html +++ b/src-gui/ui/src/app/modules/settings/session/session.component.html @@ -44,5 +44,51 @@
SWITCH NAME SETTINGS
+ + +
+
LOGIN ATTEMPT SETTINGS
+
+
+
+
+
+ + + +
+   +   +   +
+
+
+
+
+
+
+ + +
+
USER ACCOUNT UNLOCK SETTINGS
+
+
+
+
+
+ + + +
+   +   +   +
+
+
+
+
+
+
\ No newline at end of file diff --git a/src-gui/ui/src/app/modules/settings/session/session.component.ts b/src-gui/ui/src/app/modules/settings/session/session.component.ts index d846feb7cfd..eca0477fbf7 100644 --- a/src-gui/ui/src/app/modules/settings/session/session.component.ts +++ b/src-gui/ui/src/app/modules/settings/session/session.component.ts @@ -16,11 +16,17 @@ import { MessageObj } from 'src/app/common/constants/constants'; export class SessionComponent implements OnInit, AfterViewInit, OnChanges,DoCheck { sessionForm: FormGroup; switchNameSourceForm:FormGroup; + userUnlockForm:FormGroup; + loginAttemptForm:FormGroup; switchNameSourceTypes:any; isEdit = false; isSwitchNameSourcEdit = false; + isloginAttemptEdit = false; + isUserUnlockEdit = false; initialVal = null; initialNameSource = null; + intialLoginAttemptValue = null; + initialUserUnlockValue = null; constructor( private formBuilder: FormBuilder, private commonService: CommonService, @@ -47,6 +53,15 @@ export class SessionComponent implements OnInit, AfterViewInit, OnChanges,DoChec switch_name_source: ["FILE_STORAGE"] }); this.switchNameSourceForm.disable(); + + this.loginAttemptForm = this.formBuilder.group({ + login_attempt: [""] + }); + this.loginAttemptForm.disable(); + this.userUnlockForm = this.formBuilder.group({ + user_unlock_time: [""] + }); + this.userUnlockForm.disable(); } @@ -59,6 +74,10 @@ export class SessionComponent implements OnInit, AfterViewInit, OnChanges,DoChec this.switchNameSourceTypes = responseList[1]; this.switchNameSourceForm.setValue({"switch_name_source":settings['SWITCH_NAME_STORAGE_TYPE'] || 'FILE_STORAGE'}); this.initialNameSource = settings['SWITCH_NAME_STORAGE_TYPE'] || 'FILE_STORAGE'; + this.intialLoginAttemptValue = settings['INVALID_LOGIN_ATTEMPT'] || 5; + this.loginAttemptForm.setValue({"login_attempt":settings['INVALID_LOGIN_ATTEMPT']}); + this.initialUserUnlockValue = settings['USER_ACCOUNT_UNLOCK_TIME'] || 60; + this.userUnlockForm.setValue({"user_unlock_time":settings['USER_ACCOUNT_UNLOCK_TIME']}); this.loaderService.hide(); },error=>{ var errorMsg = error && error.error && error.error['error-auxiliary-message'] ? error.error['error-auxiliary-message']:'Api response error'; @@ -165,4 +184,78 @@ export class SessionComponent implements OnInit, AfterViewInit, OnChanges,DoChec this.switchNameSourceForm.disable(); } + saveUserUnlockTimeSetting(){ + let unlock_time = this.userUnlockForm.controls['user_unlock_time'].value; + if(unlock_time == ''){ + return false; + } + const modalReff = this.modalService.open(ModalconfirmationComponent); + modalReff.componentInstance.title = "Confirmation"; + modalReff.componentInstance.content = 'Are you sure you want to save user unlock time settings ?'; + modalReff.result.then((response) => { + if(response && response == true){ + this.loaderService.show(MessageObj.saving_unlock_time_setting); + this.commonService.saveUserAccountUnlockTimeSettings(unlock_time).subscribe((response)=>{ + this.toastrService.success(MessageObj.user_unlock_time_setting_saved,'Success'); + this.loaderService.hide(); + this.initialUserUnlockValue = this.userUnlockForm.controls['user_unlock_time'].value; + this.isUserUnlockEdit = false; + this.userUnlockForm.disable(); + },error=>{ + var errorMsg = error && error.error && error.error['error-auxiliary-message'] ? error.error['error-auxiliary-message']:'Unable to save'; + this.toastrService.error(errorMsg,'Error'); + this.loaderService.hide(); + }); + } + }); + } + + editUserUnlockTimeSetting(){ + this.isUserUnlockEdit = true; + this.userUnlockForm.enable(); + } + + cancelUserUnlockTimeSetting(){ + this.userUnlockForm.setValue({"user_unlock_time":this.initialUserUnlockValue}); + this.isUserUnlockEdit = false; + this.userUnlockForm.disable(); + } + + + saveLoginAttemptSetting(){ + let login_attempt = this.loginAttemptForm.controls['login_attempt'].value; + if(login_attempt == ''){ + return false; + } + const modalReff = this.modalService.open(ModalconfirmationComponent); + modalReff.componentInstance.title = "Confirmation"; + modalReff.componentInstance.content = 'Are you sure you want to save user login attempt settings ?'; + modalReff.result.then((response) => { + if(response && response == true){ + this.loaderService.show(MessageObj.saving_login_attempt_setting); + this.commonService.saveInvalidLoginAttemptSettings(login_attempt).subscribe((response)=>{ + this.toastrService.success(MessageObj.user_login_attempt_setting_saved,'Success'); + this.loaderService.hide(); + this.intialLoginAttemptValue = this.loginAttemptForm.controls['login_attempt'].value; + this.isloginAttemptEdit = false; + this.loginAttemptForm.disable(); + },error=>{ + var errorMsg = error && error.error && error.error['error-auxiliary-message'] ? error.error['error-auxiliary-message']:'Unable to save'; + this.toastrService.error(errorMsg,'Error'); + this.loaderService.hide(); + }); + } + }); + } + + editLoginAttemptSetting(){ + this.isloginAttemptEdit = true; + this.loginAttemptForm.enable(); + } + + cancelLoginAttemptSetting(){ + this.loginAttemptForm.setValue({"login_attempt":this.intialLoginAttemptValue}); + this.isloginAttemptEdit = false; + this.loginAttemptForm.disable(); + } } From c480f648a032ffcc2362cf7b0b0a0184ea2f79fc Mon Sep 17 00:00:00 2001 From: Neeraj Date: Wed, 24 Mar 2021 18:54:11 +0530 Subject: [PATCH 18/46] - adding feature to unblock user --- .../ui/src/app/common/constants/constants.ts | 2 ++ .../src/app/common/services/user.service.ts | 5 +++++ .../users/user-list/user-list.component.html | 1 + .../users/user-list/user-list.component.ts | 21 +++++++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/src-gui/ui/src/app/common/constants/constants.ts b/src-gui/ui/src/app/common/constants/constants.ts index c3e12d59467..9052db6e862 100644 --- a/src-gui/ui/src/app/common/constants/constants.ts +++ b/src-gui/ui/src/app/common/constants/constants.ts @@ -128,6 +128,8 @@ export const MessageObj = { user_deleted:"User removed successfully!", updating_user_status:"Updating user status", user_status_updated:"User status changed successfully!", + unblok_user:"Unblocking user", + user_unblocked:"User account is unblokced successfully", resetting_password:"Resetting Password", reset_pwd_mail_sent:"Reset password email sent successfully!", resetting_pwd_by_admin:"Resetting password by admin", diff --git a/src-gui/ui/src/app/common/services/user.service.ts b/src-gui/ui/src/app/common/services/user.service.ts index 08eb9617a5e..69734e663af 100644 --- a/src-gui/ui/src/app/common/services/user.service.ts +++ b/src-gui/ui/src/app/common/services/user.service.ts @@ -99,4 +99,9 @@ const httpOptions = { return this.http.patch(`${this.configUrl}/user/settings`,payload); } + unblockUser(Id){ + const url = `${this.configUrl}/user/unlock/account/${Id}`; + return this.http.put(url,{}); + } + } \ No newline at end of file diff --git a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html index 1e03ecef1a5..e693e172032 100644 --- a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html +++ b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html @@ -35,6 +35,7 @@ + diff --git a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.ts b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.ts index 17af78ef9a3..784dc0b4511 100644 --- a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.ts +++ b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.ts @@ -210,6 +210,27 @@ export class UserListComponent implements OnDestroy, OnInit, AfterViewInit{ }); } + /* + Method: unblockUser + Description: Unblock a user if blocked by failed login attempts + */ + unblockUser(id){ + const modalRef = this.modalService.open(ModalconfirmationComponent); + modalRef.componentInstance.title = "Confirmation"; + modalRef.componentInstance.content = 'Are you sure you want to unblock this user ?'; + + modalRef.result.then((response) => { + if(response && response == true){ + this.loaderService.show(MessageObj.unblok_user); + this.userService.unblockUser(id).subscribe(user => { + this.toastr.success(MessageObj.user_unblocked,'Success') + this.getUsers(); + + }); + } + }); + } + /* Method: resetpassword Description: Reset the user password and send an email with updated imformation. From cfddd8f77efb4d08303c5481cbd12dbe92b8120e Mon Sep 17 00:00:00 2001 From: Neeraj Date: Thu, 25 Mar 2021 10:53:19 +0530 Subject: [PATCH 19/46] -adding permission to unblock user --- .../usermanagement/users/user-list/user-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html index e693e172032..7614a06db89 100644 --- a/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html +++ b/src-gui/ui/src/app/modules/usermanagement/users/user-list/user-list.component.html @@ -35,7 +35,7 @@ - + From f4a3b2ee6987871e79d806154c45736b9182b681 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Thu, 8 Apr 2021 16:04:39 +0530 Subject: [PATCH 20/46] - implemented some design changes in setting screen --- .../settings/session/session.component.html | 98 ++++++++++--------- 1 file changed, 52 insertions(+), 46 deletions(-) diff --git a/src-gui/ui/src/app/modules/settings/session/session.component.html b/src-gui/ui/src/app/modules/settings/session/session.component.html index 76522857d86..a6bda8cdc2c 100644 --- a/src-gui/ui/src/app/modules/settings/session/session.component.html +++ b/src-gui/ui/src/app/modules/settings/session/session.component.html @@ -1,7 +1,30 @@
-
-
SESSION SETTINGS
+ +
+
SWITCH NAME SETTINGS
+
+
+
+
+
+ + +
+   +   +   +
+
+
+
+
+
+
+
+
USER SETTINGS
@@ -18,39 +41,8 @@
SESSION SETTINGS
-
-
-
- -
-
SWITCH NAME SETTINGS
-
-
-
-
-
- - -
-   -   -   -
-
-
-
-
-
-
- - -
-
LOGIN ATTEMPT SETTINGS
-
-
-
+ +
@@ -64,19 +56,11 @@
LOGIN ATTEMPT SETTINGS
-
-
-
- - -
-
USER ACCOUNT UNLOCK SETTINGS
-
-
-
+ +
- +
@@ -87,8 +71,30 @@
USER ACCOUNT UNLOCK SETTINGS
+ +
+
+
+ + + +
\ No newline at end of file From 578a5f0afaea68af194de2cb6fcd87b8f803ffa9 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Mon, 12 Apr 2021 13:08:50 +0530 Subject: [PATCH 21/46] -adding functionality to email notification to user if account blocked --- .../CustomAuthenticationProvider.java | 24 + .../org/usermanagement/util/MailUtils.java | 17 +- src-gui/src/main/resources/mail.properties | 1 + .../webapp/ui/templates/mail/accountBlock.vm | 444 ++++++++++++++++++ 4 files changed, 485 insertions(+), 1 deletion(-) create mode 100644 src-gui/src/main/webapp/ui/templates/mail/accountBlock.vm diff --git a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java index f12ccc0583d..cdadca16401 100644 --- a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java +++ b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java @@ -22,6 +22,8 @@ import org.openkilda.exception.TwoFaKeyNotSetException; import org.openkilda.service.ApplicationSettingService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.LockedException; @@ -30,18 +32,31 @@ import org.springframework.security.core.Authentication; import org.usermanagement.dao.entity.UserEntity; import org.usermanagement.dao.repository.UserRepository; +import org.usermanagement.service.MailService; +import org.usermanagement.service.TemplateService; +import org.usermanagement.util.MailUtils; import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; +import java.util.Map; public class CustomAuthenticationProvider extends DaoAuthenticationProvider { + private static final Logger LOGGER = LoggerFactory.getLogger(CustomAuthenticationProvider.class); + + @Autowired + private MailUtils mailUtils; + @Autowired private UserRepository userRepository; @Autowired private ApplicationSettingService applicationSettingService; + + @Autowired + private MailService mailService; /* * (non-Javadoc) @@ -126,6 +141,15 @@ private void updateInvalidLoginAttempts(UserEntity entity, String value, String entity.setFailedLoginTime(new Timestamp(System.currentTimeMillis())); entity.setStatusEntity(Status.getStatusByCode(Status.LOCK.getCode()).getStatusEntity()); userRepository.save(entity); +// try { + Map map = new HashMap(); + map.put("name", entity.getName()); + map.put("time", accUnlockTime); + mailService.send(entity.getEmail(), mailUtils.getSubjectAccountBlock(), + TemplateService.Template.ACCOUNT_BLOCK, map); +// } catch (Exception e) { +// LOGGER.warn("User account block email failed for username:'" + entity.getUsername()); +// } throw new LockedException("User account is locked for " + Integer.valueOf(accUnlockTime) + " minute(s)"); } diff --git a/src-gui/src/main/java/org/usermanagement/util/MailUtils.java b/src-gui/src/main/java/org/usermanagement/util/MailUtils.java index 9c0ae0fbe9e..fbcfa579264 100644 --- a/src-gui/src/main/java/org/usermanagement/util/MailUtils.java +++ b/src-gui/src/main/java/org/usermanagement/util/MailUtils.java @@ -39,8 +39,23 @@ public class MailUtils { @Value("${subject.change.password}") private String subjectChangePassword; + @Value("${subject.account.block}") + private String subjectAccountBlock; - public String getSubjectAccountUsername() { + + public String getSubjectAccountBlock() { + return subjectAccountBlock; + } + + + + public void setSubjectAccountBlock(String subjectAccountBlock) { + this.subjectAccountBlock = subjectAccountBlock; + } + + + + public String getSubjectAccountUsername() { return subjectAccountUsername; } diff --git a/src-gui/src/main/resources/mail.properties b/src-gui/src/main/resources/mail.properties index 01786f574c1..c6e34188942 100644 --- a/src-gui/src/main/resources/mail.properties +++ b/src-gui/src/main/resources/mail.properties @@ -3,3 +3,4 @@ subject.account.password=Account password subject.reset.password=Reset Password subject.reset.twofa=Reset 2FA subject.change.password=Change Password +subject.account.block=Account Blocked diff --git a/src-gui/src/main/webapp/ui/templates/mail/accountBlock.vm b/src-gui/src/main/webapp/ui/templates/mail/accountBlock.vm new file mode 100644 index 00000000000..6a2987a8286 --- /dev/null +++ b/src-gui/src/main/webapp/ui/templates/mail/accountBlock.vm @@ -0,0 +1,444 @@ + + + + + Set up a new password for [Product Name] + + + + + + + + + + + + + + \ No newline at end of file From dba973c720cd1dc3bec98d0e711052c6f51d3f62 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Mon, 12 Apr 2021 13:43:07 +0530 Subject: [PATCH 22/46] adding missing code --- .../main/java/org/usermanagement/service/TemplateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-gui/src/main/java/org/usermanagement/service/TemplateService.java b/src-gui/src/main/java/org/usermanagement/service/TemplateService.java index de6615f5f76..31526d86134 100644 --- a/src-gui/src/main/java/org/usermanagement/service/TemplateService.java +++ b/src-gui/src/main/java/org/usermanagement/service/TemplateService.java @@ -35,6 +35,6 @@ public interface TemplateService { * Enum of templates. */ enum Template { - RESET_ACCOUNT_PASSWORD, ACCOUNT_USERNAME, ACCOUNT_PASSWORD, RESET_2FA, CHANGE_PASSWORD; + RESET_ACCOUNT_PASSWORD, ACCOUNT_USERNAME, ACCOUNT_PASSWORD, RESET_2FA, CHANGE_PASSWORD, ACCOUNT_BLOCK; } } From 4ec45809782a98d89d6776b89ff045f18534888b Mon Sep 17 00:00:00 2001 From: Neeraj Date: Mon, 12 Apr 2021 14:16:06 +0530 Subject: [PATCH 23/46] fixed checkstyle issues --- .../security/CustomAuthenticationProvider.java | 18 +++++++++--------- .../org/usermanagement/util/MailUtils.java | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java index cdadca16401..6e8daac73f5 100644 --- a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java +++ b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java @@ -141,15 +141,15 @@ private void updateInvalidLoginAttempts(UserEntity entity, String value, String entity.setFailedLoginTime(new Timestamp(System.currentTimeMillis())); entity.setStatusEntity(Status.getStatusByCode(Status.LOCK.getCode()).getStatusEntity()); userRepository.save(entity); -// try { - Map map = new HashMap(); - map.put("name", entity.getName()); - map.put("time", accUnlockTime); - mailService.send(entity.getEmail(), mailUtils.getSubjectAccountBlock(), - TemplateService.Template.ACCOUNT_BLOCK, map); -// } catch (Exception e) { -// LOGGER.warn("User account block email failed for username:'" + entity.getUsername()); -// } + try { + Map map = new HashMap(); + map.put("name", entity.getName()); + map.put("time", accUnlockTime); + mailService.send(entity.getEmail(), mailUtils.getSubjectAccountBlock(), + TemplateService.Template.ACCOUNT_BLOCK, map); + } catch (Exception e) { + LOGGER.warn("User account block email failed for username:'" + entity.getUsername()); + } throw new LockedException("User account is locked for " + Integer.valueOf(accUnlockTime) + " minute(s)"); } diff --git a/src-gui/src/main/java/org/usermanagement/util/MailUtils.java b/src-gui/src/main/java/org/usermanagement/util/MailUtils.java index fbcfa579264..976a0f47f70 100644 --- a/src-gui/src/main/java/org/usermanagement/util/MailUtils.java +++ b/src-gui/src/main/java/org/usermanagement/util/MailUtils.java @@ -44,18 +44,18 @@ public class MailUtils { public String getSubjectAccountBlock() { - return subjectAccountBlock; - } - + return subjectAccountBlock; + } + - public void setSubjectAccountBlock(String subjectAccountBlock) { - this.subjectAccountBlock = subjectAccountBlock; - } + public void setSubjectAccountBlock(String subjectAccountBlock) { + this.subjectAccountBlock = subjectAccountBlock; + } - public String getSubjectAccountUsername() { + public String getSubjectAccountUsername() { return subjectAccountUsername; } From 61d9cc06230c5951b3c757c3b0836101e7882f01 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Tue, 13 Apr 2021 14:06:50 +0530 Subject: [PATCH 24/46] -adding missing code for email --- .../java/org/openkilda/controller/LoginController.java | 10 +++++++--- .../service/impl/VelocityTemplateService.java | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src-gui/src/main/java/org/openkilda/controller/LoginController.java b/src-gui/src/main/java/org/openkilda/controller/LoginController.java index 0ae4ea176cd..e63bd553609 100644 --- a/src-gui/src/main/java/org/openkilda/controller/LoginController.java +++ b/src-gui/src/main/java/org/openkilda/controller/LoginController.java @@ -1,4 +1,4 @@ -/* Copyright 2018 Telstra Open Source +/* Copyright 2019 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.LockedException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -120,7 +121,7 @@ public ModelAndView authenticate(@RequestParam("username") String username, SecurityContextHolder.getContext().setAuthentication(authenticate); userService.updateLoginDetail(username); } else { - error = "Invalid email or password"; + error = "Login failed; Invalid email or password."; LOGGER.warn("Authentication failure for user: '" + username + "'"); modelAndView.setViewName(IConstants.View.REDIRECT_LOGIN); } @@ -155,7 +156,10 @@ public ModelAndView authenticate(@RequestParam("username") String username, } } catch (BadCredentialsException e) { LOGGER.warn("Authentication failure", e); - error = "Invalid email or password"; + error = "Login failed; Invalid email or password."; + modelAndView.setViewName(IConstants.View.REDIRECT_LOGIN); + } catch (LockedException e) { + error = e.getMessage(); modelAndView.setViewName(IConstants.View.REDIRECT_LOGIN); } catch (Exception e) { LOGGER.warn("Authentication failure", e); diff --git a/src-gui/src/main/java/org/usermanagement/service/impl/VelocityTemplateService.java b/src-gui/src/main/java/org/usermanagement/service/impl/VelocityTemplateService.java index f75c3fd7665..d0a040d53fd 100644 --- a/src-gui/src/main/java/org/usermanagement/service/impl/VelocityTemplateService.java +++ b/src-gui/src/main/java/org/usermanagement/service/impl/VelocityTemplateService.java @@ -51,6 +51,7 @@ private void init() { templates.put(Template.ACCOUNT_PASSWORD, "ui/templates/mail/accountPassword.vm"); templates.put(Template.RESET_2FA, "ui/templates/mail/reset2fa.vm"); templates.put(Template.CHANGE_PASSWORD, "ui/templates/mail/changePassword.vm"); + templates.put(Template.ACCOUNT_BLOCK, "ui/templates/mail/accountBlock.vm"); } From 193b6c5d8c49a9cb28743f1f432e9ba4c58f1f5d Mon Sep 17 00:00:00 2001 From: Neeraj Date: Tue, 13 Apr 2021 17:35:25 +0530 Subject: [PATCH 25/46] removed commented code --- .../settings/session/session.component.html | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src-gui/ui/src/app/modules/settings/session/session.component.html b/src-gui/ui/src/app/modules/settings/session/session.component.html index a6bda8cdc2c..f8ee1b853a2 100644 --- a/src-gui/ui/src/app/modules/settings/session/session.component.html +++ b/src-gui/ui/src/app/modules/settings/session/session.component.html @@ -75,26 +75,6 @@
USER SETTINGS
- - - \ No newline at end of file From aed481f2e0d7b7f6799ac6776818eebc76bce38d Mon Sep 17 00:00:00 2001 From: Neeraj Kumar Date: Mon, 6 Dec 2021 14:32:28 +0530 Subject: [PATCH 26/46] check style fixes --- src-gui/src/main/java/org/openkilda/constants/IConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-gui/src/main/java/org/openkilda/constants/IConstants.java b/src-gui/src/main/java/org/openkilda/constants/IConstants.java index c7c7fbfd908..1446860b912 100644 --- a/src-gui/src/main/java/org/openkilda/constants/IConstants.java +++ b/src-gui/src/main/java/org/openkilda/constants/IConstants.java @@ -306,7 +306,7 @@ private Permission() { public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; public static final String TOPOLOGY_WORLD_MAP_VIEW = "topology_world_map_view"; - + public static final String ISL_UPDATE_BFD_PROPERTIES = "isl_update_bfd_properties"; public static final String ISL_DELETE_BFD = "isl_delete_bfd"; From 7f7ac8a0520bf38502902fe3499e9d2d603eb8c6 Mon Sep 17 00:00:00 2001 From: Swati Sharma Date: Wed, 8 Dec 2021 15:54:17 +0530 Subject: [PATCH 27/46] resolved checkstyle errors --- src-gui/src/main/java/org/openkilda/constants/IConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-gui/src/main/java/org/openkilda/constants/IConstants.java b/src-gui/src/main/java/org/openkilda/constants/IConstants.java index 1446860b912..2eeb2d1f1cd 100644 --- a/src-gui/src/main/java/org/openkilda/constants/IConstants.java +++ b/src-gui/src/main/java/org/openkilda/constants/IConstants.java @@ -306,7 +306,7 @@ private Permission() { public static final String SW_SWITCH_LOCATION_UPDATE = "sw_switch_location_update"; public static final String TOPOLOGY_WORLD_MAP_VIEW = "topology_world_map_view"; - + public static final String ISL_UPDATE_BFD_PROPERTIES = "isl_update_bfd_properties"; public static final String ISL_DELETE_BFD = "isl_delete_bfd"; From 5299f03f90434ef017ffcc4b1be962a69c6e692a Mon Sep 17 00:00:00 2001 From: Neeraj Kumar Date: Thu, 23 Dec 2021 10:56:03 +0530 Subject: [PATCH 28/46] fixed issue in updating the bfd properties --- .../app/modules/isl/isl-detail/isl-detail.component.html | 4 ++-- .../app/modules/isl/isl-detail/isl-detail.component.ts | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html index 9a0dfae065d..bcf385fa0cc 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html @@ -233,11 +233,11 @@
BFD PROPERTIES
- +
- +
diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts index 47ed2ebff30..93b4c104fbd 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.ts @@ -93,6 +93,7 @@ import { FlowsService } from 'src/app/common/services/flows.service'; targetSwitch:"" } + @Output() hideToValue: EventEmitter = new EventEmitter(); newMessageDetail(){ @@ -218,10 +219,10 @@ import { FlowsService } from 'src/app/common/services/flows.service'; this.islListService.getLinkBFDProperties(this.src_switch, this.src_port, this.dst_switch, this.dst_port).subscribe((data : any) =>{ if(data!= null){ - this.bfdPropertyData = data; + this.bfdPropertyData = data; this.bfdPropForm = this.formBuiler.group({ - interval_ms: [this.bfdPropertyData.interval_ms, Validators.min(0)], - multiplier:[this.bfdPropertyData.multiplier,Validators.min(0)] + interval_ms: [this.bfdPropertyData.properties['interval_ms'], Validators.min(0)], + multiplier: [this.bfdPropertyData.properties['multiplier'],Validators.min(0)] }); } else{ @@ -1006,6 +1007,7 @@ get f() { let multiplier = this.bfdPropForm.value.multiplier; var data = {interval_ms:interval_ms,multiplier:multiplier}; this.islListService.updateLinkBFDProperties(data,this.src_switch, this.src_port, this.dst_switch, this.dst_port).subscribe((response: any) => { + this.bfdPropertyData = response; this.loaderService.hide(); this.toastr.success(MessageObj.updating_bfd_properties_success,'Success'); this.isBFDEdit = false; From f8417b1c91a609aac008567d49d1731c2494ce06 Mon Sep 17 00:00:00 2001 From: Swati Sharma Date: Fri, 24 Dec 2021 16:29:57 +0530 Subject: [PATCH 29/46] updates sql script for isl bfd properties --- src-gui/src/main/resources/db/import-script_31.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src-gui/src/main/resources/db/import-script_31.sql b/src-gui/src/main/resources/db/import-script_31.sql index 63d8754fd1a..181e4cd85c5 100644 --- a/src-gui/src/main/resources/db/import-script_31.sql +++ b/src-gui/src/main/resources/db/import-script_31.sql @@ -1,14 +1,14 @@ -INSERT INTO "VERSION" (Version_ID, Version_Number, Version_Deployment_Date) +INSERT INTO VERSION_ENTITY (Version_ID, Version_Number, Version_Deployment_Date) VALUES (31, 31, CURRENT_TIMESTAMP); -INSERT INTO "ACTIVITY_TYPE" (activity_type_id, activity_name) VALUES +INSERT INTO ACTIVITY_TYPE (activity_type_id, activity_name) VALUES (44, 'UPDATE_ISL_BFD_PROPERTIES'), (45, 'DELETE_ISL_BFD'); -INSERT INTO "KILDA_PERMISSION" (PERMISSION_ID, PERMISSION, IS_EDITABLE, IS_ADMIN_PERMISSION, STATUS_ID, CREATED_BY, CREATED_DATE, UPDATED_BY, UPDATED_DATE,DESCRIPTION) VALUES +INSERT INTO KILDA_PERMISSION (PERMISSION_ID, PERMISSION, IS_EDITABLE, IS_ADMIN_PERMISSION, STATUS_ID, CREATED_BY, CREATED_DATE, UPDATED_BY, UPDATED_DATE,DESCRIPTION) VALUES (360, 'isl_update_bfd_properties', false, false, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 'Permission to update isl bfd properties'), (361, 'isl_delete_bfd', false, false, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 'Permission to delete isl bfd'); -INSERT INTO "ROLE_PERMISSION" (ROLE_ID,PERMISSION_ID) VALUES +INSERT INTO ROLE_PERMISSION (ROLE_ID,PERMISSION_ID) VALUES (2, 360), (2, 361); \ No newline at end of file From d28eb39fe398d250d1547bd69ce6929c3dcf914b Mon Sep 17 00:00:00 2001 From: Swati Sharma Date: Mon, 27 Dec 2021 17:13:06 +0530 Subject: [PATCH 30/46] updates brute force defence error message and resets login attempts count on successful login --- .../org/openkilda/controller/LoginController.java | 2 +- .../security/CustomAuthenticationProvider.java | 12 +++++++++--- .../org/usermanagement/service/UserService.java | 2 ++ src-gui/src/main/resources/db/import-script_32.sql | 14 +++++++------- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src-gui/src/main/java/org/openkilda/controller/LoginController.java b/src-gui/src/main/java/org/openkilda/controller/LoginController.java index e63bd553609..b6afe583413 100644 --- a/src-gui/src/main/java/org/openkilda/controller/LoginController.java +++ b/src-gui/src/main/java/org/openkilda/controller/LoginController.java @@ -156,7 +156,7 @@ public ModelAndView authenticate(@RequestParam("username") String username, } } catch (BadCredentialsException e) { LOGGER.warn("Authentication failure", e); - error = "Login failed; Invalid email or password."; + error = e.getMessage(); modelAndView.setViewName(IConstants.View.REDIRECT_LOGIN); } catch (LockedException e) { error = e.getMessage(); diff --git a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java index 6e8daac73f5..80fd747d5e4 100644 --- a/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java +++ b/src-gui/src/main/java/org/openkilda/security/CustomAuthenticationProvider.java @@ -100,10 +100,13 @@ public Authentication authenticate(final Authentication auth) } return new UsernamePasswordAuthenticationToken(user, result.getCredentials(), result.getAuthorities()); } catch (BadCredentialsException e) { + String error = null; if (user.getUserId() != 1) { - updateInvalidLoginAttempts(user, loginCount, unlockTime); + error = updateInvalidLoginAttempts(user, loginCount, unlockTime); + } else { + error = "Login Failed.Invalid email or password."; } - throw new BadCredentialsException(e.getMessage()); + throw new BadCredentialsException(error); } } @@ -132,7 +135,7 @@ private void checkUserLoginAttempts(UserEntity user, String value, String accUnl } } - private void updateInvalidLoginAttempts(UserEntity entity, String value, String accUnlockTime) { + private String updateInvalidLoginAttempts(UserEntity entity, String value, String accUnlockTime) { Integer loginCount = entity.getFailedLoginCount(); if (loginCount != null) { if (loginCount + 1 >= Integer.valueOf(value)) { @@ -157,7 +160,10 @@ private void updateInvalidLoginAttempts(UserEntity entity, String value, String } else { entity.setFailedLoginCount(1); } + int attempts = Integer.valueOf(value) - entity.getFailedLoginCount(); + String error = "Invalid email or password.You are left with " + attempts + " more attempts."; userRepository.save(entity); + return error; } /* diff --git a/src-gui/src/main/java/org/usermanagement/service/UserService.java b/src-gui/src/main/java/org/usermanagement/service/UserService.java index 4d23cc94d27..1e650906474 100644 --- a/src-gui/src/main/java/org/usermanagement/service/UserService.java +++ b/src-gui/src/main/java/org/usermanagement/service/UserService.java @@ -271,6 +271,8 @@ public void updateLoginDetail(final String userName) { throw new RequestValidationException(messageUtil.getAttributeInvalid("username", userName + "")); } userEntity.setLoginTime(Calendar.getInstance().getTime()); + userEntity.setFailedLoginCount(null); + userEntity.setUnlockTime(null); if (userEntity.getIs2FaEnabled()) { userEntity.setIs2FaConfigured(true); } diff --git a/src-gui/src/main/resources/db/import-script_32.sql b/src-gui/src/main/resources/db/import-script_32.sql index 1f98856453a..95a8f9f9cf3 100644 --- a/src-gui/src/main/resources/db/import-script_32.sql +++ b/src-gui/src/main/resources/db/import-script_32.sql @@ -1,21 +1,21 @@ -INSERT INTO "VERSION" (Version_ID, Version_Number, Version_Deployment_Date) +INSERT INTO VERSION_ENTITY (Version_ID, Version_Number, Version_Deployment_Date) VALUES (32, 32, CURRENT_TIMESTAMP); -INSERT INTO "KILDA_PERMISSION" (PERMISSION_ID, PERMISSION, IS_EDITABLE, IS_ADMIN_PERMISSION, STATUS_ID, CREATED_BY, CREATED_DATE, UPDATED_BY, UPDATED_DATE,DESCRIPTION) VALUES +INSERT INTO KILDA_PERMISSION (PERMISSION_ID, PERMISSION, IS_EDITABLE, IS_ADMIN_PERMISSION, STATUS_ID, CREATED_BY, CREATED_DATE, UPDATED_BY, UPDATED_DATE,DESCRIPTION) VALUES (362, 'um_user_account_unlock', false, false, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 'Permission to unlock user account'); -INSERT INTO "ROLE_PERMISSION" (ROLE_ID,PERMISSION_ID) VALUES +INSERT INTO ROLE_PERMISSION (ROLE_ID,PERMISSION_ID) VALUES (2, 362); -INSERT INTO "ACTIVITY_TYPE" (activity_type_id, activity_name) VALUES +INSERT INTO ACTIVITY_TYPE (activity_type_id, activity_name) VALUES (46, 'CONFIG_INVALID_LOGIN_ATTEMPT_COUNT'), (47, 'CONFIG_USER_ACCOUNT_UNLOCK_TIME'), (48, 'UNLOCK_USER_ACCOUNT'); -INSERT INTO "APPLICATION_SETTING" (id, setting_type, setting_value) VALUES (3, 'invalid_login_attempt', '5'); -INSERT INTO "APPLICATION_SETTING" (id, setting_type, setting_value) VALUES (4, 'user_account_unlock_time', '60'); +INSERT INTO APPLICATION_SETTING (id, setting_type, setting_value) VALUES (3, 'invalid_login_attempt', '5'); +INSERT INTO APPLICATION_SETTING (id, setting_type, setting_value) VALUES (4, 'user_account_unlock_time', '60'); -INSERT INTO "KILDA_STATUS" (status_id, STATUS_CODE, STATUS) VALUES +INSERT INTO KILDA_STATUS (status_id, STATUS_CODE, STATUS) VALUES (3, 'LCK', 'Lock'); From 1fbda931676940b7fc1b93e6312de588dec6e715 Mon Sep 17 00:00:00 2001 From: Sergii Iakovenko Date: Wed, 22 Dec 2021 22:36:58 +0200 Subject: [PATCH 31/46] Upgrade Gradle to 7.3.3 and other plugins to the recent versions. --- README.md | 4 +- src-gui/build.gradle | 27 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../base-storm-topology/build.gradle | 26 +- src-java/build.gradle | 44 +-- src-java/checkstyle/checkstyle.xml | 32 ++- .../build.gradle | 6 +- .../build.gradle | 6 +- .../flowhs-storm-topology/build.gradle | 6 +- .../build.gradle | 6 +- src-java/gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- src-java/gradlew | 257 +++++++++++------- .../grpc-speaker/grpc-service/build.gradle | 4 +- .../isllatency-storm-topology/build.gradle | 6 +- .../nbworker-storm-topology/build.gradle | 6 +- .../network-storm-topology/build.gradle | 6 +- .../northbound/build.gradle | 7 +- .../opentsdb-storm-topology/build.gradle | 6 +- .../ping-storm-topology/build.gradle | 6 +- .../portstate-storm-topology/build.gradle | 6 +- .../projectfloodlight/floodlight/build.gradle | 8 +- .../projectfloodlight/openflowj/build.gradle | 6 +- .../reroute-storm-topology/build.gradle | 6 +- .../server42-control-server-stub/build.gradle | 2 +- .../server42-control-storm-stub/build.gradle | 2 +- .../build.gradle | 6 +- .../server42/server42-control/build.gradle | 2 +- src-java/server42/server42-stats/build.gradle | 2 +- .../stats-storm-topology/build.gradle | 6 +- .../swmanager-storm-topology/build.gradle | 6 +- .../testing/functional-tests/build.gradle | 12 +- .../testing/performance-tests/build.gradle | 2 +- src-java/testing/test-library/build.gradle | 2 +- 34 files changed, 296 insertions(+), 231 deletions(-) diff --git a/README.md b/README.md index 4e8cb59955c..44d5bcd20ab 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Note that the build process will install additional packages. It is recommended ### Prerequisites The followings are required for building Kilda controller: - - Gradle 6.7+ + - Gradle 7.0+ - Maven 3.3.9+ - JDK8 - Python 3.6+ @@ -44,7 +44,7 @@ sudo pip3 install docker-compose You can either install Gradle, or use Gradle wrapper: - Option 1 - Use Gradle wrapper. The Kilda repository contains an instance of Gradle Wrapper which can be used straight from here without further installation. - - Option 2 - Install Gradle (ensure that you have gradle 6.7 or later) - https://gradle.org/install/ + - Option 2 - Install Gradle (ensure that you have gradle 7.0 or later) - https://gradle.org/install/ #### Docker diff --git a/src-gui/build.gradle b/src-gui/build.gradle index 3f18d66926d..f31b79b1d2f 100644 --- a/src-gui/build.gradle +++ b/src-gui/build.gradle @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id 'java' id 'jacoco' @@ -11,14 +7,10 @@ plugins { } repositories { - jcenter() + mavenCentral() maven { url = uri('https://repo.spring.io/libs-milestone') } - - maven { - url = uri('http://repo.maven.apache.org/maven2') - } } dependencies { @@ -60,13 +52,13 @@ dependencies { testImplementation 'org.mockito:mockito-all:2.0.2-beta' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.0-M4' testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.0.0-M4' - + compileOnly 'org.projectlombok:lombok:1.18.10' testCompileOnly 'org.projectlombok:lombok:1.18.10' annotationProcessor 'org.projectlombok:lombok:1.18.10' testAnnotationProcessor 'org.projectlombok:lombok:1.18.10' - - compile group: 'org.eclipse.jdt.core.compiler', name: 'ecj', version: '4.5.1' + + implementation group: 'org.eclipse.jdt.core.compiler', name: 'ecj', version: '4.5.1' } group = 'org.openkilda' @@ -78,14 +70,14 @@ tasks.withType(JavaCompile) { } jacoco { - toolVersion = '0.8.5' + toolVersion = '0.8.7' } jacocoTestReport { reports { - xml.enabled true - csv.enabled false - html.enabled true + xml.required = true + csv.required = false + html.required = true } } @@ -114,9 +106,10 @@ checkstyle { } } +/*TODO: not compatible with Gradle 7+, need another way [checkstyleMain, checkstyleTest].each { task -> task.logging.setLevel(LogLevel.LIFECYCLE) -} +}*/ jar { manifest { diff --git a/src-gui/gradle/wrapper/gradle-wrapper.properties b/src-gui/gradle/wrapper/gradle-wrapper.properties index da9702f9e70..2e6e5897b52 100644 --- a/src-gui/gradle/wrapper/gradle-wrapper.properties +++ b/src-gui/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src-java/base-topology/base-storm-topology/build.gradle b/src-java/base-topology/base-storm-topology/build.gradle index d0ade8af6c4..da3b66eb805 100644 --- a/src-java/base-topology/base-storm-topology/build.gradle +++ b/src-java/base-topology/base-storm-topology/build.gradle @@ -1,6 +1,12 @@ buildscript { + repositories { + maven { url 'https://jitpack.io' } + } dependencies { - classpath 'org.anarres.jarjar:jarjar-gradle:1.0.1' + // Not compatible with Gradle 7. See https://github.com/shevek/jarjar/issues/22 + //classpath 'org.anarres.jarjar:jarjar-gradle:1.0.1' + // So build the plugin from the source at the version which supports Gradle 7. + classpath 'com.github.shevek.jarjar:jarjar-gradle:9a7eca72f9' } } @@ -40,11 +46,11 @@ dependencies { from 'org.apache.storm:flux-core:1.2.1' // Remove bundled libraries as they conflict with other dependencies. - classDelete "org.apache.commons.**" - classDelete "org.apache.http.**" - classDelete "org.apache.storm.flux.wrappers.**" - classDelete "org.apache.thrift.**" - classDelete "org.yaml.**" + classDelete 'org.apache.commons.**' + classDelete 'org.apache.http.**' + classDelete 'org.apache.storm.flux.wrappers.**' + classDelete 'org.apache.thrift.**' + classDelete 'org.yaml.**' } api('org.squirrelframework:squirrel-foundation') { @@ -65,7 +71,7 @@ dependencies { api 'org.hibernate.validator:hibernate-validator' runtimeOnly 'org.glassfish:javax.el' - implementation 'org.aspectj:aspectjrt' + api 'org.aspectj:aspectjrt' implementation 'org.mapstruct:mapstruct' implementation 'org.mapstruct:mapstruct-processor' annotationProcessor 'org.mapstruct:mapstruct-processor' @@ -100,7 +106,7 @@ dependencies { } sourceSets { - release { + releaseResources { resources { srcDir 'src/release/resources' } @@ -121,7 +127,7 @@ task testJar(type: Jar) { task releaseJar(type: Jar) { dependsOn processResources classifier 'release' - from sourceSets.release.output + from sourceSets.releaseResources.output } artifacts { @@ -130,5 +136,5 @@ artifacts { } buildAndCopyArtifacts { - from("${project.buildDir}/resources/release/topology.properties") { into "${project.name}/resources" } + from("${project.buildDir}/resources/releaseResources/topology.properties") { into "${project.name}/resources" } } diff --git a/src-java/build.gradle b/src-java/build.gradle index e233ed42e88..8338c786688 100644 --- a/src-java/build.gradle +++ b/src-java/build.gradle @@ -5,10 +5,10 @@ import java.text.DateFormat import java.util.jar.JarFile plugins { - id 'org.sonarqube' version '3.1.1' - id 'org.ajoberstar.grgit' version '4.0.2' apply false - id 'com.github.johnrengelman.shadow' version '6.1.0' apply false - id 'io.freefair.aspectj.post-compile-weaving' version '5.3.0' apply false + id 'org.sonarqube' version '3.3' + id 'org.ajoberstar.grgit' version '4.1.1' apply false + id 'com.github.johnrengelman.shadow' version '7.1.1' apply false + id 'io.freefair.aspectj.post-compile-weaving' version '6.3.0' apply false } allprojects { @@ -33,7 +33,7 @@ subprojects { repositories { mavenCentral() - maven { url "https://clojars.org/repo" } + maven { url 'https://clojars.org/repo' } } dependencies { @@ -178,7 +178,7 @@ subprojects { } checkstyle { - toolVersion '8.41' + toolVersion '9.2' configDirectory = rootProject.file('checkstyle') configProperties = [ 'checkstyle.suppression.file': project.file('src/checkstyle/checkstyle-suppressions.xml'), @@ -194,25 +194,26 @@ subprojects { } dependencies { - checkstyle 'com.puppycrawl.tools:checkstyle:8.41' + checkstyle 'com.puppycrawl.tools:checkstyle:9.2' } } + /*TODO: not compatible with Gradle 7+, need another way [checkstyleMain, checkstyleTest].each { task -> task.logging.setLevel(LogLevel.LIFECYCLE) - } + }*/ jacoco { - toolVersion = '0.8.6' + toolVersion = '0.8.7' } jacocoTestReport { dependsOn test reports { - xml.enabled true - csv.enabled false - html.enabled true + xml.required = true + csv.required = false + html.required = true } } @@ -239,22 +240,25 @@ subprojects { doFirst { Map classes = new HashMap<>() getIncludedDependencies().each { jar -> - JarFile jf = new JarFile(jar) - jf.entries().each { file -> - // TODO: it's good to reuse shadowJar plugin's patterns - if (file.name.endsWith('.class') && file.name != 'module-info.class') { - if (classes.containsKey(file.name)) { - throw new GradleException("shadowJar failure: ${file.name} conflicts in jars:${classes.get(file.name)} and ${jar}") + if(jar.isFile()) { + JarFile jf = new JarFile(jar) + jf.entries().each { file -> + // TODO: it's good to reuse shadowJar plugin's patterns + if (file.name.endsWith('.class') && file.name != 'module-info.class') { + if (classes.containsKey(file.name)) { + throw new GradleException("shadowJar failure: ${file.name} conflicts in jars:${classes.get(file.name)} and ${jar}") + } + classes.put(file.name, jar) } - classes.put(file.name, jar) } + jf.close() } - jf.close() } } } } +//TODO: the task handles Floodlight build only, should we rename the task? task buildAndCopyArtifacts(type: Copy) { onlyIf { project.hasProperty('destPath') diff --git a/src-java/checkstyle/checkstyle.xml b/src-java/checkstyle/checkstyle.xml index 127de3a77a1..15f53c5f467 100644 --- a/src-java/checkstyle/checkstyle.xml +++ b/src-java/checkstyle/checkstyle.xml @@ -1,7 +1,7 @@ + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd"> - + - + @@ -144,13 +144,13 @@ - + - + @@ -253,6 +253,7 @@ PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, RECORD_COMPONENT_DEF"/> + @@ -269,7 +270,8 @@ + value="COMMA, SEMI, POST_INC, POST_DEC, DOT, + LABELED_STAT, METHOD_REF"/> @@ -284,12 +286,14 @@ + LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF, + TYPE_EXTENSION_AND "/> + value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, + RECORD_DEF, COMPACT_CTOR_DEF"/> @@ -304,13 +308,14 @@ value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/> + - + + 4 zYYc!v@NU%|U;_sM`2z(4BAilWijmR>4U^KdN)D8%@2KLcqkTDW%^3U(Wg>{qkAF z&RcYr;D1I5aD(N-PnqoEeBN~JyXiT(+@b`4Pv`;KmkBXYN48@0;iXuq6!ytn`vGp$ z6X4DQHMx^WlOek^bde&~cvEO@K$oJ}i`T`N;M|lX0mhmEH zuRpo!rS~#&rg}ajBdma$$}+vEhz?JAFUW|iZEcL%amAg_pzqul-B7Itq6Y_BGmOCC zX*Bw3rFz3R)DXpCVBkI!SoOHtYstv*e-May|+?b80ZRh$MZ$FerlC`)ZKt} zTd0Arf9N2dimjs>mg5&@sfTPsRXKXI;0L~&t+GH zkB<>wxI9D+k5VHHcB7Rku{Z>i3$&hgd9Mt_hS_GaGg0#2EHzyV=j=u5xSyV~F0*qs zW{k9}lFZ?H%@4hII_!bzao!S(J^^ZZVmG_;^qXkpJb7OyR*sPL>))Jx{K4xtO2xTr@St!@CJ=y3q2wY5F`77Tqwz8!&Q{f7Dp zifvzVV1!Dj*dxG%BsQyRP6${X+Tc$+XOG zzvq5xcC#&-iXlp$)L=9t{oD~bT~v^ZxQG;FRz|HcZj|^L#_(VNG)k{=_6|6Bs-tRNCn-XuaZ^*^hpZ@qwi`m|BxcF6IWc?_bhtK_cDZRTw#*bZ2`1@1HcB`mLUmo_>@2R&nj7&CiH zF&laHkG~7#U>c}rn#H)q^|sk+lc!?6wg0xy`VPn!{4P=u@cs%-V{VisOxVqAR{XX+ zw}R;{Ux@6A_QPka=48|tph^^ZFjSHS1BV3xfrbY84^=?&gX=bmz(7C({=*oy|BEp+ zYgj;<`j)GzINJA>{HeSHC)bvp6ucoE`c+6#2KzY9)TClmtEB1^^Mk)(mXWYvup02e%Ghm9qyjz#fO3bNGBX} zFiB>dvc1+If!>I10;qZk`?6pEd*(?bI&G*3YLt;MWw&!?=Mf7%^Op?qnyXWur- zwX|S^P>jF?{m9c&mmK-epCRg#WB+-VDe!2d2~YVoi%7_q(dyC{(}zB${!ElKB2D}P z7QNFM!*O^?FrPMGZ}wQ0TrQAVqZy!weLhu_Zq&`rlD39r*9&2sJHE(JT0EY5<}~x@ z1>P0!L2IFDqAB!($H9s2fI`&J_c+5QT|b#%99HA3@zUWOuYh(~7q7!Pf_U3u!ij5R zjFzeZta^~RvAmd_TY+RU@e}wQaB_PNZI26zmtzT4iGJg9U(Wrgrl>J%Z3MKHOWV(? zj>~Ph$<~8Q_sI+)$DOP^9FE6WhO09EZJ?1W|KidtEjzBX3RCLUwmj9qH1CM=^}MaK z59kGxRRfH(n|0*lkE?`Rpn6d^u5J6wPfi0WF(rucTv(I;`aW)3;nY=J=igkjsn?ED ztH&ji>}TW8)o!Jg@9Z}=i2-;o4#xUksQHu}XT~yRny|kg-$Pqeq!^78xAz2mYP9+4 z9gwAoti2ICvUWxE&RZ~}E)#M8*zy1iwz zHqN%q;u+f6Ti|SzILm0s-)=4)>eb5o-0K zbMW8ecB4p^6OuIX@u`f{>Yn~m9PINEl#+t*jqalwxIx=TeGB9(b6jA}9VOHnE$9sC zH`;epyH!k-3kNk2XWXW!K`L_G!%xOqk0ljPCMjK&VweAxEaZ==cT#;!7)X&C|X{dY^IY(e4D#!tx^vV3NZqK~--JW~wtXJ8X19adXim?PdN(|@o(OdgH3AiHts~?#QkolO?*=U_buYC&tQ3sc(O5HGHN~=6wB@dgIAVT$ z_OJWJ^&*40Pw&%y^t8-Wn4@l9gOl`uU z{Uda_uk9!Iix?KBu9CYwW9Rs=yt_lE11A+k$+)pkY5pXpocxIEJe|pTxwFgB%Kpr&tH;PzgOQ&m|(#Otm?@H^r`v)9yiR8v&Uy>d#TNdRfyN4Jk;`g zp+jr5@L2A7TS4=G-#O<`A9o;{En5!I8lVUG?!PMsv~{E_yP%QqqTxxG%8%KxZ{uwS zOT+EA5`*moN8wwV`Z=wp<3?~f#frmID^K?t7YL`G^(X43gWbo!6(q*u%HxWh$$^2EOq`Hj zp=-fS#Av+s9r-M)wGIggQ)b<@-BR`R8l1G@2+KODmn<_$Tzb7k35?e8;!V0G>`(!~ zY~qZz!6*&|TupOcnvsQYPbcMiJ!J{RyfezB^;fceBk znpA1XS)~KcC%0^_;ihibczSxwBuy;^ksH7lwfq7*GU;TLt*WmUEVQxt{ zKSfJf;lk$0XO8~48Xn2dnh8tMC9WHu`%DZj&a`2!tNB`5%;Md zBs|#T0Ktf?vkWQ)Y+q!At1qgL`C|nbzvgc(+28Q|4N6Geq)Il%+I5c@t02{9^=QJ?=h2BTe`~BEu=_u3xX2&?^zwcQWL+)7dI>JK0g8_`W1n~ zMaEP97X>Ok#=G*nkPmY`VoP8_{~+Rp7DtdSyWxI~?TZHxJ&=6KffcO2Qx1?j7=LZA z?GQt`oD9QpXw+s7`t+eeLO$cpQpl9(6h3_l9a6OUpbwBasCeCw^UB6we!&h9Ik@1zvJ`j4i=tvG9X8o34+N|y(ay~ho$f=l z514~mP>Z>#6+UxM<6@4z*|hFJ?KnkQBs_9{H(-v!_#Vm6Z4(xV5WgWMd3mB9A(>@XE292#k(HdI7P zJkQ2)`bQXTKlr}{VrhSF5rK9TsjtGs0Rs&nUMcH@$ZX_`Hh$Uje*)(Wd&oLW($hZQ z_tPt`{O@f8hZ<}?aQc6~|9iHt>=!%We3=F9yIfiqhXqp=QUVa!@UY@IF5^dr5H8$R zIh{=%S{$BHG+>~a=vQ={!B9B=<-ID=nyjfA0V8->gN{jRL>Qc4Rc<86;~aY+R!~Vs zV7MI~gVzGIY`B*Tt@rZk#Lg}H8sL39OE31wr_Bm%mn}8n773R&N)8B;l+-eOD@N$l zh&~Wz`m1qavVdxwtZLACS(U{rAa0;}KzPq9r76xL?c{&GaG5hX_NK!?)iq`t7q*F# zFoKI{h{*8lb>&sOeHXoAiqm*vV6?C~5U%tXR8^XQ9Y|(XQvcz*>a?%HQ(Vy<2UhNf zVmGeOO#v159KV@1g`m%gJ)XGPLa`a|?9HSzSSX{j;)xg>G(Ncc7+C>AyAWYa(k}5B3mtzg4tsA=C^Wfezb1&LlyrBE1~kNfeiubLls{C)!<%#m@f}v^o+7<VZ6!FZ;JeiAG@5vw7Li{flC8q1%jD_WP2ApBI{fQ}kN zhvhmdZ0bb5(qK@VS5-)G+@GK(tuF6eJuuV5>)Odgmt?i_`tB69DWpC~e8gqh!>jr_ zL1~L0xw@CbMSTmQflpRyjif*Y*O-IVQ_OFhUw-zhPrXXW>6X}+73IoMsu2?uuK3lT>;W#38#qG5tDl66A7Y{mYh=jK8Se!+f=N7%nv zYSHr6a~Nxd`jqov9VgII{%EpC_jFCEc>>SND0;}*Ja8Kv;G)MK7?T~h((c&FEBcQq zvUU1hW2^TX(dDCeU@~a1LF-(+#lz3997A@pipD53&Dr@III2tlw>=!iGabjXzbyUJ z4Hi~M1KCT-5!NR#I%!2Q*A>mqI{dpmUa_mW)%SDs{Iw1LG}0y=wbj@0ba-`q=0!`5 zr(9q1p{#;Rv2CY!L#uTbs(UHVR5+hB@m*zEf4jNu3(Kj$WwW|v?YL*F_0x)GtQC~! zzrnZRmBmwt+i@uXnk05>uR5&1Ddsx1*WwMrIbPD3yU*2By`71pk@gt{|H0D<#B7&8 z2dVmXp*;B)SWY)U1VSNs4ds!yBAj;P=xtatUx^7_gC5tHsF#vvdV;NmKwmNa1GNWZ zi_Jn-B4GnJ%xcYWD5h$*z^haku#_Irh818x^KB)3-;ufjf)D0TE#6>|zFf@~pU;Rs zNw+}c9S+6aPzxkEA6R%s*xhJ37wmgc)-{Zd1&mD5QT}4BQvczWr-Xim>(P^)52`@R z9+Z}44203T5}`AM_G^Snp<_KKc!OrA(5h7{MT^$ZeDsSr(R@^kI?O;}QF)OU zQ9-`t^ys=6DzgLcWt0U{Q(FBs22=r zKD%fLQ^5ZF24c-Z)J{xv?x$&4VhO^mswyb4QTIofCvzq+27*WlYm;h@;Bq%i;{hZA zM97mHI6pP}XFo|^pRTuWQzQs3B-8kY@ajLV!Fb?OYAO3jFv*W-_;AXd;G!CbpZt04iW`Ie^_+cQZGY_Zd@P<*J9EdRsc>c=edf$K|;voXRJ zk*aC@@=MKwR120(%I_HX`3pJ+8GMeO>%30t?~uXT0O-Tu-S{JA;zHoSyXs?Z;fy58 zi>sFtI7hoxNAdOt#3#AWFDW)4EPr4kDYq^`s%JkuO7^efX+u#-qZ56aoRM!tC^P6O zP(cFuBnQGjhX(^LJ(^rVe4-_Vk*3PkBCj!?SsULdmVr0cGJM^=?8b0^DuOFq>0*yA zk1g|C7n%pMS0A8@Aintd$fvRbH?SNdRaFrfoAJ=NoX)G5Gr}3-$^IGF+eI&t{I-GT zp=1fj)2|*ur1Td)+s&w%p#E6tDXX3YYOC{HGHLiCvv?!%%3DO$B$>A}aC;8D0Ef#b z{7NNqC8j+%1n95zq8|hFY`afAB4E)w_&7?oqG0IPJZv)lr{MT}>9p?}Y`=n+^CZ6E zKkjIXPub5!82(B-O2xQojW^P(#Q*;ETpEr^+Wa=qDJ9_k=Wm@fZB6?b(u?LUzX(}+ zE6OyapdG$HC& z&;oa*ALoyIxVvB2cm_N&h&{3ZTuU|aBrJlGOLtZc3KDx)<{ z27@)~GtQF@%6B@w3emrGe?Cv_{iC@a#YO8~OyGRIvp@%RRKC?fclXMP*6GzBFO z5U4QK?~>AR>?KF@I;|(rx(rKxdT9-k-anYS+#S#e1SzKPslK!Z&r8iomPsWG#>`Ld zJ<#+8GFHE!^wsXt(s=CGfVz5K+FHYP5T0E*?0A-z*lNBf)${Y`>Gwc@?j5{Q|6;Bl zkHG1%r$r&O!N^><8AEL+=y(P$7E6hd=>BZ4ZZ9ukJ2*~HR4KGvUR~MUOe$d>E5UK3 z*~O2LK4AnED}4t1Fs$JgvPa*O+WeCji_cn1@Tv7XQ6l@($F1K%{E$!naeX)`bfCG> z8iD<%_M6aeD?a-(Qqu61&fzQqC(E8ksa%CulMnPvR35d{<`VsmaHyzF+B zF6a@1$CT0xGVjofcct4SyxA40uQ`b#9kI)& z?B67-12X-$v#Im4CVUGZHXvPWwuspJ610ITG*A4xMoRVXJl5xbk;OL(;}=+$9?H`b z>u2~yd~gFZ*V}-Q0K6E@p}mtsri&%Zep?ZrPJmv`Qo1>94Lo||Yl)nqwHXEbe)!g( zo`w|LU@H14VvmBjjkl~=(?b{w^G$~q_G(HL`>|aQR%}A64mv0xGHa`S8!*Wb*eB}` zZh)&rkjLK!Rqar)UH)fM<&h&@v*YyOr!Xk2OOMV%$S2mCRdJxKO1RL7xP_Assw)bb z9$sQ30bapFfYTS`i1PihJZYA#0AWNmp>x(;C!?}kZG7Aq?zp!B+gGyJ^FrXQ0E<>2 zCjqZ(wDs-$#pVYP3NGA=en<@_uz!FjFvn1&w1_Igvqs_sL>ExMbcGx4X5f%`Wrri@ z{&vDs)V!rd=pS?G(ricfwPSg(w<8P_6=Qj`qBC7_XNE}1_5>+GBjpURPmvTNE7)~r)Y>ZZecMS7Ro2` z0}nC_GYo3O7j|Wux?6-LFZs%1IV0H`f`l9or-8y0=5VGzjPqO2cd$RRHJIY06Cnh- ztg@Pn1OeY=W`1Mv3`Ti6!@QIT{qcC*&vptnX4Pt1O|dWv8u2s|(CkV`)vBjAC_U5` zCw1f&c4o;LbBSp0=*q z3Y^horBAnR)u=3t?!}e}14%K>^562K!)Vy6r~v({5{t#iRh8WIL|U9H6H97qX09xp zjb0IJ^9Lqxop<-P*VA0By@In*5dq8Pr3bTPu|ArID*4tWM7w+mjit0PgmwLV4&2PW z3MnIzbdR`3tPqtUICEuAH^MR$K_u8~-U2=N1)R=l>zhygus44>6V^6nJFbW-`^)f} zI&h$FK)Mo*x?2`0npTD~jRd}5G~-h8=wL#Y-G+a^C?d>OzsVl7BFAaM==(H zR;ARWa^C3J)`p~_&FRsxt|@e+M&!84`eq)@aO9yBj8iifJv0xVW4F&N-(#E=k`AwJ z3EFXWcpsRlB%l_0Vdu`0G(11F7( zsl~*@XP{jS@?M#ec~%Pr~h z2`M*lIQaolzWN&;hkR2*<=!ORL(>YUMxOzj(60rQfr#wTrkLO!t{h~qg% zv$R}0IqVIg1v|YRu9w7RN&Uh7z$ijV=3U_M(sa`ZF=SIg$uY|=NdC-@%HtkUSEqJv zg|c}mKTCM=Z8YmsFQu7k{VrXtL^!Cts-eb@*v0B3M#3A7JE*)MeW1cfFqz~^S6OXFOIP&iL;Vpy z4dWKsw_1Wn%Y;eW1YOfeP_r1s4*p1C(iDG_hrr~-I%kA>ErxnMWRYu{IcG{sAW;*t z9T|i4bI*g)FXPpKM@~!@a7LDVVGqF}C@mePD$ai|I>73B+9!Ks7W$pw;$W1B%-rb; zJ*-q&ljb=&41dJ^*A0)7>Wa@khGZ;q1fL(2qW=|38j43mTl_;`PEEw07VKY%71l6p z@F|jp88XEnm1p~<5c*cVXvKlj0{THF=n3sU7g>Ki&(ErR;!KSmfH=?49R5(|c_*xw z4$jhCJ1gWT6-g5EV)Ahg?Nw=}`iCyQ6@0DqUb%AZEM^C#?B-@Hmw?LhJ^^VU>&phJ zlB!n5&>I>@sndh~v$2I2Ue23F?0!0}+9H~jg7E`?CS_ERu75^jSwm%!FTAegT`6s7 z^$|%sj2?8wtPQR>@D3sA0-M-g-vL@47YCnxdvd|1mPymvk!j5W1jHnVB&F-0R5e-vs`@u8a5GKdv`LF7uCfKncI4+??Z4iG@AxuX7 z6+@nP^TZ5HX#*z(!y+-KJ3+Ku0M90BTY{SC^{ z&y2#RZPjfX_PE<<>XwGp;g4&wcXsQ0T&XTi(^f+}4qSFH1%^GYi+!rJo~t#ChTeAX zmR0w(iODzQOL+b&{1OqTh*psAb;wT*drr^LKdN?c?HJ*gJl+%kEH&48&S{s28P=%p z7*?(xFW_RYxJxxILS!kdLIJYu@p#mnQ(?moGD1)AxQd66X6b*KN?o&e`u9#N4wu8% z^Gw#G!@|>c740RXziOR=tdbkqf(v~wS_N^CS^1hN-N4{Dww1lvSWcBTX*&9}Cz|s@ z*{O@jZ4RVHq19(HC9xSBZI0M)E;daza+Q*zayrX~N5H4xJ33BD4gn5Ka^Hj{995z4 zzm#Eo?ntC$q1a?)dD$qaC_M{NW!5R!vVZ(XQqS67xR3KP?rA1^+s3M$60WRTVHeTH z6BJO$_jVx0EGPXy}XK_&x597 zt(o6ArN8vZX0?~(lFGHRtHP{gO0y^$iU6Xt2e&v&ugLxfsl;GD)nf~3R^ACqSFLQ< zV7`cXgry((wDMJB55a6D4J;13$z6pupC{-F+wpToW%k1qKjUS^$Mo zN3@}T!ZdpiV7rkNvqP3KbpEn|9aB;@V;gMS1iSb@ zwyD7!5mfj)q+4jE1dq3H`sEKgrVqk|y8{_vmn8bMOi873!rmnu5S=1=-DFx+Oj)Hi zx?~ToiJqOrvSou?RVALltvMADodC7BOg7pOyc4m&6yd(qIuV5?dYUpYzpTe!BuWKi zpTg(JHBYzO&X1e{5o|ZVU-X5e?<}mh=|eMY{ldm>V3NsOGwyxO2h)l#)rH@BI*TN; z`yW26bMSp=k6C4Ja{xB}s`dNp zE+41IwEwo>7*PA|7v-F#jLN>h#a`Er9_86!fwPl{6yWR|fh?c%qc44uP~Ocm2V*(* zICMpS*&aJjxutxKC0Tm8+FBz;3;R^=ajXQUB*nTN*Lb;mruQHUE<&=I7pZ@F-O*VMkJbI#FOrBM8`QEL5Uy=q5e2 z_BwVH%c0^uIWO0*_qD;0jlPoA@sI7BPwOr-mrp7y`|EF)j;$GYdOtEPFRAKyUuUZS z(N4)*6R*ux8s@pMdC*TP?Hx`Zh{{Ser;clg&}CXriXZCr2A!wIoh;j=_eq3_%n7V} za?{KhXg2cXPpKHc90t6=`>s@QF-DNcTJRvLTS)E2FTb+og(wTV7?$kI?QZYgVBn)& zdpJf@tZ{j>B;<MVHiPl_U&KlqBT)$ic+M0uUQWK|N1 zCMl~@o|}!!7yyT%7p#G4?T^Azxt=D(KP{tyx^lD_(q&|zNFgO%!i%7T`>mUuU^FeR zHP&uClWgXm6iXgI8*DEA!O&X#X(zdrNctF{T#pyax16EZ5Lt5Z=RtAja!x+0Z31U8 zjfaky?W)wzd+66$L>o`n;DISQNs09g{GAv%8q2k>2n8q)O^M}=5r#^WR^=se#WSCt zQ`7E1w4qdChz4r@v6hgR?nsaE7pg2B6~+i5 zcTTbBQ2ghUbC-PV(@xvIR(a>Kh?{%YAsMV#4gt1nxBF?$FZ2~nFLKMS!aK=(`WllA zHS<_7ugqKw!#0aUtQwd#A$8|kPN3Af?Tkn)dHF?_?r#X68Wj;|$aw)Wj2Dkw{6)*^ zZfy!TWwh=%g~ECDCy1s8tTgWCi}F1BvTJ9p3H6IFq&zn#3FjZoecA_L_bxGWgeQup zAAs~1IPCnI@H>g|6Lp^Bk)mjrA3_qD4(D(65}l=2RzF-8@h>|Aq!2K-qxt(Q9w7c^ z;gtx`I+=gKOl;h=#fzSgw-V*YT~2_nnSz|!9hIxFb{~dKB!{H zSi??dnmr@%(1w^Be=*Jz5bZeofEKKN&@@uHUMFr-DHS!pb1I&;x9*${bmg6=2I4Zt zHb5LSvojY7ubCNGhp)=95jQ00sMAC{IZdAFsN!lAVQDeiec^HAu=8);2AKqNTT!&E zo+FAR`!A1#T6w@0A+o%&*yzkvxsrqbrfVTG+@z8l4+mRi@j<&)U9n6L>uZoezW>qS zA4YfO;_9dQSyEYpkWnsk0IY}Nr2m(ql@KuQjLgY-@g z4=$uai6^)A5+~^TvLdvhgfd+y?@+tRE^AJabamheJFnpA#O*5_B%s=t8<;?I;qJ}j z&g-9?hbwWEez-!GIhqpB>nFvyi{>Yv>dPU=)qXnr;3v-cd`l}BV?6!v{|cHDOx@IG z;TSiQQ(8=vlH^rCEaZ@Yw}?4#a_Qvx=}BJuxACxm(E7tP4hki^jU@8A zUS|4tTLd)gr@T|F$1eQXPY%fXb7u}(>&9gsd3It^B{W#6F2_g40cgo1^)@-xO&R5X z>qKon+Nvp!4v?-rGQu#M_J2v+3e+?N-WbgPQWf`ZL{Xd9KO^s{uIHTJ6~@d=mc7i z+##ya1p+ZHELmi%3C>g5V#yZt*jMv( zc{m*Y;7v*sjVZ-3mBuaT{$g+^sbs8Rp7BU%Ypi+c%JxtC4O}|9pkF-p-}F{Z7-+45 zDaJQx&CNR)8x~0Yf&M|-1rw%KW3ScjWmKH%J1fBxUp(;F%E+w!U470e_3%+U_q7~P zJm9VSWmZ->K`NfswW(|~fGdMQ!K2z%k-XS?Bh`zrjZDyBMu74Fb4q^A=j6+Vg@{Wc zPRd5Vy*-RS4p1OE-&8f^Fo}^yDj$rb+^>``iDy%t)^pHSV=En5B5~*|32#VkH6S%9 zxgIbsG+|{-$v7mhOww#v-ejaS>u(9KV9_*X!AY#N*LXIxor9hDv%aie@+??X6@Et=xz>6ev9U>6Pn$g4^!}w2Z%Kpqpp+M%mk~?GE-jL&0xLC zy(`*|&gm#mLeoRU8IU?Ujsv=;ab*URmsCl+r?%xcS1BVF*rP}XRR%MO_C!a9J^fOe>U;Y&3aj3 zX`3?i12*^W_|D@VEYR;h&b^s#Kd;JMNbZ#*x8*ZXm(jgw3!jyeHo14Zq!@_Q`V;Dv zKik~!-&%xx`F|l^z2A92aCt4x*I|_oMH9oeqsQgQDgI0j2p!W@BOtCTK8Jp#txi}7 z9kz);EX-2~XmxF5kyAa@n_$YYP^Hd4UPQ>O0-U^-pw1*n{*kdX`Jhz6{!W=V8a$0S z9mYboj#o)!d$gs6vf8I$OVOdZu7L5%)Vo0NhN`SwrQFhP3y4iXe2uV@(G{N{yjNG( zKvcN{k@pXkxyB~9ucR(uPSZ7{~sC=lQtz&V(^A^HppuN!@B4 zS>B=kb14>M-sR>{`teApuHlca6YXs6&sRvRV;9G!XI08CHS~M$=%T~g5Xt~$exVk` zWP^*0h{W%`>K{BktGr@+?ZP}2t0&smjKEVw@3=!rSjw5$gzlx`{dEajg$A58m|Okx zG8@BTPODSk@iqLbS*6>FdVqk}KKHuAHb0UJNnPm!(XO{zg--&@#!niF4T!dGVdNif z3_&r^3+rfQuV^8}2U?bkI5Ng*;&G>(O4&M<86GNxZK{IgKNbRfpg>+32I>(h`T&uv zUN{PRP&onFj$tn1+Yh|0AF330en{b~R+#i9^QIbl9fBv>pN|k&IL2W~j7xbkPyTL^ z*TFONZUS2f33w3)fdzr?)Yg;(s|||=aWZV(nkDaACGSxNCF>XLJSZ=W@?$*` z#sUftY&KqTV+l@2AP5$P-k^N`Bme-xcWPS|5O~arUq~%(z8z87JFB|llS&h>a>Som zC34(_uDViE!H2jI3<@d+F)LYhY)hoW6)i=9u~lM*WH?hI(yA$X#ip}yYld3RAv#1+sBt<)V_9c4(SN9Fn#$}_F}A-}P>N+8io}I3mh!}> z*~*N}ZF4Zergb;`R_g49>ZtTCaEsCHiFb(V{9c@X0`YV2O^@c6~LXg2AE zhA=a~!ALnP6aO9XOC^X15(1T)3!1lNXBEVj5s*G|Wm4YBPV`EOhU&)tTI9-KoLI-U zFI@adu6{w$dvT(zu*#aW*4F=i=!7`P!?hZy(9iL;Z^De3?AW`-gYTPALhrZ*K2|3_ zfz;6xQN9?|;#_U=4t^uS2VkQ8$|?Ub5CgKOj#Ni5j|(zX>x#K(h7LgDP-QHwok~-I zOu9rn%y97qrtKdG=ep)4MKF=TY9^n6CugQ3#G2yx;{))hvlxZGE~rzZ$qEHy-8?pU#G;bwufgSN6?*BeA!7N3RZEh{xS>>-G1!C(e1^ zzd#;39~PE_wFX3Tv;zo>5cc=md{Q}(Rb?37{;YPtAUGZo7j*yHfGH|TOVR#4ACaM2 z;1R0hO(Gl}+0gm9Bo}e@lW)J2OU4nukOTVKshHy7u)tLH^9@QI-jAnDBp(|J8&{fKu=_97$v&F67Z zq+QsJ=gUx3_h_%=+q47msQ*Ub=gMzoSa@S2>`Y9Cj*@Op4plTc!jDhu51nSGI z^sfZ(4=yzlR}kP2rcHRzAY9@T7f`z>fdCU0zibx^gVg&fMkcl)-0bRyWe12bT0}<@ z^h(RgGqS|1y#M;mER;8!CVmX!j=rfNa6>#_^j{^C+SxGhbSJ_a0O|ae!ZxiQCN2qA zKs_Z#Zy|9BOw6x{0*APNm$6tYVG2F$K~JNZ!6>}gJ_NLRYhcIsxY1z~)mt#Yl0pvC zO8#Nod;iow5{B*rUn(0WnN_~~M4|guwfkT(xv;z)olmj=f=aH#Y|#f_*d1H!o( z!EXNxKxth9w1oRr0+1laQceWfgi8z`YS#uzg#s9-QlTT7y2O^^M1PZx z3YS7iegfp6Cs0-ixlG93(JW4wuE7)mfihw}G~Uue{Xb+#F!BkDWs#*cHX^%(We}3% zT%^;m&Juw{hLp^6eyM}J({luCL_$7iRFA6^8B!v|B9P{$42F>|M`4Z_yA{kK()WcM zu#xAZWG%QtiANfX?@+QQOtbU;Avr*_>Yu0C2>=u}zhH9VLp6M>fS&yp*-7}yo8ZWB z{h>ce@HgV?^HgwRThCYnHt{Py0MS=Ja{nIj5%z;0S@?nGQ`z`*EVs&WWNwbzlk`(t zxDSc)$dD+4G6N(p?K>iEKXIk>GlGKTH{08WvrehnHhh%tgpp&8db4*FLN zETA@<$V=I7S^_KxvYv$Em4S{gO>(J#(Wf;Y%(NeECoG3n+o;d~Bjme-4dldKukd`S zRVAnKxOGjWc;L#OL{*BDEA8T=zL8^`J=2N)d&E#?OMUqk&9j_`GX*A9?V-G zdA5QQ#(_Eb^+wDkDiZ6RXL`fck|rVy%)BVv;dvY#`msZ}{x5fmd! zInmWSxvRgXbJ{unxAi*7=Lt&7_e0B#8M5a=Ad0yX#0rvMacnKnXgh>4iiRq<&wit93n!&p zeq~-o37qf)L{KJo3!{l9l9AQb;&>)^-QO4RhG>j`rBlJ09~cbfNMR_~pJD1$UzcGp zOEGTzz01j$=-kLC+O$r8B|VzBotz}sj(rUGOa7PDYwX~9Tum^sW^xjjoncxSz;kqz z$Pz$Ze|sBCTjk7oM&`b5g2mFtuTx>xl{dj*U$L%y-xeQL~|i>KzdUHeep-Yd@}p&L*ig< zgg__3l9T=nbM3bw0Sq&Z2*FA)P~sx0h634BXz0AxV69cED7QGTbK3?P?MENkiy-mV zZ1xV5ry3zIpy>xmThBL0Q!g+Wz@#?6fYvzmEczs(rcujrfCN=^!iWQ6$EM zaCnRThqt~gI-&6v@KZ78unqgv9j6-%TOxpbV`tK{KaoBbhc}$h+rK)5h|bT6wY*t6st-4$e99+Egb#3ip+ERbve08G@Ref&hP)qB&?>B94?eq5i3k;dOuU#!y-@+&5>~!FZik=z4&4|YHy=~!F254 zQAOTZr26}Nc7jzgJ;V~+9ry#?7Z0o*;|Q)k+@a^87lC}}1C)S))f5tk+lMNqw>vh( z`A9E~5m#b9!ZDBltf7QIuMh+VheCoD7nCFhuzThlhA?|8NCt3w?oWW|NDin&&eDU6 zwH`aY=))lpWG?{fda=-auXYp1WIPu&3 zwK|t(Qiqvc@<;1_W#ALDJ}bR;3&v4$9rP)eAg`-~iCte`O^MY+SaP!w%~+{{1tMo` zbp?T%ENs|mHP)Lsxno=nWL&qizR+!Ib=9i%4=B@(Umf$|7!WVxkD%hfRjvxV`Co<; zG*g4QG_>;RE{3V_DOblu$GYm&!+}%>G*yO{-|V9GYG|bH2JIU2iO}ZvY>}Fl%1!OE zZFsirH^$G>BDIy`8;R?lZl|uu@qWj2T5}((RG``6*05AWsVVa2Iu>!F5U>~7_Tlv{ zt=Dpgm~0QVa5mxta+fUt)I0gToeEm9eJX{yYZ~3sLR&nCuyuFWuiDIVJ+-lwViO(E zH+@Rg$&GLueMR$*K8kOl>+aF84Hss5p+dZ8hbW$=bWNIk0paB!qEK$xIm5{*^ad&( zgtA&gb&6FwaaR2G&+L+Pp>t^LrG*-B&Hv;-s(h0QTuYWdnUObu8LRSZoAVd7SJ;%$ zh%V?58mD~3G2X<$H7I)@x?lmbeeSY7X~QiE`dfQ5&K^FB#9e!6!@d9vrSt!);@ZQZ zO#84N5yH$kjm9X4iY#f+U`FKhg=x*FiDoUeu1O5LcC2w&$~5hKB9ZnH+8BpbTGh5T zi_nfmyQY$vQh%ildbR7T;7TKPxSs#vhKR|uup`qi1PufMa(tNCjRbllakshQgn1)a8OO-j8W&aBc_#q1hKDF5-X$h`!CeT z+c#Ial~fDsGAenv7~f@!icm(~)a3OKi((=^zcOb^qH$#DVciGXslUwTd$gt{7)&#a`&Lp ze%AnL0#U?lAl8vUkv$n>bxH*`qOujO0HZkPWZnE0;}0DSEu1O!hg-d9#{&#B1Dm)L zvN%r^hdEt1vR<4zwshg*0_BNrDWjo65be1&_82SW8#iKWs7>TCjUT;-K~*NxpG2P% zovXUo@S|fMGudVSRQrP}J3-Wxq;4xIxJJC|Y#TQBr>pwfy*%=`EUNE*dr-Y?9y9xK zmh1zS@z{^|UL}v**LNYY!?1qIRPTvr!gNXzE{%=-`oKclPrfMKwn` zUwPeIvLcxkIV>(SZ-SeBo-yw~{p!<&_}eELG?wxp zee-V59%@BtB+Z&Xs=O(@P$}v_qy1m=+`!~r^aT> zY+l?+6(L-=P%m4ScfAYR8;f9dyVw)@(;v{|nO#lAPI1xDHXMYt~-BGiP&9y2OQsYdh7-Q1(vL<$u6W0nxVn-qh=nwuRk}{d!uACozccRGx6~xZQ;=#JCE?OuA@;4 zadp$sm}jfgW4?La(pb!3f0B=HUI{5A4b$2rsB|ZGb?3@CTA{|zBf07pYpQ$NM({C6Srv6%_{rVkCndT=1nS}qyEf}Wjtg$e{ng7Wgz$7itYy0sWW_$qld);iUm85GBH)fk3b=2|5mvflm?~inoVo zDH_%e;y`DzoNj|NgZ`U%a9(N*=~8!qqy0Etkxo#`r!!{|(NyT0;5= z8nVZ6AiM+SjMG8J@6c4_f-KXd_}{My?Se1GWP|@wROFpD^5_lu?I%CBzpwi(`x~xh B8dv}T delta 17845 zcmV)CK*GO}(F4QI1F(Jx4W$DjNjn4p0N4ir06~)x5+0MO2`GQvQyWzj|J`gh3(E#l zNGO!HfVMRRN~%`0q^)g%XlN*vP!O#;m*h5VyX@j-1N|HN;8S1vqEAj=eCdn`)tUB9 zXZjcT^`bL6qvL}gvXj%9vrOD+x!Gc_0{$Zg+6lTXG$bmoEBV z*%y^c-mV0~Rjzv%e6eVI)yl>h;TMG)Ft8lqpR`>&IL&`>KDi5l$AavcVh9g;CF0tY zw_S0eIzKD?Nj~e4raA8wxiiImTRzv6;b6|LFmw)!E4=CiJ4I%&axSey4zE-MIh@*! z*P;K2Mx{xVYPLeagKA}Hj=N=1VrWU`ukuBnc14iBG?B}Uj>?=2UMk4|42=()8KOnc zrJzAxxaEIfjw(CKV6F$35u=1qyf(%cY8fXaS9iS?yetY{mQ#Xyat*7sSoM9fJlZqq zyasQ3>D>6p^`ck^Y|kYYZB*G})uAbQ#7)Jeb~glGz@2rPu}zBWDzo5K$tP<|meKV% z{Swf^eq6NBioF)v&~9NLIxHMTKe6gJ@QQ^A6fA!n#u1C&n`aG7TDXKM1Jly-DwTB` z+6?=Y)}hj;C#r5>&x;MCM4U13nuXVK*}@yRY~W3X%>U>*CB2C^K6_OZsXD!nG2RSX zQg*0)$G3%Es$otA@p_1N!hIPT(iSE=8OPZG+t)oFyD~{nevj0gZen$p>U<7}uRE`t5Mk1f4M0K*5 zbn@3IG5I2mk;8K>*RZ zPV6iL006)S001s%0eYj)9hu1 z9o)iQT9(v*sAuZ|ot){RrZ0Qw4{E0A+!Yx_M~#Pj&OPUM&i$RU=Uxu}e*6Sr2ror= z&?lmvFCO$)BY+^+21E>ENWe`I0{02H<-lz&?})gIVFyMWxX0B|0b?S6?qghp3lDgz z2?0|ALJU=7s-~Lb3>9AA5`#UYCl!Xeh^i@bxs5f&SdiD!WN}CIgq&WI4VCW;M!UJL zX2};d^sVj5oVl)OrkapV-C&SrG)*x=X*ru!2s04TjZ`pY$jP)4+%)7&MlpiZ`lgoF zo_p>^4qGz^(Y*uB10dY2kcIbt=$FIdYNqk;~47wf@)6|nJp z1cocL3zDR9N2Pxkw)dpi&_rvMW&Dh0@T*_}(1JFSc0S~Ph2Sr=vy)u*=TY$i_IHSo zR+&dtWFNxHE*!miRJ%o5@~GK^G~4$LzEYR-(B-b(L*3jyTq}M3d0g6sdx!X3-m&O% zK5g`P179KHJKXpIAAX`A2MFUA;`nXx^b?mboVbQgigIHTU8FI>`q53AjWaD&aowtj z{XyIX>c)*nLO~-WZG~>I)4S1d2q@&?nwL)CVSWqWi&m1&#K1!gt`g%O4s$u^->Dwq ziKc&0O9KQ7000OG0000%03-m(e&Y`S09YWC4iYDSty&3q8^?8ij|8zxaCt!zCFq1@ z9TX4Hl68`nY>}cQNW4Ullqp$~SHO~l1!CdFLKK}ij_t^a?I?C^CvlvnZkwiVn>dl2 z2$V(JN{`5`-8ShF_ek6HNRPBlPuIPYu>TAeAV5O2)35r3*_k(Q-h1+h5pb(Zu%oJ__pBsW0n5ILw`!&QR&YV`g0Fe z(qDM!FX_7;`U3rxX#QHT{f%h;)Eursw=*#qvV)~y%^Uo^% zi-%sMe^uz;#Pe;@{JUu05zT*i=u7mU9{MkT`ft(vPdQZoK&2mg=tnf8FsaNQ+QcPg zB>vP8Rd6Z0JoH5_Q`zldg;hx4azQCq*rRZThqlqTRMzn1O3_rQTrHk8LQ<{5UYN~` zM6*~lOGHyAnx&#yCK{i@%N1Us@=6cw=UQxpSE;<(LnnES%6^q^QhBYQ-VCSmIu8wh z@_LmwcFDfAhIn>`%h7L{)iGBzu`Md4dj-m3C8mA9+BL*<>q z#$7^ttIBOE-=^|zmG`K8yUKT{yjLu2SGYsreN0*~9yhFxn4U};Nv1XXj1fH*v-g=3 z@tCPc`YdzQGLp%zXwo*o$m9j-+~nSWls#s|?PyrHO%SUGdk**X9_=|b)Y%^j_V$3S z>mL2A-V)Q}qb(uZipEFVm?}HWc+%G6_K+S+87g-&RkRQ8-{0APDil115eG|&>WQhU zufO*|e`hFks^cJJmx_qNx{ltSp3aT|XgD5-VxGGXb7gkiOG$w^qMVBDjR8%!Sbh72niHRDV* ziFy8LE+*$j?t^6aZP9qt-ow;hzkmhvy*Hn-X^6?yVMbtNbyqZQ^rXg58`gk+I%Wv} zn_)dRq+3xjc8D%}EQ%nnTF7L7m}o9&*^jf`_qvUhVKY7w9Zgxr-0YHWFRd3$l_6UX zpXt^U&TiC*qZWx#pOG6k?3Tg)pra*fw(O6_45>lUBN1U5Qmc>^DHt)5b~Ntjsw!NI z1n4{$HWFeIi)*qvgK^ui;(81VQc1(wJ8C#tjR>Dkjf{xYC^_B^#qrdCc)uZxtgua6 zk98UGQF|;;k`c+0_z)tQ&9DwLB~&12@D1!*mTz_!3Mp=cg;B7Oq4cKN>5v&dW7q@H zal=g6Ipe`siZN4NZiBrkJCU*x216gmbV(FymgHuG@%%|8sgD?gR&0*{y4n=pukZnd z4=Nl~_>jVfbIehu)pG)WvuUpLR}~OKlW|)=S738Wh^a&L+Vx~KJU25o6%G7+Cy5mB zgmYsgkBC|@K4Jm_PwPoz`_|5QSk}^p`XV`649#jr4Lh^Q>Ne~#6Cqxn$7dNMF=%Va z%z9Ef6QmfoXAlQ3)PF8#3Y% zadcE<1`fd1&Q9fMZZnyI;&L;YPuy#TQ8b>AnXr*SGY&xUb>2678A+Y z8K%HOdgq_4LRFu_M>Ou|kj4W%sPPaV)#zDzN~25klE!!PFz_>5wCxglj7WZI13U5| zEq_YLKPH;v8sEhyG`dV_jozR);a6dBvkauhC;1dk%mr+J*Z6MMH9jqxFk@)&h{mHl zrf^i_d-#mTF=6-T8Rk?(1+rPGgl$9=j%#dkf@x6>czSc`jk7$f!9SrV{do%m!t8{? z_iAi$Qe&GDR#Nz^#uJ>-_?(E$ns)(3)X3cYY)?gFvU+N>nnCoBSmwB2<4L|xH19+4 z`$u#*Gt%mRw=*&|em}h_Y`Pzno?k^8e*hEwfM`A_yz-#vJtUfkGb=s>-!6cHfR$Mz z`*A8jVcz7T{n8M>ZTb_sl{EZ9Ctau4naX7TX?&g^VLE?wZ+}m)=YW4ODRy*lV4%-0 zG1XrPs($mVVfpnqoSihnIFkLdxG9um&n-U|`47l{bnr(|8dmglO7H~yeK7-wDwZXq zaHT($Qy2=MMuj@lir(iyxI1HnMlaJwpX86je}e=2n|Esb6hB?SmtDH3 z2qH6o`33b{;M{mDa5@@~1or8+Zcio*97pi1Jkx6v5MXCaYsb~Ynq)eWpKnF{n)FXZ z?Xd;o7ESu&rtMFr5(yJ(B7V>&0gnDdL*4MZH&eO+r*t!TR98ssbMRaw`7;`SLI8mT z=)hSAt~F=mz;JbDI6g~J%w!;QI(X14AnOu;uve^4wyaP3>(?jSLp+LQ7uU(iib%IyB(d&g@+hg;78M>h7yAeq$ALRoHGkKXA+E z$Sk-hd$Fs2nL4w9p@O*Y$c;U)W#d~)&8Js;i^Dp^* z0*7*zEGj~VehF4sRqSGny*K_CxeF=T^8;^lb}HF125G{kMRV?+hYktZWfNA^Mp7y8 zK~Q?ycf%rr+wgLaHQ|_<6z^eTG7izr@99SG9Q{$PCjJabSz`6L_QJJe7{LzTc$P&pwTy<&3RRUlSHmK;?}=QAhQaDW3#VWcNAH3 zeBPRTDf3?3mfdI$&WOg(nr9Gyzg`&u^o!f2rKJ57D_>p z6|?Vg?h(@(*X=o071{g^le>*>qSbVam`o}sAK8>b|11%e&;%`~b2OP7--q%0^2YDS z`2M`{2QYr1VC)sIW9WOu8<~7Q>^$*Og{KF+kI;wFegvaIDkB%3*%PWtWKSq7l`1YcDxQQ2@nv{J!xWV?G+w6C zhUUxUYVf%(Q(40_xrZB@rbxL=Dj3RV^{*yHd>4n-TOoHVRnazDOxxkS9kiZyN}IN3 zB^5N=* zRSTO+rA<{*P8-$GZdyUNOB=MzddG$*@q>mM;pUIiQ_z)hbE#Ze-IS)9G}Rt$5PSB{ zZZ;#h9nS7Rf1ecW&n(Gpu9}{vXQZ-f`UHIvD?cTbF`YvH*{rgE(zE22pLAQfhg-`U zuh612EpByB(~{w7svCylrBk%5$LCIyuhrGi=yOfca`=8ltKxHcSNfDRt@62QH^R_0 z&eQL6rRk>Dvf6rjMQv5ZXzg}S`HqV69hJT^pPHtdhqsrPJWs|IT9>BvpQa@*(FX6v zG}TYjreQCnH(slMt5{NgUf)qsS1F&Bb(M>$X}tWI&yt2I&-rJbqveuj?5J$`Dyfa2 z)m6Mq0XH@K)Y2v8X=-_4=4niodT&Y7W?$KLQhjA<+R}WTdYjX9>kD+SRS^oOY1{A= zZTId-(@wF^UEWso($wZtrs%e7t<}YaC_;#@`r0LUzKY&|qPJz*y~RHG`E6bypP5AX zN!p0^AUu8uDR>xM-ALFzBxXM~Q3z=}fHWCIG>0&I6x2Iu7&U)49j7qeMI&?qb$=4I zdMmhAJrO%@0f%YW! z^gLByEGSk+R0v4*d4w*N$Ju6z#j%HBI}6y$2en=-@S3=6+yZX94m&1j@s- z7T6|#0$c~dYq9IkA!P)AGkp~S$zYJ1SXZ#RM0|E~Q0PSm?DsT4N3f^)b#h(u9%_V5 zX*&EIX|gD~P!vtx?ra71pl%v)F!W~X2hcE!h8cu@6uKURdmo1-7icN4)ej4H1N~-C zjXgOK+mi#aJv4;`DZ%QUbVVZclkx;9`2kgbAhL^d{@etnm+5N8pB#fyH)bxtZGCAv z(%t0kPgBS{Q2HtjrfI0B$$M0c?{r~2T=zeXo7V&&aprCzww=i*}Atu7g^(*ivauMz~kkB%Vt{Wydlz%%2c26%>0PAbZO zVHx%tK(uzDl#ZZK`cW8TD2)eD77wB@gum{B2bO_jnqGl~01EF_^jx4Uqu1yfA~*&g zXJ`-N?D-n~5_QNF_5+Un-4&l$1b zVlHFqtluoN85b^C{A==lp#hS9J(npJ#6P4aY41r) zzCmv~c77X5L}H%sj>5t&@0heUDy;S1gSOS>JtH1v-k5l}z2h~i3^4NF6&iMb;ZYVE zMw*0%-9GdbpF1?HHim|4+)Zed=Fk<2Uz~GKc^P(Ig@x0&XuX0<-K(gA*KkN&lY2Xu zG054Q8wbK~$jE32#Ba*Id2vkqmfV{U$Nx9vJ;jeI`X+j1kh7hB8$CBTe@ANmT^tI8 z%U>zrTKuECin-M|B*gy(SPd`(_xvxjUL?s137KOyH>U{z01cBcFFt=Fp%d+BK4U;9 zQG_W5i)JASNpK)Q0wQpL<+Ml#cei41kCHe&P9?>p+KJN>I~`I^vK1h`IKB7k^xi`f z$H_mtr_+@M>C5+_xt%v}{#WO{86J83;VS@Ei3JLtp<*+hsY1oGzo z0?$?OJO$79;{|@aP!fO6t9TJ!?8i&|c&UPWRMbkwT3nEeFH`Yyyh6b%Rm^nBuTt@9 z+$&-4lf!G|@LCo3<8=yN@5dYbc%uq|Hz|0tiiLQKiUoM9g14zyECKGv0}3AWv2WJ zUAXGUhvkNk`0-H%ACsRSmy4fJ@kxBD3ZKSj6g(n1KPw?g{v19phcBr3BEF>J%lL|d zud3LNuL;cR*xS+;X+N^Br+x2{&hDMhb-$6_fKU(Pt0FQUXgNrZvzsVCnsFqv?#L z4-FYsQ-?D>;LdjHu_TT1CHN~aGkmDjWJkJg4G^!+V_APd%_48tErDv6BW5;ji^UDD zRu5Sw7wwplk`w{OGEKWJM&61c-AWn!SeUP8G#+beH4_Ov*)NUV?eGw&GHNDI6G(1Y zTfCv?T*@{QyK|!Q09wbk5koPD>=@(cA<~i4pSO?f(^5sSbdhUc+K$DW#_7^d7i%At z?KBg#vm$?P4h%?T=XymU;w*AsO_tJr)`+HUll+Uk_zx6vNw>G3jT){w3ck+Z=>7f0 zZVkM*!k^Z_E@_pZK6uH#|vzoL{-j1VFlUHP&5~q?j=UvJJNQG ztQdiCF$8_EaN_Pu8+afN6n8?m5UeR_p_6Log$5V(n9^W)-_vS~Ws`RJhQNPb1$C?| zd9D_ePe*`aI9AZ~Ltbg)DZ;JUo@-tu*O7CJ=T)ZI1&tn%#cisS85EaSvpS~c#CN9B z#Bx$vw|E@gm{;cJOuDi3F1#fxWZ9+5JCqVRCz5o`EDW890NUfNCuBn)3!&vFQE{E$L`Cf7FMSSX%ppLH+Z}#=p zSow$)$z3IL7frW#M>Z4|^9T!=Z8}B0h*MrWXXiVschEA=$a|yX9T~o!=%C?T+l^Cc zJx&MB$me(a*@lLLWZ=>PhKs!}#!ICa0! zq%jNgnF$>zrBZ3z%)Y*yOqHbKzEe_P=@<5$u^!~9G2OAzi#}oP&UL9JljG!zf{JIK z++G*8j)K=$#57N)hj_gSA8golO7xZP|KM?elUq)qLS)i(?&lk{oGMJh{^*FgklBY@Xfl<_Q zXP~(}ST6V01$~VfOmD6j!Hi}lsE}GQikW1YmBH)`f_+)KI!t#~B7=V;{F*`umxy#2Wt8(EbQ~ks9wZS(KV5#5Tn3Ia90r{}fI%pfbqBAG zhZ)E7)ZzqA672%@izC5sBpo>dCcpXi$VNFztSQnmI&u`@zQ#bqFd9d&ls?RomgbSh z9a2rjfNiKl2bR!$Y1B*?3Ko@s^L5lQN|i6ZtiZL|w5oq%{Fb@@E*2%%j=bcma{K~9 z*g1%nEZ;0g;S84ZZ$+Rfurh;Nhq0;{t~(EIRt}D@(Jb7fbe+_@H=t&)I)gPCtj*xI z9S>k?WEAWBmJZ|gs}#{3*pR`-`!HJ)1Dkx8vAM6Tv1bHZhH=MLI;iC#Y!$c|$*R>h zjP{ETat(izXB{@tTOAC4nWNhh1_%7AVaf!kVI5D=Jf5I1!?}stbx_Yv23hLf$iUTb z-)WrTtd2X+;vBW_q*Z6}B!10fs=2FA=3gy*dljsE43!G*3Uw(Is>(-a*5E!T4}b-Y zfvOC)-HYjNfcpi`=kG%(X3XcP?;p&=pz+F^6LKqRom~pA}O* zitR+Np{QZ(D2~p_Jh-k|dL!LPmexLM?tEqI^qRDq9Mg z5XBftj3z}dFir4oScbB&{m5>s{v&U=&_trq#7i&yQN}Z~OIu0}G)>RU*`4<}@7bB% zKYxGx0#L#u199YKSWZwV$nZd>D>{mDTs4qDNyi$4QT6z~D_%Bgf?>3L#NTtvX;?2D zS3IT*2i$Snp4fjDzR#<)A``4|dA(}wv^=L?rB!;kiotwU_gma`w+@AUtkSyhwp{M} z!e`jbUR3AG4XvnBVcyIZht6Vi~?pCC!$XF2 z*V~)DBVm8H7$*OZQJYl3482hadhsI2NCz~_NINtpC?|KI6H3`SG@1d%PsDdw{u}hq zN;OU~F7L1jT&KAitilb&Fl3X12zfSuFm;X)xQWOHL&7d)Q5wgn{78QJ6k5J;is+XP zCPO8_rlGMJB-kuQ*_=Yo1TswG4xnZd&eTjc8=-$6J^8TAa~kEnRQ@Zp-_W&B(4r@F zA==}0vBzsF1mB~743XqBmL9=0RSkGn$cvHf*hyc{<2{@hW+jKjbC|y%CNupHY_NC% zivz^btBLP-cDyV8j>u)=loBs>HoI5ME)xg)oK-Q0wAy|8WD$fm>K{-`0|W{H00;;G z000j`0OWQ8aHA9e04^;603eeQIvtaXMG=2tcr1y8Fl-J;AS+=<0%DU8Bp3oEEDhA^ zOY)M8%o5+cF$rC?trfMcty*f)R;^v=f~}||Xe!#;T3eTDZELN&-50xk+J1heP5AQ>h5O#S_uO;O@;~REd*_G$x$hVeE#bchX)otXQy|S5(oB)2a2%Sc(iDHm z=d>V|a!BLp9^#)o7^EQ2kg=K4%nI^sK2w@-kmvB+ARXYdq?xC2age6)e4$^UaY=wn zgLD^{X0A+{ySY+&7RpldwpC6=E zSPq?y(rl8ZN%(A*sapd4PU+dIakIwT0=zxIJEUW0kZSo|(zFEWdETY*ZjIk9uNMUA ze11=mHu8lUUlgRx!hItf0dAF#HfdIB+#aOuY--#QN9Ry zbx|XkG?PrBb@l6Owl{9Oa9w{x^R}%GwcEEfY;L-6OU8|9RXvu`-ECS`jcO1x1MP{P zcr;Bw##*Dod9K@pEx9z9G~MiNi>8v1OU-}vk*HbI)@CM? zn~b=jWUF%HP=CS+VCP>GiAU_UOz$aq3%%Z2laq^Gx`WAEmuNScCN)OlW>YHGYFgV2 z42lO5ZANs5VMXLS-RZTvBJkWy*OeV#L;7HwWg51*E|RpFR=H}h(|N+79g)tIW!RBK ze08bg^hlygY$C2`%N>7bDm`UZ(5M~DTanh3d~dg+OcNdUanr8azO?})g}EfnUB;5- zE1FX=ru?X=zAk4_6@__o1fE+ml1r&u^f1Kb24Jf-)zKla%-dbd>UZ1 zrj3!RR!Jg`ZnllKJ)4Yfg)@z>(fFepeOcp=F-^VHv?3jSxfa}-NB~*qkJ5Uq(yn+( z<8)qbZh{C!xnO@-XC~XMNVnr-Z+paowv!$H7>`ypMwA(X4(knx7z{UcWWe-wXM!d? zYT}xaVy|7T@yCbNOoy)$D=E%hUNTm(lPZqL)?$v+-~^-1P8m@Jm2t^L%4#!JK#Vtg zyUjM+Y*!$);1<)0MUqL00L0*EZcsE&usAK-?|{l|-)b7|PBKl}?TM6~#j9F+eZq25_L&oSl}DOMv^-tacpDI)l*Ws3u+~jO@;t(T)P=HCEZ#s_5q=m zOsVY!QsOJn)&+Ge6Tm)Ww_Bd@0PY(78ZJ)7_eP-cnXYk`>j9q`x2?Xc6O@55wF+6R zUPdIX!2{VGA;FSivN@+;GNZ7H2(pTDnAOKqF*ARg+C54vZ@Ve`i?%nDDvQRh?m&`1 zq46gH)wV=;UrwfCT3F(m!Q5qYpa!#f6qr0wF=5b9rk%HF(ITc!*R3wIFaCcftGwPt z(kzx{$*>g5L<;u}HzS4XD%ml zmdStbJcY@pn`!fUmkzJ8N>*8Y+DOO^r}1f4ix-`?x|khoRvF%jiA)8)P{?$8j2_qN zcl3Lm9-s$xdYN9)>3j6BPFK)Jbovl|Sf_p((CHe!4hx@F)hd&&*Xb&{TBj>%pT;-n z{3+hA^QZYnjXxtF2XwxPZ`S#J8h>5qLwtwM-{5abbEnRS z`9_`Zq8FJiI#0syE_V_3M&trw$P=ezkHosV$8&I5c0(*-9KBE5DJOC-Xv zw}1bq~AD0_Xerm`%ryiG9_$S z5G|btfiAUNdV09SO2l9v+e#(H6HYOdQs=^ z@xwZQU)~;p1L*~ciC}9ao{nQ-@B>rpUzKBxv=cUusOP5Trs3QnvHxGh9e>s7AM{V1|HfYe z3QwH;nHHR49fYzuGc3W3l5xrDAI392SFXx>lWE3V9Ds9il3PyZaN5>oC3>9W-^7vC z3~KZ-@iD?tIkhg+6t{m;RGk2%>@I0&kf)o$+-^ls0(YABNbM(=l#ad@nKp_j=b~Xs ziR;xu_+)lxy6|+af!@}gO2H_x)p;nZ-tYxW5Omq=l`GzMp*GTLr>vZN1?e}^C$t*Z zvzEdIc2|HA2RFN_4#EkzMqKnbbw!?!?%B@M0^^5Z;K?x-%lg?Z>}wMV8zEqHZ$cr~Y#Wv>9+)KMUZatUqbRU8 z8t9qrek(H^C0Tuzq|cP2$WL7tzj+Dj5y^2SF1D154CnsB$xbz`$wV||n-cG%rsT$p z+3RHdadK(3-noj(2L#8c5lODg)V8pv(GEnNb@F>dEHQr>!qge@L>#qg)RAUtiOYqF ziiV_ETExwD)bQ<))?-9$)E(FiRBYyC@}issHS!j9n)~I1tarxnQ2LfjdIJ)*jp{0E z&1oTd%!Qbw$W58s!6ms>F z=p0!~_Mv~8jyaicOS*t(ntw`5uFi0Bc4*mH8kSkk$>!f0;FM zX_t14I55!ZVsg0O$D2iuEDb7(J>5|NKW^Z~kzm@dax z9(|As$U7^}LF%#`6r&UPB*6`!Rf74h~*C=ami6xUxYCwiJxdr$+`z zKSC4A%8!s%R&j*2si(OEc*fy!q)?%=TjDZJ2}O zxT6o>jlKXz_7_Y$N})}IG`*#KfMzs#R(SI#)3*ZEzCv%_tu(VTZ5J| zw2$5kK)xTa>xGFgS0?X(NecjzFVKG%VVn?neu=&eQ+DJ1APlY1E?Q1s!Kk=yf7Uho z>8mg_!U{cKqpvI3ucSkC2V`!d^XMDk;>GG~>6>&X_z75-kv0UjevS5ORHV^e8r{tr z-9z*y&0eq3k-&c_AKw~<`8dtjsP0XgFv6AnG?0eo5P14T{xW#b*Hn2gEnt5-KvN1z zy!TUSi>IRbD3u+h@;fn7fy{F&hAKx7dG4i!c?5_GnvYV|_d&F16p;)pzEjB{zL-zr z(0&AZUkQ!(A>ghC5U-)t7(EXb-3)tNgb=z`>8m8n+N?vtl-1i&*ftMbE~0zsKG^I$ zSbh+rUiucsb!Ax@yB}j>yGeiKIZk1Xj!i#K^I*LZW_bWQIA-}FmJ~^}>p=K$bX9F{}z{s^KWc~OK(zl_X57aB^J9v}yQ5h#BE$+C)WOglV)nd0WWtaF{7`_Ur`my>4*NleQG#xae4fIo(b zW(&|g*#YHZNvDtE|6}yHvu(hDekJ-t*f!2RK;FZHRMb*l@Qwkh*~CqQRNLaepXypX z1?%ATf_nHIu3z6gK<7Dmd;{`0a!|toT0ck|TL$U;7Wr-*piO@R)KrbUz8SXO0vr1K z>76arfrqImq!ny+VkH!4?x*IR$d6*;ZA}Mhro(mzUa?agrFZpHi*)P~4~4N;XoIvH z9N%4VK|j4mV2DRQUD!_-9fmfA2(YVYyL#S$B;vqu7fnTbAFMqH``wS7^B5=|1O&fL z)qq(oV6_u4x(I(**#mD}MnAy(C&B4a1n6V%$&=vrIDq^F_KhE5Uw8_@{V`_#M0vCu zaNUXB=n0HT@D+ppDXi8-vp{tj)?7+k>1j}VvEKRgQ~DWva}8*pp`W8~KRo*kJ*&X} zP!~2fxQr@dM*q0dI|)Fux=pZWBk==RI7i{^BQf`kWlD2%|@R9!JA7& zLbM$uJ12y}_62$|T|{)@OJZtzfpL^t@1nMTYHutrF#D+^?~CN~9`YQ@#&&@c_Zf)( zbC~y8!2LO8jHwQXv>G~1q?c68ipT*%dY&c{8wd_!Y#~tMJ7yk!F8| zt?m_CLVw6cU@@p(#h4cY&Qsfz2Xp3w^4Cg%m03Tmq~9n%hyoMH^KY7{(QkRyn_!YB zzZa!Tgr~5$MAG$x)Fs71#6j}Kvcv3=9VUX8CH< zbP3|fY8f#$K*<5JQ7whM(v=GN2k26Xsh)#0!HKS(koLgAp-;)8z0w&_Z=nG4v6n8u z&Tm0Fi){4_!Y5Kp?!zv$FKfUifQ{%c82uYfrvE{%ejUd72aNYmI*0z3-a-EYr+bB->oH3#t(AY3 zV{Z=(SJr;D#0(`u*dc*~9T7D8Pudw894%!>c4wU&V1m<~0InidR6fbi?yPl(z+sKa zdF*kS>_4^1UO>y4T%Ar>epSr5&vp`$KdY7B(F%P0@VyHk@1fJ=6X0=aGjD-)BrOJD zW}IU@hg~^2r>a1fQvjTtvL*mKJ7q;pfP*U2=URL`VB_Y_JojbZ+MS=vaVN0C6L_MV zG1#5=35-E`KsD%r>-Q_ndvJ2tOYcMMP9f*t0iJ`(Z`^+YP)h>@lR(@Wvrt-`0tHG+ zuP2R@@mx=T@fPoQ1s`e^1I0H*kQPBGDky@!ZQG@8jY-+2ihreG5q$6i{3vmDTg0j$ zzRb*-nKN@{_wD`V6+i*YS)?$XfrA-sW?js?SYU8#vXxxQCc|*K!EbpWfu)3~jwq6_@KC0m;3A%jH^18_a0;ksC2DEwa@2{9@{ z9@T??<4QwR69zk{UvcHHX;`ICOwrF;@U;etd@YE)4MzI1WCsadP=`%^B>xPS-{`=~ zZ+2im8meb#4p~XIL9}ZOBg7D8R=PC8V}ObDcxEEK(4yGKcyCQWUe{9jCs+@k!_y|I z%s{W(&>P4w@hjQ>PQL$zY+=&aDU6cWr#hG)BVCyfP)h>@3IG5I2mk;8K>)Ppba*!h z005B=001VF5fT=Y4_ytCUk`sv8hJckqSy&Gc2Jx^WJ$J~08N{il-M$fz_ML$)Cpil z(nOv_nlZB^c4s&&O3h=OLiCz&(|f0 zxWU_-JZy>hxP*gvR>CLnNeQ1~g;6{g#-}AbkIzWR;j=8=6!AHpKQCbjFYxf9h%bov zVi;eNa1>t-<14KERUW>^KwoF+8zNo`Y*WiQwq}3m0_2RYtL9Wmu`JaRaQMQ)`Si^6+VbM`!rH~T?DX2=(n4nT zf`G`(Rpq*pDk*v~wMYPZ@vMNZDMPnxMYmU!lA{Xfo?n=Ibb4y3eyY1@Dut4|Y^ml& zqs$r}jAo=B(Ml>ogeEjyv(E`=kBzPf2uv9TQtO$~bamD#=Tv`lNy(K|w$J2O6jS51 zzZtOCHDWz7W0=L1XDW5WR5mtLGc~W+>*vX5{e~U@rE~?7e>vKU-v8bj;F4#abtcV(3ZtwXo9ia93HiETyQXwW4a-0){;$OU*l` zW^bjkyZTJ6_DL^0}`*)#EZ|2nvKRzMLH9-~@Z6$v#t8Dm%(qpP+DgzNe6d)1q zBqhyF$jJTyYFvl_=a>#I8jhJ)d6SBNPg#xg2^kZ3NX8kQ74ah(Y5Z8mlXyzTD&}Q8 ziY(pj-N-V2f>&hZQJ`Di%wp2fN(I%F@l)3M8GcSdNy+#HuO{$I8NXubRlFkL)cY@b z#`v{}-^hRXEq*8B_cG=%PZvI$eo(|8Wc(2o8L#0_GX9L$1@yV>%7mGk)QTD1R*OvS z4OW;ym1)%k9Bfem0tOqq3yyAUWp&q|LsN!RDnxa|j;>R|Mm2rIv7=tej5GFaa+`#| z;7u9Z_^XV+vD@2hF8Xe63+Qd`oig6S9jX(*DbjzPb*K-H7c^7E-(~!R6E%TrgW;RvG;WS{Ziv*W*a*`9Bb;$Er3?MyF~5GcXv`k>U)n}lwv$Sp+H@IKA5$mKk0g*4Ln{!tfvITeY zzr%8JJ5BdcEYsR9eGzJ4B&$}4FMmbRU6{8{_w7Kl77@PNe7|Bc#c?5(C5&Z=kJ#(oM90D4`rh2S!|^L!P#e#1hkD5@~-- z`63GV0~*rOZSqw7k^#-Y$Q4z3Oa2SPRURqEahB1B^h{7~+p03SwzqL9QU#$3-X zdYtQ?-K5xDAdfomEd6(yPtZ!yY_<35bMedeq`z2JWorljz5-f9<^93HM-$#+acw%9r!JOM%O<|BR`W& zd-%j_?b^q7Kl6{q^N{cg2u;11rFB5EP+oqG9&pHD#_Mo@aNMj;LUvsl&nK(ca(hT( zzFc2oHC6WQv8g7jo+3ZSwK+9G$cvfRnql)?g=XeQ3+LTh3)79nhEle8OqS3T$qn(> z(=5Bg?EWq-ldEywgzXW965%H(9^ik*rH(8dNdkbcS9|ow&_r`X~R^R?B+(oTiMzzlx8KnHqUi z8Rh-)VAnS-CO+3}yxqm8)X+N+uzieFVm-F#syP#M1p5&$wX3MJ8 z+R@grZ*5G^Uh4I@VT=>C4RJNc^~3mx$kS1F{L?3)BzdduD2MZKdu#jNno&f2&d{?` zW(>$oktzY@GO{|Ln~Bt^A4)(%?l-&(Dm!iL#$K_xOyhwAf=K2<+Bom zw7|hl6E5}B$d%n0sfZvfQRy9Fyz2~ z83#=#LaHnf1th^k*p|ux8!!8pfHE!)x*%=_hAddl)P%4h4%&8!5-W#xqqb}c=H(i|wqcIS&oDQ{ zhI7N-$f$ra3=RjPmMh?-IEkJYQ<}R9Z!}wmp$#~Uc%u1oh#TP}wF*kJJmQX2#27kL z_dz(yKufo<=m71bZfLp^Ll#t3(IHkrgMcvx@~om%Ib(h(<$Da7urTI`x|%`wD--sN zJEEa>4DGSEG?0ulkosfj8IMNN4)B=ZtvGG{|4Fp=Xhg!wPNgYzS>{Bp%%Qa+624X@ X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/src-java/gradle/wrapper/gradle-wrapper.properties b/src-java/gradle/wrapper/gradle-wrapper.properties index 549d84424d0..2e6e5897b52 100644 --- a/src-java/gradle/wrapper/gradle-wrapper.properties +++ b/src-java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src-java/gradlew b/src-java/gradlew index 4f906e0c811..1b6c787337f 100755 --- a/src-java/gradlew +++ b/src-java/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/src-java/grpc-speaker/grpc-service/build.gradle b/src-java/grpc-speaker/grpc-service/build.gradle index 827ef870384..39d32f2b15c 100644 --- a/src-java/grpc-speaker/grpc-service/build.gradle +++ b/src-java/grpc-speaker/grpc-service/build.gradle @@ -4,7 +4,7 @@ plugins { configurations { // This conflicts with spring-boot-starter-log4j2 - compile.exclude module: 'spring-boot-starter-logging' + implementation.exclude module: 'spring-boot-starter-logging' } description = 'GRPC service' @@ -73,7 +73,7 @@ dependencies { compileJava { options.compilerArgs = [ - "-Amapstruct.defaultComponentModel=spring" + '-Amapstruct.defaultComponentModel=spring' ] } diff --git a/src-java/isllatency-topology/isllatency-storm-topology/build.gradle b/src-java/isllatency-topology/isllatency-storm-topology/build.gradle index 46438e4aef3..580742c0166 100644 --- a/src-java/isllatency-topology/isllatency-storm-topology/build.gradle +++ b/src-java/isllatency-topology/isllatency-storm-topology/build.gradle @@ -9,13 +9,13 @@ compileJava.ajc.options.compilerArgs += '-verbose' description = 'Isl Latency Storm Topology' dependencies { implementation project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') testImplementation project(path: ':base-storm-topology', configuration: 'testArtifacts') implementation project(':isllatency-messaging') implementation project(':network-messaging') implementation project(':floodlight-api') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') aspect project(':kilda-persistence-api') testImplementation project(path: ':kilda-persistence-api', configuration: 'testArtifacts') testImplementation project(path: ':kilda-persistence-tinkerpop', configuration: 'testArtifacts') diff --git a/src-java/nbworker-topology/nbworker-storm-topology/build.gradle b/src-java/nbworker-topology/nbworker-storm-topology/build.gradle index e5469828d76..af2963cebfc 100644 --- a/src-java/nbworker-topology/nbworker-storm-topology/build.gradle +++ b/src-java/nbworker-topology/nbworker-storm-topology/build.gradle @@ -16,13 +16,13 @@ dependencies { implementation project(':base-storm-topology') implementation project(':blue-green') aspect project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') testImplementation project(path: ':base-storm-topology', configuration: 'testArtifacts') implementation project(':kilda-pce') implementation project(':kilda-reporting') implementation project(':floodlight-api') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') testImplementation project(path: ':kilda-persistence-api', configuration: 'testArtifacts') testImplementation project(path: ':kilda-persistence-tinkerpop', configuration: 'testArtifacts') diff --git a/src-java/network-topology/network-storm-topology/build.gradle b/src-java/network-topology/network-storm-topology/build.gradle index 4f5bc17ba6b..014ff6d25b3 100644 --- a/src-java/network-topology/network-storm-topology/build.gradle +++ b/src-java/network-topology/network-storm-topology/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation project(':network-messaging') implementation project(':swmanager-messaging') implementation project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') testImplementation project(path: ':base-storm-topology', configuration: 'testArtifacts') implementation project(':kilda-reporting') implementation project(':nbworker-messaging') @@ -21,8 +21,8 @@ dependencies { implementation project(':ping-messaging') implementation project(':floodlight-api') implementation project(':grpc-api') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') aspect project(':kilda-persistence-api') testImplementation project(path: ':kilda-persistence-tinkerpop', configuration: 'testArtifacts') testImplementation project(':kilda-utils:stubs') diff --git a/src-java/northbound-service/northbound/build.gradle b/src-java/northbound-service/northbound/build.gradle index 8b12deef0be..adbae5bc850 100644 --- a/src-java/northbound-service/northbound/build.gradle +++ b/src-java/northbound-service/northbound/build.gradle @@ -3,7 +3,8 @@ plugins { } configurations { - compile.exclude module: 'spring-boot-starter-logging' + // This conflicts with spring-boot-starter-log4j2 + implementation.exclude module: 'spring-boot-starter-logging' } description = 'Northbound Service' @@ -19,8 +20,8 @@ dependencies { implementation project(':floodlight-api') implementation project(':kilda-persistence-api') implementation project(':blue-green') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') implementation project(':kilda-configuration') testImplementation project(':kilda-utils:stubs') diff --git a/src-java/opentsdb-topology/opentsdb-storm-topology/build.gradle b/src-java/opentsdb-topology/opentsdb-storm-topology/build.gradle index 12313ad09fb..cceb406927b 100644 --- a/src-java/opentsdb-topology/opentsdb-storm-topology/build.gradle +++ b/src-java/opentsdb-topology/opentsdb-storm-topology/build.gradle @@ -9,14 +9,14 @@ compileJava.ajc.options.compilerArgs += '-verbose' description = 'OpenTSDB Storm Topology' dependencies { implementation project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') testImplementation project(path: ':base-storm-topology', configuration: 'testArtifacts') implementation project(':kilda-reporting') testImplementation project(path: ':kilda-persistence-tinkerpop', configuration: 'testArtifacts') implementation project(':blue-green') - runtimeClasspath 'org.yaml:snakeyaml:1.15' - runtimeClasspath 'commons-logging:commons-logging:1.2' + runtimeOnly 'org.yaml:snakeyaml:1.15' + runtimeOnly 'commons-logging:commons-logging:1.2' implementation('org.apache.storm:storm-opentsdb:1.2.1') { exclude group: 'org.apache.httpcomponents', module: 'httpclient' // This conflicts with jcl-over-slf4j diff --git a/src-java/ping-topology/ping-storm-topology/build.gradle b/src-java/ping-topology/ping-storm-topology/build.gradle index 2486841b96c..bad181cc754 100644 --- a/src-java/ping-topology/ping-storm-topology/build.gradle +++ b/src-java/ping-topology/ping-storm-topology/build.gradle @@ -10,13 +10,13 @@ description = 'Ping Storm Topology' dependencies { implementation project(':ping-messaging') implementation project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') testImplementation project(path: ':base-storm-topology', configuration: 'testArtifacts') implementation project(':kilda-reporting') implementation project(':floodlight-api') implementation project(':blue-green') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') aspect project(':kilda-persistence-api') compileOnly('org.apache.storm:storm-core') diff --git a/src-java/portstate-topology/portstate-storm-topology/build.gradle b/src-java/portstate-topology/portstate-storm-topology/build.gradle index 44d26b91dcc..8f726ad2000 100644 --- a/src-java/portstate-topology/portstate-storm-topology/build.gradle +++ b/src-java/portstate-topology/portstate-storm-topology/build.gradle @@ -9,14 +9,14 @@ compileJava.ajc.options.compilerArgs += '-verbose' description = 'Port State Storm Topology' dependencies { implementation project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') implementation project(':kilda-reporting') implementation project(':network-messaging') implementation project(':nbworker-messaging') implementation project(':floodlight-api') implementation project(':blue-green') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') compileOnly('org.apache.storm:storm-core') diff --git a/src-java/projectfloodlight/floodlight/build.gradle b/src-java/projectfloodlight/floodlight/build.gradle index 4dcd26bc872..9ae86c7c3ef 100644 --- a/src-java/projectfloodlight/floodlight/build.gradle +++ b/src-java/projectfloodlight/floodlight/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java-base' - id 'org.ajoberstar.grgit' version '4.0.2' apply false + id 'org.ajoberstar.grgit' version '4.1.1' apply false } group = 'org.projectfloodlight' @@ -43,12 +43,12 @@ task cloneFloodlightRepo { grgit.checkout(branch: versionTag) grgit.close() } catch (Exception e) { - logger.warn("Failed to fetch floodlight from git: {}", e.getMessage()) + logger.warn('Failed to fetch floodlight from git: {}', e.getMessage()) } } else { def repoUri = 'https://github.com/kilda/floodlight.git' - if (project.hasProperty("floodlightGitRepo")) { - repoUri = project.property("floodlightGitRepo") + if (project.hasProperty('floodlightGitRepo')) { + repoUri = project.property('floodlightGitRepo') } def grgit = Grgit.clone(dir: repo.absolutePath, uri: repoUri, refToCheckout: versionTag) grgit.close() diff --git a/src-java/projectfloodlight/openflowj/build.gradle b/src-java/projectfloodlight/openflowj/build.gradle index e062bf243b0..39dd089aa5f 100644 --- a/src-java/projectfloodlight/openflowj/build.gradle +++ b/src-java/projectfloodlight/openflowj/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java-base' - id 'org.ajoberstar.grgit' version '4.0.2' apply false + id 'org.ajoberstar.grgit' version '4.1.1' apply false } group = 'org.projectfloodlight' @@ -42,8 +42,8 @@ task cloneLoxigenRepo { } } else { def repoUri = 'https://github.com/kilda/loxigen.git' - if (project.hasProperty("loxigenGitRepo")) { - repoUri = project.property("loxigenGitRepo") + if (project.hasProperty('loxigenGitRepo')) { + repoUri = project.property('loxigenGitRepo') } def grgit = Grgit.clone(dir: repo.absolutePath, uri: repoUri, refToCheckout: 'STABLE') grgit.close() diff --git a/src-java/reroute-topology/reroute-storm-topology/build.gradle b/src-java/reroute-topology/reroute-storm-topology/build.gradle index 7fc0d6bcdda..18c5fffd44f 100644 --- a/src-java/reroute-topology/reroute-storm-topology/build.gradle +++ b/src-java/reroute-topology/reroute-storm-topology/build.gradle @@ -13,11 +13,11 @@ dependencies { implementation project(':base-storm-topology') implementation project(':blue-green') aspect project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') testImplementation project(path: ':base-storm-topology', configuration: 'testArtifacts') implementation project(':kilda-reporting') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') compileOnly('org.apache.storm:storm-core') diff --git a/src-java/server42/server42-control-server-stub/build.gradle b/src-java/server42/server42-control-server-stub/build.gradle index de86d5638d4..929bb048684 100644 --- a/src-java/server42/server42-control-server-stub/build.gradle +++ b/src-java/server42/server42-control-server-stub/build.gradle @@ -4,7 +4,7 @@ plugins { configurations { // This conflicts with spring-boot-starter-log4j2 - compile.exclude module: 'spring-boot-starter-logging' + implementation.exclude module: 'spring-boot-starter-logging' } dependencies { diff --git a/src-java/server42/server42-control-storm-stub/build.gradle b/src-java/server42/server42-control-storm-stub/build.gradle index 5575d221450..815390f8476 100644 --- a/src-java/server42/server42-control-storm-stub/build.gradle +++ b/src-java/server42/server42-control-storm-stub/build.gradle @@ -4,7 +4,7 @@ plugins { configurations { // This conflicts with spring-boot-starter-log4j2 - compile.exclude module: 'spring-boot-starter-logging' + implementation.exclude module: 'spring-boot-starter-logging' } description = 'server42-control-storm-stub' diff --git a/src-java/server42/server42-control-storm-topology/build.gradle b/src-java/server42/server42-control-storm-topology/build.gradle index ea37c5a6c29..5ebbb1b5cbd 100644 --- a/src-java/server42/server42-control-storm-topology/build.gradle +++ b/src-java/server42/server42-control-storm-topology/build.gradle @@ -10,14 +10,14 @@ description = 'Server42 Control Storm Topology' dependencies { implementation project(':network-messaging') implementation project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') testImplementation project(path: ':base-storm-topology', configuration: 'testArtifacts') implementation project(':nbworker-messaging') implementation project(':server42-control-messaging') implementation project(':server42-messaging') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') aspect project(':kilda-persistence-api') testImplementation project(path: ':kilda-persistence-tinkerpop', configuration: 'testArtifacts') diff --git a/src-java/server42/server42-control/build.gradle b/src-java/server42/server42-control/build.gradle index c942a23c471..75e218be9bf 100644 --- a/src-java/server42/server42-control/build.gradle +++ b/src-java/server42/server42-control/build.gradle @@ -4,7 +4,7 @@ plugins { configurations { // This conflicts with spring-boot-starter-log4j2 - compile.exclude module: 'spring-boot-starter-logging' + implementation.exclude module: 'spring-boot-starter-logging' } description = 'server42-control' diff --git a/src-java/server42/server42-stats/build.gradle b/src-java/server42/server42-stats/build.gradle index 4bcc752e6a6..d19ee85a135 100644 --- a/src-java/server42/server42-stats/build.gradle +++ b/src-java/server42/server42-stats/build.gradle @@ -4,7 +4,7 @@ plugins { configurations { // This conflicts with spring-boot-starter-log4j2 - compile.exclude module: 'spring-boot-starter-logging' + implementation.exclude module: 'spring-boot-starter-logging' } description = 'server42-stats' diff --git a/src-java/stats-topology/stats-storm-topology/build.gradle b/src-java/stats-topology/stats-storm-topology/build.gradle index 88efb9f5db6..08ac74df2b6 100644 --- a/src-java/stats-topology/stats-storm-topology/build.gradle +++ b/src-java/stats-topology/stats-storm-topology/build.gradle @@ -10,14 +10,14 @@ description = 'Stats Storm Topology' dependencies { implementation project(':stats-messaging') implementation project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') testImplementation project(path: ':base-storm-topology', configuration: 'testArtifacts') implementation project(':kilda-reporting') implementation project(':floodlight-api') implementation project(':grpc-api') implementation project(':blue-green') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') aspect project(':kilda-persistence-api') testImplementation project(path: ':kilda-persistence-tinkerpop', configuration: 'testArtifacts') diff --git a/src-java/swmanager-topology/swmanager-storm-topology/build.gradle b/src-java/swmanager-topology/swmanager-storm-topology/build.gradle index cbaba6b453c..205e7024795 100644 --- a/src-java/swmanager-topology/swmanager-storm-topology/build.gradle +++ b/src-java/swmanager-topology/swmanager-storm-topology/build.gradle @@ -12,13 +12,13 @@ dependencies { implementation project(':swmanager-messaging') implementation project(':grpc-api') aspect project(':base-storm-topology') - runtimeClasspath project(path: ':base-storm-topology', configuration: 'releaseArtifacts') + runtimeOnly project(path: ':base-storm-topology', configuration: 'releaseArtifacts') testImplementation project(path: ':base-storm-topology', configuration: 'testArtifacts') implementation project(':flowhs-messaging') implementation project(':floodlight-api') implementation project(':kilda-reporting') - runtimeClasspath project(':kilda-persistence-orientdb') - runtimeClasspath project(':kilda-persistence-hibernate') + runtimeOnly project(':kilda-persistence-orientdb') + runtimeOnly project(':kilda-persistence-hibernate') implementation project(':blue-green') compileOnly('org.apache.storm:storm-core') diff --git a/src-java/testing/functional-tests/build.gradle b/src-java/testing/functional-tests/build.gradle index a1d617b9b78..f57f96aea8b 100644 --- a/src-java/testing/functional-tests/build.gradle +++ b/src-java/testing/functional-tests/build.gradle @@ -1,7 +1,7 @@ plugins { id 'groovy' - id 'com.adarshr.test-logger' version '3.0.0' - id "org.gradle.test-retry" version "1.2.1" + id 'com.adarshr.test-logger' version '3.1.0' + id 'org.gradle.test-retry' version '1.3.1' } description = 'Functional-Tests' @@ -64,7 +64,7 @@ task functionalTest(type: Test, dependsOn: 'compileGroovy') { } Properties properties = new Properties() - File propertiesFile = file("kilda.properties.example") + File propertiesFile = file('kilda.properties.example') propertiesFile.withInputStream { properties.load(it) } @@ -91,11 +91,11 @@ tasks.withType(Test) { //if there is a failed/unstable test, create log file for further processing in Jenkins pipeline def unstableLog = new File("${project.buildDir}/test-results/unstable.log").tap { it.parentFile.mkdirs() - it.write "false" + it.write 'false' } afterTest { desc, result -> - if ("FAILURE" == result.resultType as String) { - unstableLog.write "true" + if ('FAILURE' == result.resultType as String) { + unstableLog.write 'true' } } retry { //test-retry plugin config diff --git a/src-java/testing/performance-tests/build.gradle b/src-java/testing/performance-tests/build.gradle index 88edcff4eca..f8575ecdd42 100644 --- a/src-java/testing/performance-tests/build.gradle +++ b/src-java/testing/performance-tests/build.gradle @@ -43,7 +43,7 @@ task performanceTest(type: Test, dependsOn: 'compileGroovy') { include '**/performancetests/**' systemProperty 'tags', System.getProperty('tags') Properties properties = new Properties() - File propertiesFile = file("kilda.properties.example") + File propertiesFile = file('kilda.properties.example') propertiesFile.withInputStream { properties.load(it) } diff --git a/src-java/testing/test-library/build.gradle b/src-java/testing/test-library/build.gradle index 197949d59b3..2bcf5698f00 100644 --- a/src-java/testing/test-library/build.gradle +++ b/src-java/testing/test-library/build.gradle @@ -5,7 +5,7 @@ plugins { description = 'Test-Library' dependencies { implementation(platform('org.springframework:spring-framework-bom:5.2.13.RELEASE')) - compile 'org.springframework.boot:spring-boot-autoconfigure:2.2.13.RELEASE' + implementation 'org.springframework.boot:spring-boot-autoconfigure:2.2.13.RELEASE' api project(':base-messaging') api project(':flowhs-messaging') From 9ff146b9bff9ef4e32128aba98d02ddc06a4a8ca Mon Sep 17 00:00:00 2001 From: Neeraj Kumar Date: Tue, 28 Dec 2021 17:52:16 +0530 Subject: [PATCH 32/46] design changes in bfd properties update --- .../isl/isl-detail/isl-detail.component.css | 7 + .../isl/isl-detail/isl-detail.component.html | 660 ++++++++++-------- 2 files changed, 377 insertions(+), 290 deletions(-) diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.css b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.css index a8379f2c385..db34f70dfb1 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.css +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.css @@ -66,4 +66,11 @@ i.icon { .isl_details_div .col-form-label { line-height: 1; +} + +.update_isl_cost{ +padding-left: 0px; +} +.isl_delete_dropdown .dropdown-menu{ + min-width: 120px; } \ No newline at end of file diff --git a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html index bcf385fa0cc..0fcc6c9c225 100644 --- a/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html +++ b/src-gui/ui/src/app/modules/isl/isl-detail/isl-detail.component.html @@ -2,7 +2,7 @@
SOURCE DETAILS
-
+

@@ -11,13 +11,14 @@

SOURCE DETAILS
-
- {{src_switch}} -
+
+ {{src_switch}} +
- +
-
DESTINATION DETAILS - Delete - -
+
+
DESTINATION DETAILS + +
+
+ +
+ + +
+
+
@@ -62,14 +77,15 @@
DESTINATION DETAILS
- -
- {{dst_switch }} -
+ +
+ {{dst_switch }} +
- +
-
- {{dst_switch_name}} -
+
+ {{dst_switch_name}} +
-
+
{{bfdPropertyData.effective_destination.properties['interval_ms']}}
-
- {{bfdPropertyData.effective_destination.properties['multiplier']}} +
+ {{bfdPropertyData.effective_destination.properties['multiplier']}}
@@ -101,123 +117,138 @@
DESTINATION DETAILS
-
ISL DETAILS
+
ISL DETAILS
-
-
- - -
- {{ convertInMB(max_bandwidth) }} -   +
+
+ + +
+ {{ convertInMB(max_bandwidth) }} +   + + + + - - - - + +
+
+
+ + + +
+
+
+
+ +

{{ convertInMB(speed) }}

+
+ +
+ +

{{latency}} ns

+
+
+ +
+ {{detailDataObservable.props.cost}} + + + + +
+
+ +
+ + + +
-
-
- - - +
+
+ +
+ +

{{ convertInMB(available_bandwidth) }}

+
+
+ +

{{state}}

+
+
+ +

{{bfd_session_status}}

+
+
+
+
+ +
+
+
+ +
-
- -

{{ convertInMB(speed) }}

-
- -
- -

{{latency}} ns

-
-
- -
- {{detailDataObservable.props.cost}} - - - - - -
-
- -
- - - - -
-
-
- -
-
+
+ +
+
+
+ + -

{{ convertInMB(available_bandwidth) }}

-
- -

{{state}}

-
-
- -

{{bfd_session_status}}

-
-
-
-
-
+
+
+
+ +
+
+
+ + -
-
-
- - -
-
-
-
- -
-
-
- - -
-
-
-
-
- -
-
-
- - -
-
-
-
+
+
+
@@ -225,145 +256,190 @@
ISL DETAILS
-
-
BFD PROPERTIES
- -
- -
+
+
BFD PROPERTIES
+ +
+
+
+
+
+
- - +
+ +
+ {{bfdPropertyData.properties['interval_ms']}} +
+
- - +
+ +
+ {{bfdPropertyData.properties['multiplier']}} +
+
+ + + + + +
+
-
-
- Update - Cancel +
- +
- -
-
- -
-
BFD PROPERTIES - Edit - Update - - Delete -
-
-
- -
- -
- {{bfdPropertyData.properties['interval_ms']}} -
-
-
- -
- {{bfdPropertyData.properties['multiplier']}} + +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+
+
+ + +
+
+
+
+ +
-
-
+ + +
+ +
-
-
-
-
+
+
+
- -

{{currentGraphName}}

- -

Loading data.....

- - - + +

{{currentGraphName}}

+ +

Loading data.....

+ + + + +
+
+
+
    +
  • Forward
    • +
  • Reverse
    • +
-
-
-
    -
  • Forward
    • -
  • Reverse
    • -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
- -
- - - -
-
Auto reload time should be number
-
Auto reload time required
-
- -
+
+
+ +
+
-
- -
- +
+
+
+ +
+ + +
+
+
+ +
+ + + +
+
Auto reload time should be number
+
Auto reload time required
+
+ +
+
+
+ +
+ -
-
- -
- + + -
-
- -
- - + -
- -
- -
- + + -
-
- -
-
-
- -
-
- -
+
+
+ +
+
+
+ +
+
+
- -
+ +
- -
-
-
+
+
- +
+
- +
- +
@@ -467,6 +549,4 @@

{{currentGraphName}}

Copy to Clipboard - - - + \ No newline at end of file From 7c3124a745b344d5b8627c393ad9ddf306c8f147 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Wed, 5 Jan 2022 10:33:49 +0200 Subject: [PATCH 33/46] ignore qinq tests in yflow spec for singleTable mode --- .../functionaltests/spec/flows/yflows/YFlowCreateSpec.groovy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowCreateSpec.groovy b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowCreateSpec.groovy index 1b4126af3e6..ed288e5d38a 100644 --- a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowCreateSpec.groovy +++ b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowCreateSpec.groovy @@ -52,6 +52,9 @@ class YFlowCreateSpec extends HealthCheckSpecification { @Tags([TOPOLOGY_DEPENDENT]) def "Valid y-flow can be created#trafficDisclaimer, covered cases: #coveredCases"() { assumeTrue(swT != null, "These cases cannot be covered on given topology: $coveredCases") + if (coveredCases.toString().contains("qinq")) { + assumeTrue(useMultitable, "Multi table is not enabled in kilda configuration") + } when: "Create a y-flow of certain configuration" def yFlow = northboundV2.addYFlow(yFlowRequest) From 194c489fbdfd4d5d23a49b5a6103fdab8045eca7 Mon Sep 17 00:00:00 2001 From: Neeraj Kumar Date: Fri, 7 Jan 2022 13:10:40 +0530 Subject: [PATCH 34/46] text changes --- src-gui/ui/src/app/common/constants/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-gui/ui/src/app/common/constants/constants.ts b/src-gui/ui/src/app/common/constants/constants.ts index 9052db6e862..3ae1c4deb79 100644 --- a/src-gui/ui/src/app/common/constants/constants.ts +++ b/src-gui/ui/src/app/common/constants/constants.ts @@ -129,7 +129,7 @@ export const MessageObj = { updating_user_status:"Updating user status", user_status_updated:"User status changed successfully!", unblok_user:"Unblocking user", - user_unblocked:"User account is unblokced successfully", + user_unblocked:"User account is unblocked successfully", resetting_password:"Resetting Password", reset_pwd_mail_sent:"Reset password email sent successfully!", resetting_pwd_by_admin:"Resetting password by admin", From 4d43f95d2aa0e0d15e5e22666ca5b9acf7fb79d2 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Mon, 10 Jan 2022 09:21:32 +0200 Subject: [PATCH 35/46] [test] fix LagPortSpec --- .../functionaltests/spec/switches/LagPortSpec.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/switches/LagPortSpec.groovy b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/switches/LagPortSpec.groovy index 97e5ff04b40..2b4d295e1d3 100644 --- a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/switches/LagPortSpec.groovy +++ b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/switches/LagPortSpec.groovy @@ -118,7 +118,7 @@ class LagPortSpec extends HealthCheckSpecification { [it.src, it.dst].every { it.dpId in allTraffGenSwitchIds } } def traffgenSrcSwPort = switchPair.src.traffGens.switchPort[0] - def portsArray = topology.getAllowedPortsForSwitch(switchPair.src)[-2, -1] << traffgenSrcSwPort + def portsArray = (topology.getAllowedPortsForSwitch(switchPair.src)[-2, -1] << traffgenSrcSwPort).unique() def payload = new CreateLagPortDto(portNumbers: portsArray) def lagPort = northboundV2.createLagLogicalPort(switchPair.src.dpId, payload).logicalPortNumber @@ -328,8 +328,8 @@ class LagPortSpec extends HealthCheckSpecification { exc.statusCode == HttpStatus.BAD_REQUEST def errorDetails = exc.responseBodyAsString.to(MessageError) errorDetails.errorMessage == "Error during LAG create" - errorDetails.errorDescription == "Physical port $mirrorPort already used as sink by following mirror points" + - " flow '$flow.flowId': [$mirrorEndpoint.mirrorPointId]" + errorDetails.errorDescription == "Physical port $mirrorPort already used by following flows: [$flow.flowId]. " + + "You must remove these flows to be able to use the port in LAG." cleanup: flow && flowHelperV2.deleteFlow(flow.flowId) From e3fbdadde28cbf8dd7fb0933364c75d2509855f1 Mon Sep 17 00:00:00 2001 From: Timofey Durakov Date: Mon, 10 Jan 2022 09:59:59 +0400 Subject: [PATCH 36/46] Of Group converter for Rule Manager --- .../rulemanager/OfGroupConverter.java | 28 ++- .../rulemanager/OfGroupConverterTest.java | 159 ++++++++++++++++++ 2 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/converter/rulemanager/OfGroupConverterTest.java diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/converter/rulemanager/OfGroupConverter.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/converter/rulemanager/OfGroupConverter.java index 3b4989d5743..092fadef8de 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/converter/rulemanager/OfGroupConverter.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/converter/rulemanager/OfGroupConverter.java @@ -1,4 +1,4 @@ -/* Copyright 2021 Telstra Open Source +/* Copyright 2022 Telstra Open Source * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,15 @@ package org.openkilda.floodlight.converter.rulemanager; +import org.openkilda.model.GroupId; import org.openkilda.rulemanager.GroupSpeakerData; +import org.openkilda.rulemanager.action.Action; import org.openkilda.rulemanager.group.Bucket; import org.openkilda.rulemanager.group.GroupType; import org.openkilda.rulemanager.group.WatchGroup; import org.openkilda.rulemanager.group.WatchPort; +import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import org.projectfloodlight.openflow.protocol.OFBucket; import org.projectfloodlight.openflow.protocol.OFBucket.Builder; @@ -35,9 +38,12 @@ import org.projectfloodlight.openflow.types.OFPort; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; +@Mapper public class OfGroupConverter { public static final OfGroupConverter INSTANCE = Mappers.getMapper(OfGroupConverter.class); @@ -47,6 +53,14 @@ public class OfGroupConverter { public List convertToGroupSpeakerData(OFGroupDescStatsReply statsReply) { List commandData = new ArrayList<>(); for (OFGroupDescStatsEntry entry : statsReply.getEntries()) { + GroupId groupId = new GroupId(entry.getGroup().getGroupNumber()); + GroupType type = fromOfGroupType(entry.getGroupType()); + List buckets = new ArrayList<>(); + List ofBuckets = entry.getBuckets(); + for (OFBucket bucket : ofBuckets) { + buckets.add(fromOfBucket(bucket)); + } + commandData.add(GroupSpeakerData.builder().groupId(groupId).type(type).buckets(buckets).build()); } return commandData; } @@ -87,6 +101,16 @@ private OFBucket toOfBucket(OFFactory ofFactory, Bucket bucket) { return builder.build(); } + private Bucket fromOfBucket(OFBucket ofBucket) { + WatchGroup watchGroup = fromOfGroup(ofBucket.getWatchGroup()); + WatchPort watchPort = fromOfPort(ofBucket.getWatchPort()); + Set actions = new HashSet<>(); + for (OFAction ofAction : ofBucket.getActions()) { + actions.add(OfInstructionsConverter.INSTANCE.convertToRuleManagerAction(ofAction)); + } + return Bucket.builder().watchGroup(watchGroup).watchPort(watchPort).writeActions(actions).build(); + } + private OFPort toOfWatchPort(WatchPort watchPort) { switch (watchPort) { case ANY: @@ -97,7 +121,7 @@ private OFPort toOfWatchPort(WatchPort watchPort) { } private WatchPort fromOfPort(OFPort watchPort) { - if (watchPort.equals(OFGroup.ANY)) { + if (watchPort.equals(OFPort.ANY)) { return WatchPort.ANY; } else { throw new IllegalArgumentException(String.format("Unknown watch port %s", watchPort)); diff --git a/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/converter/rulemanager/OfGroupConverterTest.java b/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/converter/rulemanager/OfGroupConverterTest.java new file mode 100644 index 00000000000..cd84e67f136 --- /dev/null +++ b/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/converter/rulemanager/OfGroupConverterTest.java @@ -0,0 +1,159 @@ +/* Copyright 2022 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.floodlight.converter.rulemanager; + +import static org.junit.Assert.assertEquals; + +import org.openkilda.model.GroupId; +import org.openkilda.rulemanager.GroupSpeakerData; +import org.openkilda.rulemanager.ProtoConstants.PortNumber; +import org.openkilda.rulemanager.action.PortOutAction; +import org.openkilda.rulemanager.group.Bucket; +import org.openkilda.rulemanager.group.GroupType; +import org.openkilda.rulemanager.group.WatchGroup; +import org.openkilda.rulemanager.group.WatchPort; + +import com.google.common.collect.Sets; +import org.junit.Test; +import org.projectfloodlight.openflow.protocol.OFBucket; +import org.projectfloodlight.openflow.protocol.OFGroupAdd; +import org.projectfloodlight.openflow.protocol.OFGroupDelete; +import org.projectfloodlight.openflow.protocol.OFGroupDescStatsEntry; +import org.projectfloodlight.openflow.protocol.OFGroupDescStatsReply.Builder; +import org.projectfloodlight.openflow.protocol.OFGroupType; +import org.projectfloodlight.openflow.protocol.action.OFAction; +import org.projectfloodlight.openflow.protocol.ver13.OFFactoryVer13; +import org.projectfloodlight.openflow.types.OFGroup; +import org.projectfloodlight.openflow.types.OFPort; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class OfGroupConverterTest { + + private static final int GROUP_ID = 12; + + private List getActions(OFFactoryVer13 factory, int portNumber) { + List list = new ArrayList<>(); + list.add(factory.actions().buildOutput().setPort(OFPort.of(portNumber)).build()); + return list; + } + + private OFGroupDescStatsEntry getOfGroupEntry(OFFactoryVer13 factory) { + OFGroupDescStatsEntry.Builder entryBuilder = factory.buildGroupDescStatsEntry(); + List buckets = new ArrayList<>(); + buckets.add(factory.buildBucket().setWatchPort(OFPort.ANY) + .setWatchGroup(OFGroup.ALL) + .setActions(getActions(factory, 1)) + .build()); + + buckets.add(factory.buildBucket().setWatchPort(OFPort.ANY) + .setWatchGroup(OFGroup.ALL) + .setActions(getActions(factory, 2)) + .build()); + + return entryBuilder.setGroup(OFGroup.of(GROUP_ID)) + .setGroupType(OFGroupType.ALL) + .setBuckets(buckets).build(); + } + + @Test + public void testConvertToGroupSpeakerData() { + OFFactoryVer13 factory = new OFFactoryVer13(); + + Builder builder = factory.buildGroupDescStatsReply(); + List entries = new ArrayList<>(); + entries.add(getOfGroupEntry(factory)); + builder.setEntries(entries); + + List groupSpeakerDataList = OfGroupConverter.INSTANCE.convertToGroupSpeakerData( + builder.build()); + assertEquals(1, groupSpeakerDataList.size()); + GroupSpeakerData groupSpeakerData = groupSpeakerDataList.get(0); + assertEquals(new GroupId(GROUP_ID), groupSpeakerData.getGroupId()); + assertEquals(GroupType.ALL, groupSpeakerData.getType()); + List buckets = groupSpeakerData.getBuckets(); + + Set expectedBuckets = new HashSet<>(); + expectedBuckets.add(Bucket.builder().watchPort(WatchPort.ANY).watchGroup(WatchGroup.ALL) + .writeActions(Sets.newHashSet(new PortOutAction(new PortNumber(2, null)))).build()); + + expectedBuckets.add(Bucket.builder().watchPort(WatchPort.ANY).watchGroup(WatchGroup.ALL) + .writeActions(Sets.newHashSet(new PortOutAction(new PortNumber(1, null)))).build()); + assertEquals(expectedBuckets, new HashSet<>(buckets)); + } + + @Test + public void testConvertInstallGroupCommand() { + List buckets = new ArrayList<>(); + buckets.add(Bucket.builder().watchPort(WatchPort.ANY).watchGroup(WatchGroup.ALL) + .writeActions(Sets.newHashSet(new PortOutAction(new PortNumber(2, null)))).build()); + + buckets.add(Bucket.builder().watchPort(WatchPort.ANY).watchGroup(WatchGroup.ALL) + .writeActions(Sets.newHashSet(new PortOutAction(new PortNumber(1, null)))).build()); + + + GroupSpeakerData groupSpeakerData = GroupSpeakerData.builder().groupId(new GroupId(GROUP_ID)) + .type(GroupType.ALL) + .buckets(buckets) + .build(); + OFFactoryVer13 factory = new OFFactoryVer13(); + + OFGroupAdd ofGroupAdd = OfGroupConverter.INSTANCE.convertInstallGroupCommand(groupSpeakerData, factory); + + assertEquals(OFGroup.of(GROUP_ID), ofGroupAdd.getGroup()); + assertEquals(OFGroupType.ALL, ofGroupAdd.getGroupType()); + assertEquals(2, ofGroupAdd.getBuckets().size()); + + List expectedBuckets = new ArrayList<>(); + expectedBuckets.add(factory.buildBucket().setWatchPort(OFPort.ANY) + .setWatchGroup(OFGroup.ALL) + .setActions(getActions(factory, 2)) + .build()); + + expectedBuckets.add(factory.buildBucket().setWatchPort(OFPort.ANY) + .setWatchGroup(OFGroup.ALL) + .setActions(getActions(factory, 1)) + .build()); + assertEquals(expectedBuckets, ofGroupAdd.getBuckets()); + } + + @Test + public void testConvertDeleteGroupCommand() { + List buckets = new ArrayList<>(); + buckets.add(Bucket.builder().watchPort(WatchPort.ANY).watchGroup(WatchGroup.ALL) + .writeActions(Sets.newHashSet(new PortOutAction(new PortNumber(2, null)))).build()); + + buckets.add(Bucket.builder().watchPort(WatchPort.ANY).watchGroup(WatchGroup.ALL) + .writeActions(Sets.newHashSet(new PortOutAction(new PortNumber(1, null)))).build()); + + + GroupSpeakerData groupSpeakerData = GroupSpeakerData.builder().groupId(new GroupId(GROUP_ID)) + .type(GroupType.ALL) + .buckets(buckets) + .build(); + OFFactoryVer13 factory = new OFFactoryVer13(); + + OFGroupDelete ofGroupDelete = OfGroupConverter.INSTANCE.convertDeleteGroupCommand(groupSpeakerData, factory); + + + assertEquals(OFGroup.of(GROUP_ID), ofGroupDelete.getGroup()); + assertEquals(OFGroupType.ALL, ofGroupDelete.getGroupType()); + } + +} From a240466456a7924d4d723786bb9d462a3bd85a6a Mon Sep 17 00:00:00 2001 From: Sergii Iakovenko Date: Fri, 31 Dec 2021 11:23:35 +0200 Subject: [PATCH 37/46] Implement YFlow swap to protected for failed paths. --- .../command/flow/FlowPathSwapRequest.java | 7 +- .../wfm/topology/flowhs/FlowHsTopology.java | 4 +- .../flowhs/bolts/FlowPathSwapHubBolt.java | 20 +- .../fsm/common/FlowPathSwappingFsm.java | 17 +- .../fsm/pathswap/FlowPathSwapContext.java | 12 +- .../flowhs/fsm/pathswap/FlowPathSwapFsm.java | 88 +++++- .../actions/BaseOnReceivedResponseAction.java | 54 ++++ .../actions/InstallIngressRulesAction.java | 2 +- .../OnReceivedInstallResponseAction.java | 94 ++++-- ...nReceivedRemoveOrRevertResponseAction.java | 114 ++++--- .../actions/RevertYFlowRulesAction.java | 77 +++++ .../actions/UpdateYFlowRulesAction.java | 129 ++++++++ .../actions/ValidateIngressRulesAction.java | 4 +- .../HandleNotCompletedCommandsAction.java | 4 +- .../error/SetInstallRuleErrorAction.java | 4 +- .../error/SetValidateRuleErrorAction.java | 4 +- .../flowhs/service/FlowPathSwapService.java | 37 ++- .../flowhs/service/AbstractFlowTest.java | 72 ++++- .../flowhs/service/FlowCreateServiceTest.java | 4 +- .../flowhs/service/FlowDeleteServiceTest.java | 4 +- .../service/FlowPathSwapServiceTest.java | 290 ++++++++++++++++++ .../service/FlowRerouteServiceTest.java | 4 +- .../flowhs/service/FlowUpdateServiceTest.java | 4 +- .../service/impl/FlowServiceImpl.java | 2 +- .../topology/reroute/bolts/RerouteBolt.java | 2 +- .../service/OperationQueueServiceTest.java | 2 +- 26 files changed, 892 insertions(+), 163 deletions(-) create mode 100644 src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/BaseOnReceivedResponseAction.java create mode 100644 src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/RevertYFlowRulesAction.java create mode 100644 src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/UpdateYFlowRulesAction.java create mode 100644 src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowPathSwapServiceTest.java diff --git a/src-java/flowhs-topology/flowhs-messaging/src/main/java/org/openkilda/messaging/command/flow/FlowPathSwapRequest.java b/src-java/flowhs-topology/flowhs-messaging/src/main/java/org/openkilda/messaging/command/flow/FlowPathSwapRequest.java index 5c8a27fc7ee..386d6e1e91a 100644 --- a/src-java/flowhs-topology/flowhs-messaging/src/main/java/org/openkilda/messaging/command/flow/FlowPathSwapRequest.java +++ b/src-java/flowhs-topology/flowhs-messaging/src/main/java/org/openkilda/messaging/command/flow/FlowPathSwapRequest.java @@ -31,10 +31,13 @@ public class FlowPathSwapRequest extends CommandData { private static final long serialVersionUID = 1L; @JsonProperty("flow_id") - protected String flowId; + String flowId; + boolean manual; @JsonCreator - public FlowPathSwapRequest(@NonNull @JsonProperty("flow_id") String flowId) { + public FlowPathSwapRequest(@NonNull @JsonProperty("flow_id") String flowId, + @JsonProperty("manual") boolean manual) { this.flowId = flowId; + this.manual = manual; } } diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/FlowHsTopology.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/FlowHsTopology.java index 065f7a7a2f3..3206852ac61 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/FlowHsTopology.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/FlowHsTopology.java @@ -295,7 +295,9 @@ private void flowSwapProtectedHub(TopologyBuilder topologyBuilder, PersistenceMa .build(); FlowResourcesConfig flowResourcesConfig = configurationProvider.getConfiguration(FlowResourcesConfig.class); - FlowPathSwapHubBolt hubBolt = new FlowPathSwapHubBolt(config, persistenceManager, flowResourcesConfig); + RuleManagerConfig ruleManagerConfig = configurationProvider.getConfiguration(RuleManagerConfig.class); + FlowPathSwapHubBolt hubBolt = new FlowPathSwapHubBolt(config, persistenceManager, flowResourcesConfig, + ruleManagerConfig); declareBolt(topologyBuilder, hubBolt, ComponentId.FLOW_PATH_SWAP_HUB.name()) .fieldsGrouping(ComponentId.FLOW_ROUTER_BOLT.name(), ROUTER_TO_FLOW_PATH_SWAP_HUB.name(), FLOW_FIELD) .directGrouping(ComponentId.FLOW_PATH_SWAP_SPEAKER_WORKER.name(), diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/bolts/FlowPathSwapHubBolt.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/bolts/FlowPathSwapHubBolt.java index 4f3ec35e032..eebafdc93c5 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/bolts/FlowPathSwapHubBolt.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/bolts/FlowPathSwapHubBolt.java @@ -26,7 +26,7 @@ import org.openkilda.bluegreen.LifecycleEvent; import org.openkilda.floodlight.api.request.SpeakerRequest; -import org.openkilda.floodlight.api.response.SpeakerFlowSegmentResponse; +import org.openkilda.floodlight.api.response.SpeakerResponse; import org.openkilda.messaging.Message; import org.openkilda.messaging.command.CommandData; import org.openkilda.messaging.command.CommandMessage; @@ -35,6 +35,9 @@ import org.openkilda.messaging.info.InfoMessage; import org.openkilda.messaging.info.reroute.PathSwapResult; import org.openkilda.persistence.PersistenceManager; +import org.openkilda.rulemanager.RuleManager; +import org.openkilda.rulemanager.RuleManagerConfig; +import org.openkilda.rulemanager.RuleManagerImpl; import org.openkilda.wfm.error.PipelineException; import org.openkilda.wfm.share.flow.resources.FlowResourcesConfig; import org.openkilda.wfm.share.flow.resources.FlowResourcesManager; @@ -51,6 +54,7 @@ import lombok.Builder; import lombok.Getter; +import lombok.NonNull; import org.apache.storm.topology.OutputFieldsDeclarer; import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Tuple; @@ -60,18 +64,21 @@ public class FlowPathSwapHubBolt extends HubBolt implements FlowPathSwapHubCarri private final FlowPathSwapConfig config; private final FlowResourcesConfig flowResourcesConfig; + private final RuleManagerConfig ruleManagerConfig; private transient FlowPathSwapService service; private String currentKey; private LifecycleEvent deferredShutdownEvent; - public FlowPathSwapHubBolt(FlowPathSwapConfig config, PersistenceManager persistenceManager, - FlowResourcesConfig flowResourcesConfig) { + public FlowPathSwapHubBolt(@NonNull FlowPathSwapConfig config, @NonNull PersistenceManager persistenceManager, + @NonNull FlowResourcesConfig flowResourcesConfig, + @NonNull RuleManagerConfig ruleManagerConfig) { super(persistenceManager, config); this.config = config; this.flowResourcesConfig = flowResourcesConfig; + this.ruleManagerConfig = ruleManagerConfig; enableMeterRegistry("kilda.flow_pathswap", HUB_TO_METRICS_BOLT.name()); } @@ -79,7 +86,8 @@ public FlowPathSwapHubBolt(FlowPathSwapConfig config, PersistenceManager persist @Override protected void init() { FlowResourcesManager resourcesManager = new FlowResourcesManager(persistenceManager, flowResourcesConfig); - service = new FlowPathSwapService(this, persistenceManager, + RuleManager ruleManager = new RuleManagerImpl(ruleManagerConfig); + service = new FlowPathSwapService(this, persistenceManager, ruleManager, config.getSpeakerCommandRetriesLimit(), resourcesManager); } @@ -108,12 +116,12 @@ protected void onRequest(Tuple input) throws PipelineException { protected void onWorkerResponse(Tuple input) { String operationKey = input.getStringByField(MessageKafkaTranslator.FIELD_ID_KEY); currentKey = KeyProvider.getParentKey(operationKey); - SpeakerFlowSegmentResponse flowResponse = (SpeakerFlowSegmentResponse) input.getValueByField(FIELD_ID_PAYLOAD); + SpeakerResponse flowResponse = (SpeakerResponse) input.getValueByField(FIELD_ID_PAYLOAD); service.handleAsyncResponse(currentKey, flowResponse); } @Override - public void onTimeout(String key, Tuple tuple) { + public void onTimeout(@NonNull String key, Tuple tuple) { currentKey = key; service.handleTimeout(key); } diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/common/FlowPathSwappingFsm.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/common/FlowPathSwappingFsm.java index 3f454ec3644..cc2fa021c4e 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/common/FlowPathSwappingFsm.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/common/FlowPathSwappingFsm.java @@ -18,8 +18,7 @@ import static java.util.Collections.emptyList; import org.openkilda.floodlight.api.request.factory.FlowSegmentRequestFactory; -import org.openkilda.floodlight.api.response.SpeakerFlowSegmentResponse; -import org.openkilda.floodlight.flow.response.FlowErrorResponse; +import org.openkilda.floodlight.api.response.SpeakerResponse; import org.openkilda.messaging.error.ErrorType; import org.openkilda.model.FlowPathStatus; import org.openkilda.model.PathId; @@ -76,8 +75,8 @@ public abstract class FlowPathSwappingFsm, S, protected final Map pendingCommands = new HashMap<>(); protected final Map retriedCommands = new HashMap<>(); - protected final Map failedCommands = new HashMap<>(); - protected final Map failedValidationResponses = new HashMap<>(); + protected final Map failedCommands = new HashMap<>(); + protected final Map failedValidationResponses = new HashMap<>(); protected final Map ingressCommands = new HashMap<>(); protected final Map nonIngressCommands = new HashMap<>(); @@ -105,6 +104,10 @@ public FlowSegmentRequestFactory getInstallCommand(UUID commandId) { return requestFactory; } + public FlowSegmentRequestFactory getRemoveCommand(UUID commandId) { + return removeCommands.get(commandId); + } + public abstract void fireNoPathFound(String errorReason); public void clearPendingCommands() { @@ -115,6 +118,10 @@ public Optional getPendingCommand(UUID key) { return Optional.ofNullable(pendingCommands.get(key)); } + public boolean hasPendingCommand(UUID key) { + return pendingCommands.containsKey(key); + } + public void addPendingCommand(UUID key, SwitchId switchId) { pendingCommands.put(key, switchId); } @@ -137,7 +144,7 @@ public void clearFailedCommands() { failedCommands.clear(); } - public void addFailedCommand(UUID key, FlowErrorResponse errorResponse) { + public void addFailedCommand(UUID key, SpeakerResponse errorResponse) { failedCommands.put(key, errorResponse); } diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/FlowPathSwapContext.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/FlowPathSwapContext.java index ed3440ba8cf..97e6f524a96 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/FlowPathSwapContext.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/FlowPathSwapContext.java @@ -15,19 +15,17 @@ package org.openkilda.wfm.topology.flowhs.fsm.pathswap; -import org.openkilda.floodlight.api.response.SpeakerFlowSegmentResponse; -import org.openkilda.wfm.topology.flowhs.fsm.common.FlowContext; +import org.openkilda.floodlight.api.response.SpeakerResponse; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; @Data -@EqualsAndHashCode(callSuper = true) -public class FlowPathSwapContext extends FlowContext { +public class FlowPathSwapContext { + private SpeakerResponse speakerResponse; @Builder - public FlowPathSwapContext(SpeakerFlowSegmentResponse speakerFlowResponse) { - super(speakerFlowResponse); + public FlowPathSwapContext(SpeakerResponse speakerResponse) { + this.speakerResponse = speakerResponse; } } diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/FlowPathSwapFsm.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/FlowPathSwapFsm.java index 933b54674ef..88457c73e9d 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/FlowPathSwapFsm.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/FlowPathSwapFsm.java @@ -15,7 +15,10 @@ package org.openkilda.wfm.topology.flowhs.fsm.pathswap; +import org.openkilda.floodlight.api.request.rulemanager.DeleteSpeakerCommandsRequest; +import org.openkilda.floodlight.api.request.rulemanager.InstallSpeakerCommandsRequest; import org.openkilda.persistence.PersistenceManager; +import org.openkilda.rulemanager.RuleManager; import org.openkilda.wfm.CommandContext; import org.openkilda.wfm.share.flow.resources.FlowResourcesManager; import org.openkilda.wfm.share.logger.FlowOperationsDashboardLogger; @@ -38,8 +41,10 @@ import org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions.RemoveOldRulesAction; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions.RevertNewRulesAction; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions.RevertPathsSwapAction; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions.RevertYFlowRulesAction; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions.UpdateFlowPathsAction; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions.UpdateFlowStatusAction; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions.UpdateYFlowRulesAction; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions.ValidateIngressRulesAction; import org.openkilda.wfm.topology.flowhs.service.FlowPathSwapHubCarrier; import org.openkilda.wfm.topology.flowhs.service.FlowProcessingEventListener; @@ -53,6 +58,10 @@ import org.squirrelframework.foundation.fsm.StateMachineBuilder; import org.squirrelframework.foundation.fsm.StateMachineBuilderFactory; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; import java.util.concurrent.TimeUnit; @Getter @@ -61,6 +70,9 @@ public final class FlowPathSwapFsm extends FlowPathSwappingFsm { + private final Map installSpeakerRequests = new HashMap<>(); + private final Map deleteSpeakerRequests = new HashMap<>(); + public FlowPathSwapFsm(@NonNull CommandContext commandContext, @NonNull FlowPathSwapHubCarrier carrier, @NonNull String flowId) { super(Event.NEXT, Event.ERROR, commandContext, carrier, flowId); @@ -71,18 +83,33 @@ public void fireNoPathFound(String errorReason) { } + public void addInstallSpeakerCommand(UUID key, InstallSpeakerCommandsRequest command) { + installSpeakerRequests.put(key, command); + } + + public Optional getInstallSpeakerCommand(UUID key) { + return Optional.ofNullable(installSpeakerRequests.get(key)); + } + + public void addDeleteSpeakerCommand(UUID key, DeleteSpeakerCommandsRequest command) { + deleteSpeakerRequests.put(key, command); + } + + public Optional getDeleteSpeakerCommand(UUID key) { + return Optional.ofNullable(deleteSpeakerRequests.get(key)); + } + @Override protected String getCrudActionName() { return "path swap"; } public static class Factory { - private final StateMachineBuilder builder; + private final StateMachineBuilder builder; private final FlowPathSwapHubCarrier carrier; public Factory(@NonNull FlowPathSwapHubCarrier carrier, @NonNull PersistenceManager persistenceManager, - @NonNull FlowResourcesManager resourcesManager, + @NonNull FlowResourcesManager resourcesManager, @NonNull RuleManager ruleManager, int speakerCommandRetriesLimit) { this.carrier = carrier; @@ -112,8 +139,6 @@ public Factory(@NonNull FlowPathSwapHubCarrier carrier, @NonNull PersistenceMana builder.internalTransition().within(State.INSTALLING_INGRESS_RULES).on(Event.RESPONSE_RECEIVED) .perform(new OnReceivedInstallResponseAction(speakerCommandRetriesLimit)); - builder.internalTransition().within(State.INSTALLING_INGRESS_RULES).on(Event.ERROR_RECEIVED) - .perform(new OnReceivedInstallResponseAction(speakerCommandRetriesLimit)); builder.transition().from(State.INSTALLING_INGRESS_RULES).to(State.INGRESS_RULES_INSTALLED) .on(Event.RULES_INSTALLED); builder.transitions().from(State.INSTALLING_INGRESS_RULES) @@ -129,21 +154,30 @@ public Factory(@NonNull FlowPathSwapHubCarrier carrier, @NonNull PersistenceMana builder.internalTransition().within(State.VALIDATING_INGRESS_RULES).on(Event.RESPONSE_RECEIVED) .perform(new ValidateIngressRulesAction(speakerCommandRetriesLimit)); - builder.internalTransition().within(State.VALIDATING_INGRESS_RULES).on(Event.ERROR_RECEIVED) - .perform(new ValidateIngressRulesAction(speakerCommandRetriesLimit)); builder.transition().from(State.VALIDATING_INGRESS_RULES).to(State.INGRESS_RULES_VALIDATED) .on(Event.RULES_VALIDATED); builder.transitions().from(State.VALIDATING_INGRESS_RULES) .toAmong(State.REVERTING_PATHS_SWAP, State.REVERTING_PATHS_SWAP, State.REVERTING_PATHS_SWAP) .onEach(Event.TIMEOUT, Event.MISSING_RULE_FOUND, Event.ERROR); - builder.transition().from(State.INGRESS_RULES_VALIDATED).to(State.REMOVING_OLD_RULES).on(Event.NEXT) + builder.transition().from(State.INGRESS_RULES_VALIDATED).to(State.UPDATING_YFLOW_RULES).on(Event.NEXT) + .perform(new UpdateYFlowRulesAction(persistenceManager, ruleManager)); + + builder.internalTransition().within(State.UPDATING_YFLOW_RULES).on(Event.RESPONSE_RECEIVED) + .perform(new OnReceivedInstallResponseAction(speakerCommandRetriesLimit)); + builder.transitions().from(State.UPDATING_YFLOW_RULES) + .toAmong(State.YFLOW_RULES_UPDATED, State.YFLOW_RULES_UPDATED) + .onEach(Event.RULES_INSTALLED, Event.SKIP_YFLOW_RULES_UPDATE); + builder.transitions().from(State.UPDATING_YFLOW_RULES) + .toAmong(State.REVERTING_PATHS_SWAP, State.REVERTING_PATHS_SWAP) + .onEach(Event.TIMEOUT, Event.ERROR) + .perform(new AbandonPendingCommandsAction()); + + builder.transition().from(State.YFLOW_RULES_UPDATED).to(State.REMOVING_OLD_RULES).on(Event.NEXT) .perform(new RemoveOldRulesAction(persistenceManager, resourcesManager)); builder.internalTransition().within(State.REMOVING_OLD_RULES).on(Event.RESPONSE_RECEIVED) .perform(new OnReceivedRemoveOrRevertResponseAction(speakerCommandRetriesLimit)); - builder.internalTransition().within(State.REMOVING_OLD_RULES).on(Event.ERROR_RECEIVED) - .perform(new OnReceivedRemoveOrRevertResponseAction(speakerCommandRetriesLimit)); builder.transitions().from(State.REMOVING_OLD_RULES) .toAmong(State.OLD_RULES_REMOVED, State.OLD_RULES_REMOVED) .onEach(Event.RULES_REMOVED, Event.ERROR); @@ -167,15 +201,26 @@ public Factory(@NonNull FlowPathSwapHubCarrier carrier, @NonNull PersistenceMana builder.internalTransition().within(State.REVERTING_NEW_RULES).on(Event.RESPONSE_RECEIVED) .perform(new OnReceivedRemoveOrRevertResponseAction(speakerCommandRetriesLimit)); - builder.internalTransition().within(State.REVERTING_NEW_RULES).on(Event.ERROR_RECEIVED) - .perform(new OnReceivedRemoveOrRevertResponseAction(speakerCommandRetriesLimit)); builder.transition().from(State.REVERTING_NEW_RULES).to(State.NEW_RULES_REVERTED) .on(Event.RULES_REMOVED); builder.transition().from(State.REVERTING_NEW_RULES).to(State.NEW_RULES_REVERTED) .on(Event.ERROR) .perform(new HandleNotCompletedCommandsAction()); - builder.transition().from(State.NEW_RULES_REVERTED) + builder.transition().from(State.NEW_RULES_REVERTED).to(State.REVERTING_YFLOW_RULES).on(Event.NEXT) + .perform(new RevertYFlowRulesAction(persistenceManager, ruleManager)); + + builder.internalTransition().within(State.REVERTING_YFLOW_RULES).on(Event.RESPONSE_RECEIVED) + .perform(new OnReceivedRemoveOrRevertResponseAction(speakerCommandRetriesLimit)); + builder.transitions().from(State.REVERTING_YFLOW_RULES) + .toAmong(State.YFLOW_RULES_REVERTED, State.YFLOW_RULES_REVERTED) + .onEach(Event.RULES_REMOVED, Event.SKIP_YFLOW_RULES_REVERT); + builder.transitions().from(State.REVERTING_YFLOW_RULES) + .toAmong(State.YFLOW_RULES_REVERTED, State.YFLOW_RULES_REVERTED) + .onEach(Event.TIMEOUT, Event.ERROR) + .perform(new HandleNotCompletedCommandsAction()); + + builder.transition().from(State.YFLOW_RULES_REVERTED) .to(State.REVERTING_FLOW_STATUS) .on(Event.NEXT) .perform(new RecalculateFlowStatusAction(persistenceManager, @@ -207,8 +252,11 @@ public Factory(@NonNull FlowPathSwapHubCarrier carrier, @NonNull PersistenceMana } public FlowPathSwapFsm newInstance(@NonNull CommandContext commandContext, @NonNull String flowId) { - FlowPathSwapFsm fsm = - builder.newStateMachine(FlowPathSwapFsm.State.INITIALIZED, commandContext, carrier, flowId); + FlowPathSwapFsm fsm = builder.newStateMachine(State.INITIALIZED, commandContext, carrier, flowId); + + fsm.addTransitionCompleteListener(event -> + log.debug("FlowPathSwapFsm, transition to {} on {}", event.getTargetState(), event.getCause())); + MeterRegistryHolder.getRegistry().ifPresent(registry -> { Sample sample = LongTaskTimer.builder("fsm.active_execution") .register(registry) @@ -238,6 +286,8 @@ public enum State { VALIDATING_INGRESS_RULES, INGRESS_RULES_VALIDATED, + UPDATING_YFLOW_RULES, + YFLOW_RULES_UPDATED, REMOVING_OLD_RULES, OLD_RULES_REMOVED, @@ -257,6 +307,9 @@ public enum State { REVERTING_NEW_RULES, NEW_RULES_REVERTED, + REVERTING_YFLOW_RULES, + YFLOW_RULES_REVERTED, + REVERTING_FLOW_STATUS, REVERTING_FLOW, @@ -270,14 +323,17 @@ public enum Event { NEXT, RESPONSE_RECEIVED, - ERROR_RECEIVED, RULES_INSTALLED, RULES_VALIDATED, MISSING_RULE_FOUND, + SKIP_YFLOW_RULES_UPDATE, + RULES_REMOVED, + SKIP_YFLOW_RULES_REVERT, + TIMEOUT, ERROR } diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/BaseOnReceivedResponseAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/BaseOnReceivedResponseAction.java new file mode 100644 index 00000000000..1b5c68c0f8d --- /dev/null +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/BaseOnReceivedResponseAction.java @@ -0,0 +1,54 @@ +/* Copyright 2021 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions; + +import org.openkilda.floodlight.api.request.rulemanager.FlowCommand; +import org.openkilda.floodlight.api.request.rulemanager.GroupCommand; +import org.openkilda.floodlight.api.request.rulemanager.MeterCommand; +import org.openkilda.floodlight.api.request.rulemanager.OfCommand; +import org.openkilda.wfm.topology.flowhs.fsm.common.actions.HistoryRecordingAction; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapContext; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm.Event; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm.State; + +import lombok.extern.slf4j.Slf4j; + +import java.util.Collection; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + +@Slf4j +public abstract class BaseOnReceivedResponseAction extends + HistoryRecordingAction { + protected final int speakerCommandRetriesLimit; + + protected BaseOnReceivedResponseAction(int speakerCommandRetriesLimit) { + this.speakerCommandRetriesLimit = speakerCommandRetriesLimit; + } + + protected Collection filterOfCommands(Collection source, Set commandUuids) { + return source.stream() + .filter(ofCommand -> ofCommand instanceof FlowCommand + && commandUuids.contains(((FlowCommand) ofCommand).getData().getUuid()) + || ofCommand instanceof MeterCommand + && commandUuids.contains(((MeterCommand) ofCommand).getData().getUuid()) + || ofCommand instanceof GroupCommand + && commandUuids.contains(((GroupCommand) ofCommand).getData().getUuid())) + .collect(Collectors.toList()); + } +} diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/InstallIngressRulesAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/InstallIngressRulesAction.java index 9913fd6d581..74328735f0b 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/InstallIngressRulesAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/InstallIngressRulesAction.java @@ -66,7 +66,7 @@ protected void perform(State from, State to, Event event, FlowPathSwapContext co commandBuilder.buildIngressOnly( stateMachine.getCommandContext(), flow, newPrimaryForward, newPrimaryReverse, speakerContext)); commands.addAll(commandBuilder.buildEgressOnly(stateMachine.getCommandContext(), - flow, newPrimaryForward, newPrimaryReverse).stream() + flow, newPrimaryForward, newPrimaryReverse).stream() .filter(f -> f instanceof TransitFlowLoopSegmentRequestFactory || f instanceof EgressMirrorFlowSegmentRequestFactory) .collect(Collectors.toList())); diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/OnReceivedInstallResponseAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/OnReceivedInstallResponseAction.java index 5e8241e7c31..69a1ad6e13a 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/OnReceivedInstallResponseAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/OnReceivedInstallResponseAction.java @@ -19,8 +19,9 @@ import org.openkilda.floodlight.api.request.factory.FlowSegmentRequestFactory; import org.openkilda.floodlight.api.response.SpeakerFlowSegmentResponse; +import org.openkilda.floodlight.api.response.SpeakerResponse; +import org.openkilda.floodlight.api.response.rulemanager.SpeakerCommandResponse; import org.openkilda.floodlight.flow.response.FlowErrorResponse; -import org.openkilda.wfm.topology.flowhs.fsm.common.actions.HistoryRecordingAction; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapContext; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm.Event; @@ -28,63 +29,102 @@ import lombok.extern.slf4j.Slf4j; +import java.util.Set; import java.util.UUID; @Slf4j -public class OnReceivedInstallResponseAction extends - HistoryRecordingAction { - private final int speakerCommandRetriesLimit; - +public class OnReceivedInstallResponseAction extends BaseOnReceivedResponseAction { public OnReceivedInstallResponseAction(int speakerCommandRetriesLimit) { - this.speakerCommandRetriesLimit = speakerCommandRetriesLimit; + super(speakerCommandRetriesLimit); } @Override protected void perform(State from, State to, Event event, FlowPathSwapContext context, FlowPathSwapFsm stateMachine) { - SpeakerFlowSegmentResponse response = context.getSpeakerFlowResponse(); + SpeakerResponse response = context.getSpeakerResponse(); UUID commandId = response.getCommandId(); - FlowSegmentRequestFactory command = stateMachine.getInstallCommand(commandId); - if (!stateMachine.getPendingCommands().containsKey(commandId) || command == null) { + if (!stateMachine.hasPendingCommand(commandId)) { log.info("Received a response for unexpected command: {}", response); return; } + boolean isInstallCommand = stateMachine.getInstallCommand(commandId) != null + || stateMachine.getInstallSpeakerCommand(commandId).isPresent(); + if (response.isSuccess()) { stateMachine.removePendingCommand(commandId); - - stateMachine.saveActionToHistory("Rule was installed", - format("The rule was installed: switch %s, cookie %s", - response.getSwitchId(), command.getCookie())); + String commandName = isInstallCommand ? "installed" : "deleted"; + if (response instanceof SpeakerFlowSegmentResponse) { + stateMachine.saveActionToHistory("Rule was " + commandName, + format("The rule was %s: switch %s, cookie %s", commandName, + response.getSwitchId(), ((SpeakerFlowSegmentResponse) response).getCookie())); + } else { + stateMachine.saveActionToHistory("Rule was " + commandName, + format("The rule was %s: switch %s", commandName, response.getSwitchId())); + } } else { - FlowErrorResponse errorResponse = (FlowErrorResponse) response; - int attempt = stateMachine.doRetryForCommand(commandId); if (attempt <= speakerCommandRetriesLimit) { - stateMachine.saveErrorToHistory("Failed to install rule", format( - "Failed to install the rule: commandId %s, switch %s, cookie %s. Error %s. " - + "Retrying (attempt %d)", - commandId, errorResponse.getSwitchId(), command.getCookie(), errorResponse, attempt)); + FlowSegmentRequestFactory flowSegmentRequest = stateMachine.getInstallCommand(commandId); + if (flowSegmentRequest != null && response instanceof FlowErrorResponse) { + FlowErrorResponse errorResponse = (FlowErrorResponse) response; + stateMachine.saveErrorToHistory("Failed to install rule", + format("Failed to install the rule: commandId %s, switch %s, cookie %s. Error %s. " + + "Retrying (attempt %d)", + commandId, errorResponse.getSwitchId(), flowSegmentRequest.getCookie(), + errorResponse, attempt)); + stateMachine.getCarrier().sendSpeakerRequest(flowSegmentRequest.makeInstallRequest(commandId)); + } else if (response instanceof SpeakerCommandResponse) { + String commandName = isInstallCommand ? "install" : "delete"; + SpeakerCommandResponse speakerCommandResponse = (SpeakerCommandResponse) response; + speakerCommandResponse.getFailedCommandIds().forEach((uuid, message) -> + stateMachine.saveErrorToHistory("Failed to " + commandName + " rule", + format("Failed to %s the rule: commandId %s, ruleId %s, switch %s. " + + "Error %s. Retrying (attempt %d)", commandName, + commandId, uuid, response.getSwitchId(), message, attempt))); - stateMachine.getCarrier().sendSpeakerRequest(command.makeInstallRequest(commandId)); + Set failedUuids = speakerCommandResponse.getFailedCommandIds().keySet(); + stateMachine.getInstallSpeakerCommand(commandId) + .ifPresent(command -> stateMachine.getCarrier() + .sendSpeakerRequest(command.toBuilder() + .commands(filterOfCommands(command.getCommands(), failedUuids)).build())); + stateMachine.getDeleteSpeakerCommand(commandId) + .ifPresent(command -> stateMachine.getCarrier() + .sendSpeakerRequest(command.toBuilder() + .commands(filterOfCommands(command.getCommands(), failedUuids)).build())); + } else { + log.warn("Received a unknown response: {}", response); + return; + } } else { + stateMachine.addFailedCommand(commandId, response); stateMachine.removePendingCommand(commandId); - stateMachine.saveErrorToHistory("Failed to install rule", format( - "Failed to install the rule: commandId %s, switch %s, cookie %s. Error: %s", - commandId, errorResponse.getSwitchId(), command.getCookie(), errorResponse)); - - stateMachine.addFailedCommand(commandId, errorResponse); + String commandName = isInstallCommand ? "install" : "delete"; + if (response instanceof FlowErrorResponse) { + stateMachine.saveErrorToHistory("Failed to " + commandName + " rule", + format("Failed to %s the rule: commandId %s, switch %s, cookie %s. Error %s.", + commandName, commandId, response.getSwitchId(), + ((FlowErrorResponse) response).getCookie(), response)); + } else if (response instanceof SpeakerCommandResponse) { + ((SpeakerCommandResponse) response).getFailedCommandIds().forEach((uuid, message) -> + stateMachine.saveErrorToHistory("Failed to " + commandName + " rule", + format("Failed to %s the rule: commandId %s, ruleId %s, switch %s. Error %s.", + commandName, commandId, uuid, response.getSwitchId(), message))); + } else { + log.warn("Received a unknown response: {}", response); + return; + } } } if (stateMachine.getPendingCommands().isEmpty()) { if (stateMachine.getFailedCommands().isEmpty()) { - log.debug("Received responses for all pending install commands of the flow {}", + log.debug("Received responses for all pending install / delete commands of the flow {}", stateMachine.getFlowId()); stateMachine.fire(Event.RULES_INSTALLED); } else { - String errorMessage = format("Received error response(s) for %d install commands", + String errorMessage = format("Received error response(s) for %d install / delete commands", stateMachine.getFailedCommands().size()); stateMachine.saveErrorToHistory(errorMessage); stateMachine.fireError(errorMessage); diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/OnReceivedRemoveOrRevertResponseAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/OnReceivedRemoveOrRevertResponseAction.java index d572b7e8f76..5c47cfd7784 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/OnReceivedRemoveOrRevertResponseAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/OnReceivedRemoveOrRevertResponseAction.java @@ -19,8 +19,9 @@ import org.openkilda.floodlight.api.request.factory.FlowSegmentRequestFactory; import org.openkilda.floodlight.api.response.SpeakerFlowSegmentResponse; +import org.openkilda.floodlight.api.response.SpeakerResponse; +import org.openkilda.floodlight.api.response.rulemanager.SpeakerCommandResponse; import org.openkilda.floodlight.flow.response.FlowErrorResponse; -import org.openkilda.wfm.topology.flowhs.fsm.common.actions.HistoryRecordingAction; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapContext; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm.Event; @@ -28,85 +29,112 @@ import lombok.extern.slf4j.Slf4j; +import java.util.Set; import java.util.UUID; @Slf4j -public class OnReceivedRemoveOrRevertResponseAction extends - HistoryRecordingAction { - private final int speakerCommandRetriesLimit; - +public class OnReceivedRemoveOrRevertResponseAction extends BaseOnReceivedResponseAction { public OnReceivedRemoveOrRevertResponseAction(int speakerCommandRetriesLimit) { - this.speakerCommandRetriesLimit = speakerCommandRetriesLimit; + super(speakerCommandRetriesLimit); } @Override protected void perform(State from, State to, Event event, FlowPathSwapContext context, FlowPathSwapFsm stateMachine) { - SpeakerFlowSegmentResponse response = context.getSpeakerFlowResponse(); + SpeakerResponse response = context.getSpeakerResponse(); UUID commandId = response.getCommandId(); - FlowSegmentRequestFactory removeCommand = stateMachine.getRemoveCommands().get(commandId); - FlowSegmentRequestFactory installCommand = stateMachine.getInstallCommand(commandId); - if (!stateMachine.getPendingCommands().containsKey(commandId) - || (removeCommand == null && installCommand == null)) { + if (!stateMachine.hasPendingCommand(commandId)) { log.info("Received a response for unexpected command: {}", response); return; } + boolean isInstallCommand = stateMachine.getInstallCommand(commandId) != null + || stateMachine.getInstallSpeakerCommand(commandId).isPresent(); + if (response.isSuccess()) { stateMachine.removePendingCommand(commandId); - - if (removeCommand != null) { - stateMachine.saveActionToHistory("Rule was deleted", - format("The rule was removed: switch %s, cookie %s", response.getSwitchId(), - removeCommand.getCookie())); + String commandName = isInstallCommand ? "re-installed (reverted)" : "deleted"; + if (response instanceof SpeakerFlowSegmentResponse) { + stateMachine.saveActionToHistory("Rule was " + commandName, + format("The rule was %s: switch %s, cookie %s", commandName, + response.getSwitchId(), ((SpeakerFlowSegmentResponse) response).getCookie())); } else { - stateMachine.saveActionToHistory("Rule was re-installed (reverted)", - format("The rule was installed: switch %s, cookie %s", - response.getSwitchId(), installCommand.getCookie())); + stateMachine.saveActionToHistory("Rule was " + commandName, + format("The rule was %s: switch %s", commandName, response.getSwitchId())); } } else { - FlowErrorResponse errorResponse = (FlowErrorResponse) response; - int attempt = stateMachine.doRetryForCommand(commandId); if (attempt <= speakerCommandRetriesLimit) { - if (removeCommand != null) { - stateMachine.saveErrorToHistory("Failed to remove rule", format( - "Failed to remove the rule: commandId %s, switch %s, cookie %s. Error %s. " - + "Retrying (attempt %d)", - commandId, errorResponse.getSwitchId(), removeCommand.getCookie(), errorResponse, attempt)); + if (response instanceof FlowErrorResponse) { + FlowErrorResponse errorResponse = (FlowErrorResponse) response; + if (isInstallCommand) { + FlowSegmentRequestFactory installCommand = stateMachine.getInstallCommand(commandId); + stateMachine.saveErrorToHistory("Failed to re-install (revert) rule", + format("Failed to install the rule: commandId %s, switch %s, cookie %s. Error %s. " + + "Retrying (attempt %d)", + commandId, errorResponse.getSwitchId(), installCommand.getCookie(), + errorResponse, attempt)); + stateMachine.getCarrier().sendSpeakerRequest(installCommand.makeInstallRequest(commandId)); + } else { + FlowSegmentRequestFactory removeCommand = stateMachine.getRemoveCommand(commandId); + stateMachine.saveErrorToHistory("Failed to delete rule", + format("Failed to remove the rule: commandId %s, switch %s, cookie %s. Error %s. " + + "Retrying (attempt %d)", + commandId, errorResponse.getSwitchId(), removeCommand.getCookie(), + errorResponse, attempt)); + stateMachine.getCarrier().sendSpeakerRequest(removeCommand.makeRemoveRequest(commandId)); + } + } else if (response instanceof SpeakerCommandResponse) { + String commandName = isInstallCommand ? "re-install (revert)" : "delete"; + SpeakerCommandResponse speakerCommandResponse = (SpeakerCommandResponse) response; + speakerCommandResponse.getFailedCommandIds().forEach((uuid, message) -> + stateMachine.saveErrorToHistory("Failed to " + commandName + " rule", + format("Failed to %s the rule: commandId %s, ruleId %s, switch %s. " + + "Error %s. Retrying (attempt %d)", commandName, + commandId, uuid, response.getSwitchId(), message, attempt))); - stateMachine.getCarrier().sendSpeakerRequest(removeCommand.makeRemoveRequest(commandId)); + Set failedUuids = speakerCommandResponse.getFailedCommandIds().keySet(); + stateMachine.getInstallSpeakerCommand(commandId) + .ifPresent(command -> stateMachine.getCarrier() + .sendSpeakerRequest(command.toBuilder() + .commands(filterOfCommands(command.getCommands(), failedUuids)).build())); + stateMachine.getDeleteSpeakerCommand(commandId) + .ifPresent(command -> stateMachine.getCarrier() + .sendSpeakerRequest(command.toBuilder() + .commands(filterOfCommands(command.getCommands(), failedUuids)).build())); } else { - stateMachine.saveErrorToHistory("Failed to re-install (revert) rule", format( - "Failed to install the rule: commandId %s, switch %s, cookie %s. Error %s. " - + "Retrying (attempt %d)", commandId, errorResponse.getSwitchId(), - installCommand.getCookie(), errorResponse, attempt)); - - stateMachine.getCarrier().sendSpeakerRequest(installCommand.makeInstallRequest(commandId)); + log.warn("Received a unknown response: {}", response); + return; } } else { + stateMachine.addFailedCommand(commandId, response); stateMachine.removePendingCommand(commandId); - if (removeCommand != null) { - stateMachine.saveErrorToHistory("Failed to remove rule", format( - "Failed to remove the rule: commandId %s, switch %s, cookie %s. Error: %s", - commandId, errorResponse.getSwitchId(), removeCommand.getCookie(), errorResponse)); + String commandName = isInstallCommand ? "re-install (revert)" : "delete"; + if (response instanceof FlowErrorResponse) { + stateMachine.saveErrorToHistory("Failed to " + commandName + " rule", + format("Failed to %s the rule: commandId %s, switch %s, cookie %s. Error %s.", + commandName, commandId, response.getSwitchId(), + ((FlowErrorResponse) response).getCookie(), response)); + } else if (response instanceof SpeakerCommandResponse) { + ((SpeakerCommandResponse) response).getFailedCommandIds().forEach((uuid, message) -> + stateMachine.saveErrorToHistory("Failed to " + commandName + " rule", + format("Failed to %s the rule: commandId %s, ruleId %s, switch %s. Error %s.", + commandName, commandId, uuid, response.getSwitchId(), message))); } else { - stateMachine.saveErrorToHistory("Failed to re-install rule", format( - "Failed to install the rule: commandId %s, switch %s, cookie %s. Error: %s", - commandId, errorResponse.getSwitchId(), installCommand.getCookie(), errorResponse)); + log.warn("Received a unknown response: {}", response); + return; } - stateMachine.addFailedCommand(commandId, errorResponse); } } if (stateMachine.getPendingCommands().isEmpty()) { if (stateMachine.getFailedCommands().isEmpty()) { - log.debug("Received responses for all pending remove / re-install commands of the flow {}", + log.debug("Received responses for all pending install / delete commands of the flow {}", stateMachine.getFlowId()); stateMachine.fire(Event.RULES_REMOVED); } else { - String errorMessage = format("Received error response(s) for %d remove / re-install commands", + String errorMessage = format("Received error response(s) for %d install / delete commands", stateMachine.getFailedCommands().size()); stateMachine.saveErrorToHistory(errorMessage); stateMachine.fireError(errorMessage); diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/RevertYFlowRulesAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/RevertYFlowRulesAction.java new file mode 100644 index 00000000000..0f689468438 --- /dev/null +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/RevertYFlowRulesAction.java @@ -0,0 +1,77 @@ +/* Copyright 2021 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions; + +import static java.lang.String.format; + +import org.openkilda.floodlight.api.request.rulemanager.DeleteSpeakerCommandsRequest; +import org.openkilda.floodlight.api.request.rulemanager.InstallSpeakerCommandsRequest; +import org.openkilda.messaging.error.ErrorType; +import org.openkilda.model.Flow; +import org.openkilda.model.SwitchId; +import org.openkilda.model.YFlow; +import org.openkilda.persistence.PersistenceManager; +import org.openkilda.rulemanager.RuleManager; +import org.openkilda.wfm.topology.flowhs.exception.FlowProcessingException; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapContext; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm.Event; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm.State; + +import lombok.extern.slf4j.Slf4j; + +import java.util.stream.Stream; + +@Slf4j +public class RevertYFlowRulesAction extends UpdateYFlowRulesAction { + public RevertYFlowRulesAction(PersistenceManager persistenceManager, RuleManager ruleManager) { + super(persistenceManager, ruleManager); + } + + @Override + protected void perform(State from, State to, Event event, FlowPathSwapContext context, + FlowPathSwapFsm stateMachine) { + String flowId = stateMachine.getFlowId(); + Flow flow = getFlow(flowId); + String yFlowId = flow.getYFlowId(); + if (yFlowId == null) { + stateMachine.saveActionToHistory("No need to revert y-flow rules - it's not a sub-flow"); + stateMachine.fire(Event.SKIP_YFLOW_RULES_REVERT); + return; + } + YFlow yFlow = yFlowRepository.findById(yFlowId) + .orElseThrow(() -> new FlowProcessingException(ErrorType.INTERNAL_ERROR, + format("Y-flow %s not found in persistent storage", yFlowId))); + + stateMachine.clearPendingAndRetriedAndFailedCommands(); + + SwitchId sharedEndpoint = yFlow.getSharedEndpoint().getSwitchId(); + InstallSpeakerCommandsRequest installRequest = buildYFlowInstallRequest(sharedEndpoint, + stateMachine.getOldPrimaryForwardPath(), stateMachine.getCommandContext()); + stateMachine.addInstallSpeakerCommand(installRequest.getCommandId(), installRequest); + DeleteSpeakerCommandsRequest deleteRequest = buildYFlowDeleteRequest(sharedEndpoint, + stateMachine.getNewPrimaryForwardPath(), stateMachine.getCommandContext()); + stateMachine.addDeleteSpeakerCommand(deleteRequest.getCommandId(), deleteRequest); + + // emitting + Stream.of(installRequest, deleteRequest).forEach(command -> { + stateMachine.getCarrier().sendSpeakerRequest(command); + stateMachine.addPendingCommand(command.getCommandId(), command.getSwitchId()); + }); + + stateMachine.saveActionToHistory("Commands for reverting y-flow rules have been sent"); + } +} diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/UpdateYFlowRulesAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/UpdateYFlowRulesAction.java new file mode 100644 index 00000000000..77b7976c2e6 --- /dev/null +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/UpdateYFlowRulesAction.java @@ -0,0 +1,129 @@ +/* Copyright 2021 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.wfm.topology.flowhs.fsm.pathswap.actions; + +import static java.lang.String.format; +import static java.util.Collections.singleton; +import static java.util.stream.Collectors.toList; + +import org.openkilda.floodlight.api.request.rulemanager.DeleteSpeakerCommandsRequest; +import org.openkilda.floodlight.api.request.rulemanager.FlowCommand; +import org.openkilda.floodlight.api.request.rulemanager.InstallSpeakerCommandsRequest; +import org.openkilda.floodlight.api.request.rulemanager.OfCommand; +import org.openkilda.messaging.MessageContext; +import org.openkilda.messaging.error.ErrorType; +import org.openkilda.model.Flow; +import org.openkilda.model.PathId; +import org.openkilda.model.SwitchId; +import org.openkilda.model.YFlow; +import org.openkilda.persistence.PersistenceManager; +import org.openkilda.persistence.repositories.YFlowRepository; +import org.openkilda.rulemanager.DataAdapter; +import org.openkilda.rulemanager.FlowSpeakerData; +import org.openkilda.rulemanager.RuleManager; +import org.openkilda.rulemanager.SpeakerData; +import org.openkilda.rulemanager.adapter.PersistenceDataAdapter; +import org.openkilda.wfm.CommandContext; +import org.openkilda.wfm.topology.flowhs.exception.FlowProcessingException; +import org.openkilda.wfm.topology.flowhs.fsm.common.actions.FlowProcessingWithHistorySupportAction; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapContext; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm.Event; +import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapFsm.State; + +import lombok.extern.slf4j.Slf4j; + +import java.util.List; +import java.util.UUID; +import java.util.stream.Stream; + +@Slf4j +public class UpdateYFlowRulesAction extends + FlowProcessingWithHistorySupportAction { + protected final YFlowRepository yFlowRepository; + protected final RuleManager ruleManager; + + public UpdateYFlowRulesAction(PersistenceManager persistenceManager, RuleManager ruleManager) { + super(persistenceManager); + yFlowRepository = persistenceManager.getRepositoryFactory().createYFlowRepository(); + this.ruleManager = ruleManager; + } + + @Override + protected void perform(State from, State to, Event event, FlowPathSwapContext context, + FlowPathSwapFsm stateMachine) { + String flowId = stateMachine.getFlowId(); + Flow flow = getFlow(flowId); + String yFlowId = flow.getYFlowId(); + if (yFlowId == null) { + stateMachine.saveActionToHistory("No need to update y-flow rules - it's not a sub-flow"); + stateMachine.fire(Event.SKIP_YFLOW_RULES_UPDATE); + return; + } + YFlow yFlow = yFlowRepository.findById(yFlowId) + .orElseThrow(() -> new FlowProcessingException(ErrorType.INTERNAL_ERROR, + format("Y-flow %s not found in persistent storage", yFlowId))); + + stateMachine.clearPendingAndRetriedAndFailedCommands(); + + SwitchId sharedEndpoint = yFlow.getSharedEndpoint().getSwitchId(); + InstallSpeakerCommandsRequest installRequest = buildYFlowInstallRequest(sharedEndpoint, + stateMachine.getNewPrimaryForwardPath(), stateMachine.getCommandContext()); + stateMachine.addInstallSpeakerCommand(installRequest.getCommandId(), installRequest); + DeleteSpeakerCommandsRequest deleteRequest = buildYFlowDeleteRequest(sharedEndpoint, + stateMachine.getOldPrimaryForwardPath(), stateMachine.getCommandContext()); + stateMachine.addDeleteSpeakerCommand(deleteRequest.getCommandId(), deleteRequest); + + // emitting + Stream.of(installRequest, deleteRequest).forEach(command -> { + stateMachine.getCarrier().sendSpeakerRequest(command); + stateMachine.addPendingCommand(command.getCommandId(), command.getSwitchId()); + }); + + stateMachine.saveActionToHistory("Commands for updating y-flow rules have been sent"); + } + + protected InstallSpeakerCommandsRequest buildYFlowInstallRequest(SwitchId switchId, PathId pathId, + CommandContext context) { + List ofCommands = buildYFlowOfCommands(switchId, pathId); + UUID commandId = commandIdGenerator.generate(); + MessageContext messageContext = new MessageContext(commandId.toString(), + context.getCorrelationId()); + return new InstallSpeakerCommandsRequest(messageContext, switchId, commandId, ofCommands); + } + + protected DeleteSpeakerCommandsRequest buildYFlowDeleteRequest(SwitchId switchId, PathId pathId, + CommandContext context) { + List ofCommands = buildYFlowOfCommands(switchId, pathId); + UUID commandId = commandIdGenerator.generate(); + MessageContext messageContext = new MessageContext(commandId.toString(), + context.getCorrelationId()); + return new DeleteSpeakerCommandsRequest(messageContext, switchId, commandId, ofCommands); + } + + private List buildYFlowOfCommands(SwitchId switchId, PathId pathId) { + DataAdapter dataAdapter = PersistenceDataAdapter.builder() + .persistenceManager(persistenceManager) + .switchIds(singleton(switchId)) + .pathIds(singleton(pathId)) + .build(); + List speakerData = ruleManager.buildRulesForSwitch(switchId, dataAdapter); + return speakerData.stream() + .filter(data -> data instanceof FlowSpeakerData) + .map(data -> new FlowCommand((FlowSpeakerData) data)) + .collect(toList()); + } +} diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/ValidateIngressRulesAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/ValidateIngressRulesAction.java index b797179ab8c..a51e1a54e26 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/ValidateIngressRulesAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/pathswap/actions/ValidateIngressRulesAction.java @@ -18,7 +18,7 @@ import static java.lang.String.format; import org.openkilda.floodlight.api.request.factory.FlowSegmentRequestFactory; -import org.openkilda.floodlight.api.response.SpeakerFlowSegmentResponse; +import org.openkilda.floodlight.api.response.SpeakerResponse; import org.openkilda.floodlight.flow.response.FlowErrorResponse; import org.openkilda.wfm.topology.flowhs.fsm.common.actions.HistoryRecordingAction; import org.openkilda.wfm.topology.flowhs.fsm.pathswap.FlowPathSwapContext; @@ -42,7 +42,7 @@ public ValidateIngressRulesAction(int speakerCommandRetriesLimit) { @Override protected void perform(State from, State to, Event event, FlowPathSwapContext context, FlowPathSwapFsm stateMachine) { - SpeakerFlowSegmentResponse response = context.getSpeakerFlowResponse(); + SpeakerResponse response = context.getSpeakerResponse(); UUID commandId = response.getCommandId(); FlowSegmentRequestFactory command = stateMachine.getIngressCommands().get(commandId); if (!stateMachine.getPendingCommands().containsKey(commandId) || command == null) { diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/HandleNotCompletedCommandsAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/HandleNotCompletedCommandsAction.java index 0c356d8d173..8611f365b11 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/HandleNotCompletedCommandsAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/HandleNotCompletedCommandsAction.java @@ -18,7 +18,7 @@ import static java.lang.String.format; import org.openkilda.floodlight.api.request.factory.FlowSegmentRequestFactory; -import org.openkilda.floodlight.flow.response.FlowErrorResponse; +import org.openkilda.floodlight.api.response.SpeakerResponse; import org.openkilda.wfm.topology.flowhs.fsm.common.actions.HistoryRecordingAction; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteContext; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteFsm; @@ -53,7 +53,7 @@ public void perform(State from, State to, Event event, FlowRerouteContext contex } } - for (FlowErrorResponse errorResponse : stateMachine.getFailedCommands().values()) { + for (SpeakerResponse errorResponse : stateMachine.getFailedCommands().values()) { log.warn( "Receive error response from {} for command {}: {}", errorResponse.getSwitchId(), errorResponse.getCommandId(), errorResponse); diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/error/SetInstallRuleErrorAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/error/SetInstallRuleErrorAction.java index d83e45f0968..76f3cf5c5b5 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/error/SetInstallRuleErrorAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/error/SetInstallRuleErrorAction.java @@ -15,7 +15,7 @@ package org.openkilda.wfm.topology.flowhs.fsm.reroute.actions.error; -import org.openkilda.floodlight.flow.response.FlowErrorResponse; +import org.openkilda.floodlight.api.response.SpeakerResponse; import org.openkilda.messaging.info.reroute.error.SpeakerRequestError; import org.openkilda.model.SwitchId; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteContext; @@ -36,7 +36,7 @@ public class SetInstallRuleErrorAction extends AnonymousAction switches = Stream.concat(stateMachine.getPendingCommands().values().stream(), - stateMachine.getFailedCommands().values().stream().map(FlowErrorResponse::getSwitchId)) + stateMachine.getFailedCommands().values().stream().map(SpeakerResponse::getSwitchId)) .collect(Collectors.toSet()); stateMachine.setRerouteError(new SpeakerRequestError("Failed to install rules", switches)); log.debug("Abandoning all pending commands: {}", stateMachine.getPendingCommands()); diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/error/SetValidateRuleErrorAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/error/SetValidateRuleErrorAction.java index f6e10f46dac..aee2d464f48 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/error/SetValidateRuleErrorAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/error/SetValidateRuleErrorAction.java @@ -15,7 +15,7 @@ package org.openkilda.wfm.topology.flowhs.fsm.reroute.actions.error; -import org.openkilda.floodlight.api.response.SpeakerFlowSegmentResponse; +import org.openkilda.floodlight.api.response.SpeakerResponse; import org.openkilda.messaging.info.reroute.error.SpeakerRequestError; import org.openkilda.model.SwitchId; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteContext; @@ -37,7 +37,7 @@ public class SetValidateRuleErrorAction extends AnonymousAction switches = Stream.concat(stateMachine.getPendingCommands().values().stream(), stateMachine.getFailedValidationResponses().values().stream() - .map(SpeakerFlowSegmentResponse::getSwitchId)) + .map(SpeakerResponse::getSwitchId)) .collect(Collectors.toSet()); stateMachine.setRerouteError(new SpeakerRequestError("Failed to validate rules", switches)); log.debug("Abandoning all pending commands: {}", stateMachine.getPendingCommands()); diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/service/FlowPathSwapService.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/service/FlowPathSwapService.java index f5364df9f9c..ef0d5a57ba2 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/service/FlowPathSwapService.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/service/FlowPathSwapService.java @@ -17,11 +17,11 @@ import static java.lang.String.format; -import org.openkilda.floodlight.api.response.SpeakerFlowSegmentResponse; -import org.openkilda.floodlight.flow.response.FlowErrorResponse; +import org.openkilda.floodlight.api.response.SpeakerResponse; import org.openkilda.messaging.command.flow.FlowPathSwapRequest; import org.openkilda.messaging.error.ErrorType; import org.openkilda.persistence.PersistenceManager; +import org.openkilda.rulemanager.RuleManager; import org.openkilda.wfm.CommandContext; import org.openkilda.wfm.share.flow.resources.FlowResourcesManager; import org.openkilda.wfm.share.utils.FsmExecutor; @@ -31,6 +31,7 @@ import org.openkilda.wfm.topology.flowhs.service.common.FlowProcessingFsmRegister; import org.openkilda.wfm.topology.flowhs.service.common.FlowProcessingService; +import lombok.NonNull; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -38,12 +39,14 @@ public class FlowPathSwapService extends FlowProcessingService, FlowProcessingEventListener> { private final FlowPathSwapFsm.Factory fsmFactory; - public FlowPathSwapService(FlowPathSwapHubCarrier carrier, - PersistenceManager persistenceManager, - int speakerCommandRetriesLimit, FlowResourcesManager flowResourcesManager) { + public FlowPathSwapService(@NonNull FlowPathSwapHubCarrier carrier, + @NonNull PersistenceManager persistenceManager, + @NonNull RuleManager ruleManager, + int speakerCommandRetriesLimit, + @NonNull FlowResourcesManager flowResourcesManager) { super(new FlowProcessingFsmRegister<>(), new FsmExecutor<>(Event.NEXT), carrier, persistenceManager); fsmFactory = new FlowPathSwapFsm.Factory(carrier, - persistenceManager, flowResourcesManager, speakerCommandRetriesLimit); + persistenceManager, flowResourcesManager, ruleManager, speakerCommandRetriesLimit); } /** @@ -52,9 +55,10 @@ public FlowPathSwapService(FlowPathSwapHubCarrier carrier, * @param key command identifier. * @param request request data. */ - public void handleRequest(String key, CommandContext commandContext, FlowPathSwapRequest request) { + public void handleRequest(@NonNull String key, @NonNull CommandContext commandContext, + @NonNull FlowPathSwapRequest request) { String flowId = request.getFlowId(); - if (yFlowRepository.isSubFlow(flowId)) { + if (request.isManual() && yFlowRepository.isSubFlow(flowId)) { sendForbiddenSubFlowOperationToNorthbound(flowId, commandContext); return; } @@ -88,8 +92,8 @@ public void handleRequest(String key, CommandContext commandContext, FlowPathSwa * * @param key command identifier. */ - public void handleAsyncResponse(String key, SpeakerFlowSegmentResponse flowResponse) { - log.debug("Received flow command response {}", flowResponse); + public void handleAsyncResponse(@NonNull String key, @NonNull SpeakerResponse speakerResponse) { + log.debug("Received flow command response {}", speakerResponse); FlowPathSwapFsm fsm = fsmRegister.getFsmByKey(key).orElse(null); if (fsm == null) { log.warn("Failed to find a FSM: received response with key {} for non pending FSM", key); @@ -97,14 +101,9 @@ public void handleAsyncResponse(String key, SpeakerFlowSegmentResponse flowRespo } FlowPathSwapContext context = FlowPathSwapContext.builder() - .speakerFlowResponse(flowResponse) + .speakerResponse(speakerResponse) .build(); - - if (flowResponse instanceof FlowErrorResponse) { - fsmExecutor.fire(fsm, FlowPathSwapFsm.Event.ERROR_RECEIVED, context); - } else { - fsmExecutor.fire(fsm, FlowPathSwapFsm.Event.RESPONSE_RECEIVED, context); - } + fsmExecutor.fire(fsm, Event.RESPONSE_RECEIVED, context); removeIfFinished(fsm, key); } @@ -114,7 +113,7 @@ public void handleAsyncResponse(String key, SpeakerFlowSegmentResponse flowRespo * * @param key command identifier. */ - public void handleTimeout(String key) { + public void handleTimeout(@NonNull String key) { log.debug("Handling timeout for {}", key); FlowPathSwapFsm fsm = fsmRegister.getFsmByKey(key).orElse(null); if (fsm == null) { @@ -122,7 +121,7 @@ public void handleTimeout(String key) { return; } - fsmExecutor.fire(fsm, FlowPathSwapFsm.Event.TIMEOUT, null); + fsmExecutor.fire(fsm, Event.TIMEOUT, null); removeIfFinished(fsm, key); } diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/AbstractFlowTest.java b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/AbstractFlowTest.java index 21edec9c76a..c1c91f83c22 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/AbstractFlowTest.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/AbstractFlowTest.java @@ -26,7 +26,12 @@ import static org.mockito.Mockito.when; import org.openkilda.floodlight.api.request.FlowSegmentRequest; +import org.openkilda.floodlight.api.request.rulemanager.BaseSpeakerCommandsRequest; +import org.openkilda.floodlight.api.request.rulemanager.FlowCommand; +import org.openkilda.floodlight.api.request.rulemanager.GroupCommand; +import org.openkilda.floodlight.api.request.rulemanager.MeterCommand; import org.openkilda.floodlight.api.response.SpeakerFlowSegmentResponse; +import org.openkilda.floodlight.api.response.rulemanager.SpeakerCommandResponse; import org.openkilda.messaging.Message; import org.openkilda.messaging.command.flow.FlowRequest; import org.openkilda.messaging.error.ErrorMessage; @@ -59,6 +64,7 @@ import org.openkilda.persistence.repositories.KildaFeatureTogglesRepository; import org.openkilda.persistence.repositories.SwitchPropertiesRepository; import org.openkilda.persistence.repositories.YFlowRepository; +import org.openkilda.rulemanager.SpeakerData; import org.openkilda.wfm.CommandContext; import org.openkilda.wfm.share.flow.resources.FlowResourcesConfig; import org.openkilda.wfm.share.flow.resources.FlowResourcesManager; @@ -79,8 +85,9 @@ import java.util.List; import java.util.Map; import java.util.Queue; +import java.util.stream.Collectors; -public abstract class AbstractFlowTest extends InMemoryGraphBasedTest { +public abstract class AbstractFlowTest extends InMemoryGraphBasedTest { protected static final SwitchId SWITCH_SOURCE = new SwitchId(1); protected static final SwitchId SWITCH_DEST = new SwitchId(2); protected static final SwitchId SWITCH_TRANSIT = new SwitchId(3L); @@ -120,7 +127,7 @@ public abstract class AbstractFlowTest extends InMemoryGraphBasedTest { @Mock PathComputer pathComputer; - final Queue requests = new ArrayDeque<>(); + protected final Queue requests = new ArrayDeque<>(); final Map> installedSegments = new HashMap<>(); @Before @@ -155,30 +162,61 @@ public void tearDown() throws Exception { } } - protected SpeakerFlowSegmentResponse buildSpeakerResponse(FlowSegmentRequest flowRequest) { - return SpeakerFlowSegmentResponse.builder() - .messageContext(flowRequest.getMessageContext()) - .commandId(flowRequest.getCommandId()) - .metadata(flowRequest.getMetadata()) - .switchId(flowRequest.getSwitchId()) - .success(true) - .build(); - } - - Answer getSpeakerCommandsAnswer() { + protected Answer buildSpeakerRequestAnswer() { return invocation -> { - FlowSegmentRequest request = invocation.getArgument(0); + T request = invocation.getArgument(0); requests.offer(request); - if (request.isInstallRequest()) { - installedSegments.computeIfAbsent(request.getSwitchId(), ignore -> new HashMap<>()) - .put(request.getCookie(), request); + if (request instanceof FlowSegmentRequest) { + FlowSegmentRequest flowSegmentRequest = (FlowSegmentRequest) request; + if (flowSegmentRequest.isInstallRequest()) { + installedSegments.computeIfAbsent(flowSegmentRequest.getSwitchId(), ignore -> new HashMap<>()) + .put(flowSegmentRequest.getCookie(), flowSegmentRequest); + } } return request; }; } + protected SpeakerFlowSegmentResponse buildSpeakerResponse(FlowSegmentRequest flowRequest) { + return SpeakerFlowSegmentResponse.builder() + .messageContext(flowRequest.getMessageContext()) + .commandId(flowRequest.getCommandId()) + .metadata(flowRequest.getMetadata()) + .switchId(flowRequest.getSwitchId()) + .success(true) + .build(); + } + + protected SpeakerCommandResponse buildSuccessfulYFlowSpeakerResponse(BaseSpeakerCommandsRequest request) { + return SpeakerCommandResponse.builder() + .messageContext(request.getMessageContext()) + .commandId(request.getCommandId()) + .switchId(request.getSwitchId()) + .success(true) + .failedCommandIds(new HashMap<>()) + .build(); + } + + protected SpeakerCommandResponse buildErrorYFlowSpeakerResponse(BaseSpeakerCommandsRequest request) { + return SpeakerCommandResponse.builder() + .messageContext(request.getMessageContext()) + .commandId(request.getCommandId()) + .switchId(request.getSwitchId()) + .success(false) + .failedCommandIds(request.getCommands().stream().map(command -> { + if (command instanceof FlowCommand) { + return ((FlowCommand) command).getData(); + } + if (command instanceof MeterCommand) { + return ((MeterCommand) command).getData(); + } + return ((GroupCommand) command).getData(); + }).collect(Collectors.toMap(SpeakerData::getUuid, error -> "Switch is unavailable"))) + .build(); + } + SpeakerFlowSegmentResponse buildResponseOnVerifyRequest(FlowSegmentRequest request) { return SpeakerFlowSegmentResponse.builder() .commandId(request.getCommandId()) diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowCreateServiceTest.java b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowCreateServiceTest.java index c4a892a95ca..63ea9f2233c 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowCreateServiceTest.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowCreateServiceTest.java @@ -54,13 +54,13 @@ import java.util.UUID; @RunWith(MockitoJUnitRunner.class) -public class FlowCreateServiceTest extends AbstractFlowTest { +public class FlowCreateServiceTest extends AbstractFlowTest { @Mock private FlowGenericCarrier carrier; @Before public void init() { - doAnswer(getSpeakerCommandsAnswer()).when(carrier).sendSpeakerRequest(any(FlowSegmentRequest.class)); + doAnswer(buildSpeakerRequestAnswer()).when(carrier).sendSpeakerRequest(any(FlowSegmentRequest.class)); } @Test diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowDeleteServiceTest.java b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowDeleteServiceTest.java index 73d533dbf31..24648d49c53 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowDeleteServiceTest.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowDeleteServiceTest.java @@ -48,7 +48,7 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class FlowDeleteServiceTest extends AbstractFlowTest { +public class FlowDeleteServiceTest extends AbstractFlowTest { private static final int SPEAKER_COMMAND_RETRIES_LIMIT = 3; @Mock @@ -56,7 +56,7 @@ public class FlowDeleteServiceTest extends AbstractFlowTest { @Before public void setUp() { - doAnswer(getSpeakerCommandsAnswer()).when(carrier).sendSpeakerRequest(any()); + doAnswer(buildSpeakerRequestAnswer()).when(carrier).sendSpeakerRequest(any(FlowSegmentRequest.class)); // must be done before first service create attempt, because repository objects are cached inside FSM actions setupFlowRepositorySpy(); diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowPathSwapServiceTest.java b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowPathSwapServiceTest.java new file mode 100644 index 00000000000..00e9e83a15a --- /dev/null +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowPathSwapServiceTest.java @@ -0,0 +1,290 @@ +/* Copyright 2021 Telstra Open Source + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openkilda.wfm.topology.flowhs.service; + +import static java.util.Collections.singletonList; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.spy; + +import org.openkilda.floodlight.api.request.FlowSegmentRequest; +import org.openkilda.floodlight.api.request.SpeakerRequest; +import org.openkilda.floodlight.api.request.rulemanager.BaseSpeakerCommandsRequest; +import org.openkilda.floodlight.api.response.SpeakerResponse; +import org.openkilda.floodlight.flow.response.FlowErrorResponse; +import org.openkilda.floodlight.flow.response.FlowErrorResponse.ErrorCode; +import org.openkilda.messaging.command.flow.FlowPathSwapRequest; +import org.openkilda.messaging.info.flow.FlowResponse; +import org.openkilda.model.Flow; +import org.openkilda.model.FlowStatus; +import org.openkilda.rulemanager.RuleManager; +import org.openkilda.rulemanager.RuleManagerConfig; +import org.openkilda.rulemanager.RuleManagerImpl; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class FlowPathSwapServiceTest extends AbstractFlowTest { + private static final int SPEAKER_COMMAND_RETRIES_LIMIT = 0; + + @Mock + private FlowPathSwapHubCarrier carrier; + private RuleManager ruleManager; + + @Before + public void setUp() { + doAnswer(buildSpeakerRequestAnswer()).when(carrier).sendSpeakerRequest(any(SpeakerRequest.class)); + + setupFlowRepositorySpy(); + setupFlowPathRepositorySpy(); + + RuleManagerConfig ruleManagerConfig = configurationProvider.getConfiguration(RuleManagerConfig.class); + ruleManager = spy(new RuleManagerImpl(ruleManagerConfig)); + } + + @Test + public void shouldSuccessfullySwapFlowPaths() { + // given + Flow origin = dummyFactory.makeFlowWithProtectedPath(flowSource, flowDestination, + singletonList(islSourceDest), singletonList(islSourceDestAlt)); + + // when + FlowPathSwapService service = makeService(); + FlowPathSwapRequest request = new FlowPathSwapRequest(origin.getFlowId(), true); + service.handleRequest(dummyRequestKey, commandContext, request); + + verifyFlowStatus(origin.getFlowId(), FlowStatus.IN_PROGRESS); + + SpeakerRequest speakerRequest; + while ((speakerRequest = requests.poll()) != null) { + produceAsyncResponse(service, dummyRequestKey, speakerRequest); + } + + // then + Flow result = verifyFlowStatus(origin.getFlowId(), FlowStatus.UP); + verifyPathSwapped(origin, result); + verifyNorthboundSuccessResponse(carrier); + } + + @Test + public void shouldFailSwapOnUnsuccessfulInstallation() { + // given + Flow origin = dummyFactory.makeFlowWithProtectedPath(flowSource, flowDestination, + singletonList(islSourceDest), singletonList(islSourceDestAlt)); + + // when + FlowPathSwapService service = makeService(); + FlowPathSwapRequest request = new FlowPathSwapRequest(origin.getFlowId(), true); + service.handleRequest(dummyRequestKey, commandContext, request); + + verifyFlowStatus(origin.getFlowId(), FlowStatus.IN_PROGRESS); + + int failCounter = 1; + SpeakerRequest speakerRequest; + while ((speakerRequest = requests.poll()) != null) { + if (speakerRequest instanceof FlowSegmentRequest) { + FlowSegmentRequest flowSegmentRequest = (FlowSegmentRequest) speakerRequest; + if (flowSegmentRequest.isInstallRequest() && failCounter > 0) { + service.handleAsyncResponse(dummyRequestKey, FlowErrorResponse.errorBuilder() + .messageContext(flowSegmentRequest.getMessageContext()) + .errorCode(ErrorCode.UNKNOWN) + .description(injectedErrorMessage) + .commandId(flowSegmentRequest.getCommandId()) + .metadata(flowSegmentRequest.getMetadata()) + .switchId(flowSegmentRequest.getSwitchId()) + .build()); + failCounter--; + } else { + service.handleAsyncResponse(dummyRequestKey, buildSpeakerResponse(flowSegmentRequest)); + } + } else { + fail(); + } + } + + // then + Flow result = verifyFlowStatus(origin.getFlowId(), FlowStatus.UP); + verifyPathNotSwapped(origin, result); + verifyNorthboundSuccessResponse(carrier); + } + + @Test + public void shouldFailSwapOnTimeoutDuringInstallation() { + // given + Flow origin = dummyFactory.makeFlowWithProtectedPath(flowSource, flowDestination, + singletonList(islSourceDest), singletonList(islSourceDestAlt)); + + // when + FlowPathSwapService service = makeService(); + FlowPathSwapRequest request = new FlowPathSwapRequest(origin.getFlowId(), true); + service.handleRequest(dummyRequestKey, commandContext, request); + + verifyFlowStatus(origin.getFlowId(), FlowStatus.IN_PROGRESS); + + service.handleTimeout(dummyRequestKey); + + SpeakerRequest speakerRequest; + while ((speakerRequest = requests.poll()) != null) { + produceAsyncResponse(service, dummyRequestKey, speakerRequest); + } + + // then + Flow result = verifyFlowStatus(origin.getFlowId(), FlowStatus.UP); + verifyPathNotSwapped(origin, result); + verifyNorthboundSuccessResponse(carrier); + } + + @Test + public void shouldSuccessfullySwapYFlowPaths() { + // given + Flow origin = dummyFactory.makeFlowWithProtectedPath(flowSource, flowDestination, + singletonList(islSourceDest), singletonList(islSourceDestAlt)); + createTestYFlowForSubFlow(origin); + + // when + FlowPathSwapService service = makeService(); + FlowPathSwapRequest request = new FlowPathSwapRequest(origin.getFlowId(), false); + service.handleRequest(dummyRequestKey, commandContext, request); + + verifyFlowStatus(origin.getFlowId(), FlowStatus.IN_PROGRESS); + + SpeakerRequest speakerRequest; + while ((speakerRequest = requests.poll()) != null) { + produceAsyncResponse(service, dummyRequestKey, speakerRequest); + } + + // then + Flow result = verifyFlowStatus(origin.getFlowId(), FlowStatus.UP); + verifyPathSwapped(origin, result); + verifyNorthboundSuccessResponse(carrier); + } + + @Test + public void shouldFailSwapOnUnsuccessfulYFlowRulesInstallation() { + // given + Flow origin = dummyFactory.makeFlowWithProtectedPath(flowSource, flowDestination, + singletonList(islSourceDest), singletonList(islSourceDestAlt)); + createTestYFlowForSubFlow(origin); + + // when + FlowPathSwapService service = makeService(); + FlowPathSwapRequest request = new FlowPathSwapRequest(origin.getFlowId(), false); + service.handleRequest(dummyRequestKey, commandContext, request); + + verifyFlowStatus(origin.getFlowId(), FlowStatus.IN_PROGRESS); + + int failCounter = 1; + SpeakerRequest speakerRequest; + while ((speakerRequest = requests.poll()) != null) { + SpeakerResponse commandResponse; + if (speakerRequest instanceof FlowSegmentRequest) { + commandResponse = buildSpeakerResponse((FlowSegmentRequest) speakerRequest); + } else { + BaseSpeakerCommandsRequest speakerCommandsRequest = (BaseSpeakerCommandsRequest) speakerRequest; + if (failCounter > 0) { + commandResponse = buildErrorYFlowSpeakerResponse(speakerCommandsRequest); + failCounter--; + } else { + commandResponse = buildSuccessfulYFlowSpeakerResponse(speakerCommandsRequest); + } + } + service.handleAsyncResponse(dummyRequestKey, commandResponse); + } + + // then + Flow result = verifyFlowStatus(origin.getFlowId(), FlowStatus.UP); + verifyPathNotSwapped(origin, result); + verifyNorthboundSuccessResponse(carrier); + } + + @Test + public void shouldFailSwapOnTimeoutDuringYFlowRulesInstallation() { + // given + Flow origin = dummyFactory.makeFlowWithProtectedPath(flowSource, flowDestination, + singletonList(islSourceDest), singletonList(islSourceDestAlt)); + createTestYFlowForSubFlow(origin); + + // when + FlowPathSwapService service = makeService(); + FlowPathSwapRequest request = new FlowPathSwapRequest(origin.getFlowId(), false); + service.handleRequest(dummyRequestKey, commandContext, request); + + verifyFlowStatus(origin.getFlowId(), FlowStatus.IN_PROGRESS); + + int failCounter = 1; + SpeakerRequest speakerRequest; + while ((speakerRequest = requests.poll()) != null) { + if (speakerRequest instanceof FlowSegmentRequest) { + service.handleAsyncResponse(dummyRequestKey, buildSpeakerResponse((FlowSegmentRequest) speakerRequest)); + } else { + if (failCounter > 0) { + service.handleTimeout(dummyRequestKey); + failCounter--; + } else { + BaseSpeakerCommandsRequest speakerCommandsRequest = (BaseSpeakerCommandsRequest) speakerRequest; + service.handleAsyncResponse(dummyRequestKey, + buildSuccessfulYFlowSpeakerResponse(speakerCommandsRequest)); + } + } + } + + // then + Flow result = verifyFlowStatus(origin.getFlowId(), FlowStatus.UP); + verifyPathNotSwapped(origin, result); + verifyNorthboundSuccessResponse(carrier); + } + + private void produceAsyncResponse(FlowPathSwapService service, String fsmKey, SpeakerRequest speakerRequest) { + SpeakerResponse commandResponse; + if (speakerRequest instanceof FlowSegmentRequest) { + commandResponse = buildSpeakerResponse((FlowSegmentRequest) speakerRequest); + } else { + BaseSpeakerCommandsRequest speakerCommandsRequest = (BaseSpeakerCommandsRequest) speakerRequest; + commandResponse = buildSuccessfulYFlowSpeakerResponse(speakerCommandsRequest); + } + service.handleAsyncResponse(fsmKey, commandResponse); + } + + private void verifyPathSwapped(Flow origin, Flow result) { + assertEquals(origin.getProtectedForwardPathId(), result.getForwardPathId()); + assertEquals(origin.getForwardPathId(), result.getProtectedForwardPathId()); + assertEquals(origin.getProtectedReversePathId(), result.getReversePathId()); + assertEquals(origin.getReversePathId(), result.getProtectedReversePathId()); + } + + private void verifyPathNotSwapped(Flow origin, Flow result) { + assertEquals(origin.getForwardPathId(), result.getForwardPathId()); + assertEquals(origin.getProtectedForwardPathId(), result.getProtectedForwardPathId()); + assertEquals(origin.getReversePathId(), result.getReversePathId()); + assertEquals(origin.getProtectedReversePathId(), result.getProtectedReversePathId()); + } + + @Override + protected void verifyNorthboundSuccessResponse(FlowGenericCarrier carrierMock) { + verifyNorthboundSuccessResponse(carrierMock, FlowResponse.class); + } + + private FlowPathSwapService makeService() { + return new FlowPathSwapService(carrier, persistenceManager, ruleManager, + SPEAKER_COMMAND_RETRIES_LIMIT, flowResourcesManager); + } +} diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowRerouteServiceTest.java b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowRerouteServiceTest.java index 164fbad3dee..608dd42319a 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowRerouteServiceTest.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowRerouteServiceTest.java @@ -74,7 +74,7 @@ import java.util.Set; @RunWith(MockitoJUnitRunner.class) -public class FlowRerouteServiceTest extends AbstractFlowTest { +public class FlowRerouteServiceTest extends AbstractFlowTest { private static final int PATH_ALLOCATION_RETRIES_LIMIT = 10; private static final int PATH_ALLOCATION_RETRY_DELAY = 0; private static final int SPEAKER_COMMAND_RETRIES_LIMIT = 0; @@ -86,7 +86,7 @@ public class FlowRerouteServiceTest extends AbstractFlowTest { @Before public void setUp() { - doAnswer(getSpeakerCommandsAnswer()).when(carrier).sendSpeakerRequest(any()); + doAnswer(buildSpeakerRequestAnswer()).when(carrier).sendSpeakerRequest(any(FlowSegmentRequest.class)); // must be done before first service create attempt, because repository objects are cached inside FSM actions setupFlowRepositorySpy(); diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowUpdateServiceTest.java b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowUpdateServiceTest.java index e5853b3b8a5..3e92c198491 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowUpdateServiceTest.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/service/FlowUpdateServiceTest.java @@ -75,7 +75,7 @@ import java.util.stream.Collectors; @RunWith(MockitoJUnitRunner.class) -public class FlowUpdateServiceTest extends AbstractFlowTest { +public class FlowUpdateServiceTest extends AbstractFlowTest { private static final int PATH_ALLOCATION_RETRIES_LIMIT = 10; private static final int PATH_ALLOCATION_RETRY_DELAY = 0; private static final int SPEAKER_COMMAND_RETRIES_LIMIT = 0; @@ -85,7 +85,7 @@ public class FlowUpdateServiceTest extends AbstractFlowTest { @Before public void setUp() { - doAnswer(getSpeakerCommandsAnswer()).when(carrier).sendSpeakerRequest(any()); + doAnswer(buildSpeakerRequestAnswer()).when(carrier).sendSpeakerRequest(any(FlowSegmentRequest.class)); // must be done before first service create attempt, because repository objects are cached inside FSM actions setupFlowRepositorySpy(); diff --git a/src-java/northbound-service/northbound/src/main/java/org/openkilda/northbound/service/impl/FlowServiceImpl.java b/src-java/northbound-service/northbound/src/main/java/org/openkilda/northbound/service/impl/FlowServiceImpl.java index 2cf5ede5582..acc50034a61 100644 --- a/src-java/northbound-service/northbound/src/main/java/org/openkilda/northbound/service/impl/FlowServiceImpl.java +++ b/src-java/northbound-service/northbound/src/main/java/org/openkilda/northbound/service/impl/FlowServiceImpl.java @@ -556,7 +556,7 @@ public CompletableFuture swapFlowPaths(String flowId) { final String correlationId = RequestCorrelationId.getId(); logger.info("Swapping paths for flow : {}", flowId); - FlowPathSwapRequest payload = new FlowPathSwapRequest(flowId); + FlowPathSwapRequest payload = new FlowPathSwapRequest(flowId, true); CommandMessage request = new CommandMessage( payload, System.currentTimeMillis(), correlationId, Destination.WFM); diff --git a/src-java/reroute-topology/reroute-storm-topology/src/main/java/org/openkilda/wfm/topology/reroute/bolts/RerouteBolt.java b/src-java/reroute-topology/reroute-storm-topology/src/main/java/org/openkilda/wfm/topology/reroute/bolts/RerouteBolt.java index 197b5a150f0..d09a7e15417 100644 --- a/src-java/reroute-topology/reroute-storm-topology/src/main/java/org/openkilda/wfm/topology/reroute/bolts/RerouteBolt.java +++ b/src-java/reroute-topology/reroute-storm-topology/src/main/java/org/openkilda/wfm/topology/reroute/bolts/RerouteBolt.java @@ -174,7 +174,7 @@ public void emitManualRerouteCommand(String flowId, FlowThrottlingData flowThrot public void emitPathSwapCommand(String correlationId, String flowId, String reason) { CommandContext context = new CommandContext(correlationId).fork(UUID.randomUUID().toString()); emit(STREAM_OPERATION_QUEUE_ID, getCurrentTuple(), - new Values(flowId, new FlowPathSwapRequest(flowId), context)); + new Values(flowId, new FlowPathSwapRequest(flowId, false), context)); log.warn("Flow {} swap path command message sent with correlationId {}, reason \"{}\"", flowId, context.getCorrelationId(), reason); diff --git a/src-java/reroute-topology/reroute-storm-topology/src/test/java/org/openkilda/wfm/topology/reroute/service/OperationQueueServiceTest.java b/src-java/reroute-topology/reroute-storm-topology/src/test/java/org/openkilda/wfm/topology/reroute/service/OperationQueueServiceTest.java index bb69d763f9e..b464f4c431c 100644 --- a/src-java/reroute-topology/reroute-storm-topology/src/test/java/org/openkilda/wfm/topology/reroute/service/OperationQueueServiceTest.java +++ b/src-java/reroute-topology/reroute-storm-topology/src/test/java/org/openkilda/wfm/topology/reroute/service/OperationQueueServiceTest.java @@ -48,7 +48,7 @@ public void shouldAddFirst() { assertEquals(TEST_CORRELATION_ID_A, flowQueueData.getTaskInProgress()); assertEquals(1, flowQueueData.getQueue().size()); - service.addFirst(TEST_FLOW_ID, TEST_CORRELATION_ID_B, new FlowPathSwapRequest(TEST_FLOW_ID)); + service.addFirst(TEST_FLOW_ID, TEST_CORRELATION_ID_B, new FlowPathSwapRequest(TEST_FLOW_ID, false)); service.operationCompleted(TEST_FLOW_ID, null); From 5af87a9cc9f37c3ef159cb4b82480a0b2dcbc59e Mon Sep 17 00:00:00 2001 From: Sergey Nikitin Date: Mon, 10 Jan 2022 17:44:17 +0400 Subject: [PATCH 38/46] Y-Flow: Ping API design Part of: #4589 --- docs/design/y-flow/y-flow-nb-api.md | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/docs/design/y-flow/y-flow-nb-api.md b/docs/design/y-flow/y-flow-nb-api.md index b39d4ada985..82a73221fea 100644 --- a/docs/design/y-flow/y-flow-nb-api.md +++ b/docs/design/y-flow/y-flow-nb-api.md @@ -317,6 +317,57 @@ Response body: } ``` +## Ping operation + +REST endpoint: `POST /v2/y-flows/{y_flow_id}/ping` + +request payload: + +```json +{ + "timeout": 0 +} +``` + +response payload: + +```json +{ + "y_flow_id": "yf-AAAAAAAAAAAAAAA", + "ping_success": true, + "error": "error", + "sub_flows": [ + { + "flow_id": "fAAAAAAAAAAAAAAA", + "forward": { + "ping_success": true, + "error": "error", + "latency": 0 + }, + "reverse": { + "ping_success": true, + "error": "error", + "latency": 0 + } + }, + { + "flow_id": "fAAAAAAAAAAAAAAB", + "forward": { + "ping_success": true, + "error": "error", + "latency": 0 + }, + "reverse": { + "ping_success": true, + "error": "error", + "latency": 0 + } + } + ] +} +``` + + # Existing API changes All flows CRUD operation responses will be extended with following fields: From 4bd3cf6d791b663ddfa6ec79371c4672151db5f8 Mon Sep 17 00:00:00 2001 From: Swati Sharma Date: Tue, 11 Jan 2022 17:10:27 +0530 Subject: [PATCH 39/46] updates maven repository url in build.gradle --- src-gui/build.gradle | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src-gui/build.gradle b/src-gui/build.gradle index f31b79b1d2f..0fecb94f1d0 100644 --- a/src-gui/build.gradle +++ b/src-gui/build.gradle @@ -11,6 +11,10 @@ repositories { maven { url = uri('https://repo.spring.io/libs-milestone') } + + maven { + url = uri('http://repo.maven.apache.org/maven2') + } } dependencies { @@ -70,14 +74,14 @@ tasks.withType(JavaCompile) { } jacoco { - toolVersion = '0.8.7' + toolVersion = '0.8.5' } jacocoTestReport { reports { - xml.required = true - csv.required = false - html.required = true + xml.enabled = true + csv.enabled = false + html.enabled = true } } From 65aeb1cedd277c4ffc5852b5c869ce30d8fed526 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Wed, 29 Dec 2021 18:13:42 +0200 Subject: [PATCH 40/46] [yflow] check that bandwidth is properly consumed --- .../spec/flows/yflows/YFlowCreateSpec.groovy | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowCreateSpec.groovy b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowCreateSpec.groovy index 1b4126af3e6..a9ff0529f36 100644 --- a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowCreateSpec.groovy +++ b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowCreateSpec.groovy @@ -54,6 +54,7 @@ class YFlowCreateSpec extends HealthCheckSpecification { assumeTrue(swT != null, "These cases cannot be covered on given topology: $coveredCases") when: "Create a y-flow of certain configuration" + def allLinksBefore = northbound.getAllLinks() def yFlow = northboundV2.addYFlow(yFlowRequest) then: "Y-flow is created and has UP status" @@ -87,7 +88,18 @@ class YFlowCreateSpec extends HealthCheckSpecification { // northbound.validateSwitch(sw.dpId).verifyMeterSectionsAreEmpty(["missing", "excess", "misconfigured"]) // } -// and: "Bandwidth is properly consumed on shared and non-shared ISLs" + and: "Bandwidth is properly consumed on shared and non-shared ISLs" + def allLinksAfter = northbound.getAllLinks() + def involvedIslsSFlow_1 = pathHelper.getInvolvedIsls(yFlow.subFlows[0].flowId) + def involvedIslsSFlow_2 = pathHelper.getInvolvedIsls(yFlow.subFlows[1].flowId) + + (involvedIslsSFlow_1 + involvedIslsSFlow_2).unique().each { link -> + [link, link.reversed].each { + def bwBefore = islUtils.getIslInfo(allLinksBefore, it).get().availableBandwidth + def bwAfter = islUtils.getIslInfo(allLinksAfter, it).get().availableBandwidth + assert bwBefore == bwAfter + yFlow.maximumBandwidth + } + } when: "Traffic starts to flow on both sub-flows with maximum bandwidth (if applicable)" def beforeTraffic = new Date() From 733b2f8a8003f61edab14ec78f58031581f7b695 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Thu, 16 Dec 2021 10:30:53 +0200 Subject: [PATCH 41/46] add tests for yFlow validation --- .../flows/yflows/YFlowValidationSpec.groovy | 184 ++++++++++++++++++ .../northbound/NorthboundServiceV2.java | 6 + .../northbound/NorthboundServiceV2Impl.java | 14 ++ 3 files changed, 204 insertions(+) create mode 100644 src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowValidationSpec.groovy diff --git a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowValidationSpec.groovy b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowValidationSpec.groovy new file mode 100644 index 00000000000..7d967c685f1 --- /dev/null +++ b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowValidationSpec.groovy @@ -0,0 +1,184 @@ +package org.openkilda.functionaltests.spec.flows.yflows + +import static org.openkilda.model.MeterId.MAX_SYSTEM_RULE_METER_ID +import static org.openkilda.testing.Constants.NON_EXISTENT_FLOW_ID +import static org.openkilda.testing.Constants.WAIT_OFFSET + +import org.openkilda.functionaltests.HealthCheckSpecification +import org.openkilda.functionaltests.extension.failfast.Tidy +import org.openkilda.functionaltests.helpers.Wrappers +import org.openkilda.functionaltests.helpers.YFlowHelper +import org.openkilda.messaging.error.MessageError +import org.openkilda.messaging.payload.flow.FlowState + +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.http.HttpStatus +import org.springframework.web.client.HttpClientErrorException +import spock.lang.Ignore +import spock.lang.Narrative +import spock.lang.Shared + +@Narrative("""Verify that missing yFlow rule is detected by switch/flow validations. +And make sure that the yFlow rule can be installed by syncSw/syncYFlow endpoints.""") +class YFlowValidationSpec extends HealthCheckSpecification { + @Autowired + @Shared + YFlowHelper yFlowHelper + + @Tidy + @Ignore("not implemented") + def "Y-Flow/flow validation should fail in case of missing y-flow shared rule"() { + given: "Existing y-flow" + def swT = topologyHelper.switchTriplets[0] + def yFlowRequest = yFlowHelper.randomYFlow(swT) + def yFlow = yFlowHelper.addYFlow(yFlowRequest) + + when: "Delete shared y-flow rule" + def swIdToManipulate = swT.shared.dpId + def sharedMeterId = northbound.getAllMeters(swIdToManipulate).meterEntries.findAll { + it.meterId > MAX_SYSTEM_RULE_METER_ID + }.max { it.meterId }.meterId + def sharedRules = northbound.getSwitchRules(swIdToManipulate).flowEntries.findAll { + it.instructions.goToMeter == sharedMeterId + } +// sharedRules.each { northbound.deleteSwitchRules(swIdToManipulate, it.cookie) } + + then: "Y-Flow validate detects discrepancies" + !northboundV2.validateYFlow(yFlow.YFlowId).asExpected + + and: "Simple flow validation detects discrepancies" + yFlow.subFlows.each { + assert !northbound.validateFlow(it.flowId).findAll { !it.discrepancies.empty }.empty + } + + and: "Switch validation detects missing y-flow rule" + with(northbound.validateSwitch(swIdToManipulate).rules) { + it.misconfigured.empty + it.excess.empty + it.missing.size() == 1 + it.missing.sort() == sharedRules*.cookie.sort() + } + + when: "Synchronize the shared switch" + northbound.synchronizeSwitch(swIdToManipulate, false) + + then: "Y-Flow/subFlow passes flow validation" + northboundV2.validateYFlow(yFlow.YFlowId).each { direction -> assert direction.asExpected } + yFlow.subFlows.each { + northbound.validateFlow(it.flowId).each { direction -> assert direction.asExpected } + } + + and: "Switch passes validation" + northbound.validateSwitch(swIdToManipulate).verifyRuleSectionsAreEmpty(["missing", "excess", "misconfigured"]) + + cleanup: + yFlowHelper.deleteYFlow(yFlow.YFlowId) + } + + @Tidy + def "Y-Flow/flow validation should fail in case of missing subFlow rule"() { + given: "Existing y-flow" + def swT = topologyHelper.switchTriplets[0] + def yFlowRequest = yFlowHelper.randomYFlow(swT) + def yFlow = yFlowHelper.addYFlow(yFlowRequest) + + when: "Delete reverse rule of subFlow_1" + def subFl_1 = yFlow.subFlows[0] + def subFl_2 = yFlow.subFlows[1] + def swIdToManipulate = swT.ep2.dpId + def cookieToDelete = database.getFlow(subFl_1.flowId).reversePath.cookie.value + northbound.deleteSwitchRules(swIdToManipulate, cookieToDelete) + + then: "Y-Flow validate detects discrepancies" + def validateYflowInfo = northboundV2.validateYFlow(yFlow.YFlowId) + !validateYflowInfo.asExpected + !validateYflowInfo.subFlowValidationResults.findAll { it.flowId == subFl_1.flowId } + .findAll { !it.discrepancies.empty }.empty + validateYflowInfo.subFlowValidationResults.findAll { it.flowId == subFl_2.flowId } + .findAll { !it.discrepancies.empty }.empty + + and: "Simple flow validation detects discrepancies for the subFlow_1 only" + !northbound.validateFlow(subFl_1.flowId).findAll { !it.discrepancies.empty }.empty + northbound.validateFlow(subFl_2.flowId).each { direction -> assert direction.asExpected } + + and: "Switch validation detects missing reverse rule only for the subFlow_1" + with(northbound.validateSwitch(swIdToManipulate).rules) { + it.misconfigured.empty + it.excess.empty + it.missing.size() == 1 + it.missing[0] == cookieToDelete + } + + when: "Delete shared rule of y-flow from the shared switch" + def sharedSwId = swT.shared.dpId + def sharedMeterId = northbound.getAllMeters(sharedSwId).meterEntries.findAll { + it.meterId > MAX_SYSTEM_RULE_METER_ID + }.max { it.meterId }.meterId + def sharedRules = northbound.getSwitchRules(sharedSwId).flowEntries.findAll { + it.instructions.goToMeter == sharedMeterId + } +// sharedRules.each { northbound.deleteSwitchRules(sharedSwId, it.cookie) } + + then: "Both subFlows are not valid" +// yFlow.subFlows.each { +// assert !northbound.validateFlow(it.flowId).findAll { !it.discrepancies.empty }.empty +// } + + and: "Switch validation detects missing y-flow rule on the shared switch" +// with(northbound.validateSwitch(sharedSwId).rules) { +// it.misconfigured.empty +// it.excess.empty +// it.missing.size() == 1 +// it.missing.sort() == sharedRules*.cookie.sort() +// } + + when: "Sync y-flow" + northboundV2.synchronizeYFlow(yFlow.YFlowId) + + then: "Y-Flow/subFlow passes flow validation" + Wrappers.wait(WAIT_OFFSET) { + northboundV2.getYFlow(yFlow.YFlowId).status == FlowState.UP.toString() + } + northboundV2.validateYFlow(yFlow.YFlowId).asExpected + yFlow.subFlows.each { + northbound.validateFlow(it.flowId).each { direction -> assert direction.asExpected } + } + + and: "Switches pass validation" + [swIdToManipulate, sharedSwId].each { + northbound.validateSwitch(it).verifyRuleSectionsAreEmpty(["missing", "misconfigured"]) +// .verifyRuleSectionsAreEmpty(swIdToManipulate, ["missing", "excess", "misconfigured"]) + } + + cleanup: + yFlowHelper.deleteYFlow(yFlow.YFlowId) + } + + @Tidy + def "Unable to #data.action a non-existent y-flow"() { + when: "Invoke a certain action for a non-existent y-flow" + data.method() + + then: "Human readable error is returned" + def e = thrown(HttpClientErrorException) + e.statusCode == HttpStatus.NOT_FOUND + verifyAll(e.responseBodyAsString.to(MessageError)) { + errorMessage == "Could not ${data.actionInMsg} y-flow" + errorDescription == "Y-flow $NON_EXISTENT_FLOW_ID not found" + } + + where: + data << [ + [ + action : "validate", + actionInMsg: "validate", + method : { northboundV2.validateYFlow(NON_EXISTENT_FLOW_ID) } + ], + [ + action : "synchronize", + actionInMsg: "reroute", + method : { northboundV2.synchronizeYFlow(NON_EXISTENT_FLOW_ID) } + ] + ] + } +} diff --git a/src-java/testing/test-library/src/main/java/org/openkilda/testing/service/northbound/NorthboundServiceV2.java b/src-java/testing/test-library/src/main/java/org/openkilda/testing/service/northbound/NorthboundServiceV2.java index 17b978a24f6..fb887646751 100644 --- a/src-java/testing/test-library/src/main/java/org/openkilda/testing/service/northbound/NorthboundServiceV2.java +++ b/src-java/testing/test-library/src/main/java/org/openkilda/testing/service/northbound/NorthboundServiceV2.java @@ -44,7 +44,9 @@ import org.openkilda.northbound.dto.v2.yflows.YFlowPatchPayload; import org.openkilda.northbound.dto.v2.yflows.YFlowPaths; import org.openkilda.northbound.dto.v2.yflows.YFlowRerouteResult; +import org.openkilda.northbound.dto.v2.yflows.YFlowSyncResult; import org.openkilda.northbound.dto.v2.yflows.YFlowUpdatePayload; +import org.openkilda.northbound.dto.v2.yflows.YFlowValidationResult; import org.openkilda.testing.model.topology.TopologyDefinition; import java.util.Date; @@ -152,4 +154,8 @@ BfdPropertiesPayload setLinkBfd(SwitchId srcSwId, Integer srcPort, SwitchId dstS YFlowRerouteResult rerouteYFlow(String yFlowId); YFlowPaths getYFlowPaths(String yFlowId); + + YFlowValidationResult validateYFlow(String yFlowId); + + YFlowSyncResult synchronizeYFlow(String yFlowId); } diff --git a/src-java/testing/test-library/src/main/java/org/openkilda/testing/service/northbound/NorthboundServiceV2Impl.java b/src-java/testing/test-library/src/main/java/org/openkilda/testing/service/northbound/NorthboundServiceV2Impl.java index 47dd4ee8a26..e883d4acc45 100644 --- a/src-java/testing/test-library/src/main/java/org/openkilda/testing/service/northbound/NorthboundServiceV2Impl.java +++ b/src-java/testing/test-library/src/main/java/org/openkilda/testing/service/northbound/NorthboundServiceV2Impl.java @@ -47,7 +47,9 @@ import org.openkilda.northbound.dto.v2.yflows.YFlowPatchPayload; import org.openkilda.northbound.dto.v2.yflows.YFlowPaths; import org.openkilda.northbound.dto.v2.yflows.YFlowRerouteResult; +import org.openkilda.northbound.dto.v2.yflows.YFlowSyncResult; import org.openkilda.northbound.dto.v2.yflows.YFlowUpdatePayload; +import org.openkilda.northbound.dto.v2.yflows.YFlowValidationResult; import org.openkilda.testing.model.topology.TopologyDefinition; import lombok.extern.slf4j.Slf4j; @@ -432,6 +434,18 @@ public YFlowPaths getYFlowPaths(String yFlowId) { new HttpEntity(buildHeadersWithCorrelationId()), YFlowPaths.class, yFlowId).getBody(); } + @Override + public YFlowValidationResult validateYFlow(String yFlowId) { + return restTemplate.exchange("/api/v2/y-flows/{y_flow_id}/validate", HttpMethod.POST, + new HttpEntity<>(buildHeadersWithCorrelationId()), YFlowValidationResult.class, yFlowId).getBody(); + } + + @Override + public YFlowSyncResult synchronizeYFlow(String yFlowId) { + return restTemplate.exchange("/api/v2/y-flows/{y_flow_id}/sync", HttpMethod.POST, + new HttpEntity<>(buildHeadersWithCorrelationId()), YFlowSyncResult.class, yFlowId).getBody(); + } + private HttpHeaders buildHeadersWithCorrelationId() { HttpHeaders headers = new HttpHeaders(); headers.set(Utils.CORRELATION_ID, "fn-tests-" + UUID.randomUUID().toString()); From 157d77f555739547aa1307e59d87725419ee13a1 Mon Sep 17 00:00:00 2001 From: Andrii Dovhan Date: Wed, 12 Jan 2022 13:05:05 +0200 Subject: [PATCH 42/46] [yflow] add test for y-flow reroute --- .../helpers/FlowHistoryConstants.groovy | 1 + .../spec/flows/yflows/YFlowRerouteSpec.groovy | 127 ++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowRerouteSpec.groovy diff --git a/src-java/testing/functional-tests/src/main/groovy/org/openkilda/functionaltests/helpers/FlowHistoryConstants.groovy b/src-java/testing/functional-tests/src/main/groovy/org/openkilda/functionaltests/helpers/FlowHistoryConstants.groovy index 9778e68823d..8c47f58f010 100644 --- a/src-java/testing/functional-tests/src/main/groovy/org/openkilda/functionaltests/helpers/FlowHistoryConstants.groovy +++ b/src-java/testing/functional-tests/src/main/groovy/org/openkilda/functionaltests/helpers/FlowHistoryConstants.groovy @@ -9,6 +9,7 @@ class FlowHistoryConstants { public static String CREATE_SUCCESS = "Flow was created successfully" public static String CREATE_SUCCESS_Y = "The y-flow was created successfully" public static String REROUTE_SUCCESS = "Flow was rerouted successfully" + public static String REROUTE_SUCCESS_Y = "The y-flow was rerouted successfully" public static String REROUTE_FAIL = "Failed to reroute the flow" public static String REROUTE_COMPLETE = "Flow reroute completed" public static String DELETE_SUCCESS = "Flow was deleted successfully" diff --git a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowRerouteSpec.groovy b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowRerouteSpec.groovy new file mode 100644 index 00000000000..1c8e5db00c5 --- /dev/null +++ b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/yflows/YFlowRerouteSpec.groovy @@ -0,0 +1,127 @@ +package org.openkilda.functionaltests.spec.flows.yflows + +import static groovyx.gpars.GParsPool.withPool +import static org.junit.jupiter.api.Assumptions.assumeTrue +import static org.openkilda.functionaltests.extension.tags.Tag.TOPOLOGY_DEPENDENT +import static org.openkilda.functionaltests.helpers.FlowHistoryConstants.REROUTE_SUCCESS +import static org.openkilda.functionaltests.helpers.Wrappers.wait +import static org.openkilda.messaging.info.event.IslChangeType.DISCOVERED +import static org.openkilda.messaging.info.event.IslChangeType.FAILED +import static org.openkilda.testing.Constants.FLOW_CRUD_TIMEOUT +import static org.openkilda.testing.Constants.WAIT_OFFSET + +import org.openkilda.functionaltests.HealthCheckSpecification +import org.openkilda.functionaltests.extension.failfast.Tidy +import org.openkilda.functionaltests.extension.tags.Tags +import org.openkilda.functionaltests.helpers.YFlowHelper +import org.openkilda.messaging.payload.flow.FlowState +import org.openkilda.testing.service.traffexam.TraffExamService +import org.openkilda.testing.service.traffexam.model.Exam +import org.openkilda.testing.service.traffexam.model.ExamReport +import org.openkilda.testing.tools.FlowTrafficExamBuilder + +import groovy.util.logging.Slf4j +import org.springframework.beans.factory.annotation.Autowired +import spock.lang.Narrative +import spock.lang.Shared + +import javax.inject.Provider + +@Slf4j +@Narrative("Verify reroute operations on y-flows.") +class YFlowRerouteSpec extends HealthCheckSpecification { + @Autowired + @Shared + YFlowHelper yFlowHelper + @Autowired + @Shared + Provider traffExamProvider + + @Tidy + @Tags([TOPOLOGY_DEPENDENT]) + def "Valid y-flow can be rerouted"() { + assumeTrue(useMultitable, "Multi table is not enabled in kilda configuration") + given: "A qinq y-flow" + def swT = topologyHelper.switchTriplets.find { + [it.shared, it.ep1, it.ep2].every { it.traffGens } && + [it.pathsEp1, it.pathsEp2].every { it.size() > 1 } && + it.ep1 != it.ep2 + } + assumeTrue(swT != null, "These cases cannot be covered on given topology:") + def yFlowRequest = yFlowHelper.randomYFlow(swT).tap { + it.subFlows[0].sharedEndpoint.vlanId = 123 + it.subFlows[1].sharedEndpoint.vlanId = 124 + it.subFlows[0].sharedEndpoint.innerVlanId = 111 + it.subFlows[1].sharedEndpoint.innerVlanId = 111 + it.subFlows[0].endpoint.vlanId = 222 + it.subFlows[1].endpoint.vlanId = 222 + it.subFlows[0].endpoint.innerVlanId = 333 + it.subFlows[1].endpoint.innerVlanId = 444 + } + def yFlow = yFlowHelper.addYFlow(yFlowRequest) + + def paths = northboundV2.getYFlowPaths(yFlow.YFlowId) + def islToFail = pathHelper.getInvolvedIsls(paths.sharedPath.nodes).first() + + when: "Fail a flow ISL (bring switch port down)" + antiflap.portDown(islToFail.srcSwitch.dpId, islToFail.srcPort) + wait(WAIT_OFFSET) { northbound.getLink(islToFail).state == FAILED } + + then: "The flow was rerouted after reroute delay" + and: "History has relevant entries about y-flow reroute" + // wait(FLOW_CRUD_TIMEOUT) { northbound.getFlowHistory(yFlow.YFlowId).last().payload.last().action == REROUTE_SUCCESS_Y } + yFlow.subFlows.each { sf -> + wait(FLOW_CRUD_TIMEOUT) { assert northbound.getFlowHistory(sf.flowId).last().payload.last().action == REROUTE_SUCCESS } + } + wait(rerouteDelay + WAIT_OFFSET) { + assert northboundV2.getYFlow(yFlow.YFlowId).status == FlowState.UP.toString() + assert northboundV2.getYFlowPaths(yFlow.YFlowId) != paths + } + + and: "Y-flow passes flow validation" + northboundV2.validateYFlow(yFlow.YFlowId) + + and: "Both sub-flows pass flow validation" + yFlow.subFlows.each { + assert northbound.validateFlow(it.flowId).every { it.asExpected } + } + + and: "All involved switches pass switch validation" + def involvedSwitches = pathHelper.getInvolvedYSwitches(paths) +// involvedSwitches.each { sw -> +// northbound.validateSwitch(sw.dpId).verifyRuleSectionsAreEmpty(["missing", "excess", "misconfigured"]) +// northbound.validateSwitch(sw.dpId).verifyMeterSectionsAreEmpty(["missing", "excess", "misconfigured"]) +// } + + when: "Traffic starts to flow on both sub-flows with maximum bandwidth (if applicable)" + def beforeTraffic = new Date() + def traffExam = traffExamProvider.get() + List examReports + def exam = new FlowTrafficExamBuilder(topology, traffExam).buildYFlowExam(yFlow, yFlow.maximumBandwidth, 5) + examReports = withPool { + [exam.forward1, exam.reverse1, exam.forward2, exam.reverse2].collectParallel { Exam direction -> + def resources = traffExam.startExam(direction) + direction.setResources(resources) + traffExam.waitExam(direction) + } + } + + then: "Traffic flows on both sub-flows, but does not exceed the y-flow bandwidth restriction (~halves for each sub-flow)" + examReports.each { report -> + assert report.hasTraffic(), report.exam + } + + + and: "Y-flow and subflows stats are available (flow.raw.bytes)" +// statsHelper.verifyFlowWritesStats(yFlow.YFlowId, beforeTraffic, true) + yFlow.subFlows.each { + statsHelper.verifyFlowWritesStats(it.flowId, beforeTraffic, true) + } + + cleanup: + yFlow && yFlowHelper.deleteYFlow(yFlow.YFlowId) + islToFail && antiflap.portUp(islToFail.srcSwitch.dpId, islToFail.srcPort) + wait(WAIT_OFFSET) { northbound.getLink(islToFail).state == DISCOVERED } + database.resetCosts(topology.isls) + } +} From df55064a2f1cb9595bde61a21ca488efbf61b64d Mon Sep 17 00:00:00 2001 From: Sergii Iakovenko Date: Wed, 12 Jan 2022 23:14:41 +0200 Subject: [PATCH 43/46] Fix merge issue - revert changes in gui build.gradle (#4151) --- src-gui/build.gradle | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src-gui/build.gradle b/src-gui/build.gradle index 0fecb94f1d0..021ceb25be0 100644 --- a/src-gui/build.gradle +++ b/src-gui/build.gradle @@ -9,11 +9,7 @@ plugins { repositories { mavenCentral() maven { - url = uri('https://repo.spring.io/libs-milestone') - } - - maven { - url = uri('http://repo.maven.apache.org/maven2') + url 'https://repo.spring.io/libs-milestone' } } @@ -74,14 +70,14 @@ tasks.withType(JavaCompile) { } jacoco { - toolVersion = '0.8.5' + toolVersion = '0.8.7' } jacocoTestReport { reports { - xml.enabled = true - csv.enabled = false - html.enabled = true + xml.required = true + csv.required = false + html.required = true } } From b07ba1793e618a4781df154d16c4fcf20f654094 Mon Sep 17 00:00:00 2001 From: Sergii Iakovenko Date: Wed, 12 Jan 2022 18:37:28 +0200 Subject: [PATCH 44/46] Update CHANGELOG.md with 1.112.0 release notes. Cleanup the rest of the content. --- CHANGELOG.md | 80 +++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eea59a439b..4e2c597b0ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,31 @@ # Changelog +## v1.112.0 (12/01/2022) + +### Features: +- [#4645](https://github.com/telstra/open-kilda/pull/4645) Implement swap for YFlow paths +- [#4648](https://github.com/telstra/open-kilda/pull/4648) Y-Flow: Ping API design (Issue: [#4589](https://github.com/telstra/open-kilda/issues/4589)) [**docs**] +- [#4146](https://github.com/telstra/open-kilda/pull/4146) Adding feature to edit/delete/update isl bfd properties (Issue: [#3920](https://github.com/telstra/open-kilda/issues/3920)) [**gui**] + +### Improvements: +- [#4643](https://github.com/telstra/open-kilda/pull/4643) ignore qinq tests in yflow spec for singleTable mode [**tests**] +- [#4646](https://github.com/telstra/open-kilda/pull/4646) [test] fix LagPortSpec [**tests**] +- [#4647](https://github.com/telstra/open-kilda/pull/4647) Of Group converter for Rule Manager [**floodlight**] +- [#4630](https://github.com/telstra/open-kilda/pull/4630) Upgrade Gradle to 7.3.3 and other plugins to the recent versions +- [#4151](https://github.com/telstra/open-kilda/pull/4151) Improvement in kilda gui to defence against brute force attack (Issue: [#3564](https://github.com/telstra/open-kilda/issues/3564)) [**gui**] + +### Other changes: +- [#4640](https://github.com/telstra/open-kilda/pull/4640) [yflow] check that bandwidth is properly consumed [**tests**] +- [#4650](https://github.com/telstra/open-kilda/pull/4650) [yflow] add test for y-flow reroute [**tests**] +- [#4624](https://github.com/telstra/open-kilda/pull/4624) add tests for yFlow validation [**tests**] + +For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.111.0...v1.112.0). + +### Affected Components: +flow-hs, gui, fl + +--- + ## v1.111.0 (04/01/2022) ### Features: @@ -31,6 +57,7 @@ For the complete list of changes, check out [the commit log](https://github.com/ ### Affected Components: stats, flow-monitor, network, fl, flow-hs +--- ## v1.110.0 (21/12/2021) @@ -63,14 +90,12 @@ flow-hs, server42 - [#4611](https://github.com/telstra/open-kilda/pull/4611) Rule Manager: Rules post processing - [#4612](https://github.com/telstra/open-kilda/pull/4612) Add server42 service rules rule manager implementation - ### Improvements: - [#4608](https://github.com/telstra/open-kilda/pull/4608) [test] fix timeUnstable field in featureToggleV2Spec [**tests**] - [#4609](https://github.com/telstra/open-kilda/pull/4609) adjust test for #4607 (Issue: [#4607](https://github.com/telstra/open-kilda/issues/4607)) [**tests**] - [#4618](https://github.com/telstra/open-kilda/pull/4618) Use spock 2.1 release instead of snapshot [**tests**] - [#4573](https://github.com/telstra/open-kilda/pull/4573) Make all tests do automatic switch sync in cleanup on validation failures [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.109.0...v1.109.1). --- @@ -79,13 +104,12 @@ For the complete list of changes, check out [the commit log](https://github.com/ ### Improvements: - [#4626](https://github.com/telstra/open-kilda/pull/4626) Upgrade log4j dependency version to mitigate log4shell - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.109.0...v1.109.0.1). ### Affected Components: all ----- +--- ## v1.109.0 (08/12/2021) @@ -100,20 +124,18 @@ all - [#4603](https://github.com/telstra/open-kilda/pull/4603) Rule Manager: Flow mirror - [#4542](https://github.com/telstra/open-kilda/pull/4542) Adapt existing Flow API to support YFlow sub-flows (Issue: [#4534](https://github.com/telstra/open-kilda/issues/4534)) - ### Improvements: - [#4610](https://github.com/telstra/open-kilda/pull/4610) Introduce joint rule generator for y flows - [#4483](https://github.com/telstra/open-kilda/pull/4483) Add rule manager design details [**docs**] - [#4350](https://github.com/telstra/open-kilda/pull/4350) Remove unused OFExxxState classes (Issue: [#238](https://github.com/telstra/open-kilda/issues/238)) - [#4571](https://github.com/telstra/open-kilda/pull/4571) PoC for shared bandwidth group solution - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.108.0...v1.109.0). ### Affected Components: reroute, flow-hs ----- +--- ## v1.108.0 (29/11/2021) @@ -146,7 +168,7 @@ For the complete list of changes, check out [the commit log](https://github.com/ ### Affected Components: swmanager, flow-hs ----- +--- ## v1.107.4 (23/11/2021) @@ -158,7 +180,7 @@ For the complete list of changes, check out [the commit log](https://github.com/ ### Affected Components: fl ----- +--- ## v1.107.3 (17/11/2021) @@ -196,18 +218,19 @@ For the complete list of changes, check out [the commit log](https://github.com/ ### Affected Components: server42, fl +--- ## v1.107.2 (13/11/2021) ### Improvements: - [#4579](https://github.com/telstra/open-kilda/pull/4579) At most once guarantee strategy for flowhs input spout - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.107.1...v1.107.2). ### Affected Components: flow-hs +--- ## v1.107.1 (02/11/2021) @@ -322,7 +345,6 @@ nbworker, gui, flow-hs, flow-monitor, orientdb - [#4400](https://github.com/telstra/open-kilda/pull/4400) Improve persistence layer implementation [**storm-topologies**] - [#4476](https://github.com/telstra/open-kilda/pull/4476) delete duplicate text in server42-to-lab/README [**docs**][**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.105.0...v1.105.1). ### Affected Components: @@ -350,7 +372,6 @@ ping, flow-hs, nbworker, reroute, swmanager, network, flow-monitor - [#4405](https://github.com/telstra/open-kilda/pull/4405) Remove flow group id field (Issue: [#4404](https://github.com/telstra/open-kilda/issues/4404)) - [#4472](https://github.com/telstra/open-kilda/pull/4472) Changed log level of unknown GRPC responces in Network topology. [**storm-topologies**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.104.0...v1.105.0). ### Affected Components: @@ -458,6 +479,8 @@ For the complete list of changes, check out [the commit log](https://github.com/ ### Affected Components: orientdb, grpc, flow, flow-hs, stats, network, fl +--- + ## v1.101.0 (09/08/2021) ### Features: @@ -539,7 +562,6 @@ OrientDB schema have been changed in this release. You need to apply schema migr - [#4349](https://github.com/telstra/open-kilda/pull/4349) unignore according to #4317 [**tests**] - [#4351](https://github.com/telstra/open-kilda/pull/4351) Add validation of OrientDB connections in the graph factory [**storm-topologies**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.98.0...v1.99.0). ### Affected Components: @@ -646,6 +668,8 @@ For the complete list of changes, check out [the commit log](https://github.com/ ### Affected Components: flow-hs, network, swmanager, fl +--- + ## v1.95.0 (07/06/2021) ### Features: @@ -1052,7 +1076,6 @@ gui, reroute, fl, stats-router, portstate, nbworker, ping, swmanager, nb, flow-h - [#4006](https://github.com/telstra/open-kilda/pull/4006) add test for RTL a-switcl link + antiflap [**tests**] - [#4031](https://github.com/telstra/open-kilda/pull/4031) Improve some waits in func tests [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.83.0...v1.84.0). ### Affected Components: @@ -1175,7 +1198,6 @@ fl - [#3898](https://github.com/telstra/open-kilda/pull/3898) Add flow-id for attendant traffic stat entries [**storm-topologies**] - [#3963](https://github.com/telstra/open-kilda/pull/3963) Create common ZK nodes by default - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.80.0...v1.81.0). ### Affected Components: @@ -1297,13 +1319,11 @@ nbworker, network, gui, fl, flow-hs - [#3838](https://github.com/telstra/open-kilda/pull/3838) ignore unstable test in swapEndpointSpec [**tests**] - [#3839](https://github.com/telstra/open-kilda/pull/3839) Wrap git commands for floodlight and loxigen in gradle - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.76.0...v1.77.0). ### Affected Components: stats, stats-router, ping, network, nb, reroute, nbworker, otsdb, router, connected, flow-hs, isllatency, portstate, fl, swmanager - --- ## v1.76.0 (29/10/2020) @@ -1346,7 +1366,6 @@ nb, nbworker, network - [#3796](https://github.com/telstra/open-kilda/pull/3796) add topology_dependent tag for grpc tests [**tests**] - [#3735](https://github.com/telstra/open-kilda/pull/3735) extend pathsSpec [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.74.1...v1.75.0). ### Affected Components: @@ -1457,7 +1476,6 @@ The migration procedure is defined in [neo4j-to-orientdb-migration-steps](https: - [#3738](https://github.com/telstra/open-kilda/pull/3738) Simplify BFD session management [**storm-topologies**] - [#3739](https://github.com/telstra/open-kilda/pull/3739) add tests for #3728 [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.72.1...v1.72.2). ### Affected Components: @@ -1483,7 +1501,6 @@ gui - [#3728](https://github.com/telstra/open-kilda/pull/3728) update port/vlan should not cause reroute [**floodlight**][**tests**] - [#3730](https://github.com/telstra/open-kilda/pull/3730) Added encapsulation_type and path_computation_strategy to /v1/network/paths API [**api**][**northbound**][**storm-topologies**] - ### Improvements: - [#3709](https://github.com/telstra/open-kilda/pull/3709) Cleanup outdated kafka-topic references - [#3726](https://github.com/telstra/open-kilda/pull/3726) add template functional-tests.log4j2.toml [**tests**] @@ -1637,7 +1654,6 @@ ping, router, nb, nbworker, stats, flow-hs, fl, network - [#3672](https://github.com/telstra/open-kilda/pull/3672) Add catch of an exception when the ISL controller is not found [**storm-topologies**] - [#3676](https://github.com/telstra/open-kilda/pull/3676) Build outside of git repo - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.68.0...v1.68.1). ### Affected Components: @@ -1679,7 +1695,6 @@ nb, flow-hs, router, nbworker, network - [#3642](https://github.com/telstra/open-kilda/pull/3642) remove ignore annotation for "Traffic counters in ingress rule are reset on flow rerouting" (Issues: [#3641](https://github.com/telstra/open-kilda/issues/3641) [#3641](https://github.com/telstra/open-kilda/issues/3641)) [**tests**] - [#3644](https://github.com/telstra/open-kilda/pull/3644) minor fixes according to v1.66 [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.66.1...v1.67.0). ### Affected Components: @@ -1763,7 +1778,6 @@ Consider using the following migration scripts to update db: - [1.25 migration-script](https://github.com/telstra/open-kilda/blob/v1.65.0/services/src/neo4j/migrations/1.25-change-type-of-flow-event-timestamp/1-change-type-of-history-timestamps-form-iso-to-epoch.xml) - In case of issues these rollback scripts should be executed: - [1.25 rollback.cql](https://github.com/telstra/open-kilda/blob/v1.65.0/services/src/neo4j/migrations/1.25-change-type-of-flow-event-timestamp/rollback.cql) @@ -1895,7 +1909,6 @@ grpc, stats, network, router, flow, flow-hs, swmanager, fl, gui ### Features: - [#3438](https://github.com/telstra/open-kilda/pull/3438) Introducing flow with 2 levels of VLAN tagging on endpoints [**floodlight**][**storm-topologies**] - ### Improvements: - [#3494](https://github.com/telstra/open-kilda/pull/3494) Add tests for partial update v2 api [**tests**] - [#3499](https://github.com/telstra/open-kilda/pull/3499) Add proper history wait in tests after path swap [**tests**] @@ -1904,7 +1917,6 @@ grpc, stats, network, router, flow, flow-hs, swmanager, fl, gui - [#3510](https://github.com/telstra/open-kilda/pull/3510) fix tests according to 1.59.0 v [**tests**] - [#3484](https://github.com/telstra/open-kilda/pull/3484) Various test stability fixes [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.59.0...v1.60.0). ### Affected Components: @@ -2022,7 +2034,6 @@ fl, gui, network ### Features: - [#3427](https://github.com/telstra/open-kilda/pull/3427) Feature/port discovery packets (Issue: [#3043](https://github.com/telstra/open-kilda/issues/3043)) [**gui**] - ### Improvements: - [#3428](https://github.com/telstra/open-kilda/pull/3428) group cookie classes in single package - [#3405](https://github.com/telstra/open-kilda/pull/3405) add tests for link-delete spec according to #3268 [**tests**] @@ -2068,6 +2079,8 @@ For the complete list of changes, check out [the commit log](https://github.com/ ### Affected Components: nbworker, stats, gui, flow, flow-hs, fl, connected, nb +--- + ## v1.55.1 (21/04/2020) ### Features: @@ -2081,7 +2094,6 @@ nbworker, stats, gui, flow, flow-hs, fl, connected, nb - [#3393](https://github.com/telstra/open-kilda/pull/3393) Expose discovery latency as separate log field [**floodlight**] - [#3234](https://github.com/telstra/open-kilda/pull/3234) Make parallelism level configurable - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.55.0...v1.55.1). ### Affected Components: @@ -2105,7 +2117,6 @@ neo4j, grpc, fl - [#3385](https://github.com/telstra/open-kilda/pull/3385) Add retries due to #3384. Refactor an autoreroute test [**tests**] - [#3387](https://github.com/telstra/open-kilda/pull/3387) add missing import and fix knockoutSwitch operation in AutoRerouteV2Spec [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.54.0...v1.55.0). ### Affected Components: @@ -2320,7 +2331,6 @@ In case of issues these rollback scripts should be executed: - [#3250](https://github.com/telstra/open-kilda/pull/3250) improve SwitchValidationSpec(wait for meter) [**tests**] - [#3251](https://github.com/telstra/open-kilda/pull/3251) Make packet loss test hw-only again [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.50.0...v1.51.0). ### Affected Components: @@ -2356,7 +2366,6 @@ In case of issues these rollback scripts should be executed: - [#3092](https://github.com/telstra/open-kilda/pull/3092) Minor tweaks in tests according to default meters validation feature [**tests**] - [#3223](https://github.com/telstra/open-kilda/pull/3223) improve protectedPath specs [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.49.0...v1.50.0). ### Affected Components: @@ -2453,7 +2462,6 @@ For the complete list of changes, check out [the commit log](https://github.com/ - [#3132](https://github.com/telstra/open-kilda/pull/3132) Add test for #3128 (Issue: [#3128](https://github.com/telstra/open-kilda/issues/3128)) [**tests**] - [#3167](https://github.com/telstra/open-kilda/pull/3167) Fix reroute request filling in Flow H&S topology. (Issue: [#3128](https://github.com/telstra/open-kilda/issues/3128)) - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.47.1...v1.47.2). ### Affected Components: @@ -2568,7 +2576,6 @@ nb, reroute, flow-hs - [#3086](https://github.com/telstra/open-kilda/pull/3086) Decrease parallelism for reply kafka spouts in flr [**storm-topologies**] - [#3062](https://github.com/telstra/open-kilda/pull/3062) Fix rollback in flow reroute [**storm-topologies**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.45.0...v1.45.1). ### Affected Components: @@ -2599,7 +2606,6 @@ flow-hs, router, reroute - [#2997](https://github.com/telstra/open-kilda/pull/2997) ignore fucn tests according to bugs [**tests**] - [#3004](https://github.com/telstra/open-kilda/pull/3004) Revise flow priority reroute test with respect to h&s [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.44.1...v1.45.0). ### Affected Components: @@ -2800,7 +2806,6 @@ fl - [#2877](https://github.com/telstra/open-kilda/pull/2877) Fix minor sonar issues [**floodlight**][**storm-topologies**] - [#2846](https://github.com/telstra/open-kilda/pull/2846) add test System does not create a flow when bandwidth is not the same on the ISL [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.40.0...v1.41.0). ### Affected Components: @@ -2857,7 +2862,6 @@ In case of issues these rollback scripts should be executed: - [#2849](https://github.com/telstra/open-kilda/pull/2849) Improvement/controller filter default (Issues: [#2787](https://github.com/telstra/open-kilda/issues/2787) [#2803](https://github.com/telstra/open-kilda/issues/2803)) [**gui**] - [#2841](https://github.com/telstra/open-kilda/pull/2841) Allow to use traffexam on python-3.5.2 [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.39.0...v1.39.1). ### Affected Components: @@ -2893,7 +2897,6 @@ gui - [#2798](https://github.com/telstra/open-kilda/pull/2798) Extend Endurance test with a 'break isl' event [**tests**] - [#2799](https://github.com/telstra/open-kilda/pull/2799) Disable port discovery feature design (Issue: [#2794](https://github.com/telstra/open-kilda/issues/2794)) [**docs**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.38.0...v1.39.0). ### Affected Components: @@ -2928,7 +2931,6 @@ In case of issues these rollback scripts should be executed: - [#2832](https://github.com/telstra/open-kilda/pull/2832) Removed migration 1.13 artifact - [#2767](https://github.com/telstra/open-kilda/pull/2767) extend statistic test coverage for different type of flow [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.37.0...v1.38.0). ### Affected Components: @@ -2964,7 +2966,6 @@ swmanager, network, stats, fl, flow-hs, nbworker, flow, nb, connected - [#2807](https://github.com/telstra/open-kilda/pull/2807) Added event logging with getting statistics. (Issue: [#2801](https://github.com/telstra/open-kilda/issues/2801)) [**floodlight**][**storm-topologies**] - [#2815](https://github.com/telstra/open-kilda/pull/2815) Fixed 1.14 migration - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.36.1...v1.37.0). ### Affected Components: @@ -2980,6 +2981,8 @@ Also please consider using following migration scripts to update db: In case of issues these rollback scripts should be executed: - [1.14 rollback.cql](https://github.com/telstra/open-kilda/blob/v1.37.0/services/neo4j/migrations/1.14-connected-device-indexes/rollback.cql) +--- + ## v1.36.1 (19/09/2019) ### Bug Fixes: @@ -3036,7 +3039,6 @@ fl, neo4j, flow-hs, nb, flow, network, nbworker, stats - [#2778](https://github.com/telstra/open-kilda/pull/2778) Change logic of verification duplicate isl in PCE - [#2775](https://github.com/telstra/open-kilda/pull/2775) add monitoring section in readme file for performance test [**tests**] - For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.35.0...v1.35.1). ### Affected Components: From 08eae1310e21e4d786182c5f9972a968558b8ead Mon Sep 17 00:00:00 2001 From: Dmitriy Bogun Date: Fri, 14 Jan 2022 20:07:24 +0200 Subject: [PATCH 45/46] Fix false negative stats cache missing warnigns --- .../stats/bolts/metrics/FlowMetricGenBolt.java | 4 ---- .../service/FlowEndpointStatsEntryHandler.java | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src-java/stats-topology/stats-storm-topology/src/main/java/org/openkilda/wfm/topology/stats/bolts/metrics/FlowMetricGenBolt.java b/src-java/stats-topology/stats-storm-topology/src/main/java/org/openkilda/wfm/topology/stats/bolts/metrics/FlowMetricGenBolt.java index 2d610053724..d0d3c7cf8b7 100644 --- a/src-java/stats-topology/stats-storm-topology/src/main/java/org/openkilda/wfm/topology/stats/bolts/metrics/FlowMetricGenBolt.java +++ b/src-java/stats-topology/stats-storm-topology/src/main/java/org/openkilda/wfm/topology/stats/bolts/metrics/FlowMetricGenBolt.java @@ -19,7 +19,6 @@ import org.openkilda.messaging.info.stats.FlowStatsEntry; import org.openkilda.model.SwitchId; -import org.openkilda.model.cookie.Cookie; import org.openkilda.wfm.topology.stats.model.DummyFlowDescriptor; import org.openkilda.wfm.topology.stats.model.FlowStatsAndDescriptor; import org.openkilda.wfm.topology.stats.model.KildaEntryDescriptor; @@ -61,9 +60,6 @@ private void handleStatsEntry( FlowStatsEntry statsEntry, long timestamp, @NonNull SwitchId switchId, @Nullable KildaEntryDescriptor descriptor) { if (descriptor == null) { - log.warn( - "Missed cache for switch {} cookie {} cookie-hex {}", - switchId, statsEntry.getCookie(), new Cookie(statsEntry.getCookie())); descriptor = new DummyFlowDescriptor(switchId); } diff --git a/src-java/stats-topology/stats-storm-topology/src/main/java/org/openkilda/wfm/topology/stats/service/FlowEndpointStatsEntryHandler.java b/src-java/stats-topology/stats-storm-topology/src/main/java/org/openkilda/wfm/topology/stats/service/FlowEndpointStatsEntryHandler.java index d979dff39b5..f107f1ed2b6 100644 --- a/src-java/stats-topology/stats-storm-topology/src/main/java/org/openkilda/wfm/topology/stats/service/FlowEndpointStatsEntryHandler.java +++ b/src-java/stats-topology/stats-storm-topology/src/main/java/org/openkilda/wfm/topology/stats/service/FlowEndpointStatsEntryHandler.java @@ -17,6 +17,8 @@ import org.openkilda.messaging.info.stats.FlowStatsEntry; import org.openkilda.model.SwitchId; +import org.openkilda.model.cookie.Cookie; +import org.openkilda.model.cookie.CookieBase.CookieType; import org.openkilda.model.cookie.FlowSegmentCookie; import org.openkilda.wfm.share.utils.MetricFormatter; import org.openkilda.wfm.topology.stats.bolts.metrics.FlowDirectionHelper.Direction; @@ -28,6 +30,9 @@ import org.openkilda.wfm.topology.stats.model.YFlowDescriptor; import org.openkilda.wfm.topology.stats.model.YFlowSubDescriptor; +import lombok.extern.slf4j.Slf4j; + +@Slf4j public final class FlowEndpointStatsEntryHandler extends BaseFlowStatsEntryHandler { /** * Handle stats entry. @@ -79,7 +84,16 @@ public void handleStatsEntry(YFlowSubDescriptor descriptor) { @Override public void handleStatsEntry(DummyFlowDescriptor descriptor) { - // nothing to do here + Cookie cookie = new Cookie(statsEntry.getCookie()); + if (cookie.getType() == CookieType.SERVICE_OR_FLOW_SEGMENT) { + log.warn( + "Missed cache entry for stats record from switch {} from table {} with cookie {}", + switchId, statsEntry.getTableId(), cookie); + } else { + log.debug( + "Ignoring stats entry from switch {} from table {} with cookie {}", + switchId, statsEntry.getTableId(), cookie); + } } @Override From e056a8fd1746c6e9b7049a72f3ff3dcd83c80d08 Mon Sep 17 00:00:00 2001 From: Sergii Iakovenko Date: Mon, 17 Jan 2022 11:23:04 +0200 Subject: [PATCH 46/46] Update CHANGELOG.md with 1.112.0 release notes (add #4658). --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e2c597b0ee..d0a150898ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - [#4648](https://github.com/telstra/open-kilda/pull/4648) Y-Flow: Ping API design (Issue: [#4589](https://github.com/telstra/open-kilda/issues/4589)) [**docs**] - [#4146](https://github.com/telstra/open-kilda/pull/4146) Adding feature to edit/delete/update isl bfd properties (Issue: [#3920](https://github.com/telstra/open-kilda/issues/3920)) [**gui**] +### Bug Fixes: +- [#4658](https://github.com/telstra/open-kilda/pull/4658) Fix false negative stats cache missing warnigns + ### Improvements: - [#4643](https://github.com/telstra/open-kilda/pull/4643) ignore qinq tests in yflow spec for singleTable mode [**tests**] - [#4646](https://github.com/telstra/open-kilda/pull/4646) [test] fix LagPortSpec [**tests**]