diff --git a/common_utils/component_state_helper.go b/common_utils/component_state_helper.go
index 3902e83a..81748633 100644
--- a/common_utils/component_state_helper.go
+++ b/common_utils/component_state_helper.go
@@ -12,7 +12,7 @@ const (
 	dbName              = "STATE_DB"
 )
 
-func getRedisDBClient() (*redis.Client, error) {
+func GetRedisDBClient() (*redis.Client, error) {
 	ns, _ := sdcfg.GetDbDefaultNamespace()
 	addr, err := sdcfg.GetDbTcpAddr(dbName, ns)
 	if err != nil {
diff --git a/gnmi_server/gnoi.go b/gnmi_server/gnoi.go
index ff27e18e..71f65568 100644
--- a/gnmi_server/gnoi.go
+++ b/gnmi_server/gnoi.go
@@ -18,6 +18,10 @@ import (
 	jwt "github.com/dgrijalva/jwt-go"
 )
 
+const (
+	stateDB  string = "STATE_DB"
+)
+
 func ReadFileStat(path string) (*gnoi_file_pb.StatInfo, error) {
 	sc, err := ssc.NewDbusClient()
 	if err != nil {
diff --git a/gnmi_server/gnoi_system.go b/gnmi_server/gnoi_system.go
index 692ef74a..fad695a0 100644
--- a/gnmi_server/gnoi_system.go
+++ b/gnmi_server/gnoi_system.go
@@ -242,7 +242,7 @@ func (srv *Server) Reboot(ctx context.Context, req *syspb.RebootRequest) (*syspb
 		return nil, status.Errorf(codes.InvalidArgument, err.Error())
 	}
 	// Initialize State DB.
-	rclient, err := common_utils.getRedisDBClient()
+	rclient, err := common_utils.GetRedisDBClient()
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, err.Error())
 	}
@@ -274,7 +274,7 @@ func (srv *Server) RebootStatus(ctx context.Context, req *syspb.RebootStatusRequ
 	log.V(1).Info("gNOI: RebootStatus")
 	resp := &syspb.RebootStatusResponse{}
 	// Initialize State DB.
-	rclient, err := common_utils.getRedisDBClient()
+	rclient, err := common_utils.GetRedisDBClient()
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, err.Error())
 	}
@@ -309,7 +309,7 @@ func (srv *Server) CancelReboot(ctx context.Context, req *syspb.CancelRebootRequ
 		return nil, status.Errorf(codes.Internal, "Invalid CancelReboot request: message is empty.")
 	}
 	// Initialize State DB.
-	rclient, err := common_utils.getRedisDBClient()
+	rclient, err := common_utils.GetRedisDBClient()
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, err.Error())
 	}
diff --git a/gnmi_server/gnoi_system_test.go b/gnmi_server/gnoi_system_test.go
index e48131f0..a728683c 100644
--- a/gnmi_server/gnoi_system_test.go
+++ b/gnmi_server/gnoi_system_test.go
@@ -117,7 +117,7 @@ func TestSystem(t *testing.T) {
 	defer cancel()
 
 	sc := syspb.NewSystemClient(conn)
-	rclient, err := common_utils.getRedisDBClient()
+	rclient, err := common_utils.GetRedisDBClient()
 	if err != nil {
 		t.Fatalf("Cannot connect to the redis server: %v.", err.Error())
 	}