HONEYCOMB-21 Vpp-integration minimal distribution

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

2 files changed, 88 insertions, 62 deletions

diff --git a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RealtimeMappingContext.java b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RealtimeMappingContext.java
new file mode 100644
index 000000000..3d1b5222f
--- /dev/null
+++ b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RealtimeMappingContext.java
@@ -0,0 +1,87 @@
+/*
+ * 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.translate.util;
+
+import com.google.common.base.Optional;
+import io.fd.honeycomb.translate.MappingContext;
+import javax.annotation.Nonnull;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public final class RealtimeMappingContext implements MappingContext {
+
+    private DataBroker contextBindingBrokerDependency;
+
+    public RealtimeMappingContext(final DataBroker contextBindingBrokerDependency) {
+        this.contextBindingBrokerDependency = contextBindingBrokerDependency;
+    }
+
+    @Override
+    public <T extends DataObject> Optional<T> read(@Nonnull final InstanceIdentifier<T> currentId) {
+        try(ReadOnlyTransaction tx = contextBindingBrokerDependency.newReadOnlyTransaction()) {
+            try {
+                return tx.read(LogicalDatastoreType.OPERATIONAL, currentId).checkedGet();
+            } catch (ReadFailedException e) {
+                throw new IllegalStateException("Unable to perform read of " + currentId, e);
+            }
+        }
+    }
+
+    @Override
+    public void delete(final InstanceIdentifier<?> path) {
+        final WriteTransaction writeTx = contextBindingBrokerDependency.newWriteOnlyTransaction();
+        writeTx.delete(LogicalDatastoreType.OPERATIONAL, path);
+        try {
+            writeTx.submit().checkedGet();
+        } catch (TransactionCommitFailedException e) {
+            throw new IllegalStateException("Unable to perform delete of " + path, e);
+        }
+    }
+
+    @Override
+    public <T extends DataObject> void merge(final InstanceIdentifier<T> path, final T data) {
+        final WriteTransaction writeTx = contextBindingBrokerDependency.newWriteOnlyTransaction();
+        writeTx.merge(LogicalDatastoreType.OPERATIONAL, path, data);
+        try {
+            writeTx.submit().checkedGet();
+        } catch (TransactionCommitFailedException e) {
+            throw new IllegalStateException("Unable to perform merge of " + path, e);
+        }
+    }
+
+    @Override
+    public <T extends DataObject> void put(final InstanceIdentifier<T> path, final T data) {
+        final WriteTransaction writeTx = contextBindingBrokerDependency.newWriteOnlyTransaction();
+        writeTx.put(LogicalDatastoreType.OPERATIONAL, path, data);
+        try {
+            writeTx.submit().checkedGet();
+        } catch (TransactionCommitFailedException e) {
+            throw new IllegalStateException("Unable to perform put of " + path, e);
+        }
+    }
+
+    @Override
+    public void close() {
+        // Noop
+    }
+}
diff --git a/infra/translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/translate/utils/rev160406/RealtimeMappingContextModule.java b/infra/translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/translate/utils/rev160406/RealtimeMappingContextModule.java
index d245682d0..f882b9ba4 100644
--- a/infra/translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/translate/utils/rev160406/RealtimeMappingContextModule.java
+++ b/infra/translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/translate/utils/rev160406/RealtimeMappingContextModule.java
@@ -1,16 +1,5 @@
 package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.translate.utils.rev160406;
 
-import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.MappingContext;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
 public class RealtimeMappingContextModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.translate.utils.rev160406.AbstractRealtimeMappingContextModule {
     public RealtimeMappingContextModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
@@ -28,57 +17,7 @@ public class RealtimeMappingContextModule extends org.opendaylight.yang.gen.v1.u
     @Override
     public java.lang.AutoCloseable createInstance() {
         // Provides real time CRUD on top of Context data broker
-        return new MappingContext() {
-
-            @Override
-            public <T extends DataObject> Optional<T> read(@Nonnull final InstanceIdentifier<T> currentId) {
-                try(ReadOnlyTransaction tx = getContextBindingBrokerDependency().newReadOnlyTransaction()) {
-                    try {
-                        return tx.read(LogicalDatastoreType.OPERATIONAL, currentId).checkedGet();
-                    } catch (ReadFailedException e) {
-                        throw new IllegalStateException("Unable to perform read of " + currentId, e);
-                    }
-                }
-            }
-
-            @Override
-            public void delete(final InstanceIdentifier<?> path) {
-                final WriteTransaction writeTx = getContextBindingBrokerDependency().newWriteOnlyTransaction();
-                writeTx.delete(LogicalDatastoreType.OPERATIONAL, path);
-                try {
-                    writeTx.submit().checkedGet();
-                } catch (TransactionCommitFailedException e) {
-                    throw new IllegalStateException("Unable to perform delete of " + path, e);
-                }
-            }
-
-            @Override
-            public <T extends DataObject> void merge(final InstanceIdentifier<T> path, final T data) {
-                final WriteTransaction writeTx = getContextBindingBrokerDependency().newWriteOnlyTransaction();
-                writeTx.merge(LogicalDatastoreType.OPERATIONAL, path, data);
-                try {
-                    writeTx.submit().checkedGet();
-                } catch (TransactionCommitFailedException e) {
-                    throw new IllegalStateException("Unable to perform merge of " + path, e);
-                }
-            }
-
-            @Override
-            public <T extends DataObject> void put(final InstanceIdentifier<T> path, final T data) {
-                final WriteTransaction writeTx = getContextBindingBrokerDependency().newWriteOnlyTransaction();
-                writeTx.put(LogicalDatastoreType.OPERATIONAL, path, data);
-                try {
-                    writeTx.submit().checkedGet();
-                } catch (TransactionCommitFailedException e) {
-                    throw new IllegalStateException("Unable to perform put of " + path, e);
-                }
-            }
-
-            @Override
-            public void close() {
-                // Noop
-            }
-        };
+        return new io.fd.honeycomb.translate.util.RealtimeMappingContext(getContextBindingBrokerDependency());
     }
 
 }