Merge branch 'release-1.118.3'

telstra · Apr 28, 2022 · 101ae06 · 101ae06
2 parents a8a863d + 2637dfb
commit 101ae06
Show file tree

Hide file tree

Showing 100 changed files with 2,398 additions and 1,779 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## v1.118.3 (26/04/2022)
+
+
+### Bug Fixes:
+-  [#4768](https://github.com/telstra/open-kilda/pull/4768) Correct removing of LLDP/ARP/Server42 rules during update in swap endpoint case (Issue: [#4766](https://github.com/telstra/open-kilda/issues/4766)) 
+-  [#4790](https://github.com/telstra/open-kilda/pull/4790) Fix groups install in switch sync operation [**floodlight**]
+-  [#4767](https://github.com/telstra/open-kilda/pull/4767) Fix flow path endpoints in flow dump for update flow operation (Issue: [#4606](https://github.com/telstra/open-kilda/issues/4606)) 
+
+### Improvements:
+-  [#4780](https://github.com/telstra/open-kilda/pull/4780) Unignore test according to #4733 (Issues: [#3973](https://github.com/telstra/open-kilda/issues/3973) [#4733](https://github.com/telstra/open-kilda/issues/4733)) [**tests**]
+-  [#4751](https://github.com/telstra/open-kilda/pull/4751) [test] unignore tests for #4607 (Issue: [#4607](https://github.com/telstra/open-kilda/issues/4607)) 
+-  [#4753](https://github.com/telstra/open-kilda/pull/4753) Rework switch sync to use RuleManager [**floodlight**][**storm-topologies**]
+-  [#4786](https://github.com/telstra/open-kilda/pull/4786) update makefile template according to #4734 (Issue: [#4734](https://github.com/telstra/open-kilda/issues/4734)) 
+-  [#4754](https://github.com/telstra/open-kilda/pull/4754) Added config option for spout parallelism [**storm-topologies**]
+-  [#4757](https://github.com/telstra/open-kilda/pull/4757) Fix appearing warnings for FlowCrudSpec [**tests**]
+-  [#4734](https://github.com/telstra/open-kilda/pull/4734) Making repeatable builds possible w/o Internet 
+
+### Other changes:
+-  [#4745](https://github.com/telstra/open-kilda/pull/4745) Switch validation without logical port info (Issue: [#4574](https://github.com/telstra/open-kilda/issues/4574)) [**northbound**][**storm-topologies**]
+-  [#4778](https://github.com/telstra/open-kilda/pull/4778) Add test to validate non existing lag port creation [**tests**]
+-  [#4791](https://github.com/telstra/open-kilda/pull/4791) Revert "Use MySQL DB to store history on local env" (Issue: [#4746](https://github.com/telstra/open-kilda/issues/4746)) 
+
+For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.118.2...v1.118.3).
+
+### Affected Components:
+otsdb, network, router, ping, reroute, fl, flow-hs, history, swmanager, nb, nbworker, flow-monitor
+
+
+
 ## v1.118.2 (08/04/2022)
 
 ### Bug Fixes:

diff --git a/confd/templates/flowhs-topology/flowhs-topology.tmpl b/confd/templates/flowhs-topology/flowhs-topology.tmpl
@@ -2,6 +2,7 @@
 config:
   topology.parallelism: {{ getv "/kilda_storm_flow_hs_parallelism" }}
   topology.workers: {{ getv "/kilda_storm_flowhs_workers" }}
+  topology.spouts.parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
 
 # spout definitions
 spouts:
@@ -10,7 +11,7 @@ spouts:
   - id: "zookeeper.spout"
     parallelism: 1
   - id: "FLOW_SPOUT"
-    parallelism: {{ getv "/kilda_storm_flow_hs_parallelism" }}
+    parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
     properties:
       # The ratio of FLOW_SPOUT max pending to FLOW_xxx_HUB parallelism defines backpressure for H&S hubs.
       #

diff --git a/confd/templates/flowmonitoring-topology/flowmonitoring-topology.tmpl b/confd/templates/flowmonitoring-topology/flowmonitoring-topology.tmpl
@@ -2,6 +2,7 @@
 config:
   topology.parallelism: {{ getv "/kilda_storm_flow_monitoring_parallelism" }}
   topology.workers: {{ getv "/kilda_storm_parallelism_workers_count" }}
+  topology.spouts.parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
 
 # spout definitions
 spouts:

diff --git a/confd/templates/history-topology/history-topology.tmpl b/confd/templates/history-topology/history-topology.tmpl
@@ -2,7 +2,7 @@
 config:
   topology.parallelism: {{ getv "/kilda_storm_history_parallelism" }}
   topology.workers: {{ getv "/kilda_storm_parallelism_workers_count" }}
-  topology.spouts.parallelism: 1
+  topology.spouts.parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
 
 # spout definitions
 spouts:

diff --git a/confd/templates/makefile/makefile.tmpl b/confd/templates/makefile/makefile.tmpl
@@ -85,7 +85,7 @@ clean-docker-files:
 
 .PHONY: clean-sources
 clean-sources:
-{{if not (exists "/no_gui")}}	$(MAKE) -C src-gui clean clean-java
+{{if not (exists "/no_gui")}}	$(MAKE) -C src-gui clean-java
 {{end}}	$(MAKE) -C src-python/lab-service/lab clean
 	cd src-java && ./gradlew clean
 

diff --git a/confd/templates/nbworker-topology/nbworker-topology.tmpl b/confd/templates/nbworker-topology/nbworker-topology.tmpl
@@ -2,6 +2,7 @@
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level_new" }}
   topology.workers: {{ getv "/kilda_storm_parallelism_workers_count" }}
+  topology.spouts.parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
 
 # spout definitions
 spouts:

diff --git a/confd/templates/network-topology/network-topology.tmpl b/confd/templates/network-topology/network-topology.tmpl
@@ -2,6 +2,7 @@
 config:
   topology.parallelism: 2
   topology.workers: {{ getv "/kilda_storm_parallelism_workers_count" }}
+  topology.spouts.parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
 
 # spout definitions
 spouts:

diff --git a/confd/templates/opentsdb-topology/opentsdb-topology.tmpl b/confd/templates/opentsdb-topology/opentsdb-topology.tmpl
@@ -2,6 +2,7 @@
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level" }}
   topology.workers: {{ getv "/kilda_opentsdb_workers" }}
+  topology.spouts.parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
 
 # spout definitions
 spouts:

diff --git a/confd/templates/ping-topology/ping-topology.tmpl b/confd/templates/ping-topology/ping-topology.tmpl
@@ -2,6 +2,7 @@
 config:
   topology.parallelism: 2
   topology.workers: {{ getv "/kilda_storm_parallelism_workers_count" }}
+  topology.spouts.parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
 
 # spout definitions
 spouts:

diff --git a/confd/templates/reroute-topology/reroute-topology.tmpl b/confd/templates/reroute-topology/reroute-topology.tmpl
@@ -2,6 +2,7 @@
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level_new" }}
   topology.workers: {{ getv "/kilda_storm_parallelism_workers_count" }}
+  topology.spouts.parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
 
 # spout definitions
 spouts:

diff --git a/confd/templates/server42/server42-control-topology.tmpl b/confd/templates/server42/server42-control-topology.tmpl
@@ -2,6 +2,7 @@
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level_new" }}
   topology.workers: {{ getv "/kilda_storm_parallelism_workers_count" }}
+  topology.spouts.parallelism: {{ getv "/kilda_storm_spout_parallelism" }}
 
 # spout definitions
 spouts:

diff --git a/confd/templates/stats-topology/stats-topology.tmpl b/confd/templates/stats-topology/stats-topology.tmpl
@@ -2,6 +2,7 @@
 config:
   topology.parallelism: {{ getv "/kilda_storm_parallelism_level" }}
   topology.workers: {{ getv "/kilda_storm_parallelism_workers_count" }}
+  topology.spouts.parallelism: 1
 
 # spout definitions
 spouts:

diff --git a/confd/vars/main.yaml b/confd/vars/main.yaml
@@ -173,6 +173,8 @@ kilda_storm_flowhs_workers: 1
 kilda_storm_parallelism_workers_count: 1
 kilda_storm_history_parallelism: 2
 
+kilda_storm_spout_parallelism: 2
+
 kilda_storm_flow_monitoring_parallelism: 2
 
 kilda_storm_disruptor_wait_timeout: 1000

diff --git a/docker/db-migration/Dockerfile b/docker/db-migration/Dockerfile
@@ -50,19 +50,32 @@ RUN GNUPGHOME="$(mktemp -d)"
 
 # Download JDBC libraries and plugins
 
-ADD --chown=liquibase:liquibase https://repo1.maven.org/maven2/com/orientechnologies/orientdb-jdbc/3.0.34/orientdb-jdbc-3.0.34-all.jar /liquibase/lib/orientdb-jdbc-3.0.34-all.jar
-#ADD --chown=liquibase:liquibase https://dl.bintray.com/till-krullmann/tools/org/unbroken-dome/liquibase-orientdb/liquibase-orientdb/0.3.0/liquibase-orientdb-0.3.0.jar /liquibase/lib/liquibase-orientdb-0.3.0.jar
-COPY --chown=liquibase:liquibase lib/liquibase-orientdb-0.3.0.jar /liquibase/lib/liquibase-orientdb-0.3.0.jar
+RUN set -x \
+  && mkdir -p /liquibase/lib/ \
+  && wget -O /liquibase/lib/orientdb-jdbc-3.0.34-all.jar \
+             "https://repo1.maven.org/maven2/com/orientechnologies/orientdb-jdbc/3.0.34/orientdb-jdbc-3.0.34-all.jar"  \
+  # && wget -O /liquibase/lib/liquibase-orientdb-0.3.0.jar \
+  #            "https://dl.bintray.com/till-krullmann/tools/org/unbroken-dome/liquibase-orientdb/liquibase-orientdb/0.3.0/liquibase-orientdb-0.3.0.jar"  \
+  # black magic satisfying dependencies of `liquibase-orientdb-0.3.0.jar`
+  && wget -O /liquibase/lib/commons-lang3-3.6.jar \
+             "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.6/commons-lang3-3.6.jar" \
+  && wget -O /liquibase/lib/commons-beanutils-1.9.2.jar \
+             "https://repo1.maven.org/maven2/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar" \
+  && wget -O /liquibase/lib/guava-23.3-jre.jar \
+             "https://repo1.maven.org/maven2/com/google/guava/guava/23.3-jre/guava-23.3-jre.jar" \
+  && wget -O /liquibase/lib/validation-api-1.1.0.Final.jar \
+             "https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar" \
+  && wget -O /liquibase/lib/hibernate-validator-5.2.4.Final.jar \
+             "https://repo1.maven.org/maven2/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final.jar" \
+  && wget -O /liquibase/lib/jackson-databind-2.6.7.jar \
+             "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.6.7/jackson-databind-2.6.7.jar" \
+  && wget -O /liquibase/lib/jboss-logging-3.2.1.Final.jar \
+             "https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final.jar" \
+  && wget -O /liquibase/lib/classmate-1.1.0.jar \
+             "https://repo1.maven.org/maven2/com/fasterxml/classmate/1.1.0/classmate-1.1.0.jar" \
+  && chown -R liquibase:liquibase /liquibase/lib/
 
-# black magic satisfying dependencies of `liquibase-orientdb-0.3.0.jar`
-ADD --chown=liquibase:liquibase https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.6/commons-lang3-3.6.jar /liquibase/lib/commons-lang3-3.6.jar
-ADD --chown=liquibase:liquibase https://repo1.maven.org/maven2/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar /liquibase/lib/commons-beanutils-1.9.2.jar
-ADD --chown=liquibase:liquibase https://repo1.maven.org/maven2/com/google/guava/guava/23.3-jre/guava-23.3-jre.jar /liquibase/lib/guava-23.3-jre.jar
-ADD --chown=liquibase:liquibase https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar /liquibase/lib/validation-api-1.1.0.Final.jar
-ADD --chown=liquibase:liquibase https://repo1.maven.org/maven2/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final.jar /liquibase/lib/hibernate-validator-5.2.4.Final.jar
-ADD --chown=liquibase:liquibase https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.6.7/jackson-databind-2.6.7.jar /liquibase/lib/jackson-databind-2.6.7.jar
-ADD --chown=liquibase:liquibase https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final.jar /liquibase/lib/jboss-logging-3.2.1.Final.jar
-ADD --chown=liquibase:liquibase https://repo1.maven.org/maven2/com/fasterxml/classmate/1.1.0/classmate-1.1.0.jar /liquibase/lib/classmate-1.1.0.jar
+COPY --chown=liquibase:liquibase lib/liquibase-orientdb-0.3.0.jar /liquibase/lib/liquibase-orientdb-0.3.0.jar
 
 ENV KILDA_ORIENTDB_USER=kilda
 ENV KILDA_ORIENTDB_PASSWORD=kilda

diff --git a/docs/design/hub-and-spoke/switch-sync/h&s-switch-sync.png b/docs/design/hub-and-spoke/switch-sync/h&s-switch-sync.png
diff --git a/docs/design/hub-and-spoke/switch-sync/h&s-switch-sync.puml b/docs/design/hub-and-spoke/switch-sync/h&s-switch-sync.puml
@@ -5,9 +5,7 @@ actor User
 boundary Northbound as NB
 participant SwitchManager << Hub >>
 participant SpeakerWorker
-participant CommandBuilder
 participant Floodlight as FL
-database DAO
 
 User -> NB : Switch sync rules
 
@@ -18,35 +16,27 @@ activate SwitchManager
 SwitchManager -> SwitchManager : Switch validate
 
 opt Missing rules exists
-    SwitchManager -> CommandBuilder : buildCommandsToCreateMissingRules
-    activate CommandBuilder
-    CommandBuilder -> CommandBuilder : Build commands
-    CommandBuilder -> SwitchManager : Rule installation commands
-    deactivate CommandBuilder
+    SwitchManager -> SwitchManager : Rule installation commands
 end
 
 opt Excess rules exists and removeExcess=true
-    SwitchManager -> CommandBuilder : buildCommandsToRemoveExcessRules
-    activate CommandBuilder
-    CommandBuilder -> CommandBuilder : Build commands
-    CommandBuilder -> SwitchManager : Rule remove commands
-    deactivate CommandBuilder
+    SwitchManager -> SwitchManager : Rule remove commands
 end
 
 group Sending rules commands
     opt Missing rules commands exists
         loop for each missing rule
-            SwitchManager ->> SpeakerWorker : InstallFlowForSwitchManagerRequest
-            SpeakerWorker ->> FL : InstallFlowForSwitchManagerRequest
+            SwitchManager ->> SpeakerWorker : BaseSpeakerCommandsRequest
+            SpeakerWorker ->> FL : BaseSpeakerCommandsRequest
 
             FL ->> SpeakerWorker
             SpeakerWorker ->> SwitchManager
         end
     end
     opt Excess rules commands exists
         loop for each excess rule
-            SwitchManager ->> SpeakerWorker : RemoveFlowForSwitchManagerRequest
-            SpeakerWorker ->> FL : RemoveFlowForSwitchManagerRequest
+            SwitchManager ->> SpeakerWorker : DeleteSpeakerCommandsRequest
+            SpeakerWorker ->> FL : DeleteSpeakerCommandsRequest
             FL ->> SpeakerWorker
             SpeakerWorker ->> SwitchManager
         end
@@ -60,8 +50,8 @@ end
 
 opt Excess meters commands exists
     loop for each excess meter
-        SwitchManager ->> SpeakerWorker : DeleterMeterForSwitchManagerRequest
-        SpeakerWorker ->> FL : DeleterMeterForSwitchManagerRequest
+        SwitchManager ->> SpeakerWorker : DeleteSpeakerCommandsRequest
+        SpeakerWorker ->> FL : DeleteSpeakerCommandsRequest
         FL ->> SpeakerWorker
         SpeakerWorker --> SwitchManager
     end

diff --git a/docs/design/hub-and-spoke/switch-sync/switch-sync-fsm.dot b/docs/design/hub-and-spoke/switch-sync/switch-sync-fsm.dot
@@ -4,53 +4,48 @@ subgraph cluster_StateMachine {
 label="org.openkilda.wfm.topology.switchmanager.fsm.SwitchSyncFsm";
 COMPUTE_EXCESS_RULES [label="COMPUTE_EXCESS_RULES"];
 COMPUTE_MISCONFIGURED_RULES [label="COMPUTE_MISCONFIGURED_RULES"];
-GROUPS_COMMANDS_SEND [label="GROUPS_COMMANDS_SEND"];
 FINISHED_WITH_ERROR [label="FINISHED_WITH_ERROR"];
 INITIALIZED [label="INITIALIZED"];
 COMPUTE_LOGICAL_PORTS_COMMANDS [label="COMPUTE_LOGICAL_PORTS_COMMANDS"];
 LOGICAL_PORTS_COMMANDS_SEND [label="LOGICAL_PORTS_COMMANDS_SEND"];
-RULES_COMMANDS_SEND [label="RULES_COMMANDS_SEND"];
 COMPUTE_MISSING_RULES [label="COMPUTE_MISSING_RULES"];
 COMPUTE_EXCESS_METERS [label="COMPUTE_EXCESS_METERS"];
 COMPUTE_MISCONFIGURED_METERS [label="COMPUTE_MISCONFIGURED_METERS"];
+COMPUTE_MISSING_METERS [label="COMPUTE_MISSING_METERS"];
 COMPUTE_GROUP_MIRROR_CONFIGS [label="COMPUTE_GROUP_MIRROR_CONFIGS"];
-METERS_COMMANDS_SEND [label="METERS_COMMANDS_SEND"];
+SEND_REMOVE_COMMANDS [label="SEND_REMOVE_COMMANDS"];
+SEND_MODIFY_COMMANDS [label="SEND_MODIFY_COMMANDS"];
+SEND_INSTALL_COMMANDS [label="SEND_INSTALL_COMMANDS"];
 FINISHED [label="FINISHED"];
 
 COMPUTE_EXCESS_RULES -> FINISHED_WITH_ERROR [ label="ERROR"];
 COMPUTE_EXCESS_RULES -> COMPUTE_EXCESS_METERS [ label="NEXT"];
 COMPUTE_MISCONFIGURED_RULES -> FINISHED_WITH_ERROR [ label="ERROR"];
 COMPUTE_MISCONFIGURED_RULES -> COMPUTE_EXCESS_RULES [ label="NEXT"];
-GROUPS_COMMANDS_SEND -> GROUPS_COMMANDS_SEND [ label="GROUPS_INSTALLED"];
-GROUPS_COMMANDS_SEND -> GROUPS_COMMANDS_SEND [ label="GROUPS_MODIFIED"];
-GROUPS_COMMANDS_SEND -> GROUPS_COMMANDS_SEND [ label="GROUPS_REMOVED"];
-GROUPS_COMMANDS_SEND -> FINISHED_WITH_ERROR [ label="TIMEOUT"];
-GROUPS_COMMANDS_SEND -> FINISHED_WITH_ERROR [ label="ERROR"];
-GROUPS_COMMANDS_SEND -> METERS_COMMANDS_SEND [ label="NEXT"];
+SEND_REMOVE_COMMANDS -> FINISHED_WITH_ERROR [ label="TIMEOUT"];
+SEND_REMOVE_COMMANDS -> FINISHED_WITH_ERROR [ label="ERROR"];
+SEND_REMOVE_COMMANDS -> SEND_MODIFY_COMMANDS [ label="COMMANDS_PROCESSED"];
 INITIALIZED -> COMPUTE_MISSING_RULES [ label="NEXT"];
 COMPUTE_LOGICAL_PORTS_COMMANDS -> FINISHED_WITH_ERROR [ label="ERROR"];
 COMPUTE_LOGICAL_PORTS_COMMANDS -> LOGICAL_PORTS_COMMANDS_SEND [ label="NEXT"];
 LOGICAL_PORTS_COMMANDS_SEND -> LOGICAL_PORTS_COMMANDS_SEND [ label="LOGICAL_PORT_INSTALLED"];
 LOGICAL_PORTS_COMMANDS_SEND -> LOGICAL_PORTS_COMMANDS_SEND [ label="LOGICAL_PORT_REMOVED"];
 LOGICAL_PORTS_COMMANDS_SEND -> FINISHED_WITH_ERROR [ label="TIMEOUT"];
 LOGICAL_PORTS_COMMANDS_SEND -> FINISHED_WITH_ERROR [ label="ERROR"];
-LOGICAL_PORTS_COMMANDS_SEND -> GROUPS_COMMANDS_SEND [ label="NEXT"];
-RULES_COMMANDS_SEND -> RULES_COMMANDS_SEND [ label="MISSING_RULES_INSTALLED"];
-RULES_COMMANDS_SEND -> RULES_COMMANDS_SEND [ label="EXCESS_RULES_REMOVED"];
-RULES_COMMANDS_SEND -> RULES_COMMANDS_SEND [ label="MISCONFIGURED_RULES_REINSTALLED"];
-RULES_COMMANDS_SEND -> FINISHED_WITH_ERROR [ label="TIMEOUT"];
-RULES_COMMANDS_SEND -> FINISHED_WITH_ERROR [ label="ERROR"];
-RULES_COMMANDS_SEND -> FINISHED [ label="NEXT"];
+LOGICAL_PORTS_COMMANDS_SEND -> SEND_REMOVE_COMMANDS [ label="NEXT"];
+SEND_INSTALL_COMMANDS -> FINISHED_WITH_ERROR [ label="TIMEOUT"];
+SEND_INSTALL_COMMANDS -> FINISHED_WITH_ERROR [ label="ERROR"];
+SEND_INSTALL_COMMANDS -> FINISHED [ label="COMMANDS_PROCESSED"];
 COMPUTE_MISSING_RULES -> FINISHED_WITH_ERROR [ label="ERROR"];
 COMPUTE_MISSING_RULES -> COMPUTE_MISCONFIGURED_RULES [ label="NEXT"];
 COMPUTE_EXCESS_METERS -> FINISHED_WITH_ERROR [ label="ERROR"];
 COMPUTE_EXCESS_METERS -> COMPUTE_MISCONFIGURED_METERS [ label="NEXT"];
 COMPUTE_MISCONFIGURED_METERS -> FINISHED_WITH_ERROR [ label="ERROR"];
-COMPUTE_MISCONFIGURED_METERS -> COMPUTE_GROUP_MIRROR_CONFIGS [ label="NEXT"];
+COMPUTE_MISCONFIGURED_METERS -> COMPUTE_MISSING_METERS [ label="NEXT"];
+COMPUTE_MISSING_METERS -> FINISHED_WITH_ERROR [ label="ERROR"];
+COMPUTE_MISSING_METERS -> COMPUTE_GROUP_MIRROR_CONFIGS [ label="NEXT"];
 COMPUTE_GROUP_MIRROR_CONFIGS -> FINISHED_WITH_ERROR [ label="ERROR"];
 COMPUTE_GROUP_MIRROR_CONFIGS -> COMPUTE_LOGICAL_PORTS_COMMANDS [ label="NEXT"];
-METERS_COMMANDS_SEND -> METERS_COMMANDS_SEND [ label="METERS_REMOVED"];
-METERS_COMMANDS_SEND -> METERS_COMMANDS_SEND [ label="MISCONFIGURED_METERS_MODIFIED"];
-METERS_COMMANDS_SEND -> FINISHED_WITH_ERROR [ label="TIMEOUT"];
-METERS_COMMANDS_SEND -> FINISHED_WITH_ERROR [ label="ERROR"];
-METERS_COMMANDS_SEND -> RULES_COMMANDS_SEND [ label="NEXT"];}}
+SEND_MODIFY_COMMANDS -> FINISHED_WITH_ERROR [ label="TIMEOUT"];
+SEND_MODIFY_COMMANDS -> FINISHED_WITH_ERROR [ label="ERROR"];
+SEND_MODIFY_COMMANDS -> SEND_INSTALL_COMMANDS [ label="COMMANDS_PROCESSED"];}}
diff --git a/docs/design/hub-and-spoke/switch-sync/switch-sync-fsm.png b/docs/design/hub-and-spoke/switch-sync/switch-sync-fsm.png
diff --git a/src-gui/Makefile b/src-gui/Makefile
@@ -1,37 +1,29 @@
 APP := openkilda-gui
 
-rebuild: clean clean-java build
+rebuild: clean-java build
 
-build:  clean-cache build/libs/${APP}.war
+build: build/libs/${APP}.war
 
 build/libs/${APP}.war: .deps/node .deps/resources
 	./gradlew build
 
-.deps/node: .deps
-	docker run --rm -e LOCAL_UID=`id -u $(USER)` -e LOCAL_GID=`id -g $(USER)` -v $(CURDIR)/src:/app/src -v $(CURDIR)/ui:/app/ui node:14.17-alpine  \
-		sh -c 'npm cache clean -f && npm install -g @angular/[email protected] --unsafe-perm && cd /app/ui && npm install && ng build --prod && chown -R $$LOCAL_UID:$$LOCAL_GID /app/src /app/ui'
-	touch $@
+.deps/node: | .deps
+	docker run --rm -e LOCAL_UID=`id -u $(USER)` -e LOCAL_GID=`id -g $(USER)` -v $(CURDIR)/src:/app/src -v $(CURDIR)/ui:/app/ui node:14.17-alpine \
+		sh -c 'cd /app/ui && npm install && /app/ui/node_modules/.bin/ng build --prod && chown -R $$LOCAL_UID:$$LOCAL_GID /app'
 
 .deps/resources: .deps
 	mkdir -p src/main/webapp/lib/css/
 	mkdir -p src/main/webapp/lib/javascript/
-	wget -O src/main/webapp/lib/css/roboto.css https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i
-	wget -O src/main/webapp/lib/css/bootstrap.min.css https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
-	wget -O src/main/webapp/lib/javascript/bootstrap.min.js https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js
-	wget -O src/main/webapp/lib/javascript/jquery-3.5.1.min.js https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.js
-	touch $@
+	[ -e src/main/webapp/lib/css/roboto.css ] || wget -O src/main/webapp/lib/css/roboto.css https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i
+	[ -e src/main/webapp/lib/css/bootstrap.min.css ] || wget -O src/main/webapp/lib/css/bootstrap.min.css https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
+	[ -e src/main/webapp/lib/javascript/bootstrap.min.js ] || wget -O src/main/webapp/lib/javascript/bootstrap.min.js https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js
+	[ -e src/main/webapp/lib/javascript/jquery-3.5.1.min.js ] || wget -O src/main/webapp/lib/javascript/jquery-3.5.1.min.js https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.js
 
 .deps:
 	mkdir -p .deps
 	mkdir -p tmp
 
-clean-cache: clean
-
-clean:
-	rm -f .deps/node
-	rm -f .deps/resources
-
 clean-java:
 	./gradlew clean
 
-.PHONY: rebuild clean clean-java
+.PHONY: rebuild clean-java