*/
package org.opendaylight.netvirt.neutronvpn;
-import static org.opendaylight.controller.md.sal.binding.api.WriteTransaction.CREATE_MISSING_PARENTS;
import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
import java.util.ArrayList;
import java.util.Collections;
-
-import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Singleton;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.AccessLists;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.AclBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.AclKey;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.acl.AccessListEntriesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.AclserviceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev160608.AclserviceAugmentationBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.SecurityGroups;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroup;
import org.slf4j.LoggerFactory;
@Singleton
-public class NeutronSecurityGroupListener
- extends AsyncDataTreeChangeListenerBase<SecurityGroup, NeutronSecurityGroupListener> {
+public class NeutronSecurityGroupListener extends AbstractAsyncDataTreeChangeListener<SecurityGroup> {
private static final Logger LOG = LoggerFactory.getLogger(NeutronSecurityGroupListener.class);
private final DataBroker dataBroker;
private final ManagedNewTransactionRunner txRunner;
private final JobCoordinator jobCoordinator;
+ private final NeutronSecurityGroupUtils neutronSecurityGroupUtils;
@Inject
- public NeutronSecurityGroupListener(DataBroker dataBroker, JobCoordinator jobCoordinator) {
- super(SecurityGroup.class, NeutronSecurityGroupListener.class);
+ public NeutronSecurityGroupListener(DataBroker dataBroker, JobCoordinator jobCoordinator,
+ final NeutronSecurityGroupUtils neutronSecurityGroupUtils) {
+ super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Neutron.class)
+ .child(SecurityGroups.class).child(SecurityGroup.class),
+ Executors.newSingleThreadExecutor("NeutronSecurityGroupListener", LOG));
this.dataBroker = dataBroker;
this.jobCoordinator = jobCoordinator;
this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
+ this.neutronSecurityGroupUtils = neutronSecurityGroupUtils;
+ init();
}
- @Override
- @PostConstruct
public void init() {
LOG.info("{} init", getClass().getSimpleName());
- registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
+ neutronSecurityGroupUtils.createAclIdPool();
}
@Override
- protected InstanceIdentifier<SecurityGroup> getWildCardPath() {
- return InstanceIdentifier.create(Neutron.class).child(SecurityGroups.class).child(SecurityGroup.class);
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
@Override
- protected void remove(InstanceIdentifier<SecurityGroup> key, SecurityGroup securityGroup) {
+ public void remove(InstanceIdentifier<SecurityGroup> key, SecurityGroup securityGroup) {
LOG.trace("Removing securityGroup: {}", securityGroup);
InstanceIdentifier<Acl> identifier = getAclInstanceIdentifier(securityGroup);
- String jobKey = securityGroup.key().getUuid().getValue();
- jobCoordinator.enqueueJob(jobKey,
- () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
- tx -> tx.delete(identifier))),
- NeutronSecurityRuleConstants.DJC_MAX_RETRIES);
+ String securityGroupId = securityGroup.key().getUuid().getValue();
+ jobCoordinator.enqueueJob(securityGroupId, () -> {
+ neutronSecurityGroupUtils.releaseAclTag(securityGroupId);
+ return Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
+ tx -> tx.delete(identifier)));
+ });
}
@Override
- protected void update(InstanceIdentifier<SecurityGroup> key, SecurityGroup dataObjectModificationBefore,
+ public void update(InstanceIdentifier<SecurityGroup> key, SecurityGroup dataObjectModificationBefore,
SecurityGroup dataObjectModificationAfter) {
LOG.debug("Do nothing");
}
@Override
- protected void add(InstanceIdentifier<SecurityGroup> instanceIdentifier, SecurityGroup securityGroup) {
+ public void add(InstanceIdentifier<SecurityGroup> instanceIdentifier, SecurityGroup securityGroup) {
LOG.trace("Adding securityGroup: {}", securityGroup);
- Acl acl = toAclBuilder(securityGroup).build();
+ String securityGroupId = securityGroup.key().getUuid().getValue();
InstanceIdentifier<Acl> identifier = getAclInstanceIdentifier(securityGroup);
- String jobKey = securityGroup.key().getUuid().getValue();
- jobCoordinator.enqueueJob(jobKey,
- () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
- tx -> tx.put(identifier, acl, CREATE_MISSING_PARENTS))),
- NeutronSecurityRuleConstants.DJC_MAX_RETRIES);
- }
-
- @Override
- protected NeutronSecurityGroupListener getDataTreeChangeListener() {
- return this;
+ jobCoordinator.enqueueJob(securityGroupId, () -> {
+ Integer aclTag = neutronSecurityGroupUtils.allocateAclTag(securityGroupId);
+ Acl acl = toAclBuilder(securityGroup, aclTag).build();
+ return Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
+ tx -> tx.mergeParentStructurePut(identifier, acl)));
+ });
}
private InstanceIdentifier<Acl> getAclInstanceIdentifier(SecurityGroup securityGroup) {
return InstanceIdentifier
.builder(AccessLists.class).child(Acl.class,
- new AclKey(securityGroup.key().getUuid().getValue(), NeutronSecurityRuleConstants.ACLTYPE))
+ new AclKey(securityGroup.key().getUuid().getValue(), NeutronSecurityGroupConstants.ACLTYPE))
.build();
}
- private AclBuilder toAclBuilder(SecurityGroup securityGroup) {
+ private AclBuilder toAclBuilder(SecurityGroup securityGroup, Integer aclTag) {
AclBuilder aclBuilder = new AclBuilder();
aclBuilder.setAclName(securityGroup.key().getUuid().getValue());
- aclBuilder.setAclType(NeutronSecurityRuleConstants.ACLTYPE);
+ aclBuilder.setAclType(NeutronSecurityGroupConstants.ACLTYPE);
aclBuilder.setAccessListEntries(new AccessListEntriesBuilder().setAce(new ArrayList<>()).build());
+ if (aclTag != NeutronSecurityGroupConstants.INVALID_ACL_TAG) {
+ AclserviceAugmentationBuilder aclserviceAugmentationBuilder = new AclserviceAugmentationBuilder();
+ aclserviceAugmentationBuilder.setAclTag(aclTag);
+ aclBuilder.addAugmentation(AclserviceAugmentation.class, aclserviceAugmentationBuilder.build());
+ }
return aclBuilder;
}
Code Review / netvirt.git / blobdiff