4964 add information about lacp connection status for lag ports

docker/db-migration/migrations/024-add-lacp-partner-class.yaml

@@ -0,0 +1,34 @@
+databaseChangeLog:
+  - changeSet:
+      id: tag
+      author: dkakollu
+      changes:
+        - tagDatabase:
+            tag: 024-add-lacp-partner-class
+
+  - changeSet:
+      id: add-lacp-partner-class
+      author: dkakollu
+      changes:
+        - sql: "CREATE CLASS lacp_partner IF NOT EXISTS EXTENDS V"
+        - sql: "CREATE PROPERTY lacp_partner.switch_id IF NOT EXISTS STRING"
+        - sql: "CREATE PROPERTY lacp_partner.logical_port_number IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.system_priority IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.system_id IF NOT EXISTS STRING"
+        - sql: "CREATE PROPERTY lacp_partner.key IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.port_priority IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.port_number IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.state_active IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_short_timeout IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_aggregatable IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_synchronised IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_collecting IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_distributing IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_defaulted IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_expired IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE INDEX lacp_partner.switch_id IF NOT EXISTS NOTUNIQUE_HASH_INDEX"
+        - sql: "CREATE INDEX lacp_partner.logical_port_number IF NOT EXISTS NOTUNIQUE_HASH_INDEX"
+
+      rollback:
+        - sql: "DELETE VERTEX lacp_partner"
+        - sql: "DROP CLASS lacp_partner IF EXISTS"

docker/db-migration/migrations/026-add-lacp-partner-class.yaml

@@ -0,0 +1,34 @@
+databaseChangeLog:
+  - changeSet:
+      id: tag
+      author: dkakollu
+      changes:
+        - tagDatabase:
+            tag: 024-add-lacp-partner-class
+
+  - changeSet:
+      id: add-lacp-partner-class
+      author: dkakollu
+      changes:
+        - sql: "CREATE CLASS lacp_partner IF NOT EXISTS EXTENDS V"
+        - sql: "CREATE PROPERTY lacp_partner.switch_id IF NOT EXISTS STRING"
+        - sql: "CREATE PROPERTY lacp_partner.logical_port_number IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.system_priority IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.system_id IF NOT EXISTS STRING"
+        - sql: "CREATE PROPERTY lacp_partner.key IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.port_priority IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.port_number IF NOT EXISTS INTEGER"
+        - sql: "CREATE PROPERTY lacp_partner.state_active IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_short_timeout IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_aggregatable IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_synchronised IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_collecting IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_distributing IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_defaulted IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE PROPERTY lacp_partner.state_expired IF NOT EXISTS BOOLEAN"
+        - sql: "CREATE INDEX lacp_partner.switch_id IF NOT EXISTS NOTUNIQUE_HASH_INDEX"
+        - sql: "CREATE INDEX lacp_partner.logical_port_number IF NOT EXISTS NOTUNIQUE_HASH_INDEX"
+
+      rollback:
+        - sql: "DELETE VERTEX lacp_partner"
+        - sql: "DROP CLASS lacp_partner IF EXISTS"

docker/db-migration/migrations/root.yaml

@@ -87,3 +87,6 @@ databaseChangeLog:
   - include:
       relativeToChangelogFile: true
       file: 025-optimise-switch-connected-device-class.yaml
+  - include:
+      relativeToChangelogFile: true
+      file: 026-add-lacp-partner-class.yaml

src-java/base-topology/base-messaging/src/main/java/org/openkilda/messaging/info/event/LacpInfoData.java

@@ -0,0 +1,39 @@
+/* Copyright 2023 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.messaging.info.event;
+
+import org.openkilda.messaging.info.InfoData;
+import org.openkilda.model.SwitchId;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+public class LacpInfoData extends InfoData {
+    SwitchId switchId;
+    int logicalPortNumber;
+    LacpPartner actor;
+}

src-java/base-topology/base-messaging/src/main/java/org/openkilda/messaging/info/event/LacpPartner.java

@@ -0,0 +1,41 @@
+/* Copyright 2023 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.messaging.info.event;
+
+import org.openkilda.model.MacAddress;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+public class LacpPartner implements Serializable {
+    int systemPriority;
+    MacAddress systemId;
+    int key;
+    int portPriority;
+    int portNumber;
+    LacpState state;
+}

src-java/base-topology/base-messaging/src/main/java/org/openkilda/messaging/info/event/LacpState.java

@@ -0,0 +1,41 @@
+/* Copyright 2023 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.messaging.info.event;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+public class LacpState implements Serializable {
+    boolean active;
+    boolean shortTimeout;
+    boolean aggregatable;
+    boolean synchronised;
+    boolean collecting;
+    boolean distributing;
+    boolean defaulted;
+    boolean expired;
+}

src-java/connecteddevices-topology/connecteddevices-storm-topology/src/main/java/org/openkilda/wfm/topology/connecteddevices/ConnectedDevicesTopology.java

@@ -31,6 +31,7 @@
 
 public class ConnectedDevicesTopology extends AbstractTopology<ConnectedDevicesTopologyConfig> {
     public static final String CONNECTED_DEVICES_SPOUT_ID = "connected-devices-spout";
+    public static final String LACP_SPOUT_ID = "lacp-spout";
     public static final String ROUTER_BOLT_ID = "router-bolt";
     public static final String PACKET_BOLT_ID = "packet-bolt";
 
@@ -43,11 +44,13 @@ public ConnectedDevicesTopology(LaunchEnvironment env) {
      */
     public StormTopology createTopology() {
         TopologyBuilder builder = new TopologyBuilder();
-        PersistenceManager persistenceManager = new PersistenceManager(configurationProvider);
 
         createZkSpout(builder);
 
         createSpout(builder);
+        createLacpSpout(builder);
+
+        PersistenceManager persistenceManager = new PersistenceManager(configurationProvider);
         createRouterBolt(builder, persistenceManager);
         createPacketBolt(builder, persistenceManager);
 
@@ -66,6 +69,7 @@ private void createRouterBolt(TopologyBuilder builder, PersistenceManager persis
         RouterBolt routerBolt = new RouterBolt(persistenceManager, ZooKeeperSpout.SPOUT_ID);
         declareBolt(builder, routerBolt, ROUTER_BOLT_ID)
                 .shuffleGrouping(CONNECTED_DEVICES_SPOUT_ID)
+                .shuffleGrouping(LACP_SPOUT_ID)
                 .allGrouping(ZooKeeperSpout.SPOUT_ID);
     }
 
@@ -80,6 +84,10 @@ private void createSpout(TopologyBuilder builder) {
         declareKafkaSpout(builder, topologyConfig.getKafkaTopoConnectedDevicesTopic(), CONNECTED_DEVICES_SPOUT_ID);
     }
 
+    private void createLacpSpout(TopologyBuilder builder) {
+        declareKafkaSpout(builder, topologyConfig.getKafkaLacpTopic(), LACP_SPOUT_ID);
+    }
+
     private void createZkBolt(TopologyBuilder builder) {
         ZooKeeperBolt zooKeeperBolt = new ZooKeeperBolt(getConfig().getBlueGreenMode(), getZkTopoName(),
                 getZookeeperConfig(), getBoltInstancesCount(ROUTER_BOLT_ID));

src-java/connecteddevices-topology/connecteddevices-storm-topology/src/main/java/org/openkilda/wfm/topology/connecteddevices/ConnectedDevicesTopologyConfig.java

@@ -25,4 +25,9 @@ public interface ConnectedDevicesTopologyConfig extends AbstractTopologyConfig {
     default String getKafkaTopoConnectedDevicesTopic() {
         return getKafkaTopics().getTopoConnectedDevicesTopic();
     }
+
+    default String getKafkaLacpTopic() {
+        return getKafkaTopics().getLacpTopic();
+    }
+
 }

src-java/connecteddevices-topology/connecteddevices-storm-topology/src/main/java/org/openkilda/wfm/topology/connecteddevices/bolts/PacketBolt.java

@@ -17,8 +17,9 @@
 
 import static org.openkilda.wfm.topology.utils.KafkaRecordTranslator.FIELD_ID_PAYLOAD;
 
+import org.openkilda.messaging.info.InfoData;
 import org.openkilda.messaging.info.event.ArpInfoData;
-import org.openkilda.messaging.info.event.ConnectedDevicePacketBase;
+import org.openkilda.messaging.info.event.LacpInfoData;
 import org.openkilda.messaging.info.event.LldpInfoData;
 import org.openkilda.persistence.PersistenceManager;
 import org.openkilda.wfm.AbstractBolt;
@@ -43,12 +44,14 @@ protected void init() {
 
     @Override
     protected void handleInput(Tuple input) throws PipelineException {
-        ConnectedDevicePacketBase data = pullValue(input, FIELD_ID_PAYLOAD, ConnectedDevicePacketBase.class);
+        InfoData data = pullValue(input, FIELD_ID_PAYLOAD, InfoData.class);
 
         if (data instanceof LldpInfoData) {
             packetService.handleLldpData((LldpInfoData) data);
         } else if (data instanceof ArpInfoData) {
             packetService.handleArpData((ArpInfoData) data);
+        } else if (data instanceof LacpInfoData) {
+            packetService.handleLacpData((LacpInfoData) data);
         } else {
             unhandledInput(input);
         }

src-java/connecteddevices-topology/connecteddevices-storm-topology/src/main/java/org/openkilda/wfm/topology/connecteddevices/bolts/RouterBolt.java

@@ -22,6 +22,7 @@
 import org.openkilda.messaging.info.InfoData;
 import org.openkilda.messaging.info.InfoMessage;
 import org.openkilda.messaging.info.event.ArpInfoData;
+import org.openkilda.messaging.info.event.LacpInfoData;
 import org.openkilda.messaging.info.event.LldpInfoData;
 import org.openkilda.persistence.PersistenceManager;
 import org.openkilda.wfm.AbstractBolt;
@@ -57,8 +58,8 @@ protected void handleInput(Tuple input) throws PipelineException {
                     emitWithContext(PACKET_STREAM_ID, input, new Values(createMessageKey((LldpInfoData) data), data));
                 } else if (data instanceof ArpInfoData) {
                     emitWithContext(PACKET_STREAM_ID, input, new Values(createMessageKey((ArpInfoData) data), data));
-                } else {
-                    unhandledInput(input);
+                } else  if (data instanceof LacpInfoData) {
+                    emitWithContext(PACKET_STREAM_ID, input, new Values(createMessageKey((LacpInfoData) data), data));
                 }
             } else {
                 unhandledInput(input);