diff --git a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
index bb2d16b..78a0222 100644
--- a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
+++ b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
@@ -349,6 +349,24 @@
         return true;
     }
 
+    /**
+     * Returns the internal P4 device ID associated with this client.
+     *
+     * @return P4 device ID
+     */
+    public int p4DeviceId() {
+        return p4DeviceId;
+    }
+
+    /**
+     * For testing purpose only. TODO: remove before release.
+     *
+     * @return blocking stub
+     */
+    public P4RuntimeGrpc.P4RuntimeBlockingStub blockingStub() {
+        return this.blockingStub;
+    }
+
 
     @Override
     public void shutdown() {