X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=govpp.go;h=f36ce40a57b7de0510bb4304a13b8bbb9f383029;hb=e45d8802fd8de3602db630d75b370ff804000da9;hp=6f0cc2e826d149af25b1c4acbc77eee523263671;hpb=2d07847237e754d9050f06f565baa430c70ed937;p=govpp.git

diff --git a/govpp.go b/govpp.go
index 6f0cc2e..f36ce40 100644
--- a/govpp.go
+++ b/govpp.go
@@ -15,21 +15,35 @@
 package govpp
 
 import (
+	"time"
+
 	"git.fd.io/govpp.git/adapter"
-	"git.fd.io/govpp.git/adapter/vppapiclient"
+	"git.fd.io/govpp.git/adapter/socketclient"
 	"git.fd.io/govpp.git/core"
 )
 
-var vppAdapter adapter.VppAdapter // VPP Adapter that will be used in the subsequent Connect calls
+var (
+	// VPP binary API adapter that will be used in the subsequent Connect calls
+	vppAdapter adapter.VppAPI
+)
+
+func getVppAdapter(addr string) adapter.VppAPI {
+	if vppAdapter == nil {
+		vppAdapter = socketclient.NewVppClient(addr)
+	}
+	return vppAdapter
+}
+
+// SetVppAdapter sets the adapter that will be used for connections to VPP in the subsequent `Connect` calls.
+func SetVppAdapter(a adapter.VppAPI) {
+	vppAdapter = a
+}
 
 // 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() (*core.Connection, error) {
-	if vppAdapter == nil {
-		vppAdapter = vppapiclient.NewVppAdapter()
-	}
-	return core.Connect(vppAdapter)
+func Connect(shm string) (*core.Connection, error) {
+	return core.Connect(getVppAdapter(shm))
 }
 
 // AsyncConnect asynchronously connects the govpp core to VPP either using the default VPP Adapter,
@@ -37,14 +51,6 @@ func Connect() (*core.Connection, error) {
 // 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() (*core.Connection, chan core.ConnectionEvent, error) {
-	if vppAdapter == nil {
-		vppAdapter = vppapiclient.NewVppAdapter()
-	}
-	return core.AsyncConnect(vppAdapter)
-}
-
-// SetAdapter sets the adapter that will be used for connections to VPP in the subsequent `Connect` calls.
-func SetAdapter(ad adapter.VppAdapter) {
-	vppAdapter = ad
+func AsyncConnect(shm string, attempts int, interval time.Duration) (*core.Connection, chan core.ConnectionEvent, error) {
+	return core.AsyncConnect(getVppAdapter(shm), attempts, interval)
 }