[VOL-2972] Revert added flows on failure
This commit consists of:
1) Reverts added flows on flow addition failure (e.g. one adapter
may return a failure in which case any corresponding flow that
has been successfully added to the other adapter will be removed).
The corresponding logical device flow will be removed as well.
2) Some minor refactoring in the mocks adapter
3) Some minor logging change to decrease the clutter when running
unit tests.
Change-Id: Ia63243e83516ef81152893563bef76c830bea022
diff --git a/rw_core/mocks/adapter_olt.go b/rw_core/mocks/adapter_olt.go
index 3ccecc7..61f431a 100644
--- a/rw_core/mocks/adapter_olt.go
+++ b/rw_core/mocks/adapter_olt.go
@@ -20,9 +20,6 @@
"context"
"errors"
"fmt"
- "strings"
- "sync"
-
"github.com/gogo/protobuf/proto"
"github.com/opencord/voltha-lib-go/v3/pkg/adapters/adapterif"
com "github.com/opencord/voltha-lib-go/v3/pkg/adapters/common"
@@ -30,6 +27,7 @@
ic "github.com/opencord/voltha-protos/v3/go/inter_container"
of "github.com/opencord/voltha-protos/v3/go/openflow_13"
"github.com/opencord/voltha-protos/v3/go/voltha"
+ "strings"
)
const (
@@ -39,18 +37,13 @@
// OLTAdapter represent OLT adapter
type OLTAdapter struct {
- flows map[uint64]*voltha.OfpFlowStats
- lock sync.Mutex
- Adapter
+ *Adapter
}
// NewOLTAdapter - creates OLT adapter instance
func NewOLTAdapter(cp adapterif.CoreProxy) *OLTAdapter {
return &OLTAdapter{
- flows: map[uint64]*voltha.OfpFlowStats{},
- Adapter: Adapter{
- coreProxy: cp,
- },
+ Adapter: NewAdapter(cp),
}
}
@@ -100,9 +93,7 @@
logger.Fatalf("getting-device-failed-%s", err)
}
- if err = oltA.updateDevice(d); err != nil {
- logger.Fatalf("saving-device-failed-%s", err)
- }
+ oltA.updateDevice(d)
// Register Child devices
initialUniPortNo := startingUNIPortNo
@@ -204,9 +195,7 @@
return
}
- if err := oltA.updateDevice(cloned); err != nil {
- logger.Fatalf("saving-device-failed-%s", err)
- }
+ oltA.updateDevice(cloned)
// Tell the Core that all child devices have been disabled (by default it's an action already taken by the Core
if err := oltA.coreProxy.ChildDevicesLost(context.TODO(), cloned.Id); err != nil {
@@ -278,24 +267,6 @@
return nil
}
-// Update_flows_incrementally mocks the incremental flow update
-func (oltA *OLTAdapter) Update_flows_incrementally(device *voltha.Device, flows *of.FlowChanges, groups *of.FlowGroupChanges, flowMetadata *voltha.FlowMetadata) error { // nolint
- oltA.lock.Lock()
- defer oltA.lock.Unlock()
-
- if flows.ToAdd != nil {
- for _, f := range flows.ToAdd.Items {
- oltA.flows[f.Id] = f
- }
- }
- if flows.ToRemove != nil {
- for _, f := range flows.ToRemove.Items {
- delete(oltA.flows, f.Id)
- }
- }
- return nil
-}
-
// Reboot_device -
func (oltA *OLTAdapter) Reboot_device(device *voltha.Device) error { // nolint
logger.Infow("reboot-device", log.Fields{"deviceId": device.Id})
@@ -305,7 +276,8 @@
logger.Fatalf("device-state-update-failed", log.Fields{"device-id": device.Id, "error": err})
}
if err := oltA.coreProxy.PortsStateUpdate(context.TODO(), device.Id, voltha.OperStatus_UNKNOWN); err != nil {
- logger.Fatalf("port-update-failed", log.Fields{"device-id": device.Id, "error": err})
+ // Not an error as the previous command will start the process of clearing the OLT
+ logger.Infow("port-update-failed", log.Fields{"device-id": device.Id, "error": err})
}
}()
return nil
@@ -317,22 +289,6 @@
return nil, errors.New("start-omci-test-not-implemented")
}
-// GetFlowCount returns the total number of flows presently under this adapter
-func (oltA *OLTAdapter) GetFlowCount() int {
- oltA.lock.Lock()
- defer oltA.lock.Unlock()
-
- return len(oltA.flows)
-}
-
-// ClearFlows removes all flows in this adapter
-func (oltA *OLTAdapter) ClearFlows() {
- oltA.lock.Lock()
- defer oltA.lock.Unlock()
-
- oltA.flows = map[uint64]*voltha.OfpFlowStats{}
-}
-
func (oltA *OLTAdapter) Get_ext_value(deviceId string, device *voltha.Device, valueflag voltha.ValueType_Type) (*voltha.ReturnValues, error) { // nolint
_ = deviceId
_ = device