From 9313c984c138a9930d4c3eea980d8e20b7bd77fa Mon Sep 17 00:00:00 2001
From: Ondrej Fabry <ofabry@cisco.com>
Date: Wed, 17 Jul 2019 06:47:06 +0200
Subject: [PATCH] Update VPP to 19.08-rc0.666-g9082b43dd (#1413)

* Update VPP to 19.08-rc0.666-g9082b43dd

Signed-off-by: Ondrej Fabry <ofabry@cisco.com>

* Update VPP to 19.08-rc0.673-ga2e4451db

Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
---
 plugins/vpp/binapi/vpp1908/abf/abf.ba.go     | 167 +++++++++++-
 plugins/vpp/binapi/vpp1908/ip/ip.ba.go       | 167 +++++++++++-
 plugins/vpp/binapi/vpp1908/ipsec/ipsec.ba.go | 167 +++++++++++-
 plugins/vpp/binapi/vpp1908/l2/l2.ba.go       | 167 +++++++++++-
 plugins/vpp/binapi/vpp1908/nat/nat.ba.go     | 167 +++++++++++-
 plugins/vpp/binapi/vpp1908/punt/punt.ba.go   | 173 +++++++++++--
 plugins/vpp/binapi/vpp1908/vpe/vpe.ba.go     | 257 ++++++++++++++++++-
 scripts/genbinapi.sh                         |   2 +-
 scripts/install_protobuf.sh                  |   0
 vpp.env                                      |   2 +-
 10 files changed, 1177 insertions(+), 92 deletions(-)
 mode change 100644 => 100755 scripts/install_protobuf.sh

diff --git a/plugins/vpp/binapi/vpp1908/abf/abf.ba.go b/plugins/vpp/binapi/vpp1908/abf/abf.ba.go
index af524a4b68..cd23e8d82e 100644
--- a/plugins/vpp/binapi/vpp1908/abf/abf.ba.go
+++ b/plugins/vpp/binapi/vpp1908/abf/abf.ba.go
@@ -5,7 +5,7 @@
 Package abf is a generated VPP binary API for 'abf' module.
 
 It consists of:
-	  5 enums
+	  7 enums
 	  2 aliases
 	 10 types
 	  1 union
@@ -29,7 +29,7 @@ const (
 	// APIVersion is the API version of this module.
 	APIVersion = "1.0.0"
 	// VersionCrc is the CRC of this module.
-	VersionCrc = 0x25b8fffd
+	VersionCrc = 0x89235b51
 )
 
 // AddressFamily represents VPP binary API enum 'address_family'.
@@ -175,28 +175,167 @@ func (x FibPathType) String() string {
 	return strconv.Itoa(int(x))
 }
 
+// IPDscp represents VPP binary API enum 'ip_dscp'.
+type IPDscp uint8
+
+const (
+	IP_API_DSCP_CS0  IPDscp = 0
+	IP_API_DSCP_CS1  IPDscp = 8
+	IP_API_DSCP_AF11 IPDscp = 10
+	IP_API_DSCP_AF12 IPDscp = 12
+	IP_API_DSCP_AF13 IPDscp = 14
+	IP_API_DSCP_CS2  IPDscp = 16
+	IP_API_DSCP_AF21 IPDscp = 18
+	IP_API_DSCP_AF22 IPDscp = 20
+	IP_API_DSCP_AF23 IPDscp = 22
+	IP_API_DSCP_CS3  IPDscp = 24
+	IP_API_DSCP_AF31 IPDscp = 26
+	IP_API_DSCP_AF32 IPDscp = 28
+	IP_API_DSCP_AF33 IPDscp = 30
+	IP_API_DSCP_CS4  IPDscp = 32
+	IP_API_DSCP_AF41 IPDscp = 34
+	IP_API_DSCP_AF42 IPDscp = 36
+	IP_API_DSCP_AF43 IPDscp = 38
+	IP_API_DSCP_CS5  IPDscp = 40
+	IP_API_DSCP_EF   IPDscp = 46
+	IP_API_DSCP_CS6  IPDscp = 48
+	IP_API_DSCP_CS7  IPDscp = 50
+)
+
+var IPDscp_name = map[uint8]string{
+	0:  "IP_API_DSCP_CS0",
+	8:  "IP_API_DSCP_CS1",
+	10: "IP_API_DSCP_AF11",
+	12: "IP_API_DSCP_AF12",
+	14: "IP_API_DSCP_AF13",
+	16: "IP_API_DSCP_CS2",
+	18: "IP_API_DSCP_AF21",
+	20: "IP_API_DSCP_AF22",
+	22: "IP_API_DSCP_AF23",
+	24: "IP_API_DSCP_CS3",
+	26: "IP_API_DSCP_AF31",
+	28: "IP_API_DSCP_AF32",
+	30: "IP_API_DSCP_AF33",
+	32: "IP_API_DSCP_CS4",
+	34: "IP_API_DSCP_AF41",
+	36: "IP_API_DSCP_AF42",
+	38: "IP_API_DSCP_AF43",
+	40: "IP_API_DSCP_CS5",
+	46: "IP_API_DSCP_EF",
+	48: "IP_API_DSCP_CS6",
+	50: "IP_API_DSCP_CS7",
+}
+
+var IPDscp_value = map[string]uint8{
+	"IP_API_DSCP_CS0":  0,
+	"IP_API_DSCP_CS1":  8,
+	"IP_API_DSCP_AF11": 10,
+	"IP_API_DSCP_AF12": 12,
+	"IP_API_DSCP_AF13": 14,
+	"IP_API_DSCP_CS2":  16,
+	"IP_API_DSCP_AF21": 18,
+	"IP_API_DSCP_AF22": 20,
+	"IP_API_DSCP_AF23": 22,
+	"IP_API_DSCP_CS3":  24,
+	"IP_API_DSCP_AF31": 26,
+	"IP_API_DSCP_AF32": 28,
+	"IP_API_DSCP_AF33": 30,
+	"IP_API_DSCP_CS4":  32,
+	"IP_API_DSCP_AF41": 34,
+	"IP_API_DSCP_AF42": 36,
+	"IP_API_DSCP_AF43": 38,
+	"IP_API_DSCP_CS5":  40,
+	"IP_API_DSCP_EF":   46,
+	"IP_API_DSCP_CS6":  48,
+	"IP_API_DSCP_CS7":  50,
+}
+
+func (x IPDscp) String() string {
+	s, ok := IPDscp_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
+// IPEcn represents VPP binary API enum 'ip_ecn'.
+type IPEcn uint8
+
+const (
+	IP_API_ECN_NONE IPEcn = 0
+	IP_API_ECN_ECT0 IPEcn = 1
+	IP_API_ECN_ECT1 IPEcn = 2
+	IP_API_ECN_CE   IPEcn = 3
+)
+
+var IPEcn_name = map[uint8]string{
+	0: "IP_API_ECN_NONE",
+	1: "IP_API_ECN_ECT0",
+	2: "IP_API_ECN_ECT1",
+	3: "IP_API_ECN_CE",
+}
+
+var IPEcn_value = map[string]uint8{
+	"IP_API_ECN_NONE": 0,
+	"IP_API_ECN_ECT0": 1,
+	"IP_API_ECN_ECT1": 2,
+	"IP_API_ECN_CE":   3,
+}
+
+func (x IPEcn) String() string {
+	s, ok := IPEcn_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
 // IPProto represents VPP binary API enum 'ip_proto'.
 type IPProto uint32
 
 const (
-	IP_API_PROTO_TCP   IPProto = 6
-	IP_API_PROTO_UDP   IPProto = 17
-	IP_API_PROTO_EIGRP IPProto = 88
-	IP_API_PROTO_OSPF  IPProto = 89
+	IP_API_PROTO_HOPOPT   IPProto = 0
+	IP_API_PROTO_ICMP     IPProto = 1
+	IP_API_PROTO_IGMP     IPProto = 2
+	IP_API_PROTO_TCP      IPProto = 6
+	IP_API_PROTO_UDP      IPProto = 17
+	IP_API_PROTO_GRE      IPProto = 47
+	IP_API_PROTO_AH       IPProto = 50
+	IP_API_PROTO_ESP      IPProto = 51
+	IP_API_PROTO_EIGRP    IPProto = 88
+	IP_API_PROTO_OSPF     IPProto = 89
+	IP_API_PROTO_SCTP     IPProto = 132
+	IP_API_PROTO_RESERVED IPProto = 255
 )
 
 var IPProto_name = map[uint32]string{
-	6:  "IP_API_PROTO_TCP",
-	17: "IP_API_PROTO_UDP",
-	88: "IP_API_PROTO_EIGRP",
-	89: "IP_API_PROTO_OSPF",
+	0:   "IP_API_PROTO_HOPOPT",
+	1:   "IP_API_PROTO_ICMP",
+	2:   "IP_API_PROTO_IGMP",
+	6:   "IP_API_PROTO_TCP",
+	17:  "IP_API_PROTO_UDP",
+	47:  "IP_API_PROTO_GRE",
+	50:  "IP_API_PROTO_AH",
+	51:  "IP_API_PROTO_ESP",
+	88:  "IP_API_PROTO_EIGRP",
+	89:  "IP_API_PROTO_OSPF",
+	132: "IP_API_PROTO_SCTP",
+	255: "IP_API_PROTO_RESERVED",
 }
 
 var IPProto_value = map[string]uint32{
-	"IP_API_PROTO_TCP":   6,
-	"IP_API_PROTO_UDP":   17,
-	"IP_API_PROTO_EIGRP": 88,
-	"IP_API_PROTO_OSPF":  89,
+	"IP_API_PROTO_HOPOPT":   0,
+	"IP_API_PROTO_ICMP":     1,
+	"IP_API_PROTO_IGMP":     2,
+	"IP_API_PROTO_TCP":      6,
+	"IP_API_PROTO_UDP":      17,
+	"IP_API_PROTO_GRE":      47,
+	"IP_API_PROTO_AH":       50,
+	"IP_API_PROTO_ESP":      51,
+	"IP_API_PROTO_EIGRP":    88,
+	"IP_API_PROTO_OSPF":     89,
+	"IP_API_PROTO_SCTP":     132,
+	"IP_API_PROTO_RESERVED": 255,
 }
 
 func (x IPProto) String() string {
diff --git a/plugins/vpp/binapi/vpp1908/ip/ip.ba.go b/plugins/vpp/binapi/vpp1908/ip/ip.ba.go
index 3426f811ba..246c2f0d76 100644
--- a/plugins/vpp/binapi/vpp1908/ip/ip.ba.go
+++ b/plugins/vpp/binapi/vpp1908/ip/ip.ba.go
@@ -5,7 +5,7 @@
 Package ip is a generated VPP binary API for 'ip' module.
 
 It consists of:
-	  7 enums
+	  9 enums
 	  3 aliases
 	 16 types
 	  1 union
@@ -29,7 +29,7 @@ const (
 	// APIVersion is the API version of this module.
 	APIVersion = "3.0.0"
 	// VersionCrc is the CRC of this module.
-	VersionCrc = 0x66000d59
+	VersionCrc = 0xc28cff0d
 )
 
 // AddressFamily represents VPP binary API enum 'address_family'.
@@ -175,6 +175,121 @@ func (x FibPathType) String() string {
 	return strconv.Itoa(int(x))
 }
 
+// IPDscp represents VPP binary API enum 'ip_dscp'.
+type IPDscp uint8
+
+const (
+	IP_API_DSCP_CS0  IPDscp = 0
+	IP_API_DSCP_CS1  IPDscp = 8
+	IP_API_DSCP_AF11 IPDscp = 10
+	IP_API_DSCP_AF12 IPDscp = 12
+	IP_API_DSCP_AF13 IPDscp = 14
+	IP_API_DSCP_CS2  IPDscp = 16
+	IP_API_DSCP_AF21 IPDscp = 18
+	IP_API_DSCP_AF22 IPDscp = 20
+	IP_API_DSCP_AF23 IPDscp = 22
+	IP_API_DSCP_CS3  IPDscp = 24
+	IP_API_DSCP_AF31 IPDscp = 26
+	IP_API_DSCP_AF32 IPDscp = 28
+	IP_API_DSCP_AF33 IPDscp = 30
+	IP_API_DSCP_CS4  IPDscp = 32
+	IP_API_DSCP_AF41 IPDscp = 34
+	IP_API_DSCP_AF42 IPDscp = 36
+	IP_API_DSCP_AF43 IPDscp = 38
+	IP_API_DSCP_CS5  IPDscp = 40
+	IP_API_DSCP_EF   IPDscp = 46
+	IP_API_DSCP_CS6  IPDscp = 48
+	IP_API_DSCP_CS7  IPDscp = 50
+)
+
+var IPDscp_name = map[uint8]string{
+	0:  "IP_API_DSCP_CS0",
+	8:  "IP_API_DSCP_CS1",
+	10: "IP_API_DSCP_AF11",
+	12: "IP_API_DSCP_AF12",
+	14: "IP_API_DSCP_AF13",
+	16: "IP_API_DSCP_CS2",
+	18: "IP_API_DSCP_AF21",
+	20: "IP_API_DSCP_AF22",
+	22: "IP_API_DSCP_AF23",
+	24: "IP_API_DSCP_CS3",
+	26: "IP_API_DSCP_AF31",
+	28: "IP_API_DSCP_AF32",
+	30: "IP_API_DSCP_AF33",
+	32: "IP_API_DSCP_CS4",
+	34: "IP_API_DSCP_AF41",
+	36: "IP_API_DSCP_AF42",
+	38: "IP_API_DSCP_AF43",
+	40: "IP_API_DSCP_CS5",
+	46: "IP_API_DSCP_EF",
+	48: "IP_API_DSCP_CS6",
+	50: "IP_API_DSCP_CS7",
+}
+
+var IPDscp_value = map[string]uint8{
+	"IP_API_DSCP_CS0":  0,
+	"IP_API_DSCP_CS1":  8,
+	"IP_API_DSCP_AF11": 10,
+	"IP_API_DSCP_AF12": 12,
+	"IP_API_DSCP_AF13": 14,
+	"IP_API_DSCP_CS2":  16,
+	"IP_API_DSCP_AF21": 18,
+	"IP_API_DSCP_AF22": 20,
+	"IP_API_DSCP_AF23": 22,
+	"IP_API_DSCP_CS3":  24,
+	"IP_API_DSCP_AF31": 26,
+	"IP_API_DSCP_AF32": 28,
+	"IP_API_DSCP_AF33": 30,
+	"IP_API_DSCP_CS4":  32,
+	"IP_API_DSCP_AF41": 34,
+	"IP_API_DSCP_AF42": 36,
+	"IP_API_DSCP_AF43": 38,
+	"IP_API_DSCP_CS5":  40,
+	"IP_API_DSCP_EF":   46,
+	"IP_API_DSCP_CS6":  48,
+	"IP_API_DSCP_CS7":  50,
+}
+
+func (x IPDscp) String() string {
+	s, ok := IPDscp_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
+// IPEcn represents VPP binary API enum 'ip_ecn'.
+type IPEcn uint8
+
+const (
+	IP_API_ECN_NONE IPEcn = 0
+	IP_API_ECN_ECT0 IPEcn = 1
+	IP_API_ECN_ECT1 IPEcn = 2
+	IP_API_ECN_CE   IPEcn = 3
+)
+
+var IPEcn_name = map[uint8]string{
+	0: "IP_API_ECN_NONE",
+	1: "IP_API_ECN_ECT0",
+	2: "IP_API_ECN_ECT1",
+	3: "IP_API_ECN_CE",
+}
+
+var IPEcn_value = map[string]uint8{
+	"IP_API_ECN_NONE": 0,
+	"IP_API_ECN_ECT0": 1,
+	"IP_API_ECN_ECT1": 2,
+	"IP_API_ECN_CE":   3,
+}
+
+func (x IPEcn) String() string {
+	s, ok := IPEcn_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
 // IPNeighborFlags represents VPP binary API enum 'ip_neighbor_flags'.
 type IPNeighborFlags uint32
 
@@ -208,24 +323,48 @@ func (x IPNeighborFlags) String() string {
 type IPProto uint32
 
 const (
-	IP_API_PROTO_TCP   IPProto = 6
-	IP_API_PROTO_UDP   IPProto = 17
-	IP_API_PROTO_EIGRP IPProto = 88
-	IP_API_PROTO_OSPF  IPProto = 89
+	IP_API_PROTO_HOPOPT   IPProto = 0
+	IP_API_PROTO_ICMP     IPProto = 1
+	IP_API_PROTO_IGMP     IPProto = 2
+	IP_API_PROTO_TCP      IPProto = 6
+	IP_API_PROTO_UDP      IPProto = 17
+	IP_API_PROTO_GRE      IPProto = 47
+	IP_API_PROTO_AH       IPProto = 50
+	IP_API_PROTO_ESP      IPProto = 51
+	IP_API_PROTO_EIGRP    IPProto = 88
+	IP_API_PROTO_OSPF     IPProto = 89
+	IP_API_PROTO_SCTP     IPProto = 132
+	IP_API_PROTO_RESERVED IPProto = 255
 )
 
 var IPProto_name = map[uint32]string{
-	6:  "IP_API_PROTO_TCP",
-	17: "IP_API_PROTO_UDP",
-	88: "IP_API_PROTO_EIGRP",
-	89: "IP_API_PROTO_OSPF",
+	0:   "IP_API_PROTO_HOPOPT",
+	1:   "IP_API_PROTO_ICMP",
+	2:   "IP_API_PROTO_IGMP",
+	6:   "IP_API_PROTO_TCP",
+	17:  "IP_API_PROTO_UDP",
+	47:  "IP_API_PROTO_GRE",
+	50:  "IP_API_PROTO_AH",
+	51:  "IP_API_PROTO_ESP",
+	88:  "IP_API_PROTO_EIGRP",
+	89:  "IP_API_PROTO_OSPF",
+	132: "IP_API_PROTO_SCTP",
+	255: "IP_API_PROTO_RESERVED",
 }
 
 var IPProto_value = map[string]uint32{
-	"IP_API_PROTO_TCP":   6,
-	"IP_API_PROTO_UDP":   17,
-	"IP_API_PROTO_EIGRP": 88,
-	"IP_API_PROTO_OSPF":  89,
+	"IP_API_PROTO_HOPOPT":   0,
+	"IP_API_PROTO_ICMP":     1,
+	"IP_API_PROTO_IGMP":     2,
+	"IP_API_PROTO_TCP":      6,
+	"IP_API_PROTO_UDP":      17,
+	"IP_API_PROTO_GRE":      47,
+	"IP_API_PROTO_AH":       50,
+	"IP_API_PROTO_ESP":      51,
+	"IP_API_PROTO_EIGRP":    88,
+	"IP_API_PROTO_OSPF":     89,
+	"IP_API_PROTO_SCTP":     132,
+	"IP_API_PROTO_RESERVED": 255,
 }
 
 func (x IPProto) String() string {
diff --git a/plugins/vpp/binapi/vpp1908/ipsec/ipsec.ba.go b/plugins/vpp/binapi/vpp1908/ipsec/ipsec.ba.go
index 55af4dd7ac..dc69c8a6f4 100644
--- a/plugins/vpp/binapi/vpp1908/ipsec/ipsec.ba.go
+++ b/plugins/vpp/binapi/vpp1908/ipsec/ipsec.ba.go
@@ -5,7 +5,7 @@
 Package ipsec is a generated VPP binary API for 'ipsec' module.
 
 It consists of:
-	  7 enums
+	  9 enums
 	  3 aliases
 	  9 types
 	  1 union
@@ -29,7 +29,7 @@ const (
 	// APIVersion is the API version of this module.
 	APIVersion = "3.0.0"
 	// VersionCrc is the CRC of this module.
-	VersionCrc = 0xfc13e31d
+	VersionCrc = 0xd2452344
 )
 
 // AddressFamily represents VPP binary API enum 'address_family'.
@@ -58,28 +58,167 @@ func (x AddressFamily) String() string {
 	return strconv.Itoa(int(x))
 }
 
+// IPDscp represents VPP binary API enum 'ip_dscp'.
+type IPDscp uint8
+
+const (
+	IP_API_DSCP_CS0  IPDscp = 0
+	IP_API_DSCP_CS1  IPDscp = 8
+	IP_API_DSCP_AF11 IPDscp = 10
+	IP_API_DSCP_AF12 IPDscp = 12
+	IP_API_DSCP_AF13 IPDscp = 14
+	IP_API_DSCP_CS2  IPDscp = 16
+	IP_API_DSCP_AF21 IPDscp = 18
+	IP_API_DSCP_AF22 IPDscp = 20
+	IP_API_DSCP_AF23 IPDscp = 22
+	IP_API_DSCP_CS3  IPDscp = 24
+	IP_API_DSCP_AF31 IPDscp = 26
+	IP_API_DSCP_AF32 IPDscp = 28
+	IP_API_DSCP_AF33 IPDscp = 30
+	IP_API_DSCP_CS4  IPDscp = 32
+	IP_API_DSCP_AF41 IPDscp = 34
+	IP_API_DSCP_AF42 IPDscp = 36
+	IP_API_DSCP_AF43 IPDscp = 38
+	IP_API_DSCP_CS5  IPDscp = 40
+	IP_API_DSCP_EF   IPDscp = 46
+	IP_API_DSCP_CS6  IPDscp = 48
+	IP_API_DSCP_CS7  IPDscp = 50
+)
+
+var IPDscp_name = map[uint8]string{
+	0:  "IP_API_DSCP_CS0",
+	8:  "IP_API_DSCP_CS1",
+	10: "IP_API_DSCP_AF11",
+	12: "IP_API_DSCP_AF12",
+	14: "IP_API_DSCP_AF13",
+	16: "IP_API_DSCP_CS2",
+	18: "IP_API_DSCP_AF21",
+	20: "IP_API_DSCP_AF22",
+	22: "IP_API_DSCP_AF23",
+	24: "IP_API_DSCP_CS3",
+	26: "IP_API_DSCP_AF31",
+	28: "IP_API_DSCP_AF32",
+	30: "IP_API_DSCP_AF33",
+	32: "IP_API_DSCP_CS4",
+	34: "IP_API_DSCP_AF41",
+	36: "IP_API_DSCP_AF42",
+	38: "IP_API_DSCP_AF43",
+	40: "IP_API_DSCP_CS5",
+	46: "IP_API_DSCP_EF",
+	48: "IP_API_DSCP_CS6",
+	50: "IP_API_DSCP_CS7",
+}
+
+var IPDscp_value = map[string]uint8{
+	"IP_API_DSCP_CS0":  0,
+	"IP_API_DSCP_CS1":  8,
+	"IP_API_DSCP_AF11": 10,
+	"IP_API_DSCP_AF12": 12,
+	"IP_API_DSCP_AF13": 14,
+	"IP_API_DSCP_CS2":  16,
+	"IP_API_DSCP_AF21": 18,
+	"IP_API_DSCP_AF22": 20,
+	"IP_API_DSCP_AF23": 22,
+	"IP_API_DSCP_CS3":  24,
+	"IP_API_DSCP_AF31": 26,
+	"IP_API_DSCP_AF32": 28,
+	"IP_API_DSCP_AF33": 30,
+	"IP_API_DSCP_CS4":  32,
+	"IP_API_DSCP_AF41": 34,
+	"IP_API_DSCP_AF42": 36,
+	"IP_API_DSCP_AF43": 38,
+	"IP_API_DSCP_CS5":  40,
+	"IP_API_DSCP_EF":   46,
+	"IP_API_DSCP_CS6":  48,
+	"IP_API_DSCP_CS7":  50,
+}
+
+func (x IPDscp) String() string {
+	s, ok := IPDscp_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
+// IPEcn represents VPP binary API enum 'ip_ecn'.
+type IPEcn uint8
+
+const (
+	IP_API_ECN_NONE IPEcn = 0
+	IP_API_ECN_ECT0 IPEcn = 1
+	IP_API_ECN_ECT1 IPEcn = 2
+	IP_API_ECN_CE   IPEcn = 3
+)
+
+var IPEcn_name = map[uint8]string{
+	0: "IP_API_ECN_NONE",
+	1: "IP_API_ECN_ECT0",
+	2: "IP_API_ECN_ECT1",
+	3: "IP_API_ECN_CE",
+}
+
+var IPEcn_value = map[string]uint8{
+	"IP_API_ECN_NONE": 0,
+	"IP_API_ECN_ECT0": 1,
+	"IP_API_ECN_ECT1": 2,
+	"IP_API_ECN_CE":   3,
+}
+
+func (x IPEcn) String() string {
+	s, ok := IPEcn_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
 // IPProto represents VPP binary API enum 'ip_proto'.
 type IPProto uint32
 
 const (
-	IP_API_PROTO_TCP   IPProto = 6
-	IP_API_PROTO_UDP   IPProto = 17
-	IP_API_PROTO_EIGRP IPProto = 88
-	IP_API_PROTO_OSPF  IPProto = 89
+	IP_API_PROTO_HOPOPT   IPProto = 0
+	IP_API_PROTO_ICMP     IPProto = 1
+	IP_API_PROTO_IGMP     IPProto = 2
+	IP_API_PROTO_TCP      IPProto = 6
+	IP_API_PROTO_UDP      IPProto = 17
+	IP_API_PROTO_GRE      IPProto = 47
+	IP_API_PROTO_AH       IPProto = 50
+	IP_API_PROTO_ESP      IPProto = 51
+	IP_API_PROTO_EIGRP    IPProto = 88
+	IP_API_PROTO_OSPF     IPProto = 89
+	IP_API_PROTO_SCTP     IPProto = 132
+	IP_API_PROTO_RESERVED IPProto = 255
 )
 
 var IPProto_name = map[uint32]string{
-	6:  "IP_API_PROTO_TCP",
-	17: "IP_API_PROTO_UDP",
-	88: "IP_API_PROTO_EIGRP",
-	89: "IP_API_PROTO_OSPF",
+	0:   "IP_API_PROTO_HOPOPT",
+	1:   "IP_API_PROTO_ICMP",
+	2:   "IP_API_PROTO_IGMP",
+	6:   "IP_API_PROTO_TCP",
+	17:  "IP_API_PROTO_UDP",
+	47:  "IP_API_PROTO_GRE",
+	50:  "IP_API_PROTO_AH",
+	51:  "IP_API_PROTO_ESP",
+	88:  "IP_API_PROTO_EIGRP",
+	89:  "IP_API_PROTO_OSPF",
+	132: "IP_API_PROTO_SCTP",
+	255: "IP_API_PROTO_RESERVED",
 }
 
 var IPProto_value = map[string]uint32{
-	"IP_API_PROTO_TCP":   6,
-	"IP_API_PROTO_UDP":   17,
-	"IP_API_PROTO_EIGRP": 88,
-	"IP_API_PROTO_OSPF":  89,
+	"IP_API_PROTO_HOPOPT":   0,
+	"IP_API_PROTO_ICMP":     1,
+	"IP_API_PROTO_IGMP":     2,
+	"IP_API_PROTO_TCP":      6,
+	"IP_API_PROTO_UDP":      17,
+	"IP_API_PROTO_GRE":      47,
+	"IP_API_PROTO_AH":       50,
+	"IP_API_PROTO_ESP":      51,
+	"IP_API_PROTO_EIGRP":    88,
+	"IP_API_PROTO_OSPF":     89,
+	"IP_API_PROTO_SCTP":     132,
+	"IP_API_PROTO_RESERVED": 255,
 }
 
 func (x IPProto) String() string {
diff --git a/plugins/vpp/binapi/vpp1908/l2/l2.ba.go b/plugins/vpp/binapi/vpp1908/l2/l2.ba.go
index 0cfa914515..39ec8f5f26 100644
--- a/plugins/vpp/binapi/vpp1908/l2/l2.ba.go
+++ b/plugins/vpp/binapi/vpp1908/l2/l2.ba.go
@@ -5,7 +5,7 @@
 Package l2 is a generated VPP binary API for 'l2' module.
 
 It consists of:
-	  4 enums
+	  6 enums
 	  3 aliases
 	  8 types
 	  1 union
@@ -29,7 +29,7 @@ const (
 	// APIVersion is the API version of this module.
 	APIVersion = "2.2.2"
 	// VersionCrc is the CRC of this module.
-	VersionCrc = 0xbaafc7be
+	VersionCrc = 0x46c9d538
 )
 
 // AddressFamily represents VPP binary API enum 'address_family'.
@@ -99,28 +99,167 @@ func (x BdFlags) String() string {
 	return strconv.Itoa(int(x))
 }
 
+// IPDscp represents VPP binary API enum 'ip_dscp'.
+type IPDscp uint8
+
+const (
+	IP_API_DSCP_CS0  IPDscp = 0
+	IP_API_DSCP_CS1  IPDscp = 8
+	IP_API_DSCP_AF11 IPDscp = 10
+	IP_API_DSCP_AF12 IPDscp = 12
+	IP_API_DSCP_AF13 IPDscp = 14
+	IP_API_DSCP_CS2  IPDscp = 16
+	IP_API_DSCP_AF21 IPDscp = 18
+	IP_API_DSCP_AF22 IPDscp = 20
+	IP_API_DSCP_AF23 IPDscp = 22
+	IP_API_DSCP_CS3  IPDscp = 24
+	IP_API_DSCP_AF31 IPDscp = 26
+	IP_API_DSCP_AF32 IPDscp = 28
+	IP_API_DSCP_AF33 IPDscp = 30
+	IP_API_DSCP_CS4  IPDscp = 32
+	IP_API_DSCP_AF41 IPDscp = 34
+	IP_API_DSCP_AF42 IPDscp = 36
+	IP_API_DSCP_AF43 IPDscp = 38
+	IP_API_DSCP_CS5  IPDscp = 40
+	IP_API_DSCP_EF   IPDscp = 46
+	IP_API_DSCP_CS6  IPDscp = 48
+	IP_API_DSCP_CS7  IPDscp = 50
+)
+
+var IPDscp_name = map[uint8]string{
+	0:  "IP_API_DSCP_CS0",
+	8:  "IP_API_DSCP_CS1",
+	10: "IP_API_DSCP_AF11",
+	12: "IP_API_DSCP_AF12",
+	14: "IP_API_DSCP_AF13",
+	16: "IP_API_DSCP_CS2",
+	18: "IP_API_DSCP_AF21",
+	20: "IP_API_DSCP_AF22",
+	22: "IP_API_DSCP_AF23",
+	24: "IP_API_DSCP_CS3",
+	26: "IP_API_DSCP_AF31",
+	28: "IP_API_DSCP_AF32",
+	30: "IP_API_DSCP_AF33",
+	32: "IP_API_DSCP_CS4",
+	34: "IP_API_DSCP_AF41",
+	36: "IP_API_DSCP_AF42",
+	38: "IP_API_DSCP_AF43",
+	40: "IP_API_DSCP_CS5",
+	46: "IP_API_DSCP_EF",
+	48: "IP_API_DSCP_CS6",
+	50: "IP_API_DSCP_CS7",
+}
+
+var IPDscp_value = map[string]uint8{
+	"IP_API_DSCP_CS0":  0,
+	"IP_API_DSCP_CS1":  8,
+	"IP_API_DSCP_AF11": 10,
+	"IP_API_DSCP_AF12": 12,
+	"IP_API_DSCP_AF13": 14,
+	"IP_API_DSCP_CS2":  16,
+	"IP_API_DSCP_AF21": 18,
+	"IP_API_DSCP_AF22": 20,
+	"IP_API_DSCP_AF23": 22,
+	"IP_API_DSCP_CS3":  24,
+	"IP_API_DSCP_AF31": 26,
+	"IP_API_DSCP_AF32": 28,
+	"IP_API_DSCP_AF33": 30,
+	"IP_API_DSCP_CS4":  32,
+	"IP_API_DSCP_AF41": 34,
+	"IP_API_DSCP_AF42": 36,
+	"IP_API_DSCP_AF43": 38,
+	"IP_API_DSCP_CS5":  40,
+	"IP_API_DSCP_EF":   46,
+	"IP_API_DSCP_CS6":  48,
+	"IP_API_DSCP_CS7":  50,
+}
+
+func (x IPDscp) String() string {
+	s, ok := IPDscp_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
+// IPEcn represents VPP binary API enum 'ip_ecn'.
+type IPEcn uint8
+
+const (
+	IP_API_ECN_NONE IPEcn = 0
+	IP_API_ECN_ECT0 IPEcn = 1
+	IP_API_ECN_ECT1 IPEcn = 2
+	IP_API_ECN_CE   IPEcn = 3
+)
+
+var IPEcn_name = map[uint8]string{
+	0: "IP_API_ECN_NONE",
+	1: "IP_API_ECN_ECT0",
+	2: "IP_API_ECN_ECT1",
+	3: "IP_API_ECN_CE",
+}
+
+var IPEcn_value = map[string]uint8{
+	"IP_API_ECN_NONE": 0,
+	"IP_API_ECN_ECT0": 1,
+	"IP_API_ECN_ECT1": 2,
+	"IP_API_ECN_CE":   3,
+}
+
+func (x IPEcn) String() string {
+	s, ok := IPEcn_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
 // IPProto represents VPP binary API enum 'ip_proto'.
 type IPProto uint32
 
 const (
-	IP_API_PROTO_TCP   IPProto = 6
-	IP_API_PROTO_UDP   IPProto = 17
-	IP_API_PROTO_EIGRP IPProto = 88
-	IP_API_PROTO_OSPF  IPProto = 89
+	IP_API_PROTO_HOPOPT   IPProto = 0
+	IP_API_PROTO_ICMP     IPProto = 1
+	IP_API_PROTO_IGMP     IPProto = 2
+	IP_API_PROTO_TCP      IPProto = 6
+	IP_API_PROTO_UDP      IPProto = 17
+	IP_API_PROTO_GRE      IPProto = 47
+	IP_API_PROTO_AH       IPProto = 50
+	IP_API_PROTO_ESP      IPProto = 51
+	IP_API_PROTO_EIGRP    IPProto = 88
+	IP_API_PROTO_OSPF     IPProto = 89
+	IP_API_PROTO_SCTP     IPProto = 132
+	IP_API_PROTO_RESERVED IPProto = 255
 )
 
 var IPProto_name = map[uint32]string{
-	6:  "IP_API_PROTO_TCP",
-	17: "IP_API_PROTO_UDP",
-	88: "IP_API_PROTO_EIGRP",
-	89: "IP_API_PROTO_OSPF",
+	0:   "IP_API_PROTO_HOPOPT",
+	1:   "IP_API_PROTO_ICMP",
+	2:   "IP_API_PROTO_IGMP",
+	6:   "IP_API_PROTO_TCP",
+	17:  "IP_API_PROTO_UDP",
+	47:  "IP_API_PROTO_GRE",
+	50:  "IP_API_PROTO_AH",
+	51:  "IP_API_PROTO_ESP",
+	88:  "IP_API_PROTO_EIGRP",
+	89:  "IP_API_PROTO_OSPF",
+	132: "IP_API_PROTO_SCTP",
+	255: "IP_API_PROTO_RESERVED",
 }
 
 var IPProto_value = map[string]uint32{
-	"IP_API_PROTO_TCP":   6,
-	"IP_API_PROTO_UDP":   17,
-	"IP_API_PROTO_EIGRP": 88,
-	"IP_API_PROTO_OSPF":  89,
+	"IP_API_PROTO_HOPOPT":   0,
+	"IP_API_PROTO_ICMP":     1,
+	"IP_API_PROTO_IGMP":     2,
+	"IP_API_PROTO_TCP":      6,
+	"IP_API_PROTO_UDP":      17,
+	"IP_API_PROTO_GRE":      47,
+	"IP_API_PROTO_AH":       50,
+	"IP_API_PROTO_ESP":      51,
+	"IP_API_PROTO_EIGRP":    88,
+	"IP_API_PROTO_OSPF":     89,
+	"IP_API_PROTO_SCTP":     132,
+	"IP_API_PROTO_RESERVED": 255,
 }
 
 func (x IPProto) String() string {
diff --git a/plugins/vpp/binapi/vpp1908/nat/nat.ba.go b/plugins/vpp/binapi/vpp1908/nat/nat.ba.go
index 6e60fe7d59..de5f7393df 100644
--- a/plugins/vpp/binapi/vpp1908/nat/nat.ba.go
+++ b/plugins/vpp/binapi/vpp1908/nat/nat.ba.go
@@ -5,7 +5,7 @@
 Package nat is a generated VPP binary API for 'nat' module.
 
 It consists of:
-	  3 enums
+	  5 enums
 	  3 aliases
 	  6 types
 	  1 union
@@ -29,7 +29,7 @@ const (
 	// APIVersion is the API version of this module.
 	APIVersion = "5.0.0"
 	// VersionCrc is the CRC of this module.
-	VersionCrc = 0x7cd9bbbc
+	VersionCrc = 0x68a1a63b
 )
 
 // AddressFamily represents VPP binary API enum 'address_family'.
@@ -58,28 +58,167 @@ func (x AddressFamily) String() string {
 	return strconv.Itoa(int(x))
 }
 
+// IPDscp represents VPP binary API enum 'ip_dscp'.
+type IPDscp uint8
+
+const (
+	IP_API_DSCP_CS0  IPDscp = 0
+	IP_API_DSCP_CS1  IPDscp = 8
+	IP_API_DSCP_AF11 IPDscp = 10
+	IP_API_DSCP_AF12 IPDscp = 12
+	IP_API_DSCP_AF13 IPDscp = 14
+	IP_API_DSCP_CS2  IPDscp = 16
+	IP_API_DSCP_AF21 IPDscp = 18
+	IP_API_DSCP_AF22 IPDscp = 20
+	IP_API_DSCP_AF23 IPDscp = 22
+	IP_API_DSCP_CS3  IPDscp = 24
+	IP_API_DSCP_AF31 IPDscp = 26
+	IP_API_DSCP_AF32 IPDscp = 28
+	IP_API_DSCP_AF33 IPDscp = 30
+	IP_API_DSCP_CS4  IPDscp = 32
+	IP_API_DSCP_AF41 IPDscp = 34
+	IP_API_DSCP_AF42 IPDscp = 36
+	IP_API_DSCP_AF43 IPDscp = 38
+	IP_API_DSCP_CS5  IPDscp = 40
+	IP_API_DSCP_EF   IPDscp = 46
+	IP_API_DSCP_CS6  IPDscp = 48
+	IP_API_DSCP_CS7  IPDscp = 50
+)
+
+var IPDscp_name = map[uint8]string{
+	0:  "IP_API_DSCP_CS0",
+	8:  "IP_API_DSCP_CS1",
+	10: "IP_API_DSCP_AF11",
+	12: "IP_API_DSCP_AF12",
+	14: "IP_API_DSCP_AF13",
+	16: "IP_API_DSCP_CS2",
+	18: "IP_API_DSCP_AF21",
+	20: "IP_API_DSCP_AF22",
+	22: "IP_API_DSCP_AF23",
+	24: "IP_API_DSCP_CS3",
+	26: "IP_API_DSCP_AF31",
+	28: "IP_API_DSCP_AF32",
+	30: "IP_API_DSCP_AF33",
+	32: "IP_API_DSCP_CS4",
+	34: "IP_API_DSCP_AF41",
+	36: "IP_API_DSCP_AF42",
+	38: "IP_API_DSCP_AF43",
+	40: "IP_API_DSCP_CS5",
+	46: "IP_API_DSCP_EF",
+	48: "IP_API_DSCP_CS6",
+	50: "IP_API_DSCP_CS7",
+}
+
+var IPDscp_value = map[string]uint8{
+	"IP_API_DSCP_CS0":  0,
+	"IP_API_DSCP_CS1":  8,
+	"IP_API_DSCP_AF11": 10,
+	"IP_API_DSCP_AF12": 12,
+	"IP_API_DSCP_AF13": 14,
+	"IP_API_DSCP_CS2":  16,
+	"IP_API_DSCP_AF21": 18,
+	"IP_API_DSCP_AF22": 20,
+	"IP_API_DSCP_AF23": 22,
+	"IP_API_DSCP_CS3":  24,
+	"IP_API_DSCP_AF31": 26,
+	"IP_API_DSCP_AF32": 28,
+	"IP_API_DSCP_AF33": 30,
+	"IP_API_DSCP_CS4":  32,
+	"IP_API_DSCP_AF41": 34,
+	"IP_API_DSCP_AF42": 36,
+	"IP_API_DSCP_AF43": 38,
+	"IP_API_DSCP_CS5":  40,
+	"IP_API_DSCP_EF":   46,
+	"IP_API_DSCP_CS6":  48,
+	"IP_API_DSCP_CS7":  50,
+}
+
+func (x IPDscp) String() string {
+	s, ok := IPDscp_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
+// IPEcn represents VPP binary API enum 'ip_ecn'.
+type IPEcn uint8
+
+const (
+	IP_API_ECN_NONE IPEcn = 0
+	IP_API_ECN_ECT0 IPEcn = 1
+	IP_API_ECN_ECT1 IPEcn = 2
+	IP_API_ECN_CE   IPEcn = 3
+)
+
+var IPEcn_name = map[uint8]string{
+	0: "IP_API_ECN_NONE",
+	1: "IP_API_ECN_ECT0",
+	2: "IP_API_ECN_ECT1",
+	3: "IP_API_ECN_CE",
+}
+
+var IPEcn_value = map[string]uint8{
+	"IP_API_ECN_NONE": 0,
+	"IP_API_ECN_ECT0": 1,
+	"IP_API_ECN_ECT1": 2,
+	"IP_API_ECN_CE":   3,
+}
+
+func (x IPEcn) String() string {
+	s, ok := IPEcn_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
 // IPProto represents VPP binary API enum 'ip_proto'.
 type IPProto uint32
 
 const (
-	IP_API_PROTO_TCP   IPProto = 6
-	IP_API_PROTO_UDP   IPProto = 17
-	IP_API_PROTO_EIGRP IPProto = 88
-	IP_API_PROTO_OSPF  IPProto = 89
+	IP_API_PROTO_HOPOPT   IPProto = 0
+	IP_API_PROTO_ICMP     IPProto = 1
+	IP_API_PROTO_IGMP     IPProto = 2
+	IP_API_PROTO_TCP      IPProto = 6
+	IP_API_PROTO_UDP      IPProto = 17
+	IP_API_PROTO_GRE      IPProto = 47
+	IP_API_PROTO_AH       IPProto = 50
+	IP_API_PROTO_ESP      IPProto = 51
+	IP_API_PROTO_EIGRP    IPProto = 88
+	IP_API_PROTO_OSPF     IPProto = 89
+	IP_API_PROTO_SCTP     IPProto = 132
+	IP_API_PROTO_RESERVED IPProto = 255
 )
 
 var IPProto_name = map[uint32]string{
-	6:  "IP_API_PROTO_TCP",
-	17: "IP_API_PROTO_UDP",
-	88: "IP_API_PROTO_EIGRP",
-	89: "IP_API_PROTO_OSPF",
+	0:   "IP_API_PROTO_HOPOPT",
+	1:   "IP_API_PROTO_ICMP",
+	2:   "IP_API_PROTO_IGMP",
+	6:   "IP_API_PROTO_TCP",
+	17:  "IP_API_PROTO_UDP",
+	47:  "IP_API_PROTO_GRE",
+	50:  "IP_API_PROTO_AH",
+	51:  "IP_API_PROTO_ESP",
+	88:  "IP_API_PROTO_EIGRP",
+	89:  "IP_API_PROTO_OSPF",
+	132: "IP_API_PROTO_SCTP",
+	255: "IP_API_PROTO_RESERVED",
 }
 
 var IPProto_value = map[string]uint32{
-	"IP_API_PROTO_TCP":   6,
-	"IP_API_PROTO_UDP":   17,
-	"IP_API_PROTO_EIGRP": 88,
-	"IP_API_PROTO_OSPF":  89,
+	"IP_API_PROTO_HOPOPT":   0,
+	"IP_API_PROTO_ICMP":     1,
+	"IP_API_PROTO_IGMP":     2,
+	"IP_API_PROTO_TCP":      6,
+	"IP_API_PROTO_UDP":      17,
+	"IP_API_PROTO_GRE":      47,
+	"IP_API_PROTO_AH":       50,
+	"IP_API_PROTO_ESP":      51,
+	"IP_API_PROTO_EIGRP":    88,
+	"IP_API_PROTO_OSPF":     89,
+	"IP_API_PROTO_SCTP":     132,
+	"IP_API_PROTO_RESERVED": 255,
 }
 
 func (x IPProto) String() string {
diff --git a/plugins/vpp/binapi/vpp1908/punt/punt.ba.go b/plugins/vpp/binapi/vpp1908/punt/punt.ba.go
index 335d504e37..9d5f58978c 100644
--- a/plugins/vpp/binapi/vpp1908/punt/punt.ba.go
+++ b/plugins/vpp/binapi/vpp1908/punt/punt.ba.go
@@ -5,7 +5,7 @@
 Package punt is a generated VPP binary API for 'punt' module.
 
 It consists of:
-	  3 enums
+	  5 enums
 	  2 aliases
 	 10 types
 	  2 unions
@@ -29,7 +29,7 @@ const (
 	// APIVersion is the API version of this module.
 	APIVersion = "2.1.0"
 	// VersionCrc is the CRC of this module.
-	VersionCrc = 0xf01c2fb8
+	VersionCrc = 0xd6aa99ad
 )
 
 // AddressFamily represents VPP binary API enum 'address_family'.
@@ -58,28 +58,167 @@ func (x AddressFamily) String() string {
 	return strconv.Itoa(int(x))
 }
 
+// IPDscp represents VPP binary API enum 'ip_dscp'.
+type IPDscp uint8
+
+const (
+	IP_API_DSCP_CS0  IPDscp = 0
+	IP_API_DSCP_CS1  IPDscp = 8
+	IP_API_DSCP_AF11 IPDscp = 10
+	IP_API_DSCP_AF12 IPDscp = 12
+	IP_API_DSCP_AF13 IPDscp = 14
+	IP_API_DSCP_CS2  IPDscp = 16
+	IP_API_DSCP_AF21 IPDscp = 18
+	IP_API_DSCP_AF22 IPDscp = 20
+	IP_API_DSCP_AF23 IPDscp = 22
+	IP_API_DSCP_CS3  IPDscp = 24
+	IP_API_DSCP_AF31 IPDscp = 26
+	IP_API_DSCP_AF32 IPDscp = 28
+	IP_API_DSCP_AF33 IPDscp = 30
+	IP_API_DSCP_CS4  IPDscp = 32
+	IP_API_DSCP_AF41 IPDscp = 34
+	IP_API_DSCP_AF42 IPDscp = 36
+	IP_API_DSCP_AF43 IPDscp = 38
+	IP_API_DSCP_CS5  IPDscp = 40
+	IP_API_DSCP_EF   IPDscp = 46
+	IP_API_DSCP_CS6  IPDscp = 48
+	IP_API_DSCP_CS7  IPDscp = 50
+)
+
+var IPDscp_name = map[uint8]string{
+	0:  "IP_API_DSCP_CS0",
+	8:  "IP_API_DSCP_CS1",
+	10: "IP_API_DSCP_AF11",
+	12: "IP_API_DSCP_AF12",
+	14: "IP_API_DSCP_AF13",
+	16: "IP_API_DSCP_CS2",
+	18: "IP_API_DSCP_AF21",
+	20: "IP_API_DSCP_AF22",
+	22: "IP_API_DSCP_AF23",
+	24: "IP_API_DSCP_CS3",
+	26: "IP_API_DSCP_AF31",
+	28: "IP_API_DSCP_AF32",
+	30: "IP_API_DSCP_AF33",
+	32: "IP_API_DSCP_CS4",
+	34: "IP_API_DSCP_AF41",
+	36: "IP_API_DSCP_AF42",
+	38: "IP_API_DSCP_AF43",
+	40: "IP_API_DSCP_CS5",
+	46: "IP_API_DSCP_EF",
+	48: "IP_API_DSCP_CS6",
+	50: "IP_API_DSCP_CS7",
+}
+
+var IPDscp_value = map[string]uint8{
+	"IP_API_DSCP_CS0":  0,
+	"IP_API_DSCP_CS1":  8,
+	"IP_API_DSCP_AF11": 10,
+	"IP_API_DSCP_AF12": 12,
+	"IP_API_DSCP_AF13": 14,
+	"IP_API_DSCP_CS2":  16,
+	"IP_API_DSCP_AF21": 18,
+	"IP_API_DSCP_AF22": 20,
+	"IP_API_DSCP_AF23": 22,
+	"IP_API_DSCP_CS3":  24,
+	"IP_API_DSCP_AF31": 26,
+	"IP_API_DSCP_AF32": 28,
+	"IP_API_DSCP_AF33": 30,
+	"IP_API_DSCP_CS4":  32,
+	"IP_API_DSCP_AF41": 34,
+	"IP_API_DSCP_AF42": 36,
+	"IP_API_DSCP_AF43": 38,
+	"IP_API_DSCP_CS5":  40,
+	"IP_API_DSCP_EF":   46,
+	"IP_API_DSCP_CS6":  48,
+	"IP_API_DSCP_CS7":  50,
+}
+
+func (x IPDscp) String() string {
+	s, ok := IPDscp_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
+// IPEcn represents VPP binary API enum 'ip_ecn'.
+type IPEcn uint8
+
+const (
+	IP_API_ECN_NONE IPEcn = 0
+	IP_API_ECN_ECT0 IPEcn = 1
+	IP_API_ECN_ECT1 IPEcn = 2
+	IP_API_ECN_CE   IPEcn = 3
+)
+
+var IPEcn_name = map[uint8]string{
+	0: "IP_API_ECN_NONE",
+	1: "IP_API_ECN_ECT0",
+	2: "IP_API_ECN_ECT1",
+	3: "IP_API_ECN_CE",
+}
+
+var IPEcn_value = map[string]uint8{
+	"IP_API_ECN_NONE": 0,
+	"IP_API_ECN_ECT0": 1,
+	"IP_API_ECN_ECT1": 2,
+	"IP_API_ECN_CE":   3,
+}
+
+func (x IPEcn) String() string {
+	s, ok := IPEcn_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
 // IPProto represents VPP binary API enum 'ip_proto'.
 type IPProto uint32
 
 const (
-	IP_API_PROTO_TCP   IPProto = 6
-	IP_API_PROTO_UDP   IPProto = 17
-	IP_API_PROTO_EIGRP IPProto = 88
-	IP_API_PROTO_OSPF  IPProto = 89
+	IP_API_PROTO_HOPOPT   IPProto = 0
+	IP_API_PROTO_ICMP     IPProto = 1
+	IP_API_PROTO_IGMP     IPProto = 2
+	IP_API_PROTO_TCP      IPProto = 6
+	IP_API_PROTO_UDP      IPProto = 17
+	IP_API_PROTO_GRE      IPProto = 47
+	IP_API_PROTO_AH       IPProto = 50
+	IP_API_PROTO_ESP      IPProto = 51
+	IP_API_PROTO_EIGRP    IPProto = 88
+	IP_API_PROTO_OSPF     IPProto = 89
+	IP_API_PROTO_SCTP     IPProto = 132
+	IP_API_PROTO_RESERVED IPProto = 255
 )
 
 var IPProto_name = map[uint32]string{
-	6:  "IP_API_PROTO_TCP",
-	17: "IP_API_PROTO_UDP",
-	88: "IP_API_PROTO_EIGRP",
-	89: "IP_API_PROTO_OSPF",
+	0:   "IP_API_PROTO_HOPOPT",
+	1:   "IP_API_PROTO_ICMP",
+	2:   "IP_API_PROTO_IGMP",
+	6:   "IP_API_PROTO_TCP",
+	17:  "IP_API_PROTO_UDP",
+	47:  "IP_API_PROTO_GRE",
+	50:  "IP_API_PROTO_AH",
+	51:  "IP_API_PROTO_ESP",
+	88:  "IP_API_PROTO_EIGRP",
+	89:  "IP_API_PROTO_OSPF",
+	132: "IP_API_PROTO_SCTP",
+	255: "IP_API_PROTO_RESERVED",
 }
 
 var IPProto_value = map[string]uint32{
-	"IP_API_PROTO_TCP":   6,
-	"IP_API_PROTO_UDP":   17,
-	"IP_API_PROTO_EIGRP": 88,
-	"IP_API_PROTO_OSPF":  89,
+	"IP_API_PROTO_HOPOPT":   0,
+	"IP_API_PROTO_ICMP":     1,
+	"IP_API_PROTO_IGMP":     2,
+	"IP_API_PROTO_TCP":      6,
+	"IP_API_PROTO_UDP":      17,
+	"IP_API_PROTO_GRE":      47,
+	"IP_API_PROTO_AH":       50,
+	"IP_API_PROTO_ESP":      51,
+	"IP_API_PROTO_EIGRP":    88,
+	"IP_API_PROTO_OSPF":     89,
+	"IP_API_PROTO_SCTP":     132,
+	"IP_API_PROTO_RESERVED": 255,
 }
 
 func (x IPProto) String() string {
@@ -347,13 +486,15 @@ func (*PuntReasonDetails) GetMessageType() api.MessageType {
 }
 
 // PuntReasonDump represents VPP binary API message 'punt_reason_dump'.
-type PuntReasonDump struct{}
+type PuntReasonDump struct {
+	Reason PuntReason
+}
 
 func (*PuntReasonDump) GetMessageName() string {
 	return "punt_reason_dump"
 }
 func (*PuntReasonDump) GetCrcString() string {
-	return "51077d14"
+	return "bf8f10da"
 }
 func (*PuntReasonDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
diff --git a/plugins/vpp/binapi/vpp1908/vpe/vpe.ba.go b/plugins/vpp/binapi/vpp1908/vpe/vpe.ba.go
index e3f937673d..e25b73caaf 100644
--- a/plugins/vpp/binapi/vpp1908/vpe/vpe.ba.go
+++ b/plugins/vpp/binapi/vpp1908/vpe/vpe.ba.go
@@ -5,9 +5,10 @@
 Package vpe is a generated VPP binary API for 'vpe' module.
 
 It consists of:
+	  1 enum
 	  1 type
-	 18 messages
-	  9 services
+	 26 messages
+	 13 services
 */
 package vpe
 
@@ -24,11 +25,58 @@ const (
 	// ModuleName is the name of this module.
 	ModuleName = "vpe"
 	// APIVersion is the API version of this module.
-	APIVersion = "1.1.0"
+	APIVersion = "1.4.0"
 	// VersionCrc is the CRC of this module.
-	VersionCrc = 0x2cc8d629
+	VersionCrc = 0xf4bcb773
 )
 
+// LogLevel represents VPP binary API enum 'log_level'.
+type LogLevel uint32
+
+const (
+	VPE_API_LOG_LEVEL_EMERG    LogLevel = 0
+	VPE_API_LOG_LEVEL_ALERT    LogLevel = 1
+	VPE_API_LOG_LEVEL_CRIT     LogLevel = 2
+	VPE_API_LOG_LEVEL_ERR      LogLevel = 3
+	VPE_API_LOG_LEVEL_WARNING  LogLevel = 4
+	VPE_API_LOG_LEVEL_NOTICE   LogLevel = 5
+	VPE_API_LOG_LEVEL_INFO     LogLevel = 6
+	VPE_API_LOG_LEVEL_DEBUG    LogLevel = 7
+	VPE_API_LOG_LEVEL_DISABLED LogLevel = 8
+)
+
+var LogLevel_name = map[uint32]string{
+	0: "VPE_API_LOG_LEVEL_EMERG",
+	1: "VPE_API_LOG_LEVEL_ALERT",
+	2: "VPE_API_LOG_LEVEL_CRIT",
+	3: "VPE_API_LOG_LEVEL_ERR",
+	4: "VPE_API_LOG_LEVEL_WARNING",
+	5: "VPE_API_LOG_LEVEL_NOTICE",
+	6: "VPE_API_LOG_LEVEL_INFO",
+	7: "VPE_API_LOG_LEVEL_DEBUG",
+	8: "VPE_API_LOG_LEVEL_DISABLED",
+}
+
+var LogLevel_value = map[string]uint32{
+	"VPE_API_LOG_LEVEL_EMERG":    0,
+	"VPE_API_LOG_LEVEL_ALERT":    1,
+	"VPE_API_LOG_LEVEL_CRIT":     2,
+	"VPE_API_LOG_LEVEL_ERR":      3,
+	"VPE_API_LOG_LEVEL_WARNING":  4,
+	"VPE_API_LOG_LEVEL_NOTICE":   5,
+	"VPE_API_LOG_LEVEL_INFO":     6,
+	"VPE_API_LOG_LEVEL_DEBUG":    7,
+	"VPE_API_LOG_LEVEL_DISABLED": 8,
+}
+
+func (x LogLevel) String() string {
+	s, ok := LogLevel_name[uint32(x)]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(x))
+}
+
 // ThreadData represents VPP binary API type 'thread_data'.
 type ThreadData struct {
 	ID        uint32
@@ -170,6 +218,68 @@ func (*ControlPingReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
+// GetF64EndianValue represents VPP binary API message 'get_f64_endian_value'.
+type GetF64EndianValue struct {
+	F64One float64
+}
+
+func (*GetF64EndianValue) GetMessageName() string {
+	return "get_f64_endian_value"
+}
+func (*GetF64EndianValue) GetCrcString() string {
+	return "809fcd44"
+}
+func (*GetF64EndianValue) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+// GetF64EndianValueReply represents VPP binary API message 'get_f64_endian_value_reply'.
+type GetF64EndianValueReply struct {
+	Retval       uint32
+	F64OneResult float64
+}
+
+func (*GetF64EndianValueReply) GetMessageName() string {
+	return "get_f64_endian_value_reply"
+}
+func (*GetF64EndianValueReply) GetCrcString() string {
+	return "7e02e404"
+}
+func (*GetF64EndianValueReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+// GetF64IncrementByOne represents VPP binary API message 'get_f64_increment_by_one'.
+type GetF64IncrementByOne struct {
+	F64Value float64
+}
+
+func (*GetF64IncrementByOne) GetMessageName() string {
+	return "get_f64_increment_by_one"
+}
+func (*GetF64IncrementByOne) GetCrcString() string {
+	return "b64f027e"
+}
+func (*GetF64IncrementByOne) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+// GetF64IncrementByOneReply represents VPP binary API message 'get_f64_increment_by_one_reply'.
+type GetF64IncrementByOneReply struct {
+	Retval   uint32
+	F64Value float64
+}
+
+func (*GetF64IncrementByOneReply) GetMessageName() string {
+	return "get_f64_increment_by_one_reply"
+}
+func (*GetF64IncrementByOneReply) GetCrcString() string {
+	return "d25dbaa3"
+}
+func (*GetF64IncrementByOneReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
 // GetNextIndex represents VPP binary API message 'get_next_index'.
 type GetNextIndex struct {
 	NodeName []byte `struc:"[64]byte"`
@@ -262,6 +372,43 @@ func (*GetNodeIndexReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
+// LogDetails represents VPP binary API message 'log_details'.
+type LogDetails struct {
+	TimestampTicks   float64
+	Level            LogLevel
+	XXX_TimestampLen uint32 `struc:"sizeof=Timestamp"`
+	Timestamp        string `binapi:",limit=24"`
+	XXX_MsgClassLen  uint32 `struc:"sizeof=MsgClass"`
+	MsgClass         string `binapi:",limit=32"`
+	XXX_MessageLen   uint32 `struc:"sizeof=Message"`
+	Message          string `binapi:",limit=256"`
+}
+
+func (*LogDetails) GetMessageName() string {
+	return "log_details"
+}
+func (*LogDetails) GetCrcString() string {
+	return "91976545"
+}
+func (*LogDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+// LogDump represents VPP binary API message 'log_dump'.
+type LogDump struct {
+	StartTimestamp float64
+}
+
+func (*LogDump) GetMessageName() string {
+	return "log_dump"
+}
+func (*LogDump) GetCrcString() string {
+	return "74fddb5f"
+}
+func (*LogDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
 // ShowThreads represents VPP binary API message 'show_threads'.
 type ShowThreads struct{}
 
@@ -328,6 +475,35 @@ func (*ShowVersionReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
 
+// ShowVpeSystemTimeTicks represents VPP binary API message 'show_vpe_system_time_ticks'.
+type ShowVpeSystemTimeTicks struct{}
+
+func (*ShowVpeSystemTimeTicks) GetMessageName() string {
+	return "show_vpe_system_time_ticks"
+}
+func (*ShowVpeSystemTimeTicks) GetCrcString() string {
+	return "51077d14"
+}
+func (*ShowVpeSystemTimeTicks) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+// ShowVpeSystemTimeTicksReply represents VPP binary API message 'show_vpe_system_time_ticks_reply'.
+type ShowVpeSystemTimeTicksReply struct {
+	Retval             int32
+	VpeSystemTimeTicks float64
+}
+
+func (*ShowVpeSystemTimeTicksReply) GetMessageName() string {
+	return "show_vpe_system_time_ticks_reply"
+}
+func (*ShowVpeSystemTimeTicksReply) GetCrcString() string {
+	return "5fa0885c"
+}
+func (*ShowVpeSystemTimeTicksReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
 func init() {
 	api.RegisterMessage((*AddNodeNext)(nil), "vpe.AddNodeNext")
 	api.RegisterMessage((*AddNodeNextReply)(nil), "vpe.AddNodeNextReply")
@@ -337,16 +513,24 @@ func init() {
 	api.RegisterMessage((*CliReply)(nil), "vpe.CliReply")
 	api.RegisterMessage((*ControlPing)(nil), "vpe.ControlPing")
 	api.RegisterMessage((*ControlPingReply)(nil), "vpe.ControlPingReply")
+	api.RegisterMessage((*GetF64EndianValue)(nil), "vpe.GetF64EndianValue")
+	api.RegisterMessage((*GetF64EndianValueReply)(nil), "vpe.GetF64EndianValueReply")
+	api.RegisterMessage((*GetF64IncrementByOne)(nil), "vpe.GetF64IncrementByOne")
+	api.RegisterMessage((*GetF64IncrementByOneReply)(nil), "vpe.GetF64IncrementByOneReply")
 	api.RegisterMessage((*GetNextIndex)(nil), "vpe.GetNextIndex")
 	api.RegisterMessage((*GetNextIndexReply)(nil), "vpe.GetNextIndexReply")
 	api.RegisterMessage((*GetNodeGraph)(nil), "vpe.GetNodeGraph")
 	api.RegisterMessage((*GetNodeGraphReply)(nil), "vpe.GetNodeGraphReply")
 	api.RegisterMessage((*GetNodeIndex)(nil), "vpe.GetNodeIndex")
 	api.RegisterMessage((*GetNodeIndexReply)(nil), "vpe.GetNodeIndexReply")
+	api.RegisterMessage((*LogDetails)(nil), "vpe.LogDetails")
+	api.RegisterMessage((*LogDump)(nil), "vpe.LogDump")
 	api.RegisterMessage((*ShowThreads)(nil), "vpe.ShowThreads")
 	api.RegisterMessage((*ShowThreadsReply)(nil), "vpe.ShowThreadsReply")
 	api.RegisterMessage((*ShowVersion)(nil), "vpe.ShowVersion")
 	api.RegisterMessage((*ShowVersionReply)(nil), "vpe.ShowVersionReply")
+	api.RegisterMessage((*ShowVpeSystemTimeTicks)(nil), "vpe.ShowVpeSystemTimeTicks")
+	api.RegisterMessage((*ShowVpeSystemTimeTicksReply)(nil), "vpe.ShowVpeSystemTimeTicksReply")
 }
 
 // Messages returns list of all messages in this module.
@@ -360,30 +544,42 @@ func AllMessages() []api.Message {
 		(*CliReply)(nil),
 		(*ControlPing)(nil),
 		(*ControlPingReply)(nil),
+		(*GetF64EndianValue)(nil),
+		(*GetF64EndianValueReply)(nil),
+		(*GetF64IncrementByOne)(nil),
+		(*GetF64IncrementByOneReply)(nil),
 		(*GetNextIndex)(nil),
 		(*GetNextIndexReply)(nil),
 		(*GetNodeGraph)(nil),
 		(*GetNodeGraphReply)(nil),
 		(*GetNodeIndex)(nil),
 		(*GetNodeIndexReply)(nil),
+		(*LogDetails)(nil),
+		(*LogDump)(nil),
 		(*ShowThreads)(nil),
 		(*ShowThreadsReply)(nil),
 		(*ShowVersion)(nil),
 		(*ShowVersionReply)(nil),
+		(*ShowVpeSystemTimeTicks)(nil),
+		(*ShowVpeSystemTimeTicksReply)(nil),
 	}
 }
 
 // RPCService represents RPC service API for vpe module.
 type RPCService interface {
+	DumpLog(ctx context.Context, in *LogDump) (RPCService_DumpLogClient, error)
 	AddNodeNext(ctx context.Context, in *AddNodeNext) (*AddNodeNextReply, error)
 	Cli(ctx context.Context, in *Cli) (*CliReply, error)
 	CliInband(ctx context.Context, in *CliInband) (*CliInbandReply, error)
 	ControlPing(ctx context.Context, in *ControlPing) (*ControlPingReply, error)
+	GetF64EndianValue(ctx context.Context, in *GetF64EndianValue) (*GetF64EndianValueReply, error)
+	GetF64IncrementByOne(ctx context.Context, in *GetF64IncrementByOne) (*GetF64IncrementByOneReply, error)
 	GetNextIndex(ctx context.Context, in *GetNextIndex) (*GetNextIndexReply, error)
 	GetNodeGraph(ctx context.Context, in *GetNodeGraph) (*GetNodeGraphReply, error)
 	GetNodeIndex(ctx context.Context, in *GetNodeIndex) (*GetNodeIndexReply, error)
 	ShowThreads(ctx context.Context, in *ShowThreads) (*ShowThreadsReply, error)
 	ShowVersion(ctx context.Context, in *ShowVersion) (*ShowVersionReply, error)
+	ShowVpeSystemTimeTicks(ctx context.Context, in *ShowVpeSystemTimeTicks) (*ShowVpeSystemTimeTicksReply, error)
 }
 
 type serviceClient struct {
@@ -394,6 +590,32 @@ func NewServiceClient(ch api.Channel) RPCService {
 	return &serviceClient{ch}
 }
 
+func (c *serviceClient) DumpLog(ctx context.Context, in *LogDump) (RPCService_DumpLogClient, error) {
+	stream := c.ch.SendMultiRequest(in)
+	x := &serviceClient_DumpLogClient{stream}
+	return x, nil
+}
+
+type RPCService_DumpLogClient interface {
+	Recv() (*LogDetails, error)
+}
+
+type serviceClient_DumpLogClient struct {
+	api.MultiRequestCtx
+}
+
+func (c *serviceClient_DumpLogClient) Recv() (*LogDetails, error) {
+	m := new(LogDetails)
+	stop, err := c.MultiRequestCtx.ReceiveReply(m)
+	if err != nil {
+		return nil, err
+	}
+	if stop {
+		return nil, io.EOF
+	}
+	return m, nil
+}
+
 func (c *serviceClient) AddNodeNext(ctx context.Context, in *AddNodeNext) (*AddNodeNextReply, error) {
 	out := new(AddNodeNextReply)
 	err := c.ch.SendRequest(in).ReceiveReply(out)
@@ -430,6 +652,24 @@ func (c *serviceClient) ControlPing(ctx context.Context, in *ControlPing) (*Cont
 	return out, nil
 }
 
+func (c *serviceClient) GetF64EndianValue(ctx context.Context, in *GetF64EndianValue) (*GetF64EndianValueReply, error) {
+	out := new(GetF64EndianValueReply)
+	err := c.ch.SendRequest(in).ReceiveReply(out)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *serviceClient) GetF64IncrementByOne(ctx context.Context, in *GetF64IncrementByOne) (*GetF64IncrementByOneReply, error) {
+	out := new(GetF64IncrementByOneReply)
+	err := c.ch.SendRequest(in).ReceiveReply(out)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *serviceClient) GetNextIndex(ctx context.Context, in *GetNextIndex) (*GetNextIndexReply, error) {
 	out := new(GetNextIndexReply)
 	err := c.ch.SendRequest(in).ReceiveReply(out)
@@ -475,6 +715,15 @@ func (c *serviceClient) ShowVersion(ctx context.Context, in *ShowVersion) (*Show
 	return out, nil
 }
 
+func (c *serviceClient) ShowVpeSystemTimeTicks(ctx context.Context, in *ShowVpeSystemTimeTicks) (*ShowVpeSystemTimeTicksReply, error) {
+	out := new(ShowVpeSystemTimeTicksReply)
+	err := c.ch.SendRequest(in).ReceiveReply(out)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the GoVPP api package it is being compiled against.
 // A compilation error at this line likely means your copy of the
diff --git a/scripts/genbinapi.sh b/scripts/genbinapi.sh
index 6314f60292..1e8943935f 100755
--- a/scripts/genbinapi.sh
+++ b/scripts/genbinapi.sh
@@ -5,4 +5,4 @@ set -euo pipefail
 go generate -x ./${VPP_BINAPI}
 
 find ${VPP_BINAPI} -maxdepth 2 -type f -name '*.patch' -exec \
-	patch --verbose --no-backup-if-mismatch -p1 -i {} \;
+	patch --no-backup-if-mismatch -p1 -i {} \;
diff --git a/scripts/install_protobuf.sh b/scripts/install_protobuf.sh
old mode 100644
new mode 100755
diff --git a/vpp.env b/vpp.env
index ec62eba68a..a104c32177 100644
--- a/vpp.env
+++ b/vpp.env
@@ -9,7 +9,7 @@ VPP_BINAPI_1901=plugins/vpp/binapi/vpp1901
 VPP_IMG_1904=ligato/vpp-base:19.04
 VPP_BINAPI_1904=plugins/vpp/binapi/vpp1904
 # VPP 19.08-rc0
-VPP_IMG_1908=ligato/vpp-base:19.08-rc0.581-g3eea9de89
+VPP_IMG_1908=ligato/vpp-base:19.08-rc0.673-ga2e4451db
 VPP_BINAPI_1908=plugins/vpp/binapi/vpp1908
 # default VPP
 VPP_DEFAULT=1904
\ No newline at end of file