From 85e8751ceb79ed8ed8eadfe70c9568b7741449f9 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Tue, 12 Apr 2016 16:19:31 +0200
Subject: HONEYCOMB-8: Fix netconf monitoring operational data provisioning

Local storage for netconf monitoring was not wired with
netconf northbound for vpp.

Change-Id: I864614ffcbf7acf16eccc65ab58b9821b2682f93
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 .../translate/util/read/BindingBrokerReader.java   | 67 ++++++++++++++++++++++
 .../translate/util/read/NoopReaderCustomizer.java  |  4 +-
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/BindingBrokerReader.java

(limited to 'v3po/translate-utils')

diff --git a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/BindingBrokerReader.java b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/BindingBrokerReader.java
new file mode 100644
index 000000000..58695cf8b
--- /dev/null
+++ b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/BindingBrokerReader.java
@@ -0,0 +1,67 @@
+/*
+ * 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.v3po.translate.util.read;
+
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
+import io.fd.honeycomb.v3po.translate.read.ReadContext;
+import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
+import io.fd.honeycomb.v3po.translate.read.Reader;
+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.common.api.data.LogicalDatastoreType;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+/**
+ * Simple DataBroker backed reader allowing to delegate reads to different brokers
+ */
+public final class BindingBrokerReader<D extends DataObject> implements Reader<D> {
+
+    private final InstanceIdentifier<D> instanceIdentifier;
+    private final DataBroker dataBroker;
+    private final LogicalDatastoreType datastoreType;
+
+    public BindingBrokerReader(final Class<D> managedDataObjectType, final DataBroker dataBroker,
+                               final LogicalDatastoreType datastoreType) {
+        this.dataBroker = dataBroker;
+        this.datastoreType = datastoreType;
+        this.instanceIdentifier = InstanceIdentifier.create(managedDataObjectType);
+    }
+
+    @Nonnull
+    @Override
+    public Optional<? extends DataObject> read(@Nonnull final InstanceIdentifier<? extends DataObject> id,
+                                               @Nonnull final ReadContext ctx) throws ReadFailedException {
+        try (final ReadOnlyTransaction readOnlyTransaction = dataBroker.newReadOnlyTransaction()) {
+            final CheckedFuture<? extends Optional<? extends DataObject>, org.opendaylight.controller.md.sal.common.api.data.ReadFailedException>
+                read = readOnlyTransaction.read(datastoreType, id);
+            try {
+                return read.checkedGet();
+            } catch (org.opendaylight.controller.md.sal.common.api.data.ReadFailedException e) {
+                throw new ReadFailedException(id, e);
+            }
+        }
+    }
+
+    @Nonnull
+    @Override
+    public InstanceIdentifier<D> getManagedDataObjectType() {
+        return instanceIdentifier;
+    }
+}
diff --git a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/NoopReaderCustomizer.java b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/NoopReaderCustomizer.java
index 5ed033755..3b703da3f 100644
--- a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/NoopReaderCustomizer.java
+++ b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/read/NoopReaderCustomizer.java
@@ -17,6 +17,7 @@
 package io.fd.honeycomb.v3po.translate.util.read;
 
 import io.fd.honeycomb.v3po.translate.Context;
+import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
 import io.fd.honeycomb.v3po.translate.spi.read.RootReaderCustomizer;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -26,7 +27,8 @@ public abstract class NoopReaderCustomizer<C extends DataObject, B extends Build
     RootReaderCustomizer<C, B> {
 
     @Override
-    public void readCurrentAttributes(InstanceIdentifier<C> id, final B builder, final Context context) {
+    public void readCurrentAttributes(InstanceIdentifier<C> id, final B builder, final Context context) throws
+        ReadFailedException {
         // Noop
     }
 }
-- 
cgit 1.2.3-korg