X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=govpp.go;h=0ca020a3a91c62e5c0aadb0c197ed28fdfc54dae;hb=a4112fac7b86fe09650d2bb57969fe46404edd7d;hp=d66d5dc564f68aa04a4258934f2951e57d0abaa9;hpb=e6cca4bfd215aba51d58bf0bb046c16c081e42a3;p=govpp.git

diff --git a/govpp.go b/govpp.go
index d66d5dc..0ca020a 100644
--- a/govpp.go
+++ b/govpp.go
@@ -15,41 +15,38 @@
 package govpp
 
 import (
-	"git.fd.io/govpp.git/adapter"
-	"git.fd.io/govpp.git/adapter/vppapiclient"
-	"git.fd.io/govpp.git/core"
 	"time"
-)
 
-var (
-	// VPP binary API adapter that will be used in the subsequent Connect calls
-	vppAdapter adapter.VppAPI
+	"git.fd.io/govpp.git/adapter"
+	"git.fd.io/govpp.git/adapter/socketclient"
+	"git.fd.io/govpp.git/core"
+	"git.fd.io/govpp.git/internal/version"
 )
 
-func getVppAdapter(shm string) adapter.VppAPI {
-	if vppAdapter == nil {
-		vppAdapter = vppapiclient.NewVppClient(shm)
-	}
-	return vppAdapter
+// Connect connects to the VPP API using a new adapter instance created with NewVppAPIAdapter.
+//
+// This call blocks until VPP is connected, or an error occurs.
+// Only one connection attempt will be performed.
+func Connect(target string) (*core.Connection, error) {
+	return core.Connect(NewVppAdapter(target))
 }
 
-// SetVppAdapter sets the adapter that will be used for connections to VPP in the subsequent `Connect` calls.
-func SetVppAdapter(a adapter.VppAPI) {
-	vppAdapter = a
+// AsyncConnect asynchronously connects to the VPP API using a new adapter instance
+// created with NewVppAPIAdapter.
+//
+// This call does not block until connection is established, it returns immediately.
+// The caller is supposed to watch the returned ConnectionState channel for connection events.
+// In case of disconnect, the library will asynchronously try to reconnect.
+func AsyncConnect(target string, attempts int, interval time.Duration) (*core.Connection, chan core.ConnectionEvent, error) {
+	return core.AsyncConnect(NewVppAdapter(target), attempts, interval)
 }
 
-// Connect connects the govpp core to VPP either using the default VPP Adapter, or using the adapter previously
-// set by SetAdapter (useful mostly just for unit/integration tests with mocked VPP adapter).
-// This call blocks until VPP is connected, or an error occurs. Only one connection attempt will be performed.
-func Connect(shm string) (*core.Connection, error) {
-	return core.Connect(getVppAdapter(shm))
+// NewVppAdapter returns new instance of VPP adapter for connecting to VPP API.
+var NewVppAdapter = func(target string) adapter.VppAPI {
+	return socketclient.NewVppClient(target)
 }
 
-// AsyncConnect asynchronously connects the govpp core to VPP either using the default VPP Adapter,
-// or using the adapter previously set by SetAdapter.
-// This call does not block until connection is established, it returns immediately. The caller is
-// supposed to watch the returned ConnectionState channel for Connected/Disconnected events.
-// In case of disconnect, the library will asynchronously try to reconnect.
-func AsyncConnect(shm string, attempts int, interval time.Duration) (*core.Connection, chan core.ConnectionEvent, error) {
-	return core.AsyncConnect(getVppAdapter(shm), attempts, interval)
+// Version returns version of GoVPP.
+func Version() string {
+	return version.String()
 }