Remove hc2vpp codebase

Moved to a dedicated hc2vpp project in fd.io

Change-Id: I03dc3b3029f21b127a00c69a86bcd8e467896241
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

22 files changed, 0 insertions, 2732 deletions

diff --git a/nsh/api/asciidoc/Readme.adoc b/nsh/api/asciidoc/Readme.adoc
deleted file mode 100644
index 4d78ad6c1..000000000
--- a/nsh/api/asciidoc/Readme.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= vppnsh-api
-
-Overview of vppnsh-api
\ No newline at end of file
diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml
deleted file mode 100644
index a6dc0416e..000000000
--- a/nsh/api/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Intel 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>api-parent</artifactId>
-    <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/api-parent</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.vppnsh</groupId>
-  <artifactId>vppnsh-api</artifactId>
-  <name>${project.artifactId}</name>
-  <version>1.16.12-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>iana-if-type-2014-05-08</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-interfaces</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.v3po</groupId>
-      <artifactId>v3po-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/nsh/api/src/main/yang/vpp-nsh.yang b/nsh/api/src/main/yang/vpp-nsh.yang
deleted file mode 100644
index d4914f4fd..000000000
--- a/nsh/api/src/main/yang/vpp-nsh.yang
+++ /dev/null
@@ -1,303 +0,0 @@
-module vpp-nsh {
-  yang-version 1;
-  namespace "urn:opendaylight:params:xml:ns:yang:vpp:nsh";
-  prefix "vpp-nsh";
-
-  revision "2016-06-24" {
-    description "Initial revision of vpp-nsh model";
-  }
-
-  import iana-if-type {
-    prefix "ianaift";
-  }
-  import ietf-interfaces {
-    prefix "if";
-  }
-  import ietf-yang-types {
-    prefix "yang";
-  }
-  import ietf-inet-types {
-    prefix "inet";
-  }
-  import yang-ext {
-    prefix "ext";
-  }
-  import v3po {
-    prefix "v3po";
-  }
-  /*
-   * Defines the supported next protocols that can be used for
-   * NSH next-protocol field.
-   */
-  identity next-protocol {
-    description "Base identity from which all nsh next protocols
-                 are derived from";
-  }
-
-  identity ipv4 {
-    base next-protocol;
-    description
-      "Support ipv4 to act as next protocol";
-  }
-
-  identity ipv6 {
-    base next-protocol;
-    description
-      "Support ipv6 to act as next protocol";
-  }
-
-  identity ethernet {
-    base next-protocol;
-    description
-      "Support ethernet to act as next protocol";
-  }
-
-  typedef nsh-next-protocol {
-    type identityref {
-      base "next-protocol";
-    }
-    description "Identifies a specific next protocol for nsh";
-  }
-
-  /*
-   * Defines the supported nsh header action.
-   */
-  identity action-type {
-    description "nsh header action type";
-  }
-
-  identity swap {
-    base "action-type";
-    description "swap action type";
-  }
-
-  identity push {
-    base "action-type";
-    description "push action type";
-  }
-
-  identity pop {
-    base "action-type";
-    description "pop action type";
-  }
-
-  typedef nsh-action-type {
-    type identityref {
-      base "action-type";
-    }
-  }
-
-  /*
-   * Defines the supported encap type.
-   */
-  identity encap-type {
-    description "encap type";
-  }
-
-  identity vxlan-gpe {
-    base "encap-type";
-    description "vxlan-gpe encap type";
-  }
-
-  identity vxlan {
-    base "encap-type";
-    description "vxlan encap type";
-  }
-
-  typedef nsh-encap-type {
-    type identityref {
-      base "encap-type";
-    }
-  }
-
-  /*
-   * Defines the supported MD-types.
-   */
-  identity md-type {
-    description "md type";
-  }
-
-  identity md-type1 {
-    base "md-type";
-    description "nsh md-type1";
-  }
-
-  identity md-type2 {
-    base "md-type";
-    description "nsh md-type2";
-  }
-
-  typedef nsh-md-type {
-    type identityref {
-      base "md-type";
-    }
-  }
-
-  grouping nsh-md-type1-attributes {
-    leaf c1 {
-      type uint32;
-    }
-    leaf c2 {
-      type uint32;
-    }
-    leaf c3 {
-      type uint32;
-    }
-    leaf c4 {
-      type uint32;
-    }
-  }
-
-  grouping nsh-md-type2-attributes {
-      leaf type {
-      type uint32;
-    }
-  }
-
-  grouping nsh-entry-base-attributes {
-    leaf name {
-      type string;
-      description "NSH Entry Name";
-    }
-    leaf nsp {
-      type uint32 {
-        range "0..16777215";
-      }
-    }
-    leaf nsi {
-      type uint8 {
-        range "1..255";
-      }
-    }
-    leaf md-type {
-      type nsh-md-type;
-    }
-    leaf version {
-      type uint8;
-    }
-    leaf length {
-      type uint8;
-    }
-    leaf next-protocol {
-      type nsh-next-protocol;
-    }
-  }
-
-  grouping nsh-map-base-attributes {
-    leaf name {
-      type string;
-      description "NSH Map Name";
-    }
-    leaf nsp {
-      type uint32 {
-        range "0..16777215";
-      }
-    }
-    leaf nsi {
-      type uint8 {
-        range "1..255";
-      }
-    }
-    leaf mapped-nsp {
-      type uint32 {
-        range "0..16777215";
-      }
-    }
-    leaf mapped-nsi {
-      type uint8 {
-        range "1..255";
-      }
-    }
-    leaf nsh-action {
-      type nsh-action-type;
-      default "swap";
-    }
-    leaf encap-type {
-      type nsh-encap-type;
-    }
-    leaf encap-if-name {
-      type string;
-      description "Interface Name";
-    }
-  }
-
-  container vpp-nsh {
-    description
-    "NSH config data";
-
-    container nsh-entries {
-      list nsh-entry {
-        key "name";
-
-        uses nsh-entry-base-attributes;
-
-        description
-          "nsh-entry configuration";
-      }
-    }
-
-    container nsh-maps {
-      list nsh-map {
-        key "name";
-
-        uses nsh-map-base-attributes;
-
-        description
-          "nsh-map configuration";
-      }
-    }
-  }
-
-  augment /vpp-nsh/nsh-entries/nsh-entry {
-    ext:augment-identifier nsh-md-type-1-augment;
-    when "/md-type = 'vpp-nsh:md-type1' ";
-    uses nsh-md-type1-attributes;
-  }
-
-  augment /vpp-nsh/nsh-entries/nsh-entry {
-    ext:augment-identifier nsh-md-type-2-augment;
-    when "/md-type = 'vpp-nsh:md-type2' ";
-    uses nsh-md-type2-attributes;
-  }
-
-  container vpp-nsh-state {
-    config false;
-
-    description
-      "NSH operational data";
-
-    container nsh-entries {
-      list nsh-entry {
-        key "name";
-
-        uses nsh-entry-base-attributes;
-
-        description
-          "nsh-entry operational data";
-      }
-    }
-
-    container nsh-maps {
-      list nsh-map {
-        key "name";
-
-        uses nsh-map-base-attributes;
-
-        description
-          "nsh-map operational data";
-      }
-    }
-  }
-
-  augment /vpp-nsh-state/nsh-entries/nsh-entry {
-    ext:augment-identifier nsh-md-type-1-state-augment;
-    when "/md-type = 'vpp-nsh:md-type1' ";
-    uses nsh-md-type1-attributes;
-  }
-
-  augment /vpp-nsh-state/nsh-entries/nsh-entry {
-    ext:augment-identifier nsh-md-type-2-state-augment;
-    when "/md-type = 'vpp-nsh:md-type2' ";
-    uses nsh-md-type2-attributes;
-  }
-}
\ No newline at end of file
diff --git a/nsh/asciidoc/Readme.adoc b/nsh/asciidoc/Readme.adoc
deleted file mode 100644
index 1ae29484a..000000000
--- a/nsh/asciidoc/Readme.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-= nsh
-
-This is a Honeycomb plugin providing mapping code between HC and NSH_SFC Plugin APIs.
-
-== Usage
-
-Refer to nsh_postman_collection.json for sample requests. All capabilities of NSH_SFC are demo-ed there.
-
-In order to make HC NSH plugin work, need to start vpp and load nsh_sfc plugin first.
-
-Please follow the right order to support NSH_SFC feature:
-(1). Creates vxlan-gpe interface.
-(2). Creates nsh-entry.
-(3). Creates nsh-map. 
\ No newline at end of file
diff --git a/nsh/impl/asciidoc/Readme.adoc b/nsh/impl/asciidoc/Readme.adoc
deleted file mode 100644
index 5c0fb4705..000000000
--- a/nsh/impl/asciidoc/Readme.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= vppnsh-impl
-
-Overview of vppnsh-impl
\ No newline at end of file
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
deleted file mode 100644
index 8cd0dabbb..000000000
--- a/nsh/impl/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Intel 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.vppnsh</groupId>
-  <artifactId>vppnsh-impl</artifactId>
-  <name>${project.artifactId}</name>
-  <version>1.16.12-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <guice.version>4.1.0</guice.version>
-    <guice.config.version>1.2.0</guice.config.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vppnsh-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>${guice.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>net.jmob</groupId>
-      <artifactId>guice.conf</artifactId>
-      <version>${guice.config.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <version>${guice.version}</version>
-    </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>16.12-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-        <groupId>io.fd.nsh_sfc</groupId>
-        <artifactId>nsh-sfc</artifactId>
-        <version>16.12-SNAPSHOT</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>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>minimal-distribution</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.v3po</groupId>
-      <artifactId>v3po2vpp</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/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java
deleted file mode 100755
index 90c826dc7..000000000
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.impl;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.AbstractModule;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-import com.google.inject.multibindings.Multibinder;
-import com.google.inject.name.Names;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.vppnsh.impl.config.VppNshWriterFactory;
-import io.fd.honeycomb.vppnsh.impl.oper.VppNshReaderFactory;
-import io.fd.honeycomb.vppnsh.impl.util.JVppNshProvider;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This is some glue code necessary for Honeycomb distribution to pick up the plugin classes
- */
-public final class VppNshModule extends AbstractModule {
-
-    private static final Logger LOG = LoggerFactory.getLogger(VppNshModule.class);
-    private final Class<? extends Provider<FutureJVppNshFacade>> jvppNshProviderClass;
-
-    public VppNshModule() {
-        this(JVppNshProvider.class);
-    }
-    @VisibleForTesting
-    VppNshModule(Class<? extends Provider<FutureJVppNshFacade>> jvppNshProvider) {
-        this.jvppNshProviderClass = jvppNshProvider;
-    }
-
-    @Override
-    protected void configure() {
-        LOG.debug("Installing NSH module");
-
-        // Naming contexts
-        bind(NamingContext.class)
-            .annotatedWith(Names.named("nsh-entry-context"))
-            .toInstance(new NamingContext("nsh-entry-", "nsh-entry-context"));
-
-        bind(NamingContext.class)
-            .annotatedWith(Names.named("nsh-map-context"))
-            .toInstance(new NamingContext("nsh-map-", "nsh-map-context"));
-
-        // Bind to Plugin's JVPP.
-        bind(FutureJVppNsh.class).toProvider(jvppNshProviderClass).in(Singleton.class);
-
-        // Below are classes picked up by HC framework
-        Multibinder.newSetBinder(binder(), WriterFactory.class).addBinding().to(VppNshWriterFactory.class);
-        Multibinder.newSetBinder(binder(), ReaderFactory.class).addBinding().to(VppNshReaderFactory.class);
-        LOG.info("Module NSH successfully configured");
-    }
-}
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java
deleted file mode 100755
index 795e8b9ad..000000000
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.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.vppnsh.impl.util.FutureJVppNshCustomizer;
-import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry;
-import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import java.util.concurrent.CompletionStage;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ethernet;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.MdType1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1Augment;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Writer customizer responsible for NshEntry create/delete.
- */
-public class NshEntryWriterCustomizer extends FutureJVppNshCustomizer
-        implements ListWriterCustomizer<NshEntry, NshEntryKey>, ByteDataTranslator, JvppReplyConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(NshEntryWriterCustomizer.class);
-    private final NamingContext nshEntryContext;
-
-    public NshEntryWriterCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh,
-                                    @Nonnull final NamingContext nshEntryContext) {
-        super(futureJVppNsh);
-        this.nshEntryContext = checkNotNull(nshEntryContext, "nshEntryContext should not be null");
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<NshEntry> id,
-                                       @Nonnull final NshEntry dataAfter, @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-        LOG.debug("Creating nsh entry: iid={} dataAfter={}", id, dataAfter);
-        final int newEntryIndex =
-                nshAddDelEntry(true, id, dataAfter, ~0 /* value not present */, writeContext.getMappingContext());
-        // Add nsh entry name <-> vpp index mapping to the naming context:
-        nshEntryContext.addName(newEntryIndex, dataAfter.getName(), writeContext.getMappingContext());
-        LOG.debug("Successfully created nsh entry(id={]): iid={} dataAfter={}", newEntryIndex, id, dataAfter);
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<NshEntry> id,
-                                        @Nonnull final NshEntry dataBefore, @Nonnull final NshEntry dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        throw new UnsupportedOperationException("Nsh entry update is not supported");
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<NshEntry> id,
-                                        @Nonnull final NshEntry dataBefore,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        LOG.debug("Removing nsh entry: iid={} dataBefore={}", id, dataBefore);
-        final String entryName = dataBefore.getName();
-        checkState(nshEntryContext.containsIndex(entryName, writeContext.getMappingContext()),
-                "Removing nsh entry {}, but index could not be found in the nsh entry context", entryName);
-
-        final int entryIndex = nshEntryContext.getIndex(entryName, writeContext.getMappingContext());
-        nshAddDelEntry(false, id, dataBefore, entryIndex, writeContext.getMappingContext());
-
-        // Remove deleted interface from interface context:
-        nshEntryContext.removeName(dataBefore.getName(), writeContext.getMappingContext());
-        LOG.debug("Successfully removed nsh entry(id={]): iid={} dataAfter={}", entryIndex, id, dataBefore);
-    }
-
-    private int nshAddDelEntry(final boolean isAdd, @Nonnull final InstanceIdentifier<NshEntry> id,
-                               @Nonnull final NshEntry entry, final int entryId, final MappingContext ctx)
-            throws WriteFailedException {
-        final CompletionStage<NshAddDelEntryReply> createNshEntryReplyCompletionStage =
-                getFutureJVppNsh().nshAddDelEntry(getNshAddDelEntryRequest(isAdd, entryId, entry, ctx));
-
-        final NshAddDelEntryReply reply =
-                getReplyForWrite(createNshEntryReplyCompletionStage.toCompletableFuture(), id);
-        return reply.entryIndex;
-
-    }
-
-    private void getNshEntryMdType1Request(@Nonnull final NshEntry entry,
-                                           @Nonnull NshAddDelEntry request) {
-        final NshMdType1Augment nshMdType1Augment = entry.getAugmentation(NshMdType1Augment.class);
-        if (nshMdType1Augment != null) {
-            request.c1 = (int) nshMdType1Augment.getC1().longValue();
-            request.c2 = (int) nshMdType1Augment.getC2().longValue();
-            request.c3 = (int) nshMdType1Augment.getC3().longValue();
-            request.c4 = (int) nshMdType1Augment.getC4().longValue();
-        }
-    }
-
-    private NshAddDelEntry getNshAddDelEntryRequest(final boolean isAdd, final int entryIndex,
-                                                    @Nonnull final NshEntry entry,
-                                                    @Nonnull final MappingContext ctx) {
-        final NshAddDelEntry request = new NshAddDelEntry();
-        request.isAdd = booleanToByte(isAdd);
-
-        request.verOC = (byte) entry.getVersion().shortValue();
-        request.length = (byte) entry.getLength().intValue();
-        if (entry.getNextProtocol() == Ipv4.class) {
-            request.nextProtocol = 1;
-        } else if (entry.getNextProtocol() == Ipv6.class) {
-            request.nextProtocol = 2;
-        } else if (entry.getNextProtocol() == Ethernet.class) {
-            request.nextProtocol = 3;
-        } else {
-            request.nextProtocol = 0;
-        }
-
-        if (entry.getMdType() == MdType1.class) {
-            request.mdType = 1;
-            getNshEntryMdType1Request(entry, request);
-        } else if (entry.getMdType() == MdType1.class) {
-            request.mdType = 2;
-        } else {
-            request.mdType = 0;
-        }
-
-        request.nspNsi = (entry.getNsp().intValue() << 8) | entry.getNsi();
-
-        return request;
-    }
-}
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java
deleted file mode 100755
index 701475936..000000000
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.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.vppnsh.impl.util.FutureJVppNshCustomizer;
-import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap;
-import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import java.util.concurrent.CompletionStage;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Pop;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Push;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Swap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VxlanGpe;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Writer customizer responsible for NshMap create/delete.
- */
-public class NshMapWriterCustomizer extends FutureJVppNshCustomizer
-        implements ListWriterCustomizer<NshMap, NshMapKey>, ByteDataTranslator, JvppReplyConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(NshMapWriterCustomizer.class);
-    private final NamingContext nshMapContext;
-    private final NamingContext interfaceContext;
-
-    public NshMapWriterCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh,
-                                  @Nonnull final NamingContext nshMapContext,
-                                  @Nonnull final NamingContext interfaceContext) {
-        super(futureJVppNsh);
-        this.nshMapContext = checkNotNull(nshMapContext, "nshMapContext should not be null");
-        this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null");
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<NshMap> id,
-                                       @Nonnull final NshMap dataAfter, @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-        LOG.debug("Creating nsh map: iid={} dataAfter={}", id, dataAfter);
-        final int newMapIndex =
-                nshAddDelMap(true, id, dataAfter, ~0 /* value not present */, writeContext.getMappingContext());
-
-        // Add nsh map name <-> vpp index mapping to the naming context:
-        nshMapContext.addName(newMapIndex, dataAfter.getName(), writeContext.getMappingContext());
-        LOG.debug("Successfully created nsh map(id={]): iid={} dataAfter={}", newMapIndex, id, dataAfter);
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<NshMap> id,
-                                        @Nonnull final NshMap dataBefore, @Nonnull final NshMap dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        throw new UnsupportedOperationException("Nsh map update is not supported");
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<NshMap> id,
-                                        @Nonnull final NshMap dataBefore,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        LOG.debug("Removing nsh map: iid={} dataBefore={}", id, dataBefore);
-        final String mapName = dataBefore.getName();
-        checkState(nshMapContext.containsIndex(mapName, writeContext.getMappingContext()),
-                "Removing nsh map {}, but index could not be found in the nsh map context", mapName);
-
-        final int mapIndex = nshMapContext.getIndex(mapName, writeContext.getMappingContext());
-        nshAddDelMap(false, id, dataBefore, mapIndex, writeContext.getMappingContext());
-
-        // Remove deleted interface from interface context:
-        nshMapContext.removeName(dataBefore.getName(), writeContext.getMappingContext());
-        LOG.debug("Successfully removed nsh map(id={]): iid={} dataAfter={}", mapIndex, id, dataBefore);
-    }
-
-    private int nshAddDelMap(final boolean isAdd, @Nonnull final InstanceIdentifier<NshMap> id,
-                             @Nonnull final NshMap map, final int mapId, final MappingContext ctx)
-            throws WriteFailedException {
-        final CompletionStage<NshAddDelMapReply> createNshMapReplyCompletionStage =
-                getFutureJVppNsh().nshAddDelMap(getNshAddDelMapRequest(isAdd, mapId, map, ctx));
-
-        final NshAddDelMapReply reply = getReplyForWrite(createNshMapReplyCompletionStage.toCompletableFuture(), id);
-        return reply.mapIndex;
-
-    }
-
-    private NshAddDelMap getNshAddDelMapRequest(final boolean isAdd, final int mapIndex,
-                                                @Nonnull final NshMap map,
-                                                @Nonnull final MappingContext ctx) {
-        final NshAddDelMap request = new NshAddDelMap();
-        request.isAdd = booleanToByte(isAdd);
-
-        request.nspNsi = (map.getNsp().intValue() << 8) | map.getNsi();
-        request.mappedNspNsi = (map.getMappedNsp().intValue() << 8) | map.getMappedNsi();
-
-        if (map.getNshAction() == Swap.class) {
-            request.nshAction = 0;
-        } else if (map.getNshAction() == Push.class) {
-            request.nshAction = 1;
-        } else if (map.getNshAction() == Pop.class) {
-            request.nshAction = 2;
-        }
-
-        if (map.getEncapType() == VxlanGpe.class) {
-            request.nextNode = 2;
-        }
-
-        checkState(interfaceContext.containsIndex(map.getEncapIfName(), ctx),
-                "Mapping does not contains mapping for provider interface Name ".concat(map.getEncapIfName()));
-        request.swIfIndex = interfaceContext.getIndex(map.getEncapIfName(), ctx);
-
-        return request;
-    }
-}
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java
deleted file mode 100755
index 61c442e18..000000000
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.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 io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1Augment;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType2Augment;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNsh;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshEntries;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshMaps;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMap;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class VppNshWriterFactory implements WriterFactory {
-
-    @Nonnull
-    private final FutureJVppNsh jvppNsh;
-    private final NamingContext nshEntryContext;
-    private final NamingContext nshMapContext;
-    private final NamingContext interfaceContext;
-
-    @Inject
-    public VppNshWriterFactory(@Nonnull final FutureJVppNsh jvppNsh,
-                               @Named("nsh-entry-context") @Nonnull final NamingContext nshEntryContext,
-                               @Named("nsh-map-context") @Nonnull final NamingContext nshMapContext,
-                               @Named("interface-context") @Nonnull final NamingContext interfaceContext) {
-        this.jvppNsh = jvppNsh;
-        this.nshEntryContext = nshEntryContext;
-        this.nshMapContext = nshMapContext;
-        this.interfaceContext = interfaceContext;
-    }
-
-    @Override
-    public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) {
-        // WriterFactory is intended for registering Writers into HC framework
-        // Writers handle ONLY config (config "true") data coming from upper layers and propagate them into lower layer/device
-        // they are triggered when RESTCONF PUT/POST on config is invoked or when NETCONF edit-config + commit operation is executed
-
-        // VppNsh has no handlers
-        //  NshEntries has no handlers
-        //   NshEntry =
-        final InstanceIdentifier<NshEntries> nshEntriesId = InstanceIdentifier.create(VppNsh.class).child(NshEntries.class);
-        final InstanceIdentifier<NshEntry> nshEntryId = nshEntriesId.child(NshEntry.class);
-        registry.subtreeAdd(
-                Sets.newHashSet(
-                    InstanceIdentifier.create(NshEntry.class).augmentation(NshMdType1Augment.class),
-                    InstanceIdentifier.create(NshEntry.class).augmentation(NshMdType2Augment.class)),
-                new GenericListWriter<>(nshEntryId, new NshEntryWriterCustomizer(jvppNsh, nshEntryContext)));
-
-        // VppNsh has no handlers
-        //  NshMaps has no handlers
-        //   NshMap =
-        final InstanceIdentifier<NshMap> nshMapId =
-              InstanceIdentifier.create(VppNsh.class).child(NshMaps.class).child(NshMap.class);
-        registry.add(new GenericListWriter<>(nshMapId, new NshMapWriterCustomizer(jvppNsh, nshMapContext, interfaceContext)));
-
-    }
-}
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java
deleted file mode 100755
index 066fb103d..000000000
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.impl.oper;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import io.fd.honeycomb.translate.read.ReadContext;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.Initialized;
-import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer;
-import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails;
-import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump;
-import io.fd.vpp.jvpp.nsh.dto.NshEntryDump;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ethernet;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.MdType1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1StateAugment;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1StateAugmentBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNsh;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntryKey;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Reader customizer responsible for nsh entry read.<br> to VPP.
- */
-public class NshEntryReaderCustomizer extends FutureJVppNshCustomizer
-        implements InitializingListReaderCustomizer<NshEntry, NshEntryKey, NshEntryBuilder>, JvppReplyConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(NshEntryReaderCustomizer.class);
-    private final NamingContext nshEntryContext;
-
-    public NshEntryReaderCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh,
-                                    @Nonnull final NamingContext nshEntryContext) {
-        super(futureJVppNsh);
-        this.nshEntryContext = checkNotNull(nshEntryContext, "nshEntryContext should not be null");
-    }
-
-    @Override
-    public void merge(@Nonnull final Builder<? extends DataObject> builder,
-                      @Nonnull final List<NshEntry> readData) {
-        ((NshEntriesBuilder) builder).setNshEntry(readData);
-    }
-
-    @Nonnull
-    @Override
-    public NshEntryBuilder getBuilder(@Nonnull final InstanceIdentifier<NshEntry> id) {
-        return new NshEntryBuilder();
-    }
-
-    private void setNshEntryMdType1Augment(@Nonnull final NshEntryBuilder builder,
-                                           @Nonnull NshEntryDetails nshEntryDetails) {
-        final NshMdType1StateAugmentBuilder augmentBuilder = new NshMdType1StateAugmentBuilder();
-        augmentBuilder.setC1((long) nshEntryDetails.c1);
-        augmentBuilder.setC2((long) nshEntryDetails.c2);
-        augmentBuilder.setC3((long) nshEntryDetails.c3);
-        augmentBuilder.setC4((long) nshEntryDetails.c4);
-
-        builder.addAugmentation(NshMdType1StateAugment.class, augmentBuilder.build());
-    }
-
-    @Override
-    public void readCurrentAttributes(@Nonnull final InstanceIdentifier<NshEntry> id,
-                                      @Nonnull final NshEntryBuilder builder, @Nonnull final ReadContext ctx)
-            throws ReadFailedException {
-        LOG.debug("Reading attributes for nsh entry: {}", id);
-        final NshEntryKey key = id.firstKeyOf(NshEntry.class);
-        checkArgument(key != null, "could not find NshEntry key in {}", id);
-        final NshEntryDump request = new NshEntryDump();
-
-        final String entryName = key.getName();
-        if (!nshEntryContext.containsIndex(entryName, ctx.getMappingContext())) {
-            LOG.debug("Could not find nsh entry {} in the naming context", entryName);
-            return;
-        }
-        request.entryIndex = nshEntryContext.getIndex(entryName, ctx.getMappingContext());
-
-        final CompletionStage<NshEntryDetailsReplyDump> nshEntryDetailsReplyDumpCompletionStage =
-                getFutureJVppNsh().nshEntryDump(request);
-        final NshEntryDetailsReplyDump reply =
-                getReplyForRead(nshEntryDetailsReplyDumpCompletionStage.toCompletableFuture(), id);
-
-        if (reply == null || reply.nshEntryDetails == null || reply.nshEntryDetails.isEmpty()) {
-            LOG.debug("Has no Nsh Entry {} in VPP. ", key.getName());
-            return;
-        }
-
-        LOG.trace("Nsh Entry : {} attributes returned from VPP: {}", key.getName(), reply);
-
-        final NshEntryDetails nshEntryDetails = reply.nshEntryDetails.get(0);
-        builder.setName(entryName);
-        builder.setKey(key);
-        builder.setVersion((short) nshEntryDetails.verOC);
-        builder.setLength((short) nshEntryDetails.length);
-
-        switch (nshEntryDetails.nextProtocol) {
-            case 1:
-                builder.setNextProtocol(Ipv4.class);
-                break;
-            case 2:
-                builder.setNextProtocol(Ipv6.class);
-                break;
-            case 3:
-                builder.setNextProtocol(Ethernet.class);
-                break;
-            default:
-                LOG.trace("Unsupported next protocol for nsh entry: {}", nshEntryDetails.nextProtocol);
-                return;
-        }
-
-        switch (nshEntryDetails.mdType) {
-            case 1: {
-                builder.setMdType(MdType1.class);
-                setNshEntryMdType1Augment(builder, nshEntryDetails);
-                break;
-            }
-            case 2: {
-                builder.setMdType(MdType1.class);
-                break;
-            }
-            default:
-                LOG.trace("Unsupported Mdtype for nsh entry: {}", nshEntryDetails.mdType);
-                return;
-        }
-
-        builder.setNsp((long) ((nshEntryDetails.nspNsi >> 8) & 0xFFFFFF));
-        builder.setNsi((short) (nshEntryDetails.nspNsi & 0xFF));
-
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Attributes for nsh entry {} successfully read: {}", id, builder.build());
-        }
-    }
-
-    @Nonnull
-    @Override
-    public List<NshEntryKey> getAllIds(@Nonnull final InstanceIdentifier<NshEntry> id,
-                                       @Nonnull final ReadContext context) throws ReadFailedException {
-        LOG.debug("Reading list of keys for nsh entry: {}", id);
-
-        final NshEntryDump request = new NshEntryDump();
-        request.entryIndex = -1; // dump call
-
-        NshEntryDetailsReplyDump reply;
-        try {
-            reply = getFutureJVppNsh().nshEntryDump(request).toCompletableFuture().get();
-        } catch (Exception e) {
-            throw new IllegalStateException("Nsh Entry dump failed", e);
-        }
-
-        if (reply == null || reply.nshEntryDetails == null) {
-            return Collections.emptyList();
-        }
-
-        final int nIdsLength = reply.nshEntryDetails.size();
-        LOG.debug("vppstate.NshEntryCustomizer.getAllIds: nIds.length={}", nIdsLength);
-        if (nIdsLength == 0) {
-            return Collections.emptyList();
-        }
-
-        final List<NshEntryKey> allIds = new ArrayList<>(nIdsLength);
-        for (NshEntryDetails detail : reply.nshEntryDetails) {
-            final String nshName = nshEntryContext.getName(detail.entryIndex, context.getMappingContext());
-            LOG.debug("vppstate.NshEntryCustomizer.getAllIds: nName={}", nshName);
-            allIds.add(new NshEntryKey(nshName));
-        }
-
-        return allIds;
-    }
-
-    @Override
-    public Initialized<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntry> init(
-            @Nonnull final InstanceIdentifier<NshEntry> id, @Nonnull final NshEntry readValue,
-            @Nonnull final ReadContext ctx) {
-        return Initialized.create(
-                InstanceIdentifier.create(VppNsh.class).child(
-                        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshEntries.class).child(
-                        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntry.class,
-                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryKey(id.firstKeyOf(NshEntry.class).getName())),
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryBuilder(readValue)
-                        .setName(readValue.getName())
-                        .build());
-    }
-}
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java
deleted file mode 100755
index 75ff21f27..000000000
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.impl.oper;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-import io.fd.honeycomb.translate.read.ReadContext;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.Initialized;
-import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer;
-import io.fd.vpp.jvpp.nsh.dto.NshMapDetails;
-import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump;
-import io.fd.vpp.jvpp.nsh.dto.NshMapDump;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Pop;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Push;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Swap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNsh;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VxlanGpe;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMapsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMapKey;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Reader customizer responsible for nsh map read.<br> to VPP.
- */
-public class NshMapReaderCustomizer extends FutureJVppNshCustomizer
-        implements InitializingListReaderCustomizer<NshMap, NshMapKey, NshMapBuilder>, JvppReplyConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(NshMapReaderCustomizer.class);
-    private final NamingContext nshMapContext;
-    private final NamingContext interfaceContext;
-
-    public NshMapReaderCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh,
-                                  @Nonnull final NamingContext nshMapContext,
-                                  @Nonnull final NamingContext interfaceContext) {
-        super(futureJVppNsh);
-        this.nshMapContext = checkNotNull(nshMapContext, "nshMapContext should not be null");
-        this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null");
-    }
-
-
-    @Override
-    public void merge(@Nonnull final Builder<? extends DataObject> builder,
-                      @Nonnull final List<NshMap> readData) {
-        ((NshMapsBuilder) builder).setNshMap(readData);
-    }
-
-    @Nonnull
-    @Override
-    public NshMapBuilder getBuilder(@Nonnull final InstanceIdentifier<NshMap> id) {
-        return new NshMapBuilder();
-    }
-
-    @Override
-    public void readCurrentAttributes(@Nonnull final InstanceIdentifier<NshMap> id,
-                                      @Nonnull final NshMapBuilder builder, @Nonnull final ReadContext ctx)
-            throws ReadFailedException {
-        LOG.debug("Reading attributes for nsh map: {}", id);
-        final NshMapKey key = id.firstKeyOf(NshMap.class);
-        checkArgument(key != null, "could not find NshMap key in {}", id);
-        final NshMapDump request = new NshMapDump();
-
-        final String mapName = key.getName();
-        if (!nshMapContext.containsIndex(mapName, ctx.getMappingContext())) {
-            LOG.debug("Could not find nsh map {} in the naming context", mapName);
-            return;
-        }
-        request.mapIndex = nshMapContext.getIndex(mapName, ctx.getMappingContext());
-
-        final CompletionStage<NshMapDetailsReplyDump> nshMapDetailsReplyDumpCompletionStage =
-                getFutureJVppNsh().nshMapDump(request);
-        final NshMapDetailsReplyDump reply =
-                getReplyForRead(nshMapDetailsReplyDumpCompletionStage.toCompletableFuture(), id);
-
-        if (reply == null || reply.nshMapDetails == null || reply.nshMapDetails.isEmpty()) {
-            LOG.debug("Has no Nsh Map {} in VPP. ", key.getName());
-            return;
-        }
-
-        LOG.trace("Nsh Map : {} attributes returned from VPP: {}", key.getName(), reply);
-
-        final NshMapDetails nshMapDetails = reply.nshMapDetails.get(0);
-        builder.setName(mapName);
-        builder.setKey(key);
-
-        builder.setNsp((long) ((nshMapDetails.nspNsi >> 8) & 0xFFFFFF));
-        builder.setNsi((short) (nshMapDetails.nspNsi & 0xFF));
-
-        builder.setMappedNsp((long) ((nshMapDetails.mappedNspNsi >> 8) & 0xFFFFFF));
-        builder.setMappedNsi((short) (nshMapDetails.mappedNspNsi & 0xFF));
-
-        switch (nshMapDetails.nshAction) {
-        case 0:
-            builder.setNshAction(Swap.class);
-            break;
-        case 1:
-            builder.setNshAction(Push.class);
-            break;
-        case 2:
-            builder.setNshAction(Pop.class);
-            break;
-        default:
-            LOG.trace("Unsupported nsh_action for nsh map: {}", nshMapDetails.nshAction);
-            return;
-    }
-
-        switch (nshMapDetails.nextNode) {
-            case 2:
-                builder.setEncapType(VxlanGpe.class);
-                break;
-            default:
-                LOG.trace("Unsupported encap type for nsh map: {}", nshMapDetails.nextNode);
-                return;
-        }
-
-        checkState(interfaceContext.containsName(nshMapDetails.swIfIndex, ctx.getMappingContext()),
-                "Mapping does not contains mapping for provider interface Index ");
-        final String interfaceName = interfaceContext.getName(nshMapDetails.swIfIndex, ctx.getMappingContext());
-        builder.setEncapIfName(interfaceName);
-
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Attributes for nsh map {} successfully read: {}", id, builder.build());
-        }
-    }
-
-    @Nonnull
-    @Override
-    public List<NshMapKey> getAllIds(@Nonnull final InstanceIdentifier<NshMap> id,
-                                     @Nonnull final ReadContext context) throws ReadFailedException {
-        LOG.debug("Reading list of keys for nsh map: {}", id);
-
-        final NshMapDump request = new NshMapDump();
-        request.mapIndex = -1; // dump call
-
-        NshMapDetailsReplyDump reply;
-        try {
-            reply = getFutureJVppNsh().nshMapDump(request).toCompletableFuture().get();
-        } catch (Exception e) {
-            throw new IllegalStateException("Nsh Map dump failed", e);
-        }
-
-        if (reply == null || reply.nshMapDetails == null) {
-            return Collections.emptyList();
-        }
-
-        final int nIdsLength = reply.nshMapDetails.size();
-        LOG.debug("vppstate.NshMapCustomizer.getAllIds: nIds.length={}", nIdsLength);
-        if (nIdsLength == 0) {
-            return Collections.emptyList();
-        }
-
-        final List<NshMapKey> allIds = new ArrayList<>(nIdsLength);
-        for (NshMapDetails detail : reply.nshMapDetails) {
-            final String nshName = nshMapContext.getName(detail.mapIndex, context.getMappingContext());
-            LOG.debug("vppstate.NshMapCustomizer.getAllIds: nName={}", nshName);
-            allIds.add(new NshMapKey(nshName));
-        }
-
-        return allIds;
-    }
-
-    @Override
-    public Initialized<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMap> init(
-            @Nonnull final InstanceIdentifier<NshMap> id,
-            @Nonnull final NshMap readValue,
-            @Nonnull final ReadContext ctx) {
-        return Initialized.create(
-                InstanceIdentifier.create(VppNsh.class).child(
-                        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshMaps.class).child(
-                        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMap.class,
-                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapKey(id.firstKeyOf(NshMap.class).getName())),
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapBuilder(readValue).setName(readValue.getName()).build());
-    }
-}
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java
deleted file mode 100755
index 5eb54669a..000000000
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.impl.oper;
-
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import io.fd.honeycomb.translate.impl.read.GenericInitListReader;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNshState;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNshStateBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntries;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMaps;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMapsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMap;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class VppNshReaderFactory implements ReaderFactory {
-
-    private final FutureJVppNsh jvppNsh;
-    private final NamingContext nshEntryContext;
-    private final NamingContext nshMapContext;
-    private final NamingContext interfaceContext;
-
-    @Inject
-    public VppNshReaderFactory(final FutureJVppNsh jvppNsh,
-                               @Named("nsh-entry-context") final NamingContext nshEntryContext,
-                               @Named("nsh-map-context") final NamingContext nshMapContext,
-                               @Named("interface-context") @Nonnull final NamingContext interfaceContext) {
-        this.jvppNsh = jvppNsh;
-        this.nshEntryContext = nshEntryContext;
-        this.nshMapContext = nshMapContext;
-        this.interfaceContext = interfaceContext;
-    }
-    @Override
-    public void init(@Nonnull final ModifiableReaderRegistryBuilder registry) {
-        // ReaderFactory is intended for registering Readers into HC framework
-        // Readers provide ONLY operational (config "false") data straight from underlying device/layer
-        // they are triggered when RESTCONF GET on operational is invoked or when NETCONF get operation is executed
-
-        // VppNshState(Structural)
-        final InstanceIdentifier<VppNshState> vppNshStateId = InstanceIdentifier.create(VppNshState.class);
-        registry.addStructuralReader(vppNshStateId, VppNshStateBuilder.class);
-
-        //  NshENtries(Structural)
-        final InstanceIdentifier<NshEntries> nshEntriesId = vppNshStateId.child(NshEntries.class);
-        registry.addStructuralReader(nshEntriesId, NshEntriesBuilder.class);
-        //  NshENtry
-        final InstanceIdentifier<NshEntry> nshEntryId = nshEntriesId.child(NshEntry.class);
-        registry.add(new GenericInitListReader<>(nshEntryId, new NshEntryReaderCustomizer(jvppNsh, nshEntryContext)));
-
-        //  NshMaps(Structural)
-        final InstanceIdentifier<NshMaps> nshMapsId = vppNshStateId.child(NshMaps.class);
-        registry.addStructuralReader(nshMapsId, NshMapsBuilder.class);
-        //  NshMap
-        final InstanceIdentifier<NshMap> nshMapId = nshMapsId.child(NshMap.class);
-        registry.add(new GenericInitListReader<>(nshMapId, new NshMapReaderCustomizer(jvppNsh, nshMapContext, interfaceContext)));
-    }
-}
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java
deleted file mode 100755
index f9b0b3b98..000000000
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.impl.util;
-
-import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import javax.annotation.Nonnull;
-
-/**
- * Abstract utility to hold the NshApi reference.
- */
-@Beta
-public abstract class FutureJVppNshCustomizer {
-
-    private final FutureJVppNsh futureJVppNsh;
-
-    public FutureJVppNshCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh) {
-        this.futureJVppNsh = Preconditions.checkNotNull(futureJVppNsh, "futureJVppNsh should not be null");
-    }
-
-    /**
-     * Get NshApi reference
-     *
-     * @return NshApi reference
-     */
-    public FutureJVppNsh getFutureJVppNsh() {
-        return futureJVppNsh;
-    }
-}
diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java
deleted file mode 100755
index 6778bae2a..000000000
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.impl.util;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.nsh.JVppNshImpl;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade;
-import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Provides future API for jvpp-nsh plugin. Must be a singleton due to shutdown hook usage.
- * Registers shutdown hook to free plugin's resources on shutdown.
- */
-public final class JVppNshProvider extends ProviderTrait<FutureJVppNshFacade> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(JVppNshProvider.class);
-
-    @Inject
-    private JVppRegistry registry;
-
-    @Override
-    protected FutureJVppNshFacade create() {
-        try {
-            final JVppNshImpl jVppNsh = new JVppNshImpl();
-            // Free jvpp-nsh plugin's resources on shutdown
-            Runtime.getRuntime().addShutdownHook(new Thread() {
-                @Override
-                public void run() {
-                    LOG.info("Unloading jvpp-nsh plugin");
-                    jVppNsh.close();
-                    LOG.info("Successfully unloaded jvpp-nsh plugin");
-                }
-            });
-
-            LOG.info("Successfully loaded jvpp-nsh plugin");
-            return new FutureJVppNshFacade(registry, jVppNsh);
-        } catch (IOException e) {
-            throw new IllegalStateException("Unable to open VPP management connection", e);
-        }
-    }
-}
-
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java
deleted file mode 100644
index 0da2c1bc4..000000000
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2016 Intel 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.vppnsh.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.name.Named;
-import com.google.inject.testing.fieldbinder.Bind;
-import com.google.inject.testing.fieldbinder.BoundFieldModule;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder;
-import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade;
-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;
-
-public class VppNshModuleTest {
-
-    @Named("honeycomb-context")
-    @Bind
-    @Mock
-    private DataBroker honeycombContext;
-
-    @Named("honeycomb-initializer")
-    @Bind
-    @Mock
-    private DataBroker honeycombInitializer;
-
-    @Named("interface-context")
-    @Bind
-    private NamingContext interfaceContext;
-
-    @Bind
-    @Mock
-    private JVppRegistry registry;
-
-    @Inject
-    private Set<ReaderFactory> readerFactories = new HashSet<>();
-
-    @Inject
-    private Set<WriterFactory> writerFactories = new HashSet<>();
-
-    @Before
-    public void setUp() throws Exception {
-
-        initMocks(this);
-
-        interfaceContext = new NamingContext("interface-", "interface-context");
-
-        Guice.createInjector(new VppNshModule(MockJVppNshProvider.class), BoundFieldModule.of(this)).injectMembers(this);
-    }
-
-    @Test
-    public void testReaderFactories() throws Exception {
-        assertThat(readerFactories, is(not(empty())));
-
-        // Test registration process (all dependencies present, topological order of readers does exist, etc.)
-        final CompositeReaderRegistryBuilder registryBuilder = new CompositeReaderRegistryBuilder();
-        readerFactories.forEach(factory -> factory.init(registryBuilder));
-        assertNotNull(registryBuilder.build());
-    }
-
-    @Test
-    public void testWriterFactories() throws Exception {
-        assertThat(writerFactories, is(not(empty())));
-
-        // Test registration process (all dependencies present, topological order of writers does exist, etc.)
-        final FlatWriterRegistryBuilder registryBuilder = new FlatWriterRegistryBuilder();
-        writerFactories.forEach(factory -> factory.init(registryBuilder));
-        assertNotNull(registryBuilder.build());
-    }
-
-    private static final class MockJVppNshProvider implements Provider<FutureJVppNshFacade> {
-
-        @Override
-        public FutureJVppNshFacade get() {
-            return mock(FutureJVppNshFacade.class);
-        }
-    }
-}
-
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java
deleted file mode 100644
index 23f861073..000000000
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * 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.vppnsh.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.verify;
-
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
-import io.fd.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry;
-import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ethernet;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.MdType1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1Augment;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1AugmentBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshEntries;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class NshEntryWriterCustomizerTest extends WriterCustomizerTest {
-
-    private static final String ENTRY_CTX_NAME = "nsh-entry-instance";
-    private static final int ENTRY_INDEX = 1;
-    private static final String ENTRY_NAME = "entry1";
-
-    @Mock
-    protected FutureJVppNsh jvppNsh;
-
-    private NamingContext nshContext;
-
-    private NshEntryWriterCustomizer customizer;
-
-    @Override
-    public void setUp() throws Exception {
-        nshContext = new NamingContext("nsh_entry", ENTRY_CTX_NAME);
-        defineMapping(mappingContext, ENTRY_NAME, ENTRY_INDEX, ENTRY_CTX_NAME);
-
-        customizer = new NshEntryWriterCustomizer(jvppNsh, nshContext);
-    }
-
-    private static NshEntry generateNshEntry(final String name) {
-        final NshEntryBuilder builder = new NshEntryBuilder();
-        builder.setName(name);
-        builder.setKey(new NshEntryKey(name));
-        builder.setVersion((short) 0);
-        builder.setLength((short) 6);
-        builder.setMdType(MdType1.class);
-        builder.setNextProtocol(Ethernet.class);
-        builder.setNsp(123L);
-        builder.setNsi((short) 4);
-
-        final NshMdType1AugmentBuilder augmentBuilder = new NshMdType1AugmentBuilder();
-        augmentBuilder.setC1((long) 1);
-        augmentBuilder.setC2((long) 2);
-        augmentBuilder.setC3((long) 3);
-        augmentBuilder.setC4((long) 4);
-        builder.addAugmentation(NshMdType1Augment.class, augmentBuilder.build());
-
-        return builder.build();
-    }
-
-    private static InstanceIdentifier<NshEntry> getNshEntryId(final String name) {
-        return InstanceIdentifier.create(NshEntries.class)
-                .child(NshEntry.class, new NshEntryKey(name));
-    }
-
-    private void whenNshAddDelEntryThenSuccess() {
-        final NshAddDelEntryReply reply = new NshAddDelEntryReply();
-        reply.entryIndex = ENTRY_INDEX;
-        doReturn(future(reply)).when(jvppNsh).nshAddDelEntry(any(NshAddDelEntry.class));
-    }
-
-    private void whenNshAddDelEntryThenFailure() {
-        doReturn(failedFuture()).when(jvppNsh).nshAddDelEntry(any(NshAddDelEntry.class));
-    }
-
-    private static NshAddDelEntry generateNshAddDelEntry(final byte isAdd) {
-        final NshAddDelEntry request = new NshAddDelEntry();
-        request.isAdd = isAdd;
-        request.verOC = 0;
-        request.length = 6;
-        request.mdType = 1;
-        request.nextProtocol = 3;
-        request.nspNsi = 123<<8 | 4;
-        request.c1 = 1;
-        request.c2 = 2;
-        request.c3 = 3;
-        request.c4 = 4;
-
-        return request;
-    }
-
-    @Test
-    public void testCreate() throws Exception {
-        final NshEntry nshEntry = generateNshEntry(ENTRY_NAME);
-        final InstanceIdentifier<NshEntry> id = getNshEntryId(ENTRY_NAME);
-
-        whenNshAddDelEntryThenSuccess();
-
-        customizer.writeCurrentAttributes(id, nshEntry, writeContext);
-
-        verify(jvppNsh).nshAddDelEntry(generateNshAddDelEntry((byte) 1));
-
-    }
-
-    @Test
-    public void testCreateFailed() throws Exception {
-        final NshEntry nshEntry = generateNshEntry(ENTRY_NAME);
-        final InstanceIdentifier<NshEntry> id = getNshEntryId(ENTRY_NAME);
-
-        whenNshAddDelEntryThenFailure();
-
-        try {
-            customizer.writeCurrentAttributes(id, nshEntry, writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(jvppNsh).nshAddDelEntry(generateNshAddDelEntry((byte) 1));
-
-            return;
-        }
-        fail("WriteFailedException.CreateFailedException was expected");
-    }
-
-    @Test
-    public void testDelete() throws Exception {
-        final NshEntry nshEntry = generateNshEntry(ENTRY_NAME);
-        final InstanceIdentifier<NshEntry> id = getNshEntryId(ENTRY_NAME);
-
-        whenNshAddDelEntryThenSuccess();
-
-        customizer.deleteCurrentAttributes(id, nshEntry, writeContext);
-
-        verify(jvppNsh).nshAddDelEntry(generateNshAddDelEntry((byte) 0));
-    }
-
-    @Test
-    public void testDeleteFailed() throws Exception {
-        final NshEntry nshEntry = generateNshEntry(ENTRY_NAME);
-        final InstanceIdentifier<NshEntry> id = getNshEntryId(ENTRY_NAME);
-
-        whenNshAddDelEntryThenFailure();
-
-        try {
-            customizer.deleteCurrentAttributes(id, nshEntry, writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(jvppNsh).nshAddDelEntry(generateNshAddDelEntry((byte) 0));
-            return;
-        }
-        fail("WriteFailedException.DeleteFailedException was expected");
-
-        customizer.deleteCurrentAttributes(id, nshEntry, writeContext);
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void testUpdate() throws Exception {
-        final NshEntry nshEntryBefore = generateNshEntry(ENTRY_NAME);
-        final InstanceIdentifier<NshEntry> id = getNshEntryId(ENTRY_NAME);
-        customizer.updateCurrentAttributes(id, nshEntryBefore, new NshEntryBuilder().build(), writeContext);
-    }
-}
\ No newline at end of file
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java
deleted file mode 100644
index 39297d427..000000000
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * 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.vppnsh.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.verify;
-
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
-import io.fd.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap;
-import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Swap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VxlanGpe;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshMaps;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class NshMapWriterCustomizerTest extends WriterCustomizerTest {
-
-    private static final String MAP_CTX_NAME = "nsh-map-instance";
-    private static final int MAP_INDEX = 1;
-    private static final String MAP_NAME = "map";
-
-    private static final String INT_CTX_NAME = "interface-instance";
-    private static final int ITF_INDEX = 3;
-    private static final String ITF_NAME = "vxlanGpeTun3";
-
-    @Mock
-    protected FutureJVppNsh jvppNsh;
-
-    private NamingContext nshContext;
-
-    private NamingContext interfaceContext;
-
-    private NshMapWriterCustomizer customizer;
-
-    @Override
-    public void setUp() throws Exception {
-        nshContext = new NamingContext("nsh_map", MAP_CTX_NAME);
-        defineMapping(mappingContext, MAP_NAME, MAP_INDEX, MAP_CTX_NAME);
-        interfaceContext = new NamingContext("interface", INT_CTX_NAME);
-        defineMapping(mappingContext, ITF_NAME, ITF_INDEX, INT_CTX_NAME);
-
-        customizer = new NshMapWriterCustomizer(jvppNsh, nshContext, interfaceContext);
-    }
-
-    private static NshMap generateNshMap(final String name) {
-        final NshMapBuilder builder = new NshMapBuilder();
-        builder.setName(name);
-        builder.setKey(new NshMapKey(name));
-        builder.setNsp(184L);
-        builder.setNsi((short) 255);
-        builder.setMappedNsp(183L);
-        builder.setMappedNsi((short) 254);
-        builder.setNshAction(Swap.class);
-        builder.setEncapType(VxlanGpe.class);
-        builder.setEncapIfName("vxlanGpeTun3");
-
-        return builder.build();
-    }
-
-    private static InstanceIdentifier<NshMap> getNshMapId(final String name) {
-        return InstanceIdentifier.create(NshMaps.class)
-                .child(NshMap.class, new NshMapKey(name));
-    }
-
-    private void whenNshAddDelMapThenSuccess() {
-        final NshAddDelMapReply reply = new NshAddDelMapReply();
-        reply.mapIndex = MAP_INDEX;
-        doReturn(future(reply)).when(jvppNsh).nshAddDelMap(any(NshAddDelMap.class));
-    }
-
-    private void whenNshAddDelMapThenFailure() {
-        doReturn(failedFuture()).when(jvppNsh).nshAddDelMap(any(NshAddDelMap.class));
-    }
-
-    private static NshAddDelMap generateNshAddDelMap(final byte isAdd) {
-        final NshAddDelMap request = new NshAddDelMap();
-        request.isAdd = isAdd;
-        request.nspNsi = 184<<8 | 255;
-        request.mappedNspNsi = 183<<8 | 254;
-        request.nshAction = 0;
-        request.swIfIndex = ITF_INDEX;
-        request.nextNode = 2;
-
-        return request;
-    }
-
-    @Test
-    public void testCreate() throws Exception {
-        final NshMap nshMap = generateNshMap(MAP_NAME);
-        final InstanceIdentifier<NshMap> id = getNshMapId(MAP_NAME);
-
-        whenNshAddDelMapThenSuccess();
-
-        customizer.writeCurrentAttributes(id, nshMap, writeContext);
-
-        verify(jvppNsh).nshAddDelMap(generateNshAddDelMap((byte) 1));
-
-    }
-
-    @Test
-    public void testCreateFailed() throws Exception {
-        final NshMap nshMap = generateNshMap(MAP_NAME);
-        final InstanceIdentifier<NshMap> id = getNshMapId(MAP_NAME);
-
-        whenNshAddDelMapThenFailure();
-
-        try {
-            customizer.writeCurrentAttributes(id, nshMap, writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(jvppNsh).nshAddDelMap(generateNshAddDelMap((byte) 1));
-
-            return;
-        }
-        fail("WriteFailedException.CreateFailedException was expected");
-    }
-
-    @Test
-    public void testDelete() throws Exception {
-        final NshMap nshMap = generateNshMap(MAP_NAME);
-        final InstanceIdentifier<NshMap> id = getNshMapId(MAP_NAME);
-
-        whenNshAddDelMapThenSuccess();
-
-        customizer.deleteCurrentAttributes(id, nshMap, writeContext);
-
-        verify(jvppNsh).nshAddDelMap(generateNshAddDelMap((byte) 0));
-    }
-
-    @Test
-    public void testDeleteFailed() throws Exception {
-        final NshMap nshMap = generateNshMap(MAP_NAME);
-        final InstanceIdentifier<NshMap> id = getNshMapId(MAP_NAME);
-
-        whenNshAddDelMapThenFailure();
-
-        try {
-            customizer.deleteCurrentAttributes(id, nshMap, writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(jvppNsh).nshAddDelMap(generateNshAddDelMap((byte) 0));
-            return;
-        }
-        fail("WriteFailedException.DeleteFailedException was expected");
-
-        customizer.deleteCurrentAttributes(id, nshMap, writeContext);
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void testUpdate() throws Exception {
-        final NshMap nshMapBefore = generateNshMap(MAP_NAME);
-        final InstanceIdentifier<NshMap> id = getNshMapId(MAP_NAME);
-        customizer.updateCurrentAttributes(id, nshMapBefore, new NshMapBuilder().build(), writeContext);
-    }
-}
\ No newline at end of file
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java
deleted file mode 100644
index 2921d07dd..000000000
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * 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.vppnsh.impl.oper;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-
-import com.google.common.collect.Lists;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
-import io.fd.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails;
-import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump;
-import io.fd.vpp.jvpp.nsh.dto.NshEntryDump;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import java.util.List;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ethernet;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.MdType1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1StateAugment;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntries;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntryKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-
-public class NshEntryReaderCustomizerTest extends
-    ListReaderCustomizerTest<NshEntry, NshEntryKey, NshEntryBuilder> {
-
-    private static final String ENTRY_CTX_NAME = "nsh-entry-instance";
-    private static final int ENTRY_INDEX_1 = 1;
-    private static final String ENTRY_NAME_1 = "entry1";
-    private static final int ENTRY_INDEX_2 = 2;
-    private static final String ENTRY_NAME_2 = "entry2";
-
-    @Mock
-    protected FutureJVppNsh jvppNsh;
-
-    private NamingContext nshContext;
-
-    public NshEntryReaderCustomizerTest() {
-        super(NshEntry.class, NshEntriesBuilder.class);
-    }
-
-    @Override
-    protected ReaderCustomizer<NshEntry, NshEntryBuilder> initCustomizer() {
-        return new NshEntryReaderCustomizer(jvppNsh, nshContext);
-    }
-
-    private static InstanceIdentifier<NshEntry> getNshEntryId(final String name) {
-        return InstanceIdentifier.create(NshEntries.class)
-            .child(NshEntry.class, new NshEntryKey(name));
-    }
-
-    @Override
-    public void setUp() throws VppBaseCallException {
-        nshContext = new NamingContext("nsh_entry", ENTRY_CTX_NAME);
-        defineMapping(mappingContext, ENTRY_NAME_1, ENTRY_INDEX_1, ENTRY_CTX_NAME);
-        defineMapping(mappingContext, ENTRY_NAME_2, ENTRY_INDEX_2, ENTRY_CTX_NAME);
-
-        final NshEntryDetailsReplyDump reply = new NshEntryDetailsReplyDump();
-        final NshEntryDetails nshEntryDetails = new NshEntryDetails();
-        nshEntryDetails.verOC = 0;
-        nshEntryDetails.length = 6;
-        nshEntryDetails.mdType = 1;
-        nshEntryDetails.nextProtocol = 3;
-        nshEntryDetails.nspNsi = (123<<8 | 4);
-        nshEntryDetails.c1 = 1;
-        nshEntryDetails.c2 = 2;
-        nshEntryDetails.c3 = 3;
-        nshEntryDetails.c4 = 4;
-        reply.nshEntryDetails = Lists.newArrayList(nshEntryDetails);
-        doReturn(future(reply)).when(jvppNsh).nshEntryDump(any(NshEntryDump.class));
-    }
-
-    @Test
-    public void testreadCurrentAttributes() throws ReadFailedException {
-
-        NshEntryBuilder builder = new NshEntryBuilder();
-        getCustomizer().readCurrentAttributes(getNshEntryId(ENTRY_NAME_1), builder, ctx);
-
-        assertEquals(0, builder.getVersion().intValue());
-        assertEquals(6, builder.getLength().intValue());
-        assertEquals(MdType1.class, builder.getMdType());
-        assertEquals(Ethernet.class, builder.getNextProtocol());
-        assertEquals(123, builder.getNsp().intValue());
-        assertEquals(4, builder.getNsi().intValue());
-        assertEquals(1, builder.getAugmentation(NshMdType1StateAugment.class).getC1().intValue());
-        assertEquals(2, builder.getAugmentation(NshMdType1StateAugment.class).getC2().intValue());
-        assertEquals(3, builder.getAugmentation(NshMdType1StateAugment.class).getC3().intValue());
-        assertEquals(4, builder.getAugmentation(NshMdType1StateAugment.class).getC4().intValue());
-
-        verify(jvppNsh).nshEntryDump(any(NshEntryDump.class));
-    }
-
-    @Test
-    public void testGetAllIds() throws ReadFailedException {
-        final NshEntryDetailsReplyDump reply = new NshEntryDetailsReplyDump();
-
-        final NshEntryDetails nshEntryDetails_1 = new NshEntryDetails();
-        nshEntryDetails_1.entryIndex = ENTRY_INDEX_1;
-        nshEntryDetails_1.verOC = 0;
-        nshEntryDetails_1.length = 6;
-        nshEntryDetails_1.mdType = 1;
-        nshEntryDetails_1.nextProtocol = 3;
-        nshEntryDetails_1.nspNsi = (123<<8 | 4);
-        nshEntryDetails_1.c1 = 1;
-        nshEntryDetails_1.c2 = 2;
-        nshEntryDetails_1.c3 = 3;
-        nshEntryDetails_1.c4 = 4;
-        reply.nshEntryDetails = Lists.newArrayList(nshEntryDetails_1);
-
-        final NshEntryDetails nshEntryDetails_2 = new NshEntryDetails();
-        nshEntryDetails_2.entryIndex = ENTRY_INDEX_2;
-        nshEntryDetails_2.verOC = 0;
-        nshEntryDetails_2.length = 6;
-        nshEntryDetails_2.mdType = 1;
-        nshEntryDetails_2.nextProtocol = 2;
-        nshEntryDetails_2.nspNsi = (223<<8 | 24);
-        nshEntryDetails_2.c1 = 21;
-        nshEntryDetails_2.c2 = 22;
-        nshEntryDetails_2.c3 = 23;
-        nshEntryDetails_2.c4 = 24;
-        reply.nshEntryDetails = Lists.newArrayList(nshEntryDetails_2);
-
-        doReturn(future(reply)).when(jvppNsh).nshEntryDump(any(NshEntryDump.class));
-
-        final List<NshEntryKey> allIds = getCustomizer().getAllIds(getNshEntryId(ENTRY_NAME_1), ctx);
-
-        assertEquals(reply.nshEntryDetails.size(), allIds.size());
-
-    }
-}
diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java
deleted file mode 100644
index 868f851a3..000000000
--- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * 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.vppnsh.impl.oper;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-
-import com.google.common.collect.Lists;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.vpp.util.NamingContext;
-import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest;
-import io.fd.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.nsh.dto.NshMapDetails;
-import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump;
-import io.fd.vpp.jvpp.nsh.dto.NshMapDump;
-import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh;
-import java.util.List;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Swap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VxlanGpe;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMaps;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMapsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMapKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-
-public class NshMapReaderCustomizerTest extends
-    ListReaderCustomizerTest<NshMap, NshMapKey, NshMapBuilder> {
-
-    private static final String MAP_CTX_NAME = "nsh-map-instance";
-    private static final int MAP_INDEX_1 = 1;
-    private static final String MAP_NAME_1 = "map1";
-
-    private static final int MAP_INDEX_2 = 2;
-    private static final String MAP_NAME_2 = "map2";
-
-    private static final String INT_CTX_NAME = "interface-instance";
-    private static final int ITF_INDEX = 3;
-    private static final String ITF_NAME = "vxlanGpeTun3";
-
-    @Mock
-    protected FutureJVppNsh jvppNsh;
-
-    private NamingContext nshContext;
-
-    private NamingContext interfaceContext;
-
-    public NshMapReaderCustomizerTest() {
-        super(NshMap.class, NshMapsBuilder.class);
-    }
-
-    @Override
-    protected ReaderCustomizer<NshMap, NshMapBuilder> initCustomizer() {
-        return new NshMapReaderCustomizer(jvppNsh, nshContext, interfaceContext);
-    }
-
-    private static InstanceIdentifier<NshMap> getNshMapId(final String name) {
-        return InstanceIdentifier.create(NshMaps.class)
-            .child(NshMap.class, new NshMapKey(name));
-    }
-
-    @Override
-    public void setUp() throws VppBaseCallException {
-        nshContext = new NamingContext("nsh_map", MAP_CTX_NAME);
-        defineMapping(mappingContext, MAP_NAME_1, MAP_INDEX_1, MAP_CTX_NAME);
-        defineMapping(mappingContext, MAP_NAME_2, MAP_INDEX_2, MAP_CTX_NAME);
-
-        interfaceContext = new NamingContext("interface", INT_CTX_NAME);
-        defineMapping(mappingContext, ITF_NAME, ITF_INDEX, INT_CTX_NAME);
-
-        final NshMapDetailsReplyDump reply = new NshMapDetailsReplyDump();
-        final NshMapDetails nshMapDetails = new NshMapDetails();
-        nshMapDetails.nspNsi = (184<<8 | 255);
-        nshMapDetails.mappedNspNsi = (183<<8 | 254);
-        nshMapDetails.nshAction = 0;
-        nshMapDetails.swIfIndex = ITF_INDEX;
-        nshMapDetails.nextNode = 2;
-        reply.nshMapDetails = Lists.newArrayList(nshMapDetails);
-        doReturn(future(reply)).when(jvppNsh).nshMapDump(any(NshMapDump.class));
-    }
-
-    @Test
-    public void testreadCurrentAttributes() throws ReadFailedException {
-
-        NshMapBuilder builder = new NshMapBuilder();
-        getCustomizer().readCurrentAttributes(getNshMapId(MAP_NAME_1), builder, ctx);
-
-        assertEquals(184, builder.getNsp().intValue());
-        assertEquals(255, builder.getNsi().intValue());
-        assertEquals(183, builder.getMappedNsp().intValue());
-        assertEquals(254, builder.getMappedNsi().intValue());
-        assertEquals(Swap.class, builder.getNshAction());
-        assertEquals(VxlanGpe.class, builder.getEncapType());
-        assertEquals("vxlanGpeTun3", builder.getEncapIfName());
-
-        verify(jvppNsh).nshMapDump(any(NshMapDump.class));
-    }
-
-    @Test
-    public void testGetAllIds() throws ReadFailedException {
-        final NshMapDetailsReplyDump reply = new NshMapDetailsReplyDump();
-
-        final NshMapDetails nshMapDetails_1 = new NshMapDetails();
-        nshMapDetails_1.mapIndex = MAP_INDEX_1;
-        nshMapDetails_1.nspNsi = (184<<8 | 255);
-        nshMapDetails_1.mappedNspNsi = (183<<8 | 254);
-        nshMapDetails_1.swIfIndex = ITF_INDEX;
-        nshMapDetails_1.nextNode = 2;
-        reply.nshMapDetails = Lists.newArrayList(nshMapDetails_1);
-
-        final NshMapDetails nshMapDetails_2 = new NshMapDetails();
-        nshMapDetails_2.mapIndex = MAP_INDEX_2;
-        nshMapDetails_2.nspNsi = (84<<8 | 255);
-        nshMapDetails_2.mappedNspNsi = (83<<8 | 254);
-        nshMapDetails_2.swIfIndex = ITF_INDEX;
-        nshMapDetails_2.nextNode = 1;
-        reply.nshMapDetails = Lists.newArrayList(nshMapDetails_2);
-
-        doReturn(future(reply)).when(jvppNsh).nshMapDump(any(NshMapDump.class));
-
-        final List<NshMapKey> allIds = getCustomizer().getAllIds(getNshMapId(MAP_NAME_1), ctx);
-
-        assertEquals(reply.nshMapDetails.size(), allIds.size());
-
-    }
-}
diff --git a/nsh/nsh_postman_collection.json b/nsh/nsh_postman_collection.json
deleted file mode 100644
index a3f3641b6..000000000
--- a/nsh/nsh_postman_collection.json
+++ /dev/null
@@ -1,343 +0,0 @@
-{
-	"id": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-	"name": "Honeycomb RESTCONF calls for NSH_SFC",
-	"description": "Common mgmt operations on VPP using Honeycomb REST interface",
-	"order": [],
-	"folders": [
-		{
-			"id": "c98829cd-4993-4e1d-58f1-97523ecb6e4f",
-			"name": "NSH_SFC",
-			"description": "",
-			"order": [
-				"2b4aaeb0-c7c1-57a9-c2a3-e07bc83dcde3",
-				"3c13298c-3619-391b-c808-5206d17a84d5",
-				"553e04ce-23d8-81de-b414-0a21b108d93d",
-				"4d8de77e-5342-3144-e904-d067eaa6a5cc",
-				"911beeb5-61c1-bdb5-a850-96171a6686ae",
-				"df2ec9ba-6a30-fc30-45db-365b666487c8",
-				"d19976f1-abc6-7c28-c69f-3bcfe8877658",
-				"23796c20-8543-9f46-8e51-413e86dfb54e"
-			],
-			"owner": "652751",
-			"collectionId": "b6a0ef73-644b-01fc-93c4-a4b260b9acff"
-		},
-		{
-			"id": "c957a93e-c4f6-53d1-0606-207eefd79ac2",
-			"name": "VXLAN-GPE-TUNNEL",
-			"description": "",
-			"order": [
-				"0a0c7d8e-6acf-96dc-81a0-6b93a65e9402",
-				"1bb24338-457a-b9ba-6834-9402e60c8c6f",
-				"ee2676f9-ce96-cae1-2d47-8515fc58dd78",
-				"477b81e3-7735-c371-967b-91cbc0cdf991"
-			],
-			"owner": "652751",
-			"collectionId": "b6a0ef73-644b-01fc-93c4-a4b260b9acff"
-		},
-		{
-			"id": "5cbd2f82-b01e-9ebe-11ef-b451d944a11b",
-			"name": "VXLAN-TUNNEL",
-			"description": "",
-			"order": [
-				"b18d5cc2-7c42-0aee-152b-27b822a7bc66",
-				"db501b30-8ac3-f889-8892-c8c8245a05fa"
-			],
-			"owner": "652751"
-		}
-	],
-	"timestamp": 1473313581383,
-	"owner": "652751",
-	"public": false,
-	"hasRequests": true,
-	"requests": [
-		{
-			"id": "0a0c7d8e-6acf-96dc-81a0-6b93a65e9402",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanGpeTun3",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1477449333942,
-			"name": "Add vxlan-gpe - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanGpeTun3\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-gpe-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan-gpe\" : {\r\n                    \"local\" : \"192.168.50.76\",\r\n                    \"remote\" : \"192.168.50.71\",\r\n                    \"vni\" : \"9\",\r\n                    \"next-protocol\" : \"ethernet\",\r\n                    \"encap-vrf-id\" : \"0\",\r\n                    \"decap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
-		},
-		{
-			"id": "1bb24338-457a-b9ba-6834-9402e60c8c6f",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanGpeTun3",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1473679728872,
-			"name": "Get vxlan-gpe - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanGpeTun3\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-gpe-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan-gpe\" : {\r\n                    \"local\" : \"192.168.50.76\",\r\n                    \"remote\" : \"192.168.50.71\",\r\n                    \"vni\" : \"9\",\r\n                    \"next-protocol\" : \"ethernet\",\r\n                    \"encap-vrf-id\" : \"0\",\r\n                    \"decap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}",
-			"folder": "c957a93e-c4f6-53d1-0606-207eefd79ac2"
-		},
-		{
-			"id": "23796c20-8543-9f46-8e51-413e86dfb54e",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-maps/nsh-map/nshMap5",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "DELETE",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1477449352823,
-			"name": "Delete nsh-map - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \"nsh-map\": [\r\n        {\r\n            \"name\": \"nshMap5\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\",\r\n            \"mapped-nsp\": \"183\",\r\n            \"mapped-nsi\": \"254\"             \r\n        }\r\n    ]\r\n}"
-		},
-		{
-			"id": "2b4aaeb0-c7c1-57a9-c2a3-e07bc83dcde3",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-entries/nsh-entry/nshEntry3",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1477448840459,
-			"name": "Add nsh-entry - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \"nsh-entry\": [\r\n        {\r\n            \"name\": \"nshEntry3\",\r\n            \"version\": \"0\",\r\n            \"length\": \"6\",\r\n            \"md-type\": \"md-type1\",\r\n            \"next-protocol\": \"ethernet\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\",\r\n            \"c1\": \"1\",\r\n            \"c2\": \"2\",\r\n            \"c3\": \"3\",\r\n            \"c4\": \"4\"\r\n        }\r\n    ]\r\n}"
-		},
-		{
-			"id": "3c13298c-3619-391b-c808-5206d17a84d5",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-entries/nsh-entry/nshEntry3",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1473313729119,
-			"name": "Get nsh-entry - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}",
-			"folder": "c98829cd-4993-4e1d-58f1-97523ecb6e4f"
-		},
-		{
-			"id": "477b81e3-7735-c371-967b-91cbc0cdf991",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanGpeTun3",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "DELETE",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1464764638498,
-			"name": "Delete vxlan-gpe - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "",
-			"folder": "c957a93e-c4f6-53d1-0606-207eefd79ac2"
-		},
-		{
-			"id": "4d8de77e-5342-3144-e904-d067eaa6a5cc",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-entries/nsh-entry/nshEntry3",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "DELETE",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1473313722940,
-			"name": "Delete nsh-entry - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \"nsh-entry\": [\r\n        {\r\n            \"name\": \"nshEntry3\",\r\n            \"version\": \"0\",\r\n            \"length\": \"6\",\r\n            \"md-type\": \"md-type1\",\r\n            \"next-protocol\": \"ethernet\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\"             \r\n        }\r\n    ]\r\n}",
-			"folder": "c98829cd-4993-4e1d-58f1-97523ecb6e4f"
-		},
-		{
-			"id": "553e04ce-23d8-81de-b414-0a21b108d93d",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/vpp-nsh:vpp-nsh-state/nsh-entries/",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1473313726281,
-			"name": "Get nsh-entry - oper",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}",
-			"folder": "c98829cd-4993-4e1d-58f1-97523ecb6e4f"
-		},
-		{
-			"id": "911beeb5-61c1-bdb5-a850-96171a6686ae",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-maps/nsh-map/nshMap5",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1477449346905,
-			"name": "Add nsh-map - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \"nsh-map\": [\r\n        {\r\n            \"name\": \"nshMap5\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\",\r\n            \"mapped-nsp\": \"183\",\r\n            \"mapped-nsi\": \"254\",\r\n            \"nsh-action\": \"push\",\r\n            \"encap-type\": \"vxlan-gpe\",\r\n            \"encap-if-name\": \"vxlanGpeTun3\"\r\n        }\r\n    ]\r\n}"
-		},
-		{
-			"id": "b18d5cc2-7c42-0aee-152b-27b822a7bc66",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "https://localhost:8443/restconf/config/ietf-interfaces:interfaces/interface/vxlanTun1",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1473679767979,
-			"name": "Add virtual ifc - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanTun1\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan\" : {\r\n                    \"src\" : \"192.168.1.6\",\r\n                    \"dst\" : \"192.168.1.9\",\r\n                    \"vni\" : \"88\",\r\n                    \"encap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}",
-			"folder": "5cbd2f82-b01e-9ebe-11ef-b451d944a11b"
-		},
-		{
-			"id": "d19976f1-abc6-7c28-c69f-3bcfe8877658",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/vpp-nsh:vpp-nsh-state/nsh-maps/",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1477449339914,
-			"name": "Get nsh-map - oper",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}"
-		},
-		{
-			"id": "db501b30-8ac3-f889-8892-c8c8245a05fa",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanTun1",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "DELETE",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1462892071867,
-			"name": "Delete virtual ifc - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"timestamp": null,
-			"rawModeData": "",
-			"folder": "5cbd2f82-b01e-9ebe-11ef-b451d944a11b"
-		},
-		{
-			"id": "df2ec9ba-6a30-fc30-45db-365b666487c8",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-maps/nsh-map/nshMap5",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1477449344219,
-			"name": "Get nsh-map - cfg",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}"
-		},
-		{
-			"id": "ee2676f9-ce96-cae1-2d47-8515fc58dd78",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/ietf-interfaces:interfaces-state/interface/vxlanGpeTun3",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1473679726298,
-			"name": "Get vxlan-gpe - oper",
-			"description": "",
-			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanGpeTun3\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-gpe-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan-gpe\" : {\r\n                    \"local\" : \"192.168.50.76\",\r\n                    \"remote\" : \"192.168.50.71\",\r\n                    \"vni\" : \"9\",\r\n                    \"next-protocol\" : \"ethernet\",\r\n                    \"encap-vrf-id\" : \"0\",\r\n                    \"decap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}",
-			"folder": "c957a93e-c4f6-53d1-0606-207eefd79ac2"
-		}
-	]
-}
\ No newline at end of file
diff --git a/nsh/pom.xml b/nsh/pom.xml
deleted file mode 100644
index 52297d846..000000000
--- a/nsh/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Intel 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>honeycomb-parent</artifactId>
-    <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../common/honeycomb-parent</relativePath>
-  </parent>
-
-  <groupId>io.fd.honeycomb.nsh</groupId>
-  <artifactId>vppnsh-aggregator</artifactId>
-  <version>1.16.12-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <description>Aggregator for Honeycomb NSH_SFC plugin</description>
-
-  <modules>
-    <module>api</module>
-    <module>impl</module>
-  </modules>
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>