Merge branch 'release-1.117.0'

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## v1.117.0 (21/03/2022)
+
+### Features:
+-  [#4683](https://github.com/telstra/open-kilda/pull/4683) [test] check update-lag-port action [**tests**]
+-  [#4687](https://github.com/telstra/open-kilda/pull/4687) [test] check yFlow periodicPings [**tests**]
+
+### Bug Fixes:
+-  [#4718](https://github.com/telstra/open-kilda/pull/4718) Fixed deleteAllFlows endpoint timeout while flow in progress (Issue: [#4629](https://github.com/telstra/open-kilda/issues/4629)) [**northbound**]
+-  [#4723](https://github.com/telstra/open-kilda/pull/4723) Fix type cast into LAG port number allocation [**storm-topologies**]
+
+### Improvements:
+-  [#4712](https://github.com/telstra/open-kilda/pull/4712) Test/ignore some unstable test [**tests**]
+-  [#4713](https://github.com/telstra/open-kilda/pull/4713) [test] make vxlan tests run on virt env [**tests**]
+-  [#4652](https://github.com/telstra/open-kilda/pull/4652) Upgrade gradle dependencies in topologies, services, gui [**northbound**][**storm-topologies**]
+-  [#4684](https://github.com/telstra/open-kilda/pull/4684) Replace meter pool with generic pool manager
+-  [#4717](https://github.com/telstra/open-kilda/pull/4717) Improved performance of sw manager topology [**storm-topologies**]
+-  [#4721](https://github.com/telstra/open-kilda/pull/4721) Ignore unstable Contention test because of bug 4711 [**tests**]
+-  [#4720](https://github.com/telstra/open-kilda/pull/4720) Add js License files into GUI .gitignore file [**gui**]
+
+
+For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.116.0...v1.117.0).
+
+### Affected Components:
+gui, ping, swmanager, flow-hs, stats, flow-monitor, isllatency, portstate, reroute, nbworker, connected, nb, server42, grpc, network
+
+---
+
 ## v1.116.0 (04/03/2022)
 
 ### Features:

confd/templates/swmanager-topology/swmanager-topology.tmpl

@@ -1,6 +1,6 @@
 # topology configuration
 config:
-  topology.parallelism: {{ getv "/kilda_storm_parallelism_level_new" }}
+  topology.parallelism: {{ getv "/kilda_storm_swmanager_parallelism" }}
   topology.workers: {{ getv "/kilda_storm_parallelism_workers_count" }}
   topology.spouts.parallelism: 1
 
@@ -21,3 +21,5 @@ bolts:
     parallelism: 1
   - id: "zookeeper.bolt"
     parallelism: 1
+  - id: "heavy.operation.bolt"
+    parallelism: {{ getv "/kilda_storm_swmanager_heavy_operation_parallelism" }}

confd/vars/main.yaml

@@ -162,6 +162,8 @@ kilda_latency_update_interval: 120
 kilda_latency_update_time_range: 600
 kilda_latency_discovery_interval_multiplier: 3
 
+kilda_storm_swmanager_parallelism: 2
+kilda_storm_swmanager_heavy_operation_parallelism: 2
 kilda_storm_isl_latency_parallelism: 4
 kilda_storm_parallelism_level_new: 2
 kilda_storm_parallelism_level: 1

docs/design/hub-and-spoke/switch-validate/switch-validate-fsm.puml

@@ -10,11 +10,10 @@ COLLECT_DATA --> VALIDATE : ready
 COLLECT_DATA --> FINISHED_WITH_ERROR : error
 COLLECT_DATA : enter / emit-requests
 COLLECT_DATA : rules-received / save-response, fire ready if all responses received
-COLLECT_DATA : expected-default-rules-received / save-response, fire ready if all responses received
+COLLECT_DATA : expected-entities-built / save-response, fire ready if all responses received
 COLLECT_DATA : groups-received / save-response, fire ready if all responses received
 COLLECT_DATA : meters-received / save-response, fire ready if all responses received
 COLLECT_DATA : logical-ports-received / save-response, fire ready if all responses received
-COLLECT_DATA : expected-default-meters-received / save-response, fire ready if all responses received
 COLLECT_DATA : meters-unsupported / save-response, fire ready if all responses received
 
 VALIDATE --> FINISHED : next

src-gui/.gitignore

@@ -28,6 +28,7 @@ src/main/webapp/lib/font/*
 src/main/webapp/ui/assets/*
 src/main/webapp/ui/*.js
 src/main/webapp/ui/*.js.map
+src/main/webapp/ui/*.js.LICENSE.txt
 ui/node_modules
 ui/package-lock.json
 src/main/webapp/ui/index.html

src-gui/build.gradle

@@ -17,11 +17,11 @@ dependencies {
     implementation 'javax.servlet:jstl:1.2'
     implementation 'org.springframework.ldap:spring-ldap-core:2.3.2.RELEASE'
     implementation 'org.springframework.security:spring-security-ldap:4.1.4.RELEASE'
-    implementation 'org.apache.httpcomponents:httpclient:4.5.2'
+    implementation 'org.apache.httpcomponents:httpclient:4.5.13'
     implementation 'javax.ws.rs:javax.ws.rs-api:2.0'
     implementation 'com.googlecode.json-simple:json-simple:1.1.1'
-    implementation 'org.codehaus.jettison:jettison:1.3.7'
-    implementation 'commons-lang:commons-lang:2.3'
+    implementation 'org.codehaus.jettison:jettison:1.4.1'
+    implementation 'commons-lang:commons-lang:2.6'
     implementation 'org.springframework.boot:spring-boot:1.4.3.RELEASE'
     implementation 'org.springframework.boot:spring-boot-autoconfigure:1.4.3.RELEASE'
     implementation 'org.springframework.boot:spring-boot-starter-web:1.4.3.RELEASE'
@@ -31,14 +31,14 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-devtools:1.4.3.RELEASE'
     implementation 'javax.mail:mail:1.5.0-b01'
     implementation 'org.springframework.boot:spring-boot-starter-mail:1.4.3.RELEASE'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.9.0.pr3'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.0.pr3'
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.0.pr3'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.13.1'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.1'
     implementation 'org.webjars:bootstrap:4.1.2'
     implementation 'net.logstash.logback:logstash-logback-encoder:4.7'
     implementation 'javax.xml.bind:jaxb-api:2.1'
     implementation 'org.apache.derby:derby:10.12.1.1'
-	implementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.12'
+	implementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.27'
     implementation 'org.apache.velocity:velocity:1.7'
     implementation 'org.apache.commons:commons-io:1.3.2'
     implementation 'com.ibatis:ibatis2-common:2.1.7.597'
@@ -48,17 +48,16 @@ dependencies {
     implementation 'org.apache.tomcat.embed:tomcat-embed-jasper:8.5.9'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test:1.4.3.RELEASE'
-    testImplementation 'junit:junit:4.12'
-    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'
+    testImplementation 'org.mockito:mockito-junit-jupiter:4.2.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 
-    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'
+    compileOnly 'org.projectlombok:lombok:1.18.22'
+    testCompileOnly 'org.projectlombok:lombok:1.18.22'
+    annotationProcessor 'org.projectlombok:lombok:1.18.22'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
 
-    implementation group: 'org.eclipse.jdt.core.compiler', name: 'ecj', version: '4.5.1'
+    implementation group: 'org.eclipse.jdt.core.compiler', name: 'ecj', version: '4.6.1'
 }
 
 group = 'org.openkilda'
@@ -106,7 +105,7 @@ checkstyle {
     }
 }
 
-/*TODO: not compatible with Gradle 7+, need another way
+/*TODO: not compatible with Gradle 7+, need another way to hide checkstyle info messages
 [checkstyleMain, checkstyleTest].each { task ->
     task.logging.setLevel(LogLevel.LIFECYCLE)
 }*/

src-gui/src/test/java/org/openkilda/controller/FlowControllerTest.java

@@ -30,12 +30,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
@@ -44,7 +42,6 @@
 import java.util.List;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 public class FlowControllerTest {
 
     @SuppressWarnings("unused")

src-gui/src/test/java/org/openkilda/controller/StatsControllerTest.java

@@ -28,19 +28,16 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
 
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 public class StatsControllerTest {
 
     private MockMvc mockMvc;

src-gui/src/test/java/org/openkilda/controller/SwitchControllerTest.java

@@ -44,11 +44,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -62,7 +60,6 @@
 import java.util.List;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 public class SwitchControllerTest {
 
     private MockMvc mockMvc;

src-gui/src/test/java/org/openkilda/test/MockitoExtension.java

@@ -39,14 +39,14 @@ public void postProcessTestInstance(Object testInstance, ExtensionContext contex
     }
 
     @Override
-    public Object resolve(ParameterContext parameterContext, ExtensionContext extensionContext)
+    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
             throws ParameterResolutionException {
         return getMock(parameterContext.getParameter(), extensionContext);
 
     }
 
     @Override
-    public boolean supports(ParameterContext parameterContext, ExtensionContext extensionContext)
+    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
             throws ParameterResolutionException {
         return parameterContext.getParameter().isAnnotationPresent(Mock.class);
     }

src-java/base-topology/base-storm-topology/build.gradle

@@ -86,7 +86,7 @@ dependencies {
         exclude group: 'log4j', module: 'log4j'
     }
 
-    api 'io.micrometer:micrometer-core:1.5.1'
+    api 'io.micrometer:micrometer-core:1.8.2'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.junit.vintage:junit-vintage-engine'

src-java/base-topology/base-storm-topology/src/main/java/org/openkilda/wfm/share/flow/resources/FlowResourcesConfig.java

@@ -37,6 +37,14 @@ public interface FlowResourcesConfig extends Serializable {
     @Default("2500")
     int getMaxFlowMeterId();
 
+    @Key("flow.meter-id.pool.chunks.count")
+    @Default("10")
+    int getPoolChunksCountMeterId();
+
+    @Key("flow.meter-id.pools.cache.size")
+    @Default("128")
+    int getPoolsCacheSizeMeterId();
+
     /**
      * Minimum vlan value for flows.
      */