Merge branch 'release-1.123.0'

telstra · Aug 8, 2022 · 00aa459 · 00aa459
2 parents 3bf4530 + af36cc3
commit 00aa459
Show file tree

Hide file tree

Showing 75 changed files with 1,297 additions and 325 deletions.
diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
@@ -0,0 +1,45 @@
+---
+name: MegaLinter
+
+on:
+  pull_request:
+    branches: [develop]
+
+env:
+  APPLY_FIXES: all
+  APPLY_FIXES_EVENT: pull_request
+  APPLY_FIXES_MODE: commit
+  PRINT_ALPACA: false
+  GITHUB_COMMENT_REPORTER: false
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: MegaLinter
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
+      - name: MegaLinter
+        id: ml
+        uses: megalinter/megalinter@v6
+        env:
+          ENABLE: GROOVY
+          VALIDATE_ALL_CODEBASE: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Archive artifacts
+        if: ${{ success() }} || ${{ failure() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: MegaLinter reports
+          path: |
+            report
+            mega-linter.log
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,38 @@
 # Changelog
 
-## v1.122.0 (07/07/2022)
+## v1.123.0 (08/08/2022)
+
+### Features:
+-  [#4866](https://github.com/telstra/open-kilda/pull/4866) Added possibility to delete lagPort in case no lagPort on a switch (Issue: [#4729](https://github.com/telstra/open-kilda/issues/4729)) [**storm-topologies**]
+-  [#4877](https://github.com/telstra/open-kilda/pull/4877) Added query parameter to /api/v1/network/paths for limiting amount of computed paths
+-  [#4842](https://github.com/telstra/open-kilda/pull/4842) Add information about misconfigured rules into switch validation response (Issue: [#4834](https://github.com/telstra/open-kilda/issues/4834)) [**docs**]
+
+### Bug Fixes:
+-  [#4871](https://github.com/telstra/open-kilda/pull/4871) Fix swap-endpoint history recording - response timeout if flow update is disabled (Issue: [#4788](https://github.com/telstra/open-kilda/issues/4788))
+-  [#4879](https://github.com/telstra/open-kilda/pull/4879) Added hex field, which should display correctly in Swagger UI (Issue: [#2120](https://github.com/telstra/open-kilda/issues/2120)) [**api**]
+-  [#4891](https://github.com/telstra/open-kilda/pull/4891) Added command context in ActionBolt
+
+### Improvements:
+-  [#4870](https://github.com/telstra/open-kilda/pull/4870) Reworked FL RuleManager response topic handling (Issue: [#4860](https://github.com/telstra/open-kilda/issues/4860)) [**floodlight**]
+-  [#4872](https://github.com/telstra/open-kilda/pull/4872) Stats topology cache notifies zookeeper about readiness only after initialization [**storm-topologies**]
+-  [#4875](https://github.com/telstra/open-kilda/pull/4875) Add static code analysis for Groovy
+-  [#4883](https://github.com/telstra/open-kilda/pull/4883) Added test relating to issue #4517 (Issues: [#4517](https://github.com/telstra/open-kilda/issues/4517) [#4517](https://github.com/telstra/open-kilda/issues/4517)) [**tests**]
+-  [#4887](https://github.com/telstra/open-kilda/pull/4887) Add test for limiting amount of computed paths #4877 (Issues: [#4877](https://github.com/telstra/open-kilda/issues/4877) [#4877](https://github.com/telstra/open-kilda/issues/4877)) [**tests**]
+-  [#4888](https://github.com/telstra/open-kilda/pull/4888) Test/deleting already deleted lag port [**tests**]
+-  [#4894](https://github.com/telstra/open-kilda/pull/4894) Set version of @types/geojson to "7946.0.8" [**gui**]
+-  [#4895](https://github.com/telstra/open-kilda/pull/4895) Add notification to templates
+-  [#4897](https://github.com/telstra/open-kilda/pull/4897) Remove commented test data (Issue: [#3896](https://github.com/telstra/open-kilda/issues/3896)) [**tests**]
+-  [#4898](https://github.com/telstra/open-kilda/pull/4898) Remove unnecessary MegaLinter options [**tests**]
+-  [#4862](https://github.com/telstra/open-kilda/pull/4862) Removed unused methods and constructors from FlowDto
+
+For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.122.0...v1.123.0).
+
+### Affected Components:
+flow-hs, history, flow-monitor, fl, gui, swmanager, stats
+
+---
+
+## v1.122.0 (21/07/2022)
 
 ### Features:
 -  [#4848](https://github.com/telstra/open-kilda/pull/4848) Added vlan statistics field to FlowV2 CRUD api (Issue: [#4855](https://github.com/telstra/open-kilda/issues/4855)) 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ---
 KILDA CONTROLLER
 ---
-[![Build Status](https://github.com/telstra/open-kilda/actions/workflows/unittest.yml/badge.svg)](https://github.com/telstra/open-kilda/actions/workflows/unittest.yml)[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=org.openkilda%3Akilda-parent&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.openkilda%3Akilda-parent)
+[![Build Status](https://github.com/telstra/open-kilda/actions/workflows/unittest.yml/badge.svg)](https://github.com/telstra/open-kilda/actions/workflows/unittest.yml)[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=org.openkilda%3Akilda-parent&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.openkilda%3Akilda-parent)[![Mega-Linter](https://github.com/telstra/open-kilda/actions/workflows/MegaLinter/badge.svg?branch=main)](https://github.com/telstra/open-kilda/actions?query=workflow%3AMegaLinter+branch%3Amain)
 
 ## Introduction
 

diff --git a/confd/templates/base-storm-topology/topology.properties.tmpl b/confd/templates/base-storm-topology/topology.properties.tmpl
@@ -113,6 +113,7 @@ local.execution.time = 3000
 #######
 # Path computation engine
 pce.network.strategy = {{ getv "/kilda_pce_network_strategy" }}
+pce.max.path.count = {{ getv "/kilda_pce_max_path_count" }}
 #######
 # cost strategy params
 # value added to path weight for each isl used in the same diversity group

diff --git a/confd/templates/connecteddevices-topology/connecteddevices-topology.tmpl b/confd/templates/connecteddevices-topology/connecteddevices-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level_new" }}

diff --git a/confd/templates/floodlightrouter-topology/floodlightrouter-topology.tmpl b/confd/templates/floodlightrouter-topology/floodlightrouter-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level_new" }}

diff --git a/confd/templates/flowhs-topology/flowhs-topology.tmpl b/confd/templates/flowhs-topology/flowhs-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_flow_hs_parallelism" }}

diff --git a/confd/templates/flowmonitoring-topology/flowmonitoring-topology.tmpl b/confd/templates/flowmonitoring-topology/flowmonitoring-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_flow_monitoring_parallelism" }}

diff --git a/confd/templates/history-topology/history-topology.tmpl b/confd/templates/history-topology/history-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_history_parallelism" }}

diff --git a/confd/templates/isllatency-topology/isllatency-topology.tmpl b/confd/templates/isllatency-topology/isllatency-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_isl_latency_parallelism" }}

diff --git a/confd/templates/makefile/makefile.tmpl b/confd/templates/makefile/makefile.tmpl
@@ -1,6 +1,9 @@
 TASK := functionalTest
 STABLE_TAG := "stable"
 
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 build-base: {{if not (exists "/no_grpc_stub")}}build-grpc-stub {{end}}build-lock-keeper update-props docker/storm/lib {{if not (exists "/no_server42_server")}}build-server42dpdk{{end}}
 	docker build -t kilda/base-ubuntu:latest docker/base/kilda-base-ubuntu/
 	docker build -t kilda/zookeeper:latest docker/zookeeper

diff --git a/confd/templates/nbworker-topology/nbworker-topology.tmpl b/confd/templates/nbworker-topology/nbworker-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level_new" }}

diff --git a/confd/templates/network-topology/network-topology.tmpl b/confd/templates/network-topology/network-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: 2

diff --git a/confd/templates/opentsdb-topology/opentsdb-topology.tmpl b/confd/templates/opentsdb-topology/opentsdb-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level" }}

diff --git a/confd/templates/ping-topology/ping-topology.tmpl b/confd/templates/ping-topology/ping-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: 2

diff --git a/confd/templates/portstate-topology/portstate-topology.tmpl b/confd/templates/portstate-topology/portstate-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level" }}

diff --git a/confd/templates/reroute-topology/reroute-topology.tmpl b/confd/templates/reroute-topology/reroute-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level_new" }}

diff --git a/confd/templates/server42/server42-control-topology.tmpl b/confd/templates/server42/server42-control-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level_new" }}

diff --git a/confd/templates/stats-topology/stats-topology.tmpl b/confd/templates/stats-topology/stats-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_stats_parallelism" }}

diff --git a/confd/templates/swmanager-topology/swmanager-topology.tmpl b/confd/templates/swmanager-topology/swmanager-topology.tmpl
@@ -1,3 +1,6 @@
+# Generated by confd.
+# Do not change this file, all changes will be lost. Change corresponding template.
+
 # topology configuration
 config:
   topology.parallelism: {{ getv "/kilda_storm_swmanager_parallelism" }}

diff --git a/confd/vars/main.yaml b/confd/vars/main.yaml
@@ -123,6 +123,7 @@ kilda_bfd_interval_ms: 350
 kilda_bfd_multiplier: 3
 
 kilda_pce_network_strategy: "SYMMETRIC_COST"
+kilda_pce_max_path_count: 500
 
 kilda_floodlight_alive_timeout: 10
 kilda_floodlight_alive_interval: 2