1 files changed, 22 insertions, 11 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppstate/VersionCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppstate/VersionCustomizer.java
index 31e3166bb..1db8217f9 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppstate/VersionCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppstate/VersionCustomizer.java
@@ -17,8 +17,10 @@
 package io.fd.honeycomb.v3po.translate.v3po.vppstate;
 
 import io.fd.honeycomb.v3po.translate.Context;
-import io.fd.honeycomb.v3po.translate.v3po.util.VppApiCustomizer;
+import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
 import io.fd.honeycomb.v3po.translate.spi.read.ChildReaderCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.util.FutureJVppCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.utils.V3poUtils;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppStateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.state.Version;
@@ -26,14 +28,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.openvpp.vppjapi.vppVersion;
+import org.openvpp.jvpp.dto.ShowVersion;
+import org.openvpp.jvpp.dto.ShowVersionReply;
+import org.openvpp.jvpp.future.FutureJVpp;
 
 public final class VersionCustomizer
-    extends VppApiCustomizer
+    extends FutureJVppCustomizer
     implements ChildReaderCustomizer<Version, VersionBuilder> {
 
-    public VersionCustomizer(@Nonnull final org.openvpp.vppjapi.vppApi vppApi) {
-        super(vppApi);
+    public VersionCustomizer(@Nonnull final FutureJVpp futureJVpp) {
+        super(futureJVpp);
     }
 
     @Override
@@ -49,11 +53,18 @@ public final class VersionCustomizer
 
     @Override
     public void readCurrentAttributes(@Nonnull InstanceIdentifier<Version> id, @Nonnull final VersionBuilder builder,
-                                      @Nonnull final Context context) {
-        final vppVersion vppVersion = getVppApi().getVppVersion();
-        builder.setBranch(vppVersion.gitBranch);
-        builder.setName(vppVersion.programName);
-        builder.setBuildDate(vppVersion.buildDate);
-        builder.setBuildDirectory(vppVersion.buildDirectory);
+                                      @Nonnull final Context context) throws ReadFailedException {
+
+        ShowVersionReply reply;
+        try {
+            reply = getFutureJVpp().showVersion(new ShowVersion()).toCompletableFuture().get();
+        } catch (Exception e) {
+            throw new ReadFailedException(id, e);
+        }
+        builder.setBranch(V3poUtils.toString(reply.version));
+        builder.setName(V3poUtils.toString(reply.program));
+        builder.setBuildDate(V3poUtils.toString(reply.buildDate));
+        builder.setBuildDirectory(V3poUtils.toString(reply.buildDirectory));
     }
+
 }