diff options
Diffstat (limited to 'vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write')
6 files changed, 173 insertions, 29 deletions
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerCustomizer.java index a3df551f0..a042e23d3 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.policer.write; -import static com.google.common.base.Preconditions.checkNotNull; - import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -46,8 +44,8 @@ final class InterfacePolicerCustomizer extends FutureJVppCustomizer implements W InterfacePolicerCustomizer(@Nonnull final FutureJVppCore vppApi, @Nonnull final NamingContext interfaceContext, @Nonnull final VppClassifierContextManager classifyTableContext) { super(vppApi); - this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null"); - this.classifyTableContext = checkNotNull(classifyTableContext, "classifyTableContext should not be null");; + this.interfaceContext = interfaceContext; + this.classifyTableContext = classifyTableContext; } @Override diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerValidator.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerValidator.java new file mode 100644 index 000000000..513ccded6 --- /dev/null +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerValidator.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2019 PANTHEON.tech. + * + * 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 io.fd.hc2vpp.policer.write; + +import static com.google.common.base.Preconditions.checkNotNull; + +import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; +import io.fd.honeycomb.translate.write.DataValidationFailedException; +import io.fd.honeycomb.translate.write.Validator; +import io.fd.honeycomb.translate.write.WriteContext; +import javax.annotation.Nonnull; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.policer.rev170315._interface.policer.attributes.Policer; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +public class InterfacePolicerValidator implements Validator<Policer> { + + public InterfacePolicerValidator(final NamingContext interfaceContext, + final VppClassifierContextManager classifyTableContext) { + checkNotNull(interfaceContext, "interfaceContext should not be null"); + checkNotNull(classifyTableContext, "classifyTableContext should not be null"); + } + + @Override + public void validateWrite(@Nonnull final InstanceIdentifier<Policer> id, + @Nonnull final Policer policer, + @Nonnull final WriteContext writeContext) + throws DataValidationFailedException.CreateValidationFailedException { + //noop for now + } + + @Override + public void validateUpdate(@Nonnull final InstanceIdentifier<Policer> id, @Nonnull final Policer dataBefore, + @Nonnull final Policer dataAfter, @Nonnull final WriteContext writeContext) + throws DataValidationFailedException.UpdateValidationFailedException { + // noop for now + } + + @Override + public void validateDelete(@Nonnull final InstanceIdentifier<Policer> id, @Nonnull final Policer dataBefore, + @Nonnull final WriteContext writeContext) + throws DataValidationFailedException.DeleteValidationFailedException { + //noop for now + } +} diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerWriterFactory.java index 641b00d79..9422cc1d2 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerWriterFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerWriterFactory.java @@ -37,9 +37,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class InterfacePolicerWriterFactory implements WriterFactory { private static final InstanceIdentifier<Interface> IFC_ID = - InstanceIdentifier.create(Interfaces.class).child(Interface.class); + InstanceIdentifier.create(Interfaces.class).child(Interface.class); private static final InstanceIdentifier<PolicerInterfaceAugmentation> POLICER_IFC_ID = - IFC_ID.augmentation(PolicerInterfaceAugmentation.class); + IFC_ID.augmentation(PolicerInterfaceAugmentation.class); static final InstanceIdentifier<Policer> POLICER_ID = POLICER_IFC_ID.child(Policer.class); @Inject @@ -54,7 +54,9 @@ public class InterfacePolicerWriterFactory implements WriterFactory { @Override public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) { registry.addAfter( - new GenericWriter<>(POLICER_ID, new InterfacePolicerCustomizer(vppApi, ifcContext, classifyTableContext)), - Sets.newHashSet(CLASSIFY_TABLE_ID, CLASSIFY_SESSION_ID)); + new GenericWriter<>(POLICER_ID, + new InterfacePolicerCustomizer(vppApi, ifcContext, classifyTableContext), + new InterfacePolicerValidator(ifcContext, classifyTableContext)), + Sets.newHashSet(CLASSIFY_TABLE_ID, CLASSIFY_SESSION_ID)); } } diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java index 8cad88f2a..b844d52da 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java @@ -16,9 +16,6 @@ package io.fd.hc2vpp.policer.write; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; - import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -33,7 +30,6 @@ import java.nio.charset.StandardCharsets; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.DscpType; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionDrop; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionMarkDscp; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionParams; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionTransmit; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionType; @@ -47,13 +43,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PolicerCustomizer extends FutureJVppCustomizer implements ListWriterCustomizer<Policer, PolicerKey>, - JvppReplyConsumer, ByteDataTranslator { + JvppReplyConsumer, ByteDataTranslator { private static final Logger LOG = LoggerFactory.getLogger(PolicerCustomizer.class); private final NamingContext policerContext; - public PolicerCustomizer(@Nonnull final FutureJVppCore futureJVppCore, @Nonnull final NamingContext policerContext) { + public PolicerCustomizer(@Nonnull final FutureJVppCore futureJVppCore, + @Nonnull final NamingContext policerContext) { super(futureJVppCore); - this.policerContext = checkNotNull(policerContext, "policerContext should not be null"); + this.policerContext = policerContext; } @Override @@ -68,7 +65,7 @@ public class PolicerCustomizer extends FutureJVppCustomizer implements ListWrite public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Policer> id, @Nonnull final Policer dataBefore, @Nonnull final Policer dataAfter, @Nonnull final WriteContext ctx) - throws WriteFailedException { + throws WriteFailedException { LOG.debug("Updating Policer {} dataBefore={} dataAfter={}", id, dataBefore, dataAfter); policerAddDel(id, dataAfter, true); } @@ -77,14 +74,14 @@ public class PolicerCustomizer extends FutureJVppCustomizer implements ListWrite public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Policer> id, @Nonnull final Policer dataBefore, @Nonnull final WriteContext ctx) - throws WriteFailedException { + throws WriteFailedException { LOG.debug("Removing Policer {} dataBefore={}", id, dataBefore); policerAddDel(id, dataBefore, false); policerContext.removeName(dataBefore.getName(), ctx.getMappingContext()); } private int policerAddDel(final InstanceIdentifier<Policer> id, final Policer policer, final boolean isAdd) - throws WriteFailedException { + throws WriteFailedException { final PolicerAddDel request = new PolicerAddDel(); request.isAdd = booleanToByte(isAdd); request.name = policer.getName().getBytes(StandardCharsets.US_ASCII); @@ -128,7 +125,7 @@ public class PolicerCustomizer extends FutureJVppCustomizer implements ListWrite } LOG.debug("Policer config change id={} request={}", id, request); final PolicerAddDelReply reply = - getReplyForWrite(getFutureJVpp().policerAddDel(request).toCompletableFuture(), id); + getReplyForWrite(getFutureJVpp().policerAddDel(request).toCompletableFuture(), id); return reply.policerIndex; } @@ -137,9 +134,6 @@ public class PolicerCustomizer extends FutureJVppCustomizer implements ListWrite if (dscp == null) { return 0; } - final Class<? extends MeterActionType> meterActionType = actionParams.getMeterActionType(); - checkArgument(MeterActionMarkDscp.class == meterActionType, - "dcsp is supported only for meter-action-mark-dscp, but %s defined", meterActionType); if (dscp.getVppDscpType() != null) { return (byte) dscp.getVppDscpType().getIntValue(); } @@ -154,10 +148,8 @@ public class PolicerCustomizer extends FutureJVppCustomizer implements ListWrite return 0; } else if (MeterActionTransmit.class == meterActionType) { return 1; - } else if (MeterActionMarkDscp.class == meterActionType) { - return 2; } else { - throw new IllegalArgumentException("Unsupported meter action type " + meterActionType); + return 2; } } } diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerValidator.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerValidator.java new file mode 100644 index 000000000..47d5c8708 --- /dev/null +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerValidator.java @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2019 PANTHEON.tech. + * + * 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 io.fd.hc2vpp.policer.write; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; + +import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.honeycomb.translate.write.DataValidationFailedException; +import io.fd.honeycomb.translate.write.Validator; +import io.fd.honeycomb.translate.write.WriteContext; +import javax.annotation.Nonnull; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionDrop; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionMarkDscp; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionParams; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionTransmit; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.MeterActionType; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.policers.Policer; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +public class PolicerValidator implements Validator<Policer> { + + public PolicerValidator(final NamingContext policerContext) { + checkNotNull(policerContext, "policerContext should not be null"); + } + + @Override + public void validateWrite(@Nonnull final InstanceIdentifier<Policer> id, + @Nonnull final Policer policer, + @Nonnull final WriteContext writeContext) + throws DataValidationFailedException.CreateValidationFailedException { + try { + validatePolicer(policer); + } catch (RuntimeException e) { + throw new DataValidationFailedException.CreateValidationFailedException(id, policer, e); + } + } + + @Override + public void validateDelete(@Nonnull final InstanceIdentifier<Policer> id, + @Nonnull final Policer policer, + @Nonnull final WriteContext writeContext) + throws DataValidationFailedException.DeleteValidationFailedException { + try { + validatePolicer(policer); + } catch (RuntimeException e) { + throw new DataValidationFailedException.DeleteValidationFailedException(id, e); + } + } + + private void validatePolicer(final Policer policer) { + checkAction(policer.getConformAction()); + checkAction(policer.getExceedAction()); + checkAction(policer.getViolateAction()); + } + + private void checkAction(MeterActionParams action) { + if (action != null) { + Class<? extends MeterActionType> actionType = action.getMeterActionType(); + checkActionType(actionType); + if (action.getDscp() != null) { + checkDscp(actionType); + } + } + } + + private void checkDscp(final Class<? extends MeterActionType> actionType) { + checkArgument(MeterActionMarkDscp.class == actionType, + "dcsp is supported only for meter-action-mark-dscp, but %s defined", actionType); + } + + private void checkActionType(Class<? extends MeterActionType> type) { + checkArgument( + type == MeterActionDrop.class || type == MeterActionTransmit.class || type == MeterActionMarkDscp.class, + "Unsupported meter action type %s", type); + } +} diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerWriterFactory.java index 0b6532fe3..db3d500d4 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerWriterFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerWriterFactory.java @@ -33,7 +33,8 @@ import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.pol import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class PolicerWriterFactory implements WriterFactory { - private static final InstanceIdentifier<Policer> POLICER_IID = InstanceIdentifier.create(Policers.class).child(Policer.class); + private static final InstanceIdentifier<Policer> POLICER_IID = + InstanceIdentifier.create(Policers.class).child(Policer.class); @Inject private FutureJVppCore vppApi; @@ -45,8 +46,9 @@ public class PolicerWriterFactory implements WriterFactory { public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) { InstanceIdentifier<Policer> IID = InstanceIdentifier.create(Policer.class); registry.subtreeAdd( - Sets.newHashSet(IID.child(ConformAction.class), IID.child(ExceedAction.class), - IID.child(ViolateAction.class)), - new GenericListWriter<>(POLICER_IID, new PolicerCustomizer(vppApi, policerContext))); + Sets.newHashSet(IID.child(ConformAction.class), IID.child(ExceedAction.class), + IID.child(ViolateAction.class)), + new GenericListWriter<>(POLICER_IID, new PolicerCustomizer(vppApi, policerContext), + new PolicerValidator(policerContext))); } } |