aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md16
-rw-r--r--README.md116
2 files changed, 73 insertions, 59 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..c237fd6
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,16 @@
+# Changelog
+
+This file lists changes for the GoVPP releases.
+
+## 0.1.0
+> _03 July 2019_
+
+The first release that introduces versioning for GoVPP.
+
+### VPP compatibility
+
+| VPP | Status | Notes |
+|---|---|---|
+| 19.08-rc0 | ❕ | preliminary support (`19.08-rc0~478-g2f5f` recommended) |
+| 19.04 | ✔ | latest release (preffered) |
+| 19.01 | ✔ | limited capabilities (dropping soon) |
diff --git a/README.md b/README.md
index b07820e..6e78620 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
# GoVPP
-This set of packages provide the API for communication with VPP from Go.
+The GoVPP projects provides the API for communication with VPP from Go.
It consists of the following packages:
-- [adapter](adapter/): adapter between GoVPP core and the VPP binary API
-- [api](api/api.go): API for communication with GoVPP core
-- [binapi-generator](cmd/binapi-generator/): generator for the VPP binary API definitions in JSON format to Go code
+- [adapter](adapter/): adapter between GoVPP core and the VPP binary/stats API
+- [api](api/): API for communication with GoVPP core
+- [cmd/binapi-generator](cmd/binapi-generator/): generator for the VPP binary API definitions in JSON format to Go code
- [codec](codec/): handles encoding/decoding of generated messages into binary form
-- [core](core/): main functionality of the GoVPP
+- [core](core/): essential functionality of the GoVPP
- [examples](examples/): examples that use the GoVPP API in real use-cases of VPP management application
- [extras](extras/): contains Go implementation for libmemif library
- [govpp](govpp.go): provides the entry point to GoVPP functionality
-The design with separated GoVPP [API package](api/api.go) and the GoVPP [core package](core/) enables
+The design with separated GoVPP [API package](api/) and the GoVPP [core package](core/) enables
plugin-based infrastructure, where one entity acts as a master responsible for talking with VPP and multiple
entities act as clients that are using the master for the communication with VPP.
The clients can be built into standalone shared libraries without the need
@@ -21,120 +21,115 @@ of linking the GoVPP core and all its dependencies into them.
```
+--------------+
+--------------+ | |
- | | | App plugin |
+ | | | plugin |
| | | |
| App | +--------------+
| | +------+ GoVPP API |
| | | +--------------+
- +--------------+ Go |
+ +--------------+ GoVPP |
| | channels | +--------------+
| GoVPP core +------------+ | |
- | | | | App plugin |
+ | | | | plugin |
+------+-------+ | | |
| | +--------------+
-binary API | +------+ GoVPP API |
- (shmem) | +--------------+
+ | +------+ GoVPP API |
+ | binary API +--------------+
|
+------+-------+
| |
- | VPP process |
+ | VPP process |
| |
+--------------+
```
## Quick Start
-#### Code Generator
+#### Generate binapi (Go bindings)
+
+Generating Go bindings for VPP binary API from the JSON files located in the
+`/usr/share/vpp/api/` directory into the Go packages that will be created
+inside of the `binapi` directory:
-Generating Go bindings from the JSON files located in the `/usr/share/vpp/api/` directory
-into the Go packages that will be created inside of the `bin_api` directory:
```
-binapi-generator --input-dir=/usr/share/vpp/api/ --output-dir=bin_api
+binapi-generator --input-dir=/usr/share/vpp/api/ --output-dir=binapi
```
#### Example Usage
-Usage of the generated bindings:
+Here is a usage sample of the generated binapi messages:
```go
func main() {
+ // Connect to VPP
conn, _ := govpp.Connect()
defer conn.Disconnect()
+ // Open channel
ch, _ := conn.NewAPIChannel()
defer ch.Close()
-
- req := &acl.ACLAddReplace{
- ACLIndex: ^uint32(0),
- Tag: []byte("access list 1"),
- R: []acl.ACLRule{
- {
- IsPermit: 1,
- SrcIPAddr: net.ParseIP("10.0.0.0").To4(),
- SrcIPPrefixLen: 8,
- DstIPAddr: net.ParseIP("192.168.1.0").To4(),
- DstIPPrefixLen: 24,
- Proto: 6,
- },
- {
- IsPermit: 1,
- SrcIPAddr: net.ParseIP("8.8.8.8").To4(),
- SrcIPPrefixLen: 32,
- DstIPAddr: net.ParseIP("172.16.0.0").To4(),
- DstIPPrefixLen: 16,
- Proto: 6,
- },
- },
- }
- reply := &acl.ACLAddReplaceReply{}
+ // Prepare messages
+ req := &vpe.ShowVersion{}
+ reply := &vpe.ShowVersionReply{}
+
+ // Send the request
err := ch.SendRequest(req).ReceiveReply(reply)
}
```
-The example above uses simple wrapper API over underlying go channels,
+The example above uses GoVPP API to communicate over underlying go channels,
see [example client](examples/simple-client/simple_client.go)
for more examples, including the example on how to use the Go channels directly.
-## Build & Installation Procedure
+## Build & Install
+
+### Using pure Go adapters (recommended)
+
+GoVPP now supports pure Go implementation for VPP binary API. This does
+not depend on CGo or any VPP library and can be easily compiled.
+
+There are two packages providing pure Go implementations in GoVPP:
+- [`socketclient`](adapter/socketclient) - for VPP binary API (via unix socket)
+- [`statsclient`](adapter/statsclient) - for VPP stats API (via shared memory)
-GoVPP uses `vppapiclient` library from VPP codebase to communicate with VPP.
-To build GoVPP, vpp-dev package must be installed,
-either [from packages](https://wiki.fd.io/view/VPP/Installing_VPP_binaries_from_packages) or
-[from sources](https://wiki.fd.io/view/VPP/Build,_install,_and_test_images#Build_A_VPP_Package).
+### Using vppapiclient library wrapper (requires CGo)
+
+GoVPP also provides vppapiclient package which actually uses
+`vppapiclient.so` library from VPP codebase to communicate with VPP API.
+To build GoVPP, `vpp-dev` package must be installed,
+either [from packages][from-packages] or [from sources][from-sources].
To build & install `vpp-dev` from sources:
-```
+```sh
git clone https://gerrit.fd.io/r/vpp
cd vpp
make install-dep
-make bootstrap
make pkg-deb
cd build-root
sudo dpkg -i vpp*.deb
```
-To build & install all GoVPP binaries into your `$GOPATH`:
+To build & install GoVPP:
-```
-go get git.fd.io/govpp.git
+```sh
+go get -u git.fd.io/govpp.git
cd $GOPATH/src/git.fd.io/govpp.git
-make
+make test
make install
```
-## Building Go bindings from VPP binary APIs
+## Generating Go bindings with binapi-generator
-Once you have `binapi-generator` installed in your `$GOPATH`, you can use it to generate Go bindings from
-VPP APis in JSON format. The JSON input can be specified as a single file (`input-file` argument), or
+Once you have `binapi-generator` installed, you can use it to generate Go bindings for VPP binary API
+using VPP APIs in JSON format. The JSON input can be specified as a single file (`input-file` argument), or
as a directory that will be scanned for all `.json` files (`input-dir`). The generated Go bindings will
be placed into `output-dir` (by default current working directory), where each Go package will be placed into
a separated directory, e.g.:
-```
-binapi-generator --input-file=examples/bin_api/acl.api.json --output-dir=examples/bin_api
-binapi-generator --input-dir=examples/bin_api --output-dir=examples/bin_api
+```sh
+binapi-generator --input-file=acl.api.json --output-dir=binapi
+binapi-generator --input-dir=/usr/share/vpp/api/core --output-dir=binapi
```
In Go, [go generate](https://blog.golang.org/generate) tool can be leveraged to ease the code generation
@@ -145,3 +140,6 @@ that are dependent on generated code using special comments, e.g. the one from
```go
//go:generate binapi-generator --input-dir=bin_api --output-dir=bin_api
```
+
+[from-packages]: https://wiki.fd.io/view/VPP/Installing_VPP_binaries_from_packages
+[from-sources]: https://wiki.fd.io/view/VPP/Build,_install,_and_test_images#Build_A_VPP_Package