summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorOndrej Fabry <ofabry@cisco.com>2019-11-05 00:16:25 +0100
committerOndrej Fabry <ofabry@cisco.com>2019-11-05 00:16:25 +0100
commit2f75863ba9bff2d2f3488b70e441b5eefc91dfd2 (patch)
tree5c54cbb3ceb47f18c9baf5c477607c212c3bcb06 /examples
parent73733b0a8ab8612233c98f9828f5f563c69fc2b7 (diff)
Begin development of next release 0.3.0
- update info in package ./version - update to Go 1.13 - regenerate ./examples/binapi for latest VPP: 19.08.1-release - clean code in proxy - refactor Makefile Change-Id: Ibf5c2682c2f4b3cbbea4aa1e35d3f02175d40a9b Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/binapi/interfaces/interfaces.ba.go27
-rw-r--r--examples/binapi/ip/ip.ba.go63
-rw-r--r--examples/binapi/vpe/vpe.ba.go40
3 files changed, 67 insertions, 63 deletions
diff --git a/examples/binapi/interfaces/interfaces.ba.go b/examples/binapi/interfaces/interfaces.ba.go
index b0eb978..4e650ed 100644
--- a/examples/binapi/interfaces/interfaces.ba.go
+++ b/examples/binapi/interfaces/interfaces.ba.go
@@ -24,9 +24,9 @@ const (
// ModuleName is the name of this module.
ModuleName = "interface"
// APIVersion is the API version of this module.
- APIVersion = "2.3.1"
+ APIVersion = "3.1.1"
// VersionCrc is the CRC of this module.
- VersionCrc = 0x6aab37be
+ VersionCrc = 0xbfceada9
)
// InterfaceIndex represents VPP binary API alias 'interface_index'.
@@ -394,7 +394,6 @@ type SwInterfaceDetails struct {
SupSwIfIndex uint32
L2AddressLength uint32
L2Address []byte `struc:"[8]byte"`
- InterfaceName []byte `struc:"[64]byte"`
AdminUpDown uint8
LinkUpDown uint8
LinkDuplex uint8
@@ -415,19 +414,20 @@ type SwInterfaceDetails struct {
VtrPushDot1q uint32
VtrTag1 uint32
VtrTag2 uint32
- Tag []byte `struc:"[64]byte"`
OuterTag uint16
BDmac []byte `struc:"[6]byte"`
BSmac []byte `struc:"[6]byte"`
BVlanid uint16
ISid uint32
+ InterfaceName string `struc:"[64]byte"`
+ Tag string `struc:"[64]byte"`
}
func (*SwInterfaceDetails) GetMessageName() string {
return "sw_interface_details"
}
func (*SwInterfaceDetails) GetCrcString() string {
- return "e4ee7eb6"
+ return "52a9262e"
}
func (*SwInterfaceDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -435,16 +435,17 @@ func (*SwInterfaceDetails) GetMessageType() api.MessageType {
// SwInterfaceDump represents VPP binary API message 'sw_interface_dump'.
type SwInterfaceDump struct {
- SwIfIndex InterfaceIndex
- NameFilterValid uint8
- NameFilter []byte `struc:"[49]byte"`
+ SwIfIndex InterfaceIndex
+ NameFilterValid bool
+ XXX_NameFilterLen uint32 `struc:"sizeof=NameFilter"`
+ NameFilter string
}
func (*SwInterfaceDump) GetMessageName() string {
return "sw_interface_dump"
}
func (*SwInterfaceDump) GetCrcString() string {
- return "052753c5"
+ return "aa610c27"
}
func (*SwInterfaceDump) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -821,16 +822,16 @@ func (*SwInterfaceSetUnnumberedReply) GetMessageType() api.MessageType {
// SwInterfaceTagAddDel represents VPP binary API message 'sw_interface_tag_add_del'.
type SwInterfaceTagAddDel struct {
- IsAdd uint8
- SwIfIndex uint32
- Tag []byte `struc:"[64]byte"`
+ IsAdd bool
+ SwIfIndex InterfaceIndex
+ Tag string `struc:"[64]byte"`
}
func (*SwInterfaceTagAddDel) GetMessageName() string {
return "sw_interface_tag_add_del"
}
func (*SwInterfaceTagAddDel) GetCrcString() string {
- return "14cc636c"
+ return "426f8bc1"
}
func (*SwInterfaceTagAddDel) GetMessageType() api.MessageType {
return api.RequestMessage
diff --git a/examples/binapi/ip/ip.ba.go b/examples/binapi/ip/ip.ba.go
index 3bdb551..62e5741 100644
--- a/examples/binapi/ip/ip.ba.go
+++ b/examples/binapi/ip/ip.ba.go
@@ -6,7 +6,7 @@ Package ip is a generated VPP binary API for 'ip' module.
It consists of:
9 enums
- 3 aliases
+ 6 aliases
17 types
1 union
93 messages
@@ -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 = 0x902699f5
+ VersionCrc = 0x251fc559
)
// AddressFamily represents VPP binary API enum 'address_family'.
@@ -416,12 +416,21 @@ func (x MfibItfFlags) String() string {
return strconv.Itoa(int(x))
}
+// AddressWithPrefix represents VPP binary API alias 'address_with_prefix'.
+type AddressWithPrefix Prefix
+
// IP4Address represents VPP binary API alias 'ip4_address'.
type IP4Address [4]uint8
+// IP4AddressWithPrefix represents VPP binary API alias 'ip4_address_with_prefix'.
+type IP4AddressWithPrefix IP4Prefix
+
// IP6Address represents VPP binary API alias 'ip6_address'.
type IP6Address [16]uint8
+// IP6AddressWithPrefix represents VPP binary API alias 'ip6_address_with_prefix'.
+type IP6AddressWithPrefix IP6Prefix
+
// MacAddress represents VPP binary API alias 'mac_address'.
type MacAddress [6]uint8
@@ -745,7 +754,7 @@ func (*IP4ArpEvent) GetMessageName() string {
return "ip4_arp_event"
}
func (*IP4ArpEvent) GetCrcString() string {
- return "72cdde7c"
+ return "efad00cd"
}
func (*IP4ArpEvent) GetMessageType() api.MessageType {
return api.EventMessage
@@ -764,7 +773,7 @@ func (*IP6NdEvent) GetMessageName() string {
return "ip6_nd_event"
}
func (*IP6NdEvent) GetCrcString() string {
- return "3a23e7d4"
+ return "d676f6ca"
}
func (*IP6NdEvent) GetMessageType() api.MessageType {
return api.EventMessage
@@ -788,7 +797,7 @@ func (*IP6RaEvent) GetMessageName() string {
return "ip6_ra_event"
}
func (*IP6RaEvent) GetCrcString() string {
- return "34c9ddac"
+ return "170493ab"
}
func (*IP6RaEvent) GetMessageType() api.MessageType {
return api.EventMessage
@@ -805,7 +814,7 @@ func (*IP6ndProxyAddDel) GetMessageName() string {
return "ip6nd_proxy_add_del"
}
func (*IP6ndProxyAddDel) GetCrcString() string {
- return "bff10d55"
+ return "b431d174"
}
func (*IP6ndProxyAddDel) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -836,7 +845,7 @@ func (*IP6ndProxyDetails) GetMessageName() string {
return "ip6nd_proxy_details"
}
func (*IP6ndProxyDetails) GetCrcString() string {
- return "bbbd7894"
+ return "46bfb684"
}
func (*IP6ndProxyDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -893,14 +902,14 @@ func (*IP6ndSendRouterSolicitationReply) GetMessageType() api.MessageType {
// IPAddressDetails represents VPP binary API message 'ip_address_details'.
type IPAddressDetails struct {
SwIfIndex uint32
- Prefix Prefix
+ Prefix AddressWithPrefix
}
func (*IPAddressDetails) GetMessageName() string {
return "ip_address_details"
}
func (*IPAddressDetails) GetCrcString() string {
- return "2f1dbc7d"
+ return "7002eee7"
}
func (*IPAddressDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -933,7 +942,7 @@ func (*IPContainerProxyAddDel) GetMessageName() string {
return "ip_container_proxy_add_del"
}
func (*IPContainerProxyAddDel) GetCrcString() string {
- return "5ba831f3"
+ return "630352c5"
}
func (*IPContainerProxyAddDel) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -964,7 +973,7 @@ func (*IPContainerProxyDetails) GetMessageName() string {
return "ip_container_proxy_details"
}
func (*IPContainerProxyDetails) GetCrcString() string {
- return "2f1dbc7d"
+ return "550a6c28"
}
func (*IPContainerProxyDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -1025,7 +1034,7 @@ func (*IPMrouteAddDel) GetMessageName() string {
return "ip_mroute_add_del"
}
func (*IPMrouteAddDel) GetCrcString() string {
- return "997baab2"
+ return "edbca49e"
}
func (*IPMrouteAddDel) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -1056,7 +1065,7 @@ func (*IPMrouteDetails) GetMessageName() string {
return "ip_mroute_details"
}
func (*IPMrouteDetails) GetCrcString() string {
- return "39405e5a"
+ return "c1cb4b44"
}
func (*IPMrouteDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -1115,7 +1124,7 @@ func (*IPNeighborAddDel) GetMessageName() string {
return "ip_neighbor_add_del"
}
func (*IPNeighborAddDel) GetCrcString() string {
- return "7a68a3c4"
+ return "029dad44"
}
func (*IPNeighborAddDel) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -1146,7 +1155,7 @@ func (*IPNeighborDetails) GetMessageName() string {
return "ip_neighbor_details"
}
func (*IPNeighborDetails) GetCrcString() string {
- return "4a05f212"
+ return "c1a190ed"
}
func (*IPNeighborDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -1178,7 +1187,7 @@ func (*IPProbeNeighbor) GetMessageName() string {
return "ip_probe_neighbor"
}
func (*IPProbeNeighbor) GetCrcString() string {
- return "2736142d"
+ return "37bc128d"
}
func (*IPProbeNeighbor) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -1241,7 +1250,7 @@ func (*IPPuntRedirect) GetMessageName() string {
return "ip_punt_redirect"
}
func (*IPPuntRedirect) GetCrcString() string {
- return "70b793c6"
+ return "f9ea79a8"
}
func (*IPPuntRedirect) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -1256,7 +1265,7 @@ func (*IPPuntRedirectDetails) GetMessageName() string {
return "ip_punt_redirect_details"
}
func (*IPPuntRedirectDetails) GetCrcString() string {
- return "07e504f8"
+ return "d6441360"
}
func (*IPPuntRedirectDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -1405,7 +1414,7 @@ func (*IPRouteAddDel) GetMessageName() string {
return "ip_route_add_del"
}
func (*IPRouteAddDel) GetCrcString() string {
- return "83e086ce"
+ return "5ceee41c"
}
func (*IPRouteAddDel) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -1436,7 +1445,7 @@ func (*IPRouteDetails) GetMessageName() string {
return "ip_route_details"
}
func (*IPRouteDetails) GetCrcString() string {
- return "acdee858"
+ return "d1ffaae1"
}
func (*IPRouteDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -1506,7 +1515,7 @@ func (*IPSourceAndPortRangeCheckAddDel) GetMessageName() string {
return "ip_source_and_port_range_check_add_del"
}
func (*IPSourceAndPortRangeCheckAddDel) GetCrcString() string {
- return "b50ed159"
+ return "97e10a78"
}
func (*IPSourceAndPortRangeCheckAddDel) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -1697,7 +1706,7 @@ func (*MfibSignalDetails) GetMessageName() string {
return "mfib_signal_details"
}
func (*MfibSignalDetails) GetCrcString() string {
- return "cd461bfa"
+ return "697ab6b4"
}
func (*MfibSignalDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -1726,7 +1735,7 @@ func (*ProxyArpAddDel) GetMessageName() string {
return "proxy_arp_add_del"
}
func (*ProxyArpAddDel) GetCrcString() string {
- return "93a0e853"
+ return "320b4c54"
}
func (*ProxyArpAddDel) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -1756,7 +1765,7 @@ func (*ProxyArpDetails) GetMessageName() string {
return "proxy_arp_details"
}
func (*ProxyArpDetails) GetCrcString() string {
- return "2515902a"
+ return "9228c150"
}
func (*ProxyArpDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -2057,7 +2066,7 @@ func (*SwInterfaceIP6ndRaPrefix) GetMessageName() string {
return "sw_interface_ip6nd_ra_prefix"
}
func (*SwInterfaceIP6ndRaPrefix) GetCrcString() string {
- return "0f759f82"
+ return "6449c040"
}
func (*SwInterfaceIP6ndRaPrefix) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -2089,7 +2098,7 @@ func (*WantIP4ArpEvents) GetMessageName() string {
return "want_ip4_arp_events"
}
func (*WantIP4ArpEvents) GetCrcString() string {
- return "70fd7195"
+ return "2678f421"
}
func (*WantIP4ArpEvents) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -2121,7 +2130,7 @@ func (*WantIP6NdEvents) GetMessageName() string {
return "want_ip6_nd_events"
}
func (*WantIP6NdEvents) GetCrcString() string {
- return "ba330719"
+ return "08283da1"
}
func (*WantIP6NdEvents) GetMessageType() api.MessageType {
return api.RequestMessage
diff --git a/examples/binapi/vpe/vpe.ba.go b/examples/binapi/vpe/vpe.ba.go
index 1d4e9db..129f868 100644
--- a/examples/binapi/vpe/vpe.ba.go
+++ b/examples/binapi/vpe/vpe.ba.go
@@ -26,9 +26,9 @@ const (
// ModuleName is the name of this module.
ModuleName = "vpe"
// APIVersion is the API version of this module.
- APIVersion = "1.5.0"
+ APIVersion = "1.6.0"
// VersionCrc is the CRC of this module.
- VersionCrc = 0x2521f24d
+ VersionCrc = 0x1bf55581
)
// LogLevel represents VPP binary API enum 'log_level'.
@@ -169,7 +169,7 @@ func (*CliInband) GetMessageName() string {
return "cli_inband"
}
func (*CliInband) GetCrcString() string {
- return "b1ad59b3"
+ return "f8377302"
}
func (*CliInband) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -186,7 +186,7 @@ func (*CliInbandReply) GetMessageName() string {
return "cli_inband_reply"
}
func (*CliInbandReply) GetCrcString() string {
- return "6d3c80a4"
+ return "05879051"
}
func (*CliInbandReply) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -394,19 +394,17 @@ func (*GetNodeIndexReply) GetMessageType() api.MessageType {
// LogDetails represents VPP binary API message 'log_details'.
type LogDetails struct {
- Timestamp Timestamp
- Level LogLevel
- XXX_MsgClassLen uint32 `struc:"sizeof=MsgClass"`
- MsgClass string `binapi:",limit=32"`
- XXX_MessageLen uint32 `struc:"sizeof=Message"`
- Message string `binapi:",limit=256"`
+ Timestamp Timestamp
+ Level LogLevel
+ MsgClass string `struc:"[32]byte"`
+ Message string `struc:"[256]byte"`
}
func (*LogDetails) GetMessageName() string {
return "log_details"
}
func (*LogDetails) GetCrcString() string {
- return "4aea1f4d"
+ return "255827a1"
}
func (*LogDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -421,7 +419,7 @@ func (*LogDump) GetMessageName() string {
return "log_dump"
}
func (*LogDump) GetCrcString() string {
- return "e4a022b6"
+ return "6ab31753"
}
func (*LogDump) GetMessageType() api.MessageType {
return api.RequestMessage
@@ -472,22 +470,18 @@ func (*ShowVersion) GetMessageType() api.MessageType {
// ShowVersionReply represents VPP binary API message 'show_version_reply'.
type ShowVersionReply struct {
- Retval int32
- XXX_ProgramLen uint32 `struc:"sizeof=Program"`
- Program string `binapi:",limit=32"`
- XXX_VersionLen uint32 `struc:"sizeof=Version"`
- Version string `binapi:",limit=32"`
- XXX_BuildDateLen uint32 `struc:"sizeof=BuildDate"`
- BuildDate string `binapi:",limit=32"`
- XXX_BuildDirectoryLen uint32 `struc:"sizeof=BuildDirectory"`
- BuildDirectory string `binapi:",limit=256"`
+ Retval int32
+ Program string `struc:"[32]byte"`
+ Version string `struc:"[32]byte"`
+ BuildDate string `struc:"[32]byte"`
+ BuildDirectory string `struc:"[256]byte"`
}
func (*ShowVersionReply) GetMessageName() string {
return "show_version_reply"
}
func (*ShowVersionReply) GetCrcString() string {
- return "b9bcf6df"
+ return "c919bde1"
}
func (*ShowVersionReply) GetMessageType() api.MessageType {
return api.ReplyMessage
@@ -516,7 +510,7 @@ func (*ShowVpeSystemTimeReply) GetMessageName() string {
return "show_vpe_system_time_reply"
}
func (*ShowVpeSystemTimeReply) GetCrcString() string {
- return "3b12fb3f"
+ return "7ffd8193"
}
func (*ShowVpeSystemTimeReply) GetMessageType() api.MessageType {
return api.ReplyMessage