From 0b6ef19a7de5b073b7818013930cc7f07526c929 Mon Sep 17 00:00:00 2001 From: Milan Lenco Date: Tue, 20 Jun 2017 17:15:59 +0200 Subject: Upgrade dependency to VPP 17.07 RC0 Change-Id: I732d478b71895f4d3889752c683dbb6a84c6e17c Signed-off-by: Milan Lenco --- api/api_test.go | 2 +- api/ifcounters/doc.go | 29 -------- api/ifcounters/ifcounters.go | 147 -------------------------------------- api/ifcounters/ifcounters_test.go | 129 --------------------------------- 4 files changed, 1 insertion(+), 306 deletions(-) delete mode 100644 api/ifcounters/doc.go delete mode 100644 api/ifcounters/ifcounters.go delete mode 100644 api/ifcounters/ifcounters_test.go (limited to 'api') diff --git a/api/api_test.go b/api/api_test.go index e7592e0..2a342f6 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -144,7 +144,7 @@ func TestRequestReplyMemifCreate(t *testing.T) { }) request := &memif.MemifCreate{ Role: 10, - Key: 12, + ID: 12, RingSize: 8000, BufferSize: 50, } diff --git a/api/ifcounters/doc.go b/api/ifcounters/doc.go deleted file mode 100644 index 35c7f7b..0000000 --- a/api/ifcounters/doc.go +++ /dev/null @@ -1,29 +0,0 @@ -// Package ifcounters provides the helper API for decoding VnetInterfaceCounters binary API message -// that contains binary-encoded statistics data into the Go structs that are better consumable by the Go code. -// -// VPP provides two types of interface counters that can be encoded inside of a single VnetInterfaceCounters -// message: simple and combined. For both of them, ifcounters API provides a separate decode function: -// DecodeCounters or DecodeCombinedCounters. The functions return a slice of simple or combined counters respectively: -// -// notifMsg := <-notifChan: -// notif := notifMsg.(*interfaces.VnetInterfaceCounters) -// -// if notif.IsCombined == 0 { -// // simple counter -// counters, err := ifcounters.DecodeCounters(ifcounters.VnetInterfaceCounters(*notif)) -// if err != nil { -// fmt.Println("Error:", err) -// } else { -// fmt.Printf("%+v\n", counters) -// } -// } else { -// // combined counter -// counters, err := ifcounters.DecodeCombinedCounters(ifcounters.VnetInterfaceCounters(*notif)) -// if err != nil { -// fmt.Println("Error:", err) -// } else { -// fmt.Printf("%+v\n", counters) -// } -// } -// -package ifcounters diff --git a/api/ifcounters/ifcounters.go b/api/ifcounters/ifcounters.go deleted file mode 100644 index 202fe6e..0000000 --- a/api/ifcounters/ifcounters.go +++ /dev/null @@ -1,147 +0,0 @@ -// Copyright (c) 2017 Cisco and/or its affiliates. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package ifcounters - -import ( - "bytes" - "errors" - "fmt" - - "github.com/lunixbochs/struc" -) - -// VnetInterfaceCounters is the input data type defined in the 'interface.api', with binary encoded Data field, -// that can be decoded into the InterfaceCounter or CombinedInterfaceCounter struct using this package. -type VnetInterfaceCounters struct { - VnetCounterType uint8 - IsCombined uint8 - FirstSwIfIndex uint32 - Count uint32 `struc:"sizeof=Data"` - Data []byte -} - -// CounterType is the basic counter type - contains only packet statistics. -type CounterType int - -// constants as defined in the vnet_interface_counter_type_t enum in 'vnet/interface.h' -const ( - Drop CounterType = 0 - Punt = 1 - IPv4 = 2 - IPv6 = 3 - RxNoBuf = 4 - RxMiss = 5 - RxError = 6 - TxError = 7 - MPLS = 8 -) - -// CombinedCounterType is the extended counter type - contains both packet and byte statistics. -type CombinedCounterType int - -// constants as defined in the vnet_interface_counter_type_t enum in 'vnet/interface.h' -const ( - Rx CombinedCounterType = 0 - Tx = 1 -) - -// InterfaceCounter contains basic counter data (contains only packet statistics). -type InterfaceCounter struct { - Type CounterType - SwIfIndex uint32 - Packets uint64 -} - -// CombinedInterfaceCounter contains extended counter data (contains both packet and byte statistics). -type CombinedInterfaceCounter struct { - Type CombinedCounterType - SwIfIndex uint32 - Packets uint64 - Bytes uint64 -} - -type counterData struct { - Packets uint64 -} - -type counter struct { - Count uint32 `struc:"sizeof=Data"` - Data []counterData -} - -type combinedCounterData struct { - Packets uint64 - Bytes uint64 -} - -type combinedCounter struct { - Count uint32 `struc:"sizeof=Data"` - Data []combinedCounterData -} - -// DecodeCounters decodes VnetInterfaceCounters struct content into the slice of InterfaceCounter structs. -func DecodeCounters(vnetCounters VnetInterfaceCounters) ([]InterfaceCounter, error) { - if vnetCounters.IsCombined == 1 { - return nil, errors.New("invalid argument - combined counter passed in") - } - - // decode into internal struct - var c counter - buf := bytes.NewReader(vnetCounters.Data) - err := struc.Unpack(buf, &c) - if err != nil { - return nil, fmt.Errorf("unable to decode counter data: %v", err) - } - - // prepare the slice - res := make([]InterfaceCounter, c.Count) - - // fill in the slice - for i := uint32(0); i < c.Count; i++ { - res[i].Type = CounterType(vnetCounters.VnetCounterType) - res[i].SwIfIndex = vnetCounters.FirstSwIfIndex + i - res[i].Packets = c.Data[i].Packets - } - - return res, nil -} - -// DecodeCombinedCounters decodes VnetInterfaceCounters struct content into the slice of CombinedInterfaceCounter structs. -func DecodeCombinedCounters(vnetCounters VnetInterfaceCounters) ([]CombinedInterfaceCounter, error) { - if vnetCounters.IsCombined != 1 { - return nil, errors.New("invalid argument - simple counter passed in") - } - - // decode into internal struct - var c combinedCounter - buf := bytes.NewReader(vnetCounters.Data) - err := struc.Unpack(buf, &c) - if err != nil { - return nil, fmt.Errorf("unable to decode counter data: %v", err) - } - - // prepare the slice - res := make([]CombinedInterfaceCounter, c.Count) - - // fill in the slice - for i := uint32(0); i < c.Count; i++ { - res[i].Type = CombinedCounterType(vnetCounters.VnetCounterType) - res[i].SwIfIndex = vnetCounters.FirstSwIfIndex + i - res[i].Packets = c.Data[i].Packets - res[i].Bytes = c.Data[i].Bytes - } - - return res, nil -} diff --git a/api/ifcounters/ifcounters_test.go b/api/ifcounters/ifcounters_test.go deleted file mode 100644 index 6f9a1d9..0000000 --- a/api/ifcounters/ifcounters_test.go +++ /dev/null @@ -1,129 +0,0 @@ -// Copyright (c) 2017 Cisco and/or its affiliates. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package ifcounters - -import ( - "testing" - - . "github.com/onsi/gomega" -) - -func TestDecodeCounters(t *testing.T) { - RegisterTestingT(t) - - testCounters := VnetInterfaceCounters{ - VnetCounterType: 1, - IsCombined: 0, - FirstSwIfIndex: 5, - Count: 2, - Data: []byte{0, 0, 0, 2, // Count - 0, 0, 0, 0, 0, 0, 0, 10, // first counter - 0, 0, 0, 0, 0, 0, 0, 11}, // second counter - } - counters, err := DecodeCounters(testCounters) - - Expect(err).ShouldNot(HaveOccurred()) - Expect(len(counters)).To(BeEquivalentTo(2), "Incorrect size of the returned slice.") - - Expect(counters[0].Type).To(BeEquivalentTo(1), "Incorrect counter type.") - Expect(counters[0].SwIfIndex).To(BeEquivalentTo(5), "Incorrect SwIfIndex.") - Expect(counters[0].Packets).To(BeEquivalentTo(10), "Incorrect Packets count.") - - Expect(counters[1].Type).To(BeEquivalentTo(1), "Incorrect counter type.") - Expect(counters[1].SwIfIndex).To(BeEquivalentTo(6), "Incorrect SwIfIndex.") - Expect(counters[1].Packets).To(BeEquivalentTo(11), "Incorrect Packets count.") -} - -func TestDecodeCombinedCounters(t *testing.T) { - RegisterTestingT(t) - - testCounters := VnetInterfaceCounters{ - VnetCounterType: 1, - IsCombined: 1, - FirstSwIfIndex: 20, - Count: 2, - Data: []byte{0, 0, 0, 2, // Count - 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 11, // first counter - 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 13}, // second counter - } - counters, err := DecodeCombinedCounters(testCounters) - - Expect(err).ShouldNot(HaveOccurred()) - Expect(len(counters)).To(BeEquivalentTo(2), "Incorrect size of the returned slice.") - - Expect(counters[0].Type).To(BeEquivalentTo(1), "Incorrect counter type.") - Expect(counters[0].SwIfIndex).To(BeEquivalentTo(20), "Incorrect SwIfIndex.") - Expect(counters[0].Packets).To(BeEquivalentTo(10), "Incorrect Packets count.") - Expect(counters[0].Bytes).To(BeEquivalentTo(11), "Incorrect Bytes count.") - - Expect(counters[1].Type).To(BeEquivalentTo(1), "Incorrect counter type.") - Expect(counters[1].SwIfIndex).To(BeEquivalentTo(21), "Incorrect SwIfIndex.") - Expect(counters[1].Packets).To(BeEquivalentTo(12), "Incorrect Packets count.") - Expect(counters[1].Bytes).To(BeEquivalentTo(13), "Incorrect Bytes count.") -} - -func TestDecodeCountersNegative1(t *testing.T) { - RegisterTestingT(t) - - testCounters := VnetInterfaceCounters{ - IsCombined: 1, // invalid, should be 0 - } - counters, err := DecodeCounters(testCounters) - - Expect(err).Should(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("invalid argument")) - Expect(counters).To(BeNil()) -} - -func TestDecodeCombinedCountersNegative1(t *testing.T) { - RegisterTestingT(t) - - testCounters := VnetInterfaceCounters{ - IsCombined: 0, // invalid, should be 1 - } - counters, err := DecodeCombinedCounters(testCounters) - - Expect(err).Should(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("invalid argument")) - Expect(counters).To(BeNil()) -} - -func TestDecodeCountersNegative2(t *testing.T) { - RegisterTestingT(t) - - testCounters := VnetInterfaceCounters{ - IsCombined: 0, - // no data - } - counters, err := DecodeCounters(testCounters) - - Expect(err).Should(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("unable to decode")) - Expect(counters).To(BeNil()) -} - -func TestDecodeCombinedCountersNegative2(t *testing.T) { - RegisterTestingT(t) - - testCounters := VnetInterfaceCounters{ - IsCombined: 1, - // no data - } - counters, err := DecodeCombinedCounters(testCounters) - - Expect(err).Should(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("unable to decode")) - Expect(counters).To(BeNil()) -} -- cgit 1.2.3-korg