*/
package org.opendaylight.netvirt.aclservice;
-import com.google.common.util.concurrent.ListenableFuture;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-
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.datastoreutils.DataStoreJobCoordinator;
import org.opendaylight.genius.mdsalutil.ActionInfo;
import org.opendaylight.genius.mdsalutil.InstructionInfo;
import org.opendaylight.genius.mdsalutil.MDSALUtil;
import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
import org.opendaylight.genius.mdsalutil.matches.MatchEthernetType;
import org.opendaylight.genius.utils.ServiceIndex;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
+import org.opendaylight.netvirt.aclservice.api.AclInterfaceCache;
import org.opendaylight.netvirt.aclservice.api.AclServiceManager.Action;
import org.opendaylight.netvirt.aclservice.api.utils.AclInterface;
import org.opendaylight.netvirt.aclservice.utils.AclConstants;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeIngress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.DirectionIngress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.IpPrefixOrAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.SecurityRuleAttr;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.interfaces._interface.AllowedAddressPairs;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
/**
* Initialize the member variables.
- *
- * @param dataBroker the data broker instance.
- * @param mdsalManager the mdsal manager.
- * @param aclDataUtil
- * the acl data util.
- * @param aclServiceUtils
- * the acl service util.
*/
public AbstractIngressAclServiceImpl(DataBroker dataBroker, IMdsalApiManager mdsalManager, AclDataUtil aclDataUtil,
- AclServiceUtils aclServiceUtils) {
+ AclServiceUtils aclServiceUtils, JobCoordinator jobCoordinator, AclInterfaceCache aclInterfaceCache) {
// Service mode is w.rt. switch
- super(ServiceModeEgress.class, dataBroker, mdsalManager, aclDataUtil, aclServiceUtils);
+ super(ServiceModeEgress.class, dataBroker, mdsalManager, aclDataUtil, aclServiceUtils,
+ jobCoordinator, aclInterfaceCache);
}
/**
@Override
public void bindService(AclInterface aclInterface) {
String interfaceName = aclInterface.getInterfaceId();
- DataStoreJobCoordinator dataStoreCoordinator = DataStoreJobCoordinator.getInstance();
- dataStoreCoordinator.enqueueJob(interfaceName,
+ jobCoordinator.enqueueJob(interfaceName,
() -> {
int instructionKey = 0;
List<Instruction> instructions = new ArrayList<>();
ServiceIndex.getIndex(NwConstants.EGRESS_ACL_SERVICE_NAME,
NwConstants.EGRESS_ACL_SERVICE_INDEX), ServiceModeEgress.class);
- WriteTransaction writeTxn = dataBroker.newWriteOnlyTransaction();
- writeTxn.put(LogicalDatastoreType.CONFIGURATION, path, serviceInfo,
- WriteTransaction.CREATE_MISSING_PARENTS);
-
- return Collections.singletonList(writeTxn.submit());
+ return Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(
+ tx -> tx.put(LogicalDatastoreType.CONFIGURATION, path, serviceInfo,
+ WriteTransaction.CREATE_MISSING_PARENTS)));
});
}
ServiceIndex.getIndex(NwConstants.EGRESS_ACL_SERVICE_NAME, NwConstants.EGRESS_ACL_SERVICE_INDEX),
ServiceModeEgress.class);
- DataStoreJobCoordinator dataStoreCoordinator = DataStoreJobCoordinator.getInstance();
LOG.debug("UnBinding ACL service for interface {}", interfaceName);
- dataStoreCoordinator.enqueueJob(interfaceName,
- () -> {
- WriteTransaction writeTxn = dataBroker.newWriteOnlyTransaction();
- writeTxn.delete(LogicalDatastoreType.CONFIGURATION, path);
-
- List<ListenableFuture<Void>> futures = new ArrayList<>();
- futures.add(writeTxn.submit());
- return futures;
- });
+ jobCoordinator.enqueueJob(interfaceName,
+ () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(
+ tx -> tx.delete(LogicalDatastoreType.CONFIGURATION, path))));
}
/**
List<AllowedAddressPairs> allowedAddresses, int lportTag, String portId, Action action, int addOrRemove);
@Override
- protected void programGeneralFixedRules(BigInteger dpid, String dhcpMacAddress,
- List<AllowedAddressPairs> allowedAddresses, int lportTag, Action action, int addOrRemove) {
+ protected void programGeneralFixedRules(AclInterface port, String dhcpMacAddress,
+ List<AllowedAddressPairs> allowedAddresses, Action action, int addOrRemove) {
LOG.info("programFixedRules : {} default rules.", action == Action.ADD ? "adding" : "removing");
+ BigInteger dpid = port.getDpId();
+ int lportTag = port.getLPortTag();
if (action == Action.ADD || action == Action.REMOVE) {
ingressAclDhcpAllowServerTraffic(dpid, dhcpMacAddress, lportTag, addOrRemove,
AclConstants.PROTO_PREFIX_MATCH_PRIORITY);
ingressAclIcmpv6AllowedTraffic(dpid, lportTag, addOrRemove);
programArpRule(dpid, lportTag, addOrRemove);
+ programIpv4BroadcastRule(port, addOrRemove);
}
}
new InstructionWriteMetadata(AclServiceUtils.getAclIdMetadata(aclId),
MetaDataUtil.METADATA_MASK_REMOTE_ACL_ID);
instructions.add(writeMetatdata);
- instructions.add(new InstructionGotoTable(getIngressAclFilterTable()));
+ instructions.add(new InstructionGotoTable(getStatefulIngressAclApplyOnExistingTrafficTable()));
Long serviceTag = vpnId != null ? vpnId : elanTag;
String flowNameAdded = "Acl_Filter_Ingress_" + new String(ip.getIpAddress().getValue()) + "_" + serviceTag;
return NwConstants.EGRESS_ACL_REMOTE_ACL_TABLE;
}
+ protected short getStatefulIngressAclApplyOnExistingTrafficTable() {
+ return NwConstants.EGRESS_ACL_STATEFUL_APPLY_CHANGE_EXIST_TRAFFIC_TABLE;
+ }
+
protected abstract String syncSpecificAclFlow(BigInteger dpId, int lportTag, int addOrRemove, Ace ace,
String portId, Map<String, List<MatchInfoBase>> flowMap, String flowName);
AclConstants.COOKIE_ACL_BASE, matches, instructions, addOrRemove);
}
+
+ /**
+ * Programs broadcast rules.
+ *
+ * @param port the Acl Interface port
+ * @param addOrRemove whether to delete or add flow
+ */
+ @Override
+ protected void programBroadcastRules(AclInterface port, int addOrRemove) {
+ programIpv4BroadcastRule(port, addOrRemove);
+ }
+
+ /**
+ * Programs IPv4 broadcast rules.
+ *
+ * @param port the Acl Interface port
+ * @param addOrRemove whether to delete or add flow
+ */
+ private void programIpv4BroadcastRule(AclInterface port, int addOrRemove) {
+ BigInteger dpId = port.getDpId();
+ int lportTag = port.getLPortTag();
+ MatchInfoBase lportMatchInfo = buildLPortTagMatch(lportTag);
+ List<IpPrefixOrAddress> cidrs = port.getSubnetIpPrefixes();
+ if (cidrs != null) {
+ List<String> broadcastAddresses = AclServiceUtils.getIpBroadcastAddresses(cidrs);
+ for (String broadcastAddress : broadcastAddresses) {
+ List<MatchInfoBase> matches =
+ AclServiceUtils.buildBroadcastIpV4Matches(broadcastAddress);
+ matches.add(lportMatchInfo);
+ List<InstructionInfo> instructions = new ArrayList<>();
+ instructions.add(new InstructionGotoTable(NwConstants.EGRESS_ACL_REMOTE_ACL_TABLE));
+ String flowName = "Ingress_v4_Broadcast_" + dpId + "_" + lportTag + "_" + broadcastAddress + "_Permit";
+ syncFlow(dpId, NwConstants.EGRESS_ACL_TABLE, flowName,
+ AclConstants.PROTO_MATCH_PRIORITY, "ACL", 0, 0, AclConstants.COOKIE_ACL_BASE, matches,
+ instructions, addOrRemove);
+ }
+ } else {
+ LOG.warn("IP Broadcast CIDRs are missing for port {}", port.getInterfaceId());
+ }
+ }
+
protected MatchInfoBase buildLPortTagMatch(int lportTag) {
return AclServiceUtils.buildLPortTagMatch(lportTag, ServiceModeIngress.class);
}
Code Review / netvirt.git / blobdiff