X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=govpp.go;h=f36ce40a57b7de0510bb4304a13b8bbb9f383029;hb=ceed73403bdb61387d04be8b47183e9c4a970749;hp=5d3ed7f10ccf2c3a77f2d2a2fbd2d4886b738ab5;hpb=cf7fbee5c540d16a162236b476d438c66f513ad9;p=govpp.git

diff --git a/govpp.go b/govpp.go
index 5d3ed7f..f36ce40 100644
--- a/govpp.go
+++ b/govpp.go
@@ -15,23 +15,42 @@
 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
+)
 
-// 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).
-func Connect() (*core.Connection, error) {
+func getVppAdapter(addr string) adapter.VppAPI {
 	if vppAdapter == nil {
-		vppAdapter = vppapiclient.NewVppAdapter()
+		vppAdapter = socketclient.NewVppClient(addr)
 	}
-	return core.Connect(vppAdapter)
+	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(shm string) (*core.Connection, error) {
+	return core.Connect(getVppAdapter(shm))
 }
 
-// SetAdapter sets the adapter that will be used for connections to VPP in the subsequent `Connect` calls.
-func SetAdapter(ad adapter.VppAdapter) {
-	vppAdapter = ad
+// 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)
 }