VOL-2180 code changes for context addition
Integrating InterContainerProxy interface changes
Change-Id: Ia20c5ac3093b7845acf80cce801ec0c1d90c125f
diff --git a/adaptercore/device_handler_test.go b/adaptercore/device_handler_test.go
index 7fbfea8..dcb1f17 100644
--- a/adaptercore/device_handler_test.go
+++ b/adaptercore/device_handler_test.go
@@ -184,7 +184,9 @@
}
dh.resourceMgr.ResourceMgrs[1] = ponmgr
dh.resourceMgr.ResourceMgrs[2] = ponmgr
- dh.flowMgr = NewFlowManager(dh, dh.resourceMgr)
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ dh.flowMgr = NewFlowManager(ctx, dh, dh.resourceMgr)
dh.Client = &mocks.MockOpenoltClient{}
dh.eventMgr = &OpenOltEventMgr{eventProxy: &mocks.MockEventProxy{}, handler: dh}
dh.transitionMap = &TransitionMap{}
@@ -669,7 +671,9 @@
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
dh := tt.deviceHandler
- dh.handleIndication(tt.args.indication)
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ dh.handleIndication(ctx, tt.args.indication)
})
}
}
@@ -756,7 +760,9 @@
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
dh := newMockDeviceHandler()
- dh.handleOltIndication(tt.args.oltIndication)
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ dh.handleOltIndication(ctx, tt.args.oltIndication)
})
}
}
@@ -781,7 +787,9 @@
//dh.doStateInit()
// context.
//dh.AdoptDevice(tt.args.device)
- tt.devicehandler.postInit()
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ tt.devicehandler.postInit(ctx)
})
}
}
@@ -808,7 +816,9 @@
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- tt.devicehandler.activateONU(tt.args.intfID, tt.args.onuID,
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ tt.devicehandler.activateONU(ctx, tt.args.intfID, tt.args.onuID,
tt.args.serialNum, tt.args.serialNumber)
})
}
@@ -855,7 +865,9 @@
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
dh := tt.devicehandler
- if err := dh.PacketOut(tt.args.egressPortNo, tt.args.packet); (err != nil) != tt.wantErr {
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ if err := dh.PacketOut(ctx, tt.args.egressPortNo, tt.args.packet); (err != nil) != tt.wantErr {
t.Errorf("DeviceHandler.PacketOut() error = %v, wantErr %v", err, tt.wantErr)
}
})
@@ -881,7 +893,9 @@
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- if err := tt.devicehandler.doStateUp(); (err != nil) != tt.wantErr {
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ if err := tt.devicehandler.doStateUp(ctx); (err != nil) != tt.wantErr {
t.Logf("DeviceHandler.doStateUp() error = %v, wantErr %v", err, tt.wantErr)
}
})
@@ -903,7 +917,9 @@
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- if err := tt.devicehandler.doStateDown(); (err != nil) != tt.wantErr {
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ if err := tt.devicehandler.doStateDown(ctx); (err != nil) != tt.wantErr {
t.Logf("DeviceHandler.doStateDown() error = %v", err)
}
})
@@ -999,7 +1015,9 @@
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- tt.devicehandler.onuDiscIndication(tt.args.onuDiscInd, tt.args.sn)
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ tt.devicehandler.onuDiscIndication(ctx, tt.args.onuDiscInd, tt.args.sn)
})
}
}
@@ -1056,7 +1074,9 @@
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- tt.devicehandler.readIndications()
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ tt.devicehandler.readIndications(ctx)
})
}
}