Make now runs lint and any unit tests.
Also update vendored voltha-go to add new api updates
Change-Id: I08e11ae043b1db46fed4cc64fddc890a6729dedf
diff --git a/vendor/github.com/opencord/voltha-go/rw_core/utils/core_utils.go b/vendor/github.com/opencord/voltha-go/rw_core/utils/core_utils.go
index 1e1ed9f..cf77d59 100644
--- a/vendor/github.com/opencord/voltha-go/rw_core/utils/core_utils.go
+++ b/vendor/github.com/opencord/voltha-go/rw_core/utils/core_utils.go
@@ -15,6 +15,13 @@
*/
package utils
+import (
+ "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/status"
+ "reflect"
+ "time"
+)
+
type DeviceID struct {
Id string
}
@@ -22,3 +29,61 @@
type LogicalDeviceID struct {
Id string
}
+
+//WaitForNilOrErrorResponses waits on a variadic number of channels for either a nil response or an error
+//response. If an error is received from a given channel then the returned error array will contain that error.
+//The error will be at the index corresponding to the order in which the channel appear in the parameter list.
+//If no errors is found then nil is returned. This method also takes in a timeout in milliseconds. If a
+//timeout is obtained then this function will stop waiting for the remaining responses and abort.
+func WaitForNilOrErrorResponses(timeout int64, chnls ...chan interface{}) []error {
+ // Create a timeout channel
+ tChnl := make(chan *interface{})
+ go func() {
+ time.Sleep(time.Duration(timeout) * time.Millisecond)
+ tChnl <- nil
+ }()
+
+ errorsReceived := false
+ errors := make([]error, len(chnls))
+ cases := make([]reflect.SelectCase, len(chnls)+1)
+ for i, ch := range chnls {
+ cases[i] = reflect.SelectCase{Dir: reflect.SelectRecv, Chan: reflect.ValueOf(ch)}
+ }
+ // Add the timeout channel
+ cases[len(chnls)] = reflect.SelectCase{Dir: reflect.SelectRecv, Chan: reflect.ValueOf(tChnl)}
+
+ resultsReceived := make([]bool, len(errors)+1)
+ remaining := len(cases) - 1
+ for remaining > 0 {
+ index, value, ok := reflect.Select(cases)
+ if !ok { // closed channel
+ //Set the channel at that index to nil to disable this case, hence preventing it from interfering with other cases.
+ cases[index].Chan = reflect.ValueOf(nil)
+ errors[index] = status.Errorf(codes.Internal, "channel closed")
+ errorsReceived = true
+ } else if index == len(chnls) { // Timeout has occurred
+ for k := range errors {
+ if !resultsReceived[k] {
+ errors[k] = status.Errorf(codes.Aborted, "timeout")
+ }
+ }
+ errorsReceived = true
+ break
+ } else if value.IsNil() { // Nil means a good response
+ //do nothing
+ } else if err, ok := value.Interface().(error); ok { // error returned
+ errors[index] = err
+ errorsReceived = true
+ } else { // unknown value
+ errors[index] = status.Errorf(codes.Internal, "%s", value)
+ errorsReceived = true
+ }
+ resultsReceived[index] = true
+ remaining -= 1
+ }
+
+ if errorsReceived {
+ return errors
+ }
+ return nil
+}
diff --git a/vendor/github.com/opencord/voltha-go/rw_core/utils/flow_utils.go b/vendor/github.com/opencord/voltha-go/rw_core/utils/flow_utils.go
index 10be81a..0c485bb 100644
--- a/vendor/github.com/opencord/voltha-go/rw_core/utils/flow_utils.go
+++ b/vendor/github.com/opencord/voltha-go/rw_core/utils/flow_utils.go
@@ -172,7 +172,9 @@
func (dr *DeviceRules) Copy() *DeviceRules {
copyDR := NewDeviceRules()
for key, val := range dr.Rules {
- copyDR.Rules[key] = val.Copy()
+ if val != nil {
+ copyDR.Rules[key] = val.Copy()
+ }
}
return copyDR
}
@@ -183,6 +185,16 @@
}
}
+func (dr *DeviceRules) FilterRules(deviceIds map[string]string) *DeviceRules {
+ filteredDR := NewDeviceRules()
+ for key, val := range dr.Rules {
+ if _, exist := deviceIds[key]; exist {
+ filteredDR.Rules[key] = val.Copy()
+ }
+ }
+ return filteredDR
+}
+
func (dr *DeviceRules) AddFlow(deviceId string, flow *ofp.OfpFlowStats) {
if _, exist := dr.Rules[deviceId]; !exist {
dr.Rules[deviceId] = NewFlowsAndGroups()