From 3c0976cd13ecc0991829ebc38e874317d8836ca8 Mon Sep 17 00:00:00 2001 From: Faseela K Date: Mon, 27 Mar 2017 15:49:35 +0530 Subject: [PATCH] Enhancing interface-manager junits - phase3 Cleanup unused methods in interface-manager Change-Id: If656303922b533aff7a7c0e12aec7896f05693ed Signed-off-by: Faseela K --- .../genius/interfacemanager/IfmUtil.java | 55 ------ .../commons/AlivenessMonitorUtils.java | 8 - .../commons/InterfaceManagerCommonUtils.java | 29 ---- .../commons/InterfaceMetaUtils.java | 12 -- .../HwVTEPConfigRemoveHelper.java | 9 - .../ovs/utilities/SouthboundUtils.java | 41 ----- .../utilities/VlanTrunkSouthboundUtils.java | 157 ------------------ .../utilities/FlowBasedServicesUtils.java | 12 -- 8 files changed, 323 deletions(-) delete mode 100644 interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/VlanTrunkSouthboundUtils.java diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java index 8ed7448d7..4537e3cb3 100755 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java @@ -82,11 +82,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.ser import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServicesKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg6; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathId; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -124,21 +119,6 @@ public class IfmUtil { return null; } - public static String getPortNoFromInterfaceName(String ifaceName, DataBroker broker) { - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.interfaces.rev140508.interfaces.state.Interface ifState = InterfaceManagerCommonUtils - .getInterfaceStateFromOperDS(ifaceName, broker); - - if (ifState == null) { - throw new NullPointerException("Interface information not present in oper DS for " + ifaceName); - } - String lowerLayerIf = ifState.getLowerLayerIf().get(0); - NodeConnectorId nodeConnectorId = new NodeConnectorId(lowerLayerIf); - String portNo = IfmUtil.getPortNoFromNodeConnectorId(nodeConnectorId); - - return portNo; - } - public static String getPortNoFromNodeConnectorId(NodeConnectorId portId) { /* * NodeConnectorId is of form 'openflow:dpnid:portnum' @@ -199,16 +179,6 @@ public class IfmUtil { return InstanceIdentifier.builder(IdPools.class).child(IdPool.class, new IdPoolKey(poolName)).build(); } - public static List getPortNameAndSuffixFromInterfaceName(String intfName) { - List strList = new ArrayList<>(2); - int index = intfName.indexOf(":"); - if (index != -1) { - strList.add(0, intfName.substring(0, index)); - strList.add(1, intfName.substring(index)); - } - return strList; - } - public static long getGroupId(long ifIndex, InterfaceInfo.InterfaceType infType) { if (infType == InterfaceInfo.InterfaceType.LOGICAL_GROUP_INTERFACE) { return ifIndex + IfmConstants.LOGICAL_GROUP_START; @@ -219,23 +189,6 @@ public class IfmUtil { } } - public static List getDpIdPortNameAndSuffixFromInterfaceName(String intfName) { - List strList = new ArrayList<>(3); - int index1 = intfName.indexOf(":"); - if (index1 != -1) { - int index2 = intfName.indexOf(":", index1 + 1); - strList.add(0, intfName.substring(0, index1)); - if (index2 != -1) { - strList.add(1, intfName.substring(index1, index2)); - strList.add(2, intfName.substring(index2)); - } else { - strList.add(1, intfName.substring(index1)); - strList.add(2, ""); - } - } - return strList; - } - public static Optional read(LogicalDatastoreType datastoreType, InstanceIdentifier path, DataBroker broker) { try (ReadOnlyTransaction tx = broker.newReadOnlyTransaction()) { @@ -470,14 +423,6 @@ public class IfmUtil { return null; } - public static String getPortName(DataBroker dataBroker, NodeConnectorId ncId) { - InstanceIdentifier ncIdentifier = InstanceIdentifier.builder(Nodes.class) - .child(Node.class, new NodeKey(getNodeIdFromNodeConnectorId(ncId))) - .child(NodeConnector.class, new NodeConnectorKey(ncId)).build(); - return read(LogicalDatastoreType.OPERATIONAL, ncIdentifier, dataBroker) - .transform(nc -> nc.getAugmentation(FlowCapableNodeConnector.class).getName()).orNull(); - } - public static InterfaceInfo.InterfaceType getInterfaceType(Interface iface) { InterfaceInfo.InterfaceType interfaceType = org.opendaylight .genius.interfacemanager.globals.InterfaceInfo.InterfaceType.UNKNOWN_INTERFACE; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/AlivenessMonitorUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/AlivenessMonitorUtils.java index cb9599810..3b4e9ce46 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/AlivenessMonitorUtils.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/AlivenessMonitorUtils.java @@ -301,12 +301,4 @@ public final class AlivenessMonitorUtils { return ifTunnel.isInternal() && ifTunnel.isMonitorEnabled() && TunnelMonitoringTypeLldp.class.isAssignableFrom(ifTunnel.getMonitorProtocol()); } - - public static Profile getDefaultMonitorProfile(EtherTypes etherType) { - ProfileBuilder profileBuilder = new ProfileBuilder(); - profileBuilder.setProtocolType(etherType); - profileBuilder.setFailureThreshold(FAILURE_THRESHOLD).setMonitorInterval(MONITORING_INTERVAL) - .setMonitorWindow(MONITORING_WINDOW).setProtocolType(etherType); - return profileBuilder.build(); - } } diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceManagerCommonUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceManagerCommonUtils.java index 36497cf07..2eb7ea768 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceManagerCommonUtils.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceManagerCommonUtils.java @@ -116,27 +116,6 @@ public final class InterfaceManagerCommonUtils { return interfaceInstanceIdentifierBuilder.build(); } - public static List getAllTunnelInterfaces(DataBroker dataBroker, - InterfaceInfo.InterfaceType interfaceType) { - List vxlanList = new ArrayList<>(); - InstanceIdentifier interfacesInstanceIdentifier = InstanceIdentifier.builder(Interfaces.class) - .build(); - Optional interfacesOptional = IfmUtil.read(LogicalDatastoreType.CONFIGURATION, - interfacesInstanceIdentifier, dataBroker); - if (!interfacesOptional.isPresent()) { - return vxlanList; - } - Interfaces interfaces = interfacesOptional.get(); - List interfacesList = interfaces.getInterface(); - for (Interface iface : interfacesList) { - if (IfmUtil.getInterfaceType(iface) == InterfaceInfo.InterfaceType.VXLAN_TRUNK_INTERFACE - && iface.getAugmentation(IfTunnel.class).isInternal()) { - vxlanList.add(iface); - } - } - return vxlanList; - } - public static List getAllTunnelInterfacesFromCache() { return interfaceConfigMap.values().stream() .filter(iface -> IfmUtil.getInterfaceType(iface) == InterfaceInfo.InterfaceType.VXLAN_TRUNK_INTERFACE @@ -453,14 +432,6 @@ public final class InterfaceManagerCommonUtils { return ifState; } - public static boolean checkIfBfdStateIsDown(String interfaceName) { - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.interfaces.rev140508.interfaces.state.Interface.OperStatus operStatus = InterfaceManagerCommonUtils - .getBfdStateFromCache(interfaceName); - return operStatus == org.opendaylight.yang.gen.v1.urn - .ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.OperStatus.Down; - } - public static void deleteStateEntry(String interfaceName, WriteTransaction transaction) { LOG.debug("removing interface state entry for {}", interfaceName); diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java index da79ff6db..632da1115 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java @@ -327,18 +327,6 @@ public class InterfaceMetaUtils { } } - public static boolean isPortConfiguredOnBridge(String portName, BigInteger dpnId, DataBroker broker) { - BridgeEntry bridgeEntry = InterfaceMetaUtils.getBridgeEntryFromConfigDS(dpnId, broker); - if (bridgeEntry != null && bridgeEntry.getBridgeInterfaceEntry() != null) { - for (BridgeInterfaceEntry entry: bridgeEntry.getBridgeInterfaceEntry()) { - if (portName.equals(entry.getInterfaceName())) { - return true; - } - } - } - return false; - } - // Cache Util methods // Start: BridgeEntryCache diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/hwvtep/confighelpers/HwVTEPConfigRemoveHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/hwvtep/confighelpers/HwVTEPConfigRemoveHelper.java index c0e51bcaf..c68ebe381 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/hwvtep/confighelpers/HwVTEPConfigRemoveHelper.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/hwvtep/confighelpers/HwVTEPConfigRemoveHelper.java @@ -18,7 +18,6 @@ import org.opendaylight.genius.interfacemanager.commons.InterfaceMetaUtils; import org.opendaylight.genius.interfacemanager.renderer.hwvtep.utilities.SouthboundUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfTunnel; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical._switch.attributes.Tunnels; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey; @@ -54,12 +53,4 @@ public class HwVTEPConfigRemoveHelper { InstanceIdentifier tpPath = SouthboundUtils.createInstanceIdentifier(globalNodeId, tpKey); transaction.delete(LogicalDatastoreType.CONFIGURATION, tpPath); } - - private static void removeTunnelTableEntry(WriteTransaction transaction, IfTunnel ifTunnel, - InstanceIdentifier physicalSwitchNodeId) { - LOG.info("removing tunnel table entry for {}", ifTunnel.getTunnelDestination()); - InstanceIdentifier tunnelsInstanceIdentifier = SouthboundUtils.createTunnelsInstanceIdentifier( - physicalSwitchNodeId, ifTunnel.getTunnelSource(), ifTunnel.getTunnelDestination()); - transaction.delete(LogicalDatastoreType.CONFIGURATION, tunnelsInstanceIdentifier); - } } diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java index 65a0e4740..719fa7f82 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java @@ -153,47 +153,6 @@ public class SouthboundUtils { } } - /* - * delete all tunnels ports corresponding to the bridge to the topology - * config DS - * - * FIXME: This is not being called from anywhere. - */ - public static void removeAllPortsFromBridge(BridgeEntry bridgeEntry, DataBroker dataBroker, - InstanceIdentifier bridgeIid, OvsdbBridgeAugmentation bridgeNew) { - WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); - String bridgeName = bridgeNew.getBridgeName().getValue(); - LOG.debug("removing all ports from bridge: {}", bridgeName); - List bridgeInterfaceEntries = bridgeEntry.getBridgeInterfaceEntry(); - if (bridgeInterfaceEntries != null) { - for (BridgeInterfaceEntry bridgeInterfaceEntry : bridgeInterfaceEntries) { - String portName = bridgeInterfaceEntry.getInterfaceName(); - InterfaceKey interfaceKey = new InterfaceKey(portName); - Interface iface = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(interfaceKey, dataBroker); - if (iface != null) { - IfTunnel ifTunnel = iface.getAugmentation(IfTunnel.class); - if (ifTunnel != null) { - removeTerminationEndPoint(dataBroker, bridgeIid, iface.getName()); - } - if (SouthboundUtils.isOfTunnel(ifTunnel)) { - LOG.debug("Using OFTunnel. Only one tunnel port to be removed"); - return; - } - } else { - LOG.debug("Interface {} not found in config DS", portName); - } - } - } - } - - private static void addVlanPortToBridge(InstanceIdentifier bridgeIid, IfL2vlan ifL2vlan, IfTunnel ifTunnel, - OvsdbBridgeAugmentation bridgeAugmentation, String bridgeName, String portName, DataBroker dataBroker, - WriteTransaction tx) { - if (ifL2vlan.getVlanId() != null) { - addTerminationPoint(bridgeIid, portName, ifL2vlan.getVlanId().getValue(), null, null, ifTunnel); - } - } - private static void addTunnelPortToBridge(IfTunnel ifTunnel, InstanceIdentifier bridgeIid, Interface iface, String portName, DataBroker dataBroker) { LOG.debug("adding tunnel port {} to bridge {}", portName, bridgeIid); diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/VlanTrunkSouthboundUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/VlanTrunkSouthboundUtils.java deleted file mode 100644 index f1ffd0090..000000000 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/VlanTrunkSouthboundUtils.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright (c) 2016, 2017 Ericsson India Global Services Pvt Ltd. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.genius.interfacemanager.renderer.ovs.utilities; - -import com.google.common.base.Optional; -import java.util.ArrayList; -import java.util.List; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.genius.interfacemanager.IfmUtil; -import org.opendaylight.genius.interfacemanager.globals.IfmConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan; -import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbPortInterfaceAttributes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentationBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.Trunks; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.TrunksBuilder; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class VlanTrunkSouthboundUtils { - private static final Logger LOG = LoggerFactory.getLogger(VlanTrunkSouthboundUtils.class); - - public static void addVlanPortToBridge(InstanceIdentifier bridgeIid, IfL2vlan ifL2vlan, - OvsdbBridgeAugmentation bridgeAugmentation, String bridgeName, String parentInterface, - DataBroker dataBroker, WriteTransaction tx) { - LOG.info("Vlan Interface creation not supported yet. please visit later."); - int vlanId = ifL2vlan.getVlanId().getValue(); - addTrunkTerminationPoint(bridgeIid, bridgeAugmentation, bridgeName, parentInterface, vlanId, dataBroker, tx); - } - - public static void updateVlanMemberInTrunk(InstanceIdentifier bridgeIid, IfL2vlan ifL2vlan, - OvsdbBridgeAugmentation bridgeAugmentation, String bridgeName, String parentInterface, - DataBroker dataBroker, WriteTransaction tx) { - LOG.info("Vlan Interface creation not supported yet. please visit later."); - int vlanId = ifL2vlan.getVlanId().getValue(); - updateTerminationPoint(bridgeIid, bridgeAugmentation, bridgeName, parentInterface, vlanId, dataBroker, tx); - } - - private static void addTrunkTerminationPoint(InstanceIdentifier bridgeIid, OvsdbBridgeAugmentation bridgeNode, - String bridgeName, String parentInterface, int vlanId, DataBroker dataBroker, WriteTransaction tx) { - if (vlanId == 0) { - LOG.error("Found vlanid 0 for bridge: {}, interface: {}", bridgeName, parentInterface); - return; - } - - InstanceIdentifier tpIid = createTerminationPointInstanceIdentifier( - InstanceIdentifier.keyOf(bridgeIid.firstIdentifierOf(Node.class)), parentInterface); - OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder(); - tpAugmentationBuilder.setName(parentInterface); - tpAugmentationBuilder.setVlanMode(OvsdbPortInterfaceAttributes.VlanMode.Trunk); - OvsdbTerminationPointAugmentation terminationPointAugmentation = null; - Optional terminationPointOptional = IfmUtil.read(LogicalDatastoreType.OPERATIONAL, tpIid, - dataBroker); - if (terminationPointOptional.isPresent()) { - TerminationPoint terminationPoint = terminationPointOptional.get(); - terminationPointAugmentation = terminationPoint.getAugmentation(OvsdbTerminationPointAugmentation.class); - if (terminationPointAugmentation != null) { - List trunks = terminationPointAugmentation.getTrunks(); - if (trunks == null) { - trunks = new ArrayList<>(); - } - - trunks.add(new TrunksBuilder().setTrunk(new VlanId(vlanId)).build()); - tpAugmentationBuilder.setTrunks(trunks); - } - } else { - List trunks = new ArrayList<>(); - trunks.add(new TrunksBuilder().setTrunk(new VlanId(vlanId)).build()); - tpAugmentationBuilder.setTrunks(trunks); - } - - TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); - tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build()); - - tx.put(LogicalDatastoreType.CONFIGURATION, tpIid, tpBuilder.build(), true); - } - - public static void addTerminationPointWithTrunks(InstanceIdentifier bridgeIid, List trunks, - String parentInterface, WriteTransaction tx) { - OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder(); - tpAugmentationBuilder.setName(parentInterface); - tpAugmentationBuilder.setVlanMode(OvsdbPortInterfaceAttributes.VlanMode.Trunk); - tpAugmentationBuilder.setTrunks(trunks); - - TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - InstanceIdentifier tpIid = createTerminationPointInstanceIdentifier( - InstanceIdentifier.keyOf(bridgeIid.firstIdentifierOf(Node.class)), parentInterface); - tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); - tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build()); - - tx.put(LogicalDatastoreType.CONFIGURATION, tpIid, tpBuilder.build(), true); - } - - private static void updateTerminationPoint(InstanceIdentifier bridgeIid, OvsdbBridgeAugmentation bridgeNode, - String bridgeName, String parentInterface, int vlanId, DataBroker dataBroker, WriteTransaction tx) { - if (vlanId == 0) { - LOG.error("Found vlanid 0 for bridge: {}, interface: {}", bridgeName, parentInterface); - return; - } - - InstanceIdentifier tpIid = createTerminationPointInstanceIdentifier( - InstanceIdentifier.keyOf(bridgeIid.firstIdentifierOf(Node.class)), parentInterface); - OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder(); - tpAugmentationBuilder.setName(parentInterface); - tpAugmentationBuilder.setVlanMode(OvsdbPortInterfaceAttributes.VlanMode.Trunk); - OvsdbTerminationPointAugmentation terminationPointAugmentation = null; - Optional terminationPointOptional = IfmUtil.read(LogicalDatastoreType.OPERATIONAL, tpIid, - dataBroker); - if (terminationPointOptional.isPresent()) { - TerminationPoint terminationPoint = terminationPointOptional.get(); - terminationPointAugmentation = terminationPoint.getAugmentation(OvsdbTerminationPointAugmentation.class); - if (terminationPointAugmentation != null) { - List trunks = terminationPointAugmentation.getTrunks(); - if (trunks != null) { - trunks.remove(new TrunksBuilder().setTrunk(new VlanId(vlanId)).build()); - } - - tpAugmentationBuilder.setTrunks(trunks); - TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); - tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build()); - - tx.put(LogicalDatastoreType.CONFIGURATION, tpIid, tpBuilder.build(), true); - } - } - } - - private static InstanceIdentifier createTerminationPointInstanceIdentifier(NodeKey nodekey, - String portName) { - InstanceIdentifier terminationPointPath = InstanceIdentifier.create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(IfmConstants.OVSDB_TOPOLOGY_ID)).child(Node.class, nodekey) - .child(TerminationPoint.class, new TerminationPointKey(new TpId(portName))); - - LOG.debug("Termination point InstanceIdentifier generated : {}", terminationPointPath); - return terminationPointPath; - } -} diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java index c4609e930..6da390190 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java @@ -225,18 +225,6 @@ public class FlowBasedServicesUtils { writeTransaction.put(LogicalDatastoreType.CONFIGURATION, flowInstanceId, flow, true); } - public static void removeFlow(String flowRef, BigInteger dpId, WriteTransaction writeTransaction) { - LOG.debug("Removing Ingress Flows"); - FlowKey flowKey = new FlowKey(new FlowId(flowRef)); - Node nodeDpn = buildInventoryDpnNode(dpId); - InstanceIdentifier flowInstanceId = InstanceIdentifier.builder(Nodes.class) - .child(Node.class, nodeDpn.getKey()).augmentation(FlowCapableNode.class) - .child(Table.class, new TableKey(NwConstants.VLAN_INTERFACE_INGRESS_TABLE)).child(Flow.class, flowKey) - .build(); - - writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, flowInstanceId); - } - private static Node buildInventoryDpnNode(BigInteger dpnId) { NodeId nodeId = new NodeId("openflow:" + dpnId); Node nodeDpn = new NodeBuilder().setId(nodeId).setKey(new NodeKey(nodeId)).build(); -- 2.36.6