X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=interfacemgr%2Finterfacemgr-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fvpnservice%2Finterfacemgr%2Frenderer%2Fovs%2Fconfighelpers%2FOvsVlanMemberConfigAddHelper.java;h=fde4bb0c4d7714ecda5eca654281de0f5447f7a9;hb=HEAD;hp=92b60e6f6b9bbe161e2ff4b1e006b6da142a9285;hpb=658da81929c5b966b2261033339d0399e3436b49;p=vpnservice.git diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/renderer/ovs/confighelpers/OvsVlanMemberConfigAddHelper.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/renderer/ovs/confighelpers/OvsVlanMemberConfigAddHelper.java index 92b60e6f..fde4bb0c 100644 --- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/renderer/ovs/confighelpers/OvsVlanMemberConfigAddHelper.java +++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/renderer/ovs/confighelpers/OvsVlanMemberConfigAddHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others. All rights reserved. + * Copyright (c) 2015 - 2016 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, @@ -7,44 +7,31 @@ */ package org.opendaylight.vpnservice.interfacemgr.renderer.ovs.confighelpers; -import com.google.common.util.concurrent.ListenableFuture; +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.vpnservice.interfacemgr.IfmConstants; -import org.opendaylight.vpnservice.interfacemgr.IfmUtil; import org.opendaylight.vpnservice.interfacemgr.commons.InterfaceManagerCommonUtils; -import org.opendaylight.vpnservice.interfacemgr.commons.InterfaceMetaUtils; -import org.opendaylight.vpnservice.interfacemgr.servicebindings.flowbased.utilities.FlowBasedServicesUtils; -import org.opendaylight.vpnservice.mdsalutil.MatchInfo; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.AdminStatus; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.OperStatus; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.IdManagerService; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.interfacemgr.rev150331.IfL2vlan; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.interfacemgr.rev150331.ParentRefs; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; +import com.google.common.util.concurrent.ListenableFuture; public class OvsVlanMemberConfigAddHelper { private static final Logger LOG = LoggerFactory.getLogger(OvsVlanMemberConfigAddHelper.class); public static List> addConfiguration(DataBroker dataBroker, ParentRefs parentRefs, Interface interfaceNew, IfL2vlan ifL2vlan, IdManagerService idManager) { + LOG.debug("add vlan member configuration {}",interfaceNew.getName()); List> futures = new ArrayList<>(); WriteTransaction t = dataBroker.newWriteOnlyTransaction(); - InterfaceManagerCommonUtils.createInterfaceParentEntryIfNotPresent(dataBroker, t, parentRefs.getParentInterface()); InterfaceManagerCommonUtils.createInterfaceChildEntry(t, parentRefs.getParentInterface(), interfaceNew.getName()); InterfaceKey interfaceKey = new InterfaceKey(parentRefs.getParentInterface()); @@ -66,63 +53,8 @@ public class OvsVlanMemberConfigAddHelper { org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState = InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(parentRefs.getParentInterface(), dataBroker); if (ifState != null) { - OperStatus operStatus = ifState.getOperStatus(); - AdminStatus adminStatus = ifState.getAdminStatus(); - PhysAddress physAddress = ifState.getPhysAddress(); - - if (!interfaceNew.isEnabled()) { - operStatus = OperStatus.Down; - } - - InstanceIdentifier ifStateId = - IfmUtil.buildStateInterfaceId(interfaceNew.getName()); - List lowerLayerIfList = new ArrayList<>(); - lowerLayerIfList.add(ifState.getLowerLayerIf().get(0)); - //lowerLayerIfList.add(parentRefs.getParentInterface()); - Integer ifIndex = IfmUtil.allocateId(idManager, IfmConstants.IFM_IDPOOL_NAME, interfaceNew.getName()); - InterfaceBuilder ifaceBuilder = new InterfaceBuilder().setAdminStatus(adminStatus).setOperStatus(operStatus) - .setPhysAddress(physAddress).setLowerLayerIf(lowerLayerIfList).setIfIndex(ifIndex); - ifaceBuilder.setKey(IfmUtil.getStateInterfaceKeyFromName(interfaceNew.getName())); - t.put(LogicalDatastoreType.OPERATIONAL, ifStateId, ifaceBuilder.build(), true); - - // create lportTag Interface Map - InterfaceMetaUtils.createLportTagInterfaceMap(t, interfaceNew.getName(), ifIndex); - //Installing vlan flow for vlan member - NodeConnectorId nodeConnectorId = new NodeConnectorId(ifState.getLowerLayerIf().get(0)); - BigInteger dpId = new BigInteger(IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId)); - long portNo = Long.valueOf(IfmUtil.getPortNoFromNodeConnectorId(nodeConnectorId)); - if (operStatus == OperStatus.Up) { - List matches = FlowBasedServicesUtils.getMatchInfoForVlanPortAtIngressTable(dpId, portNo, interfaceNew); - FlowBasedServicesUtils.installVlanFlow(dpId, portNo, interfaceNew, t, matches, ifIndex); - } - - // FIXME: Maybe, add the new interface to the higher-layer if of the parent interface-state. - // That may not serve any purpose though for interface manager.... Unless some external parties are interested in it. - - /* FIXME -- Below code is needed to add vlan-trunks to the of-port. Is this really needed. - String lowerLayerIf = ifState.getLowerLayerIf().get(0); - - NodeConnectorId nodeConnectorId = new NodeConnectorId(lowerLayerIf); - BigInteger dpId = new BigInteger(IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId)); - - BridgeRefEntryKey BridgeRefEntryKey = new BridgeRefEntryKey(dpId); - InstanceIdentifier dpnBridgeEntryIid = - InterfaceMetaUtils.getBridgeRefEntryIdentifier(BridgeRefEntryKey); - BridgeRefEntry bridgeRefEntry = - InterfaceMetaUtils.getBridgeRefEntryFromOperDS(dpnBridgeEntryIid, dataBroker); - if (bridgeRefEntry != null) { - InstanceIdentifier bridgeIid = - (InstanceIdentifier)bridgeRefEntry.getBridgeReference().getValue(); - Optional bridgeNodeOptional = - IfmUtil.read(LogicalDatastoreType.OPERATIONAL, bridgeIid, dataBroker); - if (bridgeNodeOptional.isPresent()) { - OvsdbBridgeAugmentation ovsdbBridgeAugmentation = bridgeNodeOptional.get(); - String bridgeName = ovsdbBridgeAugmentation.getBridgeName().getValue(); - VlanTrunkSouthboundUtils.addVlanPortToBridge(bridgeIid, ifL2vlan, - ovsdbBridgeAugmentation, bridgeName, parentRefs.getParentInterface(), dataBroker, t); - } - } */ - // FIXME: Need to add the Group here with actions: Push-Vlan, output_port. May not be needed here... + LOG.debug("add interface state info for vlan member {}",interfaceNew.getName()); + InterfaceManagerCommonUtils.addStateEntry(interfaceNew.getName(), t, dataBroker, idManager, ifState); } futures.add(t.submit());