HONEYCOMB-257 - Honeycomb support for in-band OAM (iOAM) path tracing

- Add iOAM module to handle configuration for the iOAM trace VPP plugin
- Add iOAM module test to verify add/delete configurations
- Reader/Initializers for future, dependent on https://gerrit.fd.io/r/3387

Change-Id: I557604a955771c139165aed7cd9e5716abbac3d1
Signed-off-by: Srihari Raghavan <srihari@cisco.com>

9 files changed, 762 insertions, 0 deletions

diff --git a/ioam/impl/asciidoc/Readme.adoc b/ioam/impl/asciidoc/Readme.adoc
new file mode 100644
index 000000000..6660fc457
--- /dev/null
+++ b/ioam/impl/asciidoc/Readme.adoc
@@ -0,0 +1,3 @@
+= vppioam-impl
+
+Overview of vppioam-impl
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
new file mode 100644
index 000000000..dd106d003
--- /dev/null
+++ b/ioam/impl/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2016 Cisco and/or its affiliates.
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>io.fd.honeycomb.common</groupId>
+    <artifactId>impl-parent</artifactId>
+    <version>1.16.12-SNAPSHOT</version>
+    <relativePath>../../common/impl-parent</relativePath>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.fd.honeycomb.vppioam</groupId>
+  <artifactId>vppioam-impl</artifactId>
+  <name>${project.artifactId}</name>
+  <version>1.16.12-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+
+  <properties>
+    <ioam.version>1.0-SNAPSHOT</ioam.version>
+    <jvpp.version>16.12-SNAPSHOT</jvpp.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vppioam-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.jmob</groupId>
+      <artifactId>guice.conf</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-multibindings</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.google.inject.extensions</groupId>
+        <artifactId>guice-testlib</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-all</artifactId>
+        <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.fd.honeycomb</groupId>
+      <artifactId>translate-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.fd.honeycomb</groupId>
+      <artifactId>translate-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.fd.honeycomb</groupId>
+      <artifactId>notification-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.fd.honeycomb</groupId>
+      <artifactId>cfg-init</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>io.fd.vpp</groupId>
+        <artifactId>jvpp-registry</artifactId>
+        <version>${jvpp.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>io.fd.vpp</groupId>
+        <artifactId>jvpp-ioam-trace</artifactId>
+        <version>${ioam.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.fd.honeycomb.vpp</groupId>
+      <artifactId>vpp-translate-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.fd.honeycomb.vpp</groupId>
+      <artifactId>vpp-translate-test</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.fd.honeycomb</groupId>
+      <artifactId>minimal-distribution</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+       <groupId>org.mockito</groupId>
+       <artifactId>mockito-core</artifactId>
+       <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/VppIoamModule.java b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/VppIoamModule.java
new file mode 100755
index 000000000..34975d71d
--- /dev/null
+++ b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/VppIoamModule.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * 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.honeycomb.vppioam.impl;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.AbstractModule;
+import com.google.inject.Singleton;
+import com.google.inject.multibindings.Multibinder;
+import com.google.inject.name.Names;
+import com.google.inject.Provider;
+import io.fd.honeycomb.data.init.DataTreeInitializer;
+import io.fd.honeycomb.translate.read.ReaderFactory;
+import io.fd.honeycomb.translate.write.WriterFactory;
+import io.fd.honeycomb.vppioam.impl.config.VppIoamWriterFactory;
+import io.fd.honeycomb.vppioam.impl.util.JVppIoamProvider;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Glue code necessary for Honeycomb distribution to pick up the plugin classes
+ */
+public final class VppIoamModule extends AbstractModule {
+
+    private static final Logger LOG = LoggerFactory.getLogger(VppIoamModule.class);
+    private final Class<? extends Provider<FutureJVppIoamtraceFacade>> jvppIoamProviderClass;
+
+    public VppIoamModule() {
+        this(JVppIoamProvider.class);
+    }
+
+    @VisibleForTesting
+    VppIoamModule(Class<? extends Provider<FutureJVppIoamtraceFacade>> jvppIoamProvider) {
+        this.jvppIoamProviderClass = jvppIoamProvider;
+    }
+
+    @Override
+    protected void configure() {
+        LOG.debug("Installing iOAM module");
+
+        // Bind to Plugin's JVPP.
+        bind(FutureJVppIoamtrace.class).toProvider(jvppIoamProviderClass).in(Singleton.class);
+
+        // Below are classes picked up by HC framework
+        Multibinder.newSetBinder(binder(), WriterFactory.class).addBinding().to(VppIoamWriterFactory.class);
+
+        LOG.debug("Module iOAM successfully configured");
+    }
+}
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizer.java b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizer.java
new file mode 100755
index 000000000..8a45e87df
--- /dev/null
+++ b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizer.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * 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.honeycomb.vppioam.impl.config;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+import io.fd.honeycomb.translate.MappingContext;
+import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
+import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator;
+import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
+import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.honeycomb.translate.write.WriteContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.honeycomb.vppioam.impl.util.FutureJVppIoamCustomizer;
+
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDel;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDelReply;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
+
+import java.util.concurrent.CompletionStage;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.IoamTraceConfig;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig.TraceOp;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.trace.config.NodeInterfaces;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfigKey;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.trace.config.NodeInterfaces;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Writer customizer responsible for Ioam Trace create/delete.
+ */
+public class IoamTraceWriterCustomizer extends FutureJVppIoamCustomizer
+        implements ListWriterCustomizer<TraceConfig, TraceConfigKey>, ByteDataTranslator, JvppReplyConsumer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(IoamTraceWriterCustomizer.class);
+
+    public IoamTraceWriterCustomizer(@Nonnull final FutureJVppIoamtrace futureJVppIoam) {
+        super(futureJVppIoam);
+    }
+
+    @Override
+    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<TraceConfig> id,
+                                       @Nonnull final TraceConfig dataCurr,
+                                       @Nonnull final WriteContext writeContext)
+            throws WriteFailedException {
+
+        try {
+            addTraceConfig(dataCurr, writeContext, id);
+        } catch (Exception exCreate) {
+            LOG.error("Add Trace Configuration failed", exCreate);
+            throw new WriteFailedException.CreateFailedException(id, dataCurr, exCreate);
+        }
+
+        LOG.debug("Trace config added iid={}, added {}", id, dataCurr);
+    }
+
+    @Override
+    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<TraceConfig> id,
+                                        @Nonnull final TraceConfig dataBefore,
+                                        @Nonnull final TraceConfig dataAfter,
+                                        @Nonnull final WriteContext ctx) throws WriteFailedException {
+        try {
+            deleteTraceConfig(dataBefore, id);
+            addTraceConfig(dataAfter, ctx, id);
+        } catch (Exception exUpdate) {
+            LOG.error("Update Trace Configuration failed", exUpdate);
+            throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter, exUpdate);
+        }
+
+        LOG.debug("Trace config updated {}", dataAfter);
+    }
+
+    @Override
+    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<TraceConfig> id,
+                                        @Nonnull final TraceConfig dataBefore,
+                                        @Nonnull final WriteContext ctx) throws WriteFailedException {
+        try {
+            deleteTraceConfig(dataBefore, id);
+        } catch (Exception exDelete) {
+            LOG.error("Delete Trace Configuration failed", exDelete);
+            throw new WriteFailedException.DeleteFailedException(id, exDelete);
+        }
+
+        LOG.debug("Trace config deleted:iid={} dataBefore={}", id, dataBefore);
+    }
+
+    public TraceProfileAddReply addTraceConfig(TraceConfig traceConfig,
+                                               WriteContext ctx,
+                                               final InstanceIdentifier<TraceConfig> id) throws Exception {
+
+        TraceProfileAdd traceProfileAdd = new TraceProfileAdd();
+        traceProfileAdd.traceType = (byte) traceConfig.getTraceType().byteValue(); //trace type
+        traceProfileAdd.numElts = (byte) traceConfig.getTraceNumElt().byteValue();  //num of elts
+        traceProfileAdd.traceTsp = (byte) traceConfig.getTraceTsp().getIntValue(); // tsp
+        traceProfileAdd.appData = (int) traceConfig.getTraceAppData().intValue(); // appdata
+        traceProfileAdd.nodeId = (int) traceConfig.getNodeId().intValue(); // nodeid
+
+        /* Write to VPP */
+        final TraceProfileAddReply reply = getReplyForWrite((getFutureJVppIoam().
+                                                            traceProfileAdd(traceProfileAdd).
+                                                            toCompletableFuture()), id);
+        return reply;
+    }
+
+    public TraceProfileDelReply deleteTraceConfig(TraceConfig dataBefore,
+                                                  final InstanceIdentifier<TraceConfig> id) throws Exception {
+        TraceProfileDel del = new TraceProfileDel();
+
+        /* Write to VPP */
+        TraceProfileDelReply reply = getReplyForWrite((getFutureJVppIoam().
+                                                      traceProfileDel(del).toCompletableFuture()), id);
+
+        return reply;
+    }
+}
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/VppIoamWriterFactory.java b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/VppIoamWriterFactory.java
new file mode 100755
index 000000000..40311cd8c
--- /dev/null
+++ b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/config/VppIoamWriterFactory.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * 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.honeycomb.vppioam.impl.config;
+
+import com.google.common.collect.Sets;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import io.fd.honeycomb.translate.impl.write.GenericListWriter;
+import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.honeycomb.translate.write.WriterFactory;
+import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.IoamTraceConfig;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
+
+public class VppIoamWriterFactory implements WriterFactory {
+
+    @Nonnull
+    private final FutureJVppIoamtrace jvppIoam;
+
+    @Inject
+    public VppIoamWriterFactory(@Nonnull final FutureJVppIoamtrace jvppIoam) {
+        this.jvppIoam = jvppIoam;
+    }
+
+    @Override
+    public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) {
+        // TraceConfig
+        final InstanceIdentifier<TraceConfig> trId =
+                InstanceIdentifier.create(IoamTraceConfig.class).child(TraceConfig.class);
+        registry.add(new GenericListWriter<>(trId, new IoamTraceWriterCustomizer(jvppIoam)));
+    }
+}
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/FutureJVppIoamCustomizer.java b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/FutureJVppIoamCustomizer.java
new file mode 100755
index 000000000..b60581a1b
--- /dev/null
+++ b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/FutureJVppIoamCustomizer.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * 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.honeycomb.vppioam.impl.util;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
+import javax.annotation.Nonnull;
+
+/**
+ * Abstract utility to hold the IoamApi reference.
+ */
+@Beta
+public abstract class FutureJVppIoamCustomizer {
+
+    private final FutureJVppIoamtrace futureJVppIoam;
+
+    public FutureJVppIoamCustomizer(@Nonnull final FutureJVppIoamtrace futureJVppIoam) {
+        this.futureJVppIoam = Preconditions.checkNotNull(futureJVppIoam,
+                                  "futureJVppIoam should not be null");
+    }
+
+    /**
+     * Get IoamApi reference
+     *
+     * @return IoamApi reference
+     */
+    public FutureJVppIoamtrace getFutureJVppIoam() {
+        return futureJVppIoam;
+    }
+}
diff --git a/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/JVppIoamProvider.java b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/JVppIoamProvider.java
new file mode 100755
index 000000000..d95266457
--- /dev/null
+++ b/ioam/impl/src/main/java/io/fd/honeycomb/vppioam/impl/util/JVppIoamProvider.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016 Cisco and its affiliates.
+ *
+ * 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.honeycomb.vppioam.impl.util;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.fd.honeycomb.infra.distro.ProviderTrait;
+import java.io.IOException;
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
+import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides future API for jvpp-ioam plugin. Must be a singleton due to shutdown hook usage.
+ * Registers shutdown hook to free plugin's resources on shutdown.
+ */
+public final class JVppIoamProvider extends ProviderTrait<FutureJVppIoamtraceFacade> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(JVppIoamProvider.class);
+
+    @Inject
+    private JVppRegistry registry;
+
+    @Override
+    protected FutureJVppIoamtraceFacade create() {
+        try {
+            final JVppIoamtraceImpl jVppIoamTr = new JVppIoamtraceImpl();
+            // Free jvpp-ioam plugin's resources on shutdown
+            Runtime.getRuntime().addShutdownHook(new Thread() {
+                @Override
+                public void run() {
+                    LOG.info("Unloading jvpp-ioam plugin");
+                    jVppIoamTr.close();
+                    LOG.info("Successfully unloaded jvpp-ioam plugin");
+                }
+            });
+
+            LOG.debug("Successfully loaded jvpp-ioam plugin");
+            return new FutureJVppIoamtraceFacade(registry, jVppIoamTr);
+        } catch (IOException e) {
+            throw new IllegalStateException("Unable to open VPP management connection", e);
+        }
+    }
+}
+
diff --git a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/VppIoamModuleTest.java b/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/VppIoamModuleTest.java
new file mode 100644
index 000000000..288122fd0
--- /dev/null
+++ b/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/VppIoamModuleTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * 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.honeycomb.vppioam.impl;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.empty;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.multibindings.Multibinder;
+import com.google.inject.name.Named;
+import com.google.inject.testing.fieldbinder.Bind;
+import com.google.inject.testing.fieldbinder.BoundFieldModule;
+import io.fd.honeycomb.translate.util.read.registry.CompositeReaderRegistryBuilder;
+import io.fd.honeycomb.translate.util.write.registry.FlatWriterRegistryBuilder;
+import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.honeycomb.translate.write.WriterFactory;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+import io.fd.honeycomb.vppioam.impl.config.VppIoamWriterFactory;
+import io.fd.honeycomb.vppioam.impl.util.JVppIoamProvider;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
+import io.fd.vpp.jvpp.JVppRegistry;
+
+
+public class VppIoamModuleTest {
+
+    @Named("honeycomb-context")
+    @Bind
+    @Mock
+    private DataBroker honeycombContext;
+
+    @Named("honeycomb-initializer")
+    @Bind
+    @Mock
+    private DataBroker honeycombInitializer;
+
+    @Bind
+    @Mock
+    private JVppRegistry registry;
+
+    @Inject
+    private Set<WriterFactory> writerFactories = new HashSet<>();
+
+    @Before
+    public void setUp() throws Exception {
+
+        initMocks(this);
+
+        Guice.createInjector(new VppIoamModule(MockJVppIoamProvider.class), BoundFieldModule.of(this)).injectMembers(this);
+    }
+
+    @Test
+    public void testWriterFactories() throws Exception {
+        assertThat(writerFactories, is(not(empty())));
+
+        final FlatWriterRegistryBuilder registryBuilder = new FlatWriterRegistryBuilder();
+        writerFactories.forEach(factory -> factory.init(registryBuilder));
+        assertNotNull(registryBuilder.build());
+    }
+
+    private static final class MockJVppIoamProvider implements Provider<FutureJVppIoamtraceFacade> {
+
+        @Override
+        public FutureJVppIoamtraceFacade get() {
+            return mock(FutureJVppIoamtraceFacade.class);
+        }
+    }
+}
+
diff --git a/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizerTest.java
new file mode 100644
index 000000000..8c182dd01
--- /dev/null
+++ b/ioam/impl/src/test/java/io/fd/honeycomb/vppioam/impl/config/IoamTraceWriterCustomizerTest.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * 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.honeycomb.vppioam.impl.config;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import io.fd.honeycomb.translate.vpp.util.NamingContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDel;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDelReply;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace;
+import io.fd.vpp.jvpp.VppBaseCallException;
+import io.fd.vpp.jvpp.VppCallbackException;
+
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.IoamTraceConfig;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig.TraceTsp;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfigBuilder;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig.TraceOp;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.trace.config.NodeInterfaces;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfigKey;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.trace.config.NodeInterfaces;
+
+
+public class IoamTraceWriterCustomizerTest extends WriterCustomizerTest {
+
+    private static final String TRACE_NAME = "trace_test";
+
+    @Mock
+    protected FutureJVppIoamtrace jvppIoam;
+
+    private IoamTraceWriterCustomizer customizer;
+
+    @Override
+    public void setUp() throws Exception {
+        customizer = new IoamTraceWriterCustomizer(jvppIoam);
+    }
+
+    private static TraceConfig generateTraceConfig(final String name) {
+        final TraceConfigBuilder builder = new TraceConfigBuilder();
+        builder.setTraceConfigName(name);
+        builder.setKey(new TraceConfigKey(name));
+        builder.setAclName(name);
+        builder.setTraceType(new Short("31"));
+        builder.setTraceNumElt(new Short("4"));
+        builder.setTraceTsp(TraceTsp.Milliseconds);
+        builder.setTraceOp(TraceOp.Add);
+        builder.setTraceAppData(new Long("123"));
+        builder.setNodeId(new Long("1"));
+
+        return builder.build();
+    }
+
+    private static InstanceIdentifier<TraceConfig> getTraceConfigId(final String name) {
+        return InstanceIdentifier.create(IoamTraceConfig.class)
+                .child(TraceConfig.class, new TraceConfigKey(name));
+    }
+
+    private void whenTraceAddThenSuccess() {
+        final TraceProfileAddReply reply = new TraceProfileAddReply();
+        reply.context = 1;
+        doReturn(future(reply)).when(jvppIoam).traceProfileAdd(any(TraceProfileAdd.class));
+    }
+
+    private void whenTraceAddThenFailure() {
+        doReturn(failedFuture()).when(jvppIoam).traceProfileAdd(any(TraceProfileAdd.class));
+    }
+
+    private void whenTraceDelThenSuccess() {
+        final TraceProfileDelReply reply = new TraceProfileDelReply();
+        reply.context = 1;
+        doReturn(future(reply)).when(jvppIoam).traceProfileDel(any(TraceProfileDel.class));
+    }
+
+    private void whenTraceDelThenFailure() {
+        doReturn(failedFuture()).when(jvppIoam).traceProfileDel(any(TraceProfileDel.class));
+    }
+
+    private static TraceProfileAdd generateTraceProfileAdd() {
+        final TraceProfileAdd request = new TraceProfileAdd();
+        request.traceType = 0x1f;
+        request.numElts = 4;
+        request.nodeId = 1;
+        request.traceTsp = 1;
+        request.appData = 123;
+
+        return request;
+    }
+
+    private static TraceProfileDel generateTraceProfileDel() {
+        final TraceProfileDel request = new TraceProfileDel();
+
+        return request;
+    }
+
+    @Test
+    public void testCreate() throws Exception {
+        final TraceConfig traceConfig = generateTraceConfig(TRACE_NAME);
+        final InstanceIdentifier<TraceConfig> id = getTraceConfigId(TRACE_NAME);
+
+        whenTraceAddThenSuccess();
+
+        customizer.writeCurrentAttributes(id, traceConfig, writeContext);
+
+        verify(jvppIoam).traceProfileAdd(generateTraceProfileAdd());
+    }
+
+    @Test
+    public void testCreateFailed() throws Exception {
+        final TraceConfig traceConfig = generateTraceConfig(TRACE_NAME);
+        final InstanceIdentifier<TraceConfig> id = getTraceConfigId(TRACE_NAME);
+
+        whenTraceAddThenFailure();
+
+        try {
+            customizer.writeCurrentAttributes(id, traceConfig, writeContext);
+        } catch (WriteFailedException e) {
+            //assertTrue(e.getCause() instanceof VppBaseCallException);
+            verify(jvppIoam).traceProfileAdd(generateTraceProfileAdd());
+
+            return;
+        }
+        fail("WriteFailedException.CreateFailedException was expected");
+    }
+
+    @Test
+    public void testDelete() throws Exception {
+
+        final TraceConfig traceConfig = generateTraceConfig(TRACE_NAME);
+        final InstanceIdentifier<TraceConfig> id = getTraceConfigId(TRACE_NAME);
+
+        whenTraceDelThenSuccess();
+
+        customizer.deleteCurrentAttributes(id, traceConfig, writeContext);
+
+        verify(jvppIoam).traceProfileDel(generateTraceProfileDel());
+    }
+
+    @Test
+    public void testDeleteFailed() throws Exception {
+
+        final TraceConfig traceConfig = generateTraceConfig(TRACE_NAME);
+        final InstanceIdentifier<TraceConfig> id = getTraceConfigId(TRACE_NAME);
+
+        whenTraceDelThenFailure();
+
+        try {
+            customizer.deleteCurrentAttributes(id, traceConfig, writeContext);
+        } catch (WriteFailedException e) {
+            //assertTrue(e.getCause() instanceof VppBaseCallException);
+            verify(jvppIoam).traceProfileDel(generateTraceProfileDel());
+
+            return;
+        }
+        fail("WriteFailedException.DeleteFailedException was expected");
+
+        customizer.deleteCurrentAttributes(id, traceConfig, writeContext);
+    }
+}