Removed global binapi VPP adapter

[govpp.git] / govpp.go

diff --git a/govpp.go b/govpp.go
index 5d3ed7f..822739c 100644 (file)
--- a/govpp.go
+++ b/govpp.go
@@ -15,23 +15,24 @@
 package govpp
 
 import (
-       "git.fd.io/govpp.git/adapter"
-       "git.fd.io/govpp.git/adapter/vppapiclient"
+       "time"
+
+       "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
-
 // 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) {
-       if vppAdapter == nil {
-               vppAdapter = vppapiclient.NewVppAdapter()
-       }
-       return core.Connect(vppAdapter)
+// 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(socketclient.NewVppClient(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 the connection is established, it returns immediately. The caller is
+// supposed to watch the returned ConnectionState channel for Connected/Disconnected events.
+// In case of a 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(socketclient.NewVppClient(shm), attempts, interval)
 }