[VOL-5536] - VGC recent fixes
Change-Id: Id6f0e647b37baac827230afbb45d132df8a62b68
Signed-off-by: Sridhar Ravindra <sridhar.ravindra@radisys.com>
diff --git a/internal/pkg/controller/controller_test.go b/internal/pkg/controller/controller_test.go
index 18b16bc..e47f727 100644
--- a/internal/pkg/controller/controller_test.go
+++ b/internal/pkg/controller/controller_test.go
@@ -173,7 +173,7 @@
v.Devices.Store(key, value)
return true
})
- if err := v.AddFlows(tt.args.cntx, tt.args.port, tt.args.device, tt.args.flow); (err != nil) != tt.wantErr {
+ if err := v.AddFlows(tt.args.cntx, tt.args.port, tt.args.device, tt.args.flow, false); (err != nil) != tt.wantErr {
t.Errorf("VoltController.AddFlows() error = %v, wantErr %v", err, tt.wantErr)
}
})
@@ -1219,9 +1219,11 @@
State: 1,
SetVlan: of.VlanAny,
}
+
+ // Setup database mock for async operations
dbintf := mocks.NewMockDBIntf(gomock.NewController(t))
db = dbintf
- dbintf.EXPECT().PutGroup(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).Times(1)
+ dbintf.EXPECT().PutGroup(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
tests := []struct {
name string
args args
@@ -1263,7 +1265,18 @@
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
switch tt.name {
- case "GroupUpdate", "DeviceNOtFound_Error", "PortNOtFound_Error":
+ case "GroupUpdate":
+ v := &VoltController{
+ Devices: sync.Map{},
+ }
+ dev.Range(func(key, value interface{}) bool {
+ v.Devices.Store(key, value)
+ return true
+ })
+ if err := v.GroupUpdate(tt.args.port, tt.args.device, tt.args.group); (err != nil) != tt.wantErr {
+ t.Errorf("VoltController.GroupUpdate() error = %v, wantErr %v", err, tt.wantErr)
+ }
+ case "DeviceNOtFound_Error", "PortNOtFound_Error":
v := &VoltController{
Devices: sync.Map{},
}