Merge "Add buffer pool stats"

[govpp.git] / api / vppapi_errors.go

diff --git a/api/vppapi_errors.go b/api/vppapi_errors.go
index c921e14..c9ce3a3 100644 (file)
--- a/api/vppapi_errors.go
+++ b/api/vppapi_errors.go
@@ -5,16 +5,26 @@ import (
        "strconv"
 )
 
+// RetvalToVPPApiError returns error for retval value.
+// Retval 0 returns nil error.
+func RetvalToVPPApiError(retval int32) error {
+       if retval == 0 {
+               return nil
+       }
+       return VPPApiError(retval)
+}
+
 // VPPApiError represents VPP's vnet API error that is usually
 // returned as Retval field in replies from VPP binary API.
 type VPPApiError int32
 
 func (e VPPApiError) Error() string {
+       errid := int64(e)
        var errstr string
        if s, ok := vppApiErrors[e]; ok {
-               errstr = s
+               errstr = fmt.Sprintf("%s (%d)", s, errid)
        } else {
-               errstr = strconv.Itoa(int(e))
+               errstr = strconv.FormatInt(errid, 10)
        }
        return fmt.Sprintf("VPPApiError: %s", errstr)
 }
@@ -55,7 +65,7 @@ const (
        INVALID_DST_ADDRESS                            = -58
        ADDRESS_LENGTH_MISMATCH                        = -59
        ADDRESS_NOT_FOUND_FOR_INTERFACE                = -60
-       ADDRESS_NOT_LINK_LOCAL                         = -61
+       ADDRESS_NOT_DELETABLE                          = -61
        IP6_NOT_ENABLED                                = -62
        IN_PROGRESS                                    = 10
        NO_SUCH_NODE                                   = -63
@@ -145,6 +155,9 @@ const (
        INSTANCE_IN_USE                                = -147
        INVALID_SESSION_ID                             = -148
        ACL_IN_USE_BY_LOOKUP_CONTEXT                   = -149
+       INVALID_VALUE_3                                = -150
+       NON_ETHERNET                                   = -151
+       BD_ALREADY_HAS_BVI                             = -152
 )
 
 var vppApiErrors = map[VPPApiError]string{
@@ -181,7 +194,7 @@ var vppApiErrors = map[VPPApiError]string{
        INVALID_DST_ADDRESS:                "Invalid dst address",
        ADDRESS_LENGTH_MISMATCH:            "Address length mismatch",
        ADDRESS_NOT_FOUND_FOR_INTERFACE:    "Address not found for interface",
-       ADDRESS_NOT_LINK_LOCAL:             "Address not link-local",
+       ADDRESS_NOT_DELETABLE:              "Address not deletable",
        IP6_NOT_ENABLED:                    "ip6 not enabled",
        IN_PROGRESS:                        "Operation in progress",
        NO_SUCH_NODE:                       "No such graph node",
@@ -271,4 +284,7 @@ var vppApiErrors = map[VPPApiError]string{
        INSTANCE_IN_USE:                    "Instance in use",
        INVALID_SESSION_ID:                 "session ID out of range",
        ACL_IN_USE_BY_LOOKUP_CONTEXT:       "ACL in use by a lookup context",
+       INVALID_VALUE_3:                    "Invalid value #3",
+       NON_ETHERNET:                       "Interface is not an Ethernet interface",
+       BD_ALREADY_HAS_BVI:                 "Bridge domain already has a BVI interface",
 }