FTTH-50934 Fix the error response for the VGC NB Apis
Change-Id: Ibeb54b0a7a370a376b222b83154e2bb54250c863
diff --git a/internal/pkg/application/service_test.go b/internal/pkg/application/service_test.go
index c687e55..1c66cb6 100644
--- a/internal/pkg/application/service_test.go
+++ b/internal/pkg/application/service_test.go
@@ -932,9 +932,8 @@
}
case "sVlan != of.VlanNone":
va.ServiceByName.Store("test_name", voltServiceTest)
- if err := va.DeactivateService(tt.args.cntx, tt.args.deviceID, tt.args.portNo, tt.args.sVlan, tt.args.cVlan, tt.args.tpID); (err != nil) != tt.wantErr {
- t.Errorf("VoltApplication.DeactivateService() error = %v, wantErr %v", err, tt.wantErr)
- }
+ err := va.DeactivateService(tt.args.cntx, tt.args.deviceID, tt.args.portNo, tt.args.sVlan, tt.args.cVlan, tt.args.tpID)
+ assert.NotNil(t, err)
case GetDeviceFromPort_error:
va.ServiceByName.Store("test_name", voltServiceTest)
if err := va.DeactivateService(tt.args.cntx, tt.args.deviceID, tt.args.portNo, tt.args.sVlan, tt.args.cVlan, tt.args.tpID); (err != nil) != tt.wantErr {
@@ -1089,9 +1088,8 @@
va.PortsDisc.Store("test_port", voltPortTest)
va.DevicesDisc.Store(test_device, voltDevice)
va.ServiceByName.Store("test_name", voltServiceTest)
- if err := va.ActivateService(tt.args.cntx, tt.args.deviceID, tt.args.portNo, tt.args.sVlan, tt.args.cVlan, tt.args.tpID); (err != nil) != tt.wantErr {
- t.Errorf("VoltApplication.ActivateService() error = %v, wantErr %v", err, tt.wantErr)
- }
+ err := va.ActivateService(tt.args.cntx, tt.args.deviceID, tt.args.portNo, tt.args.sVlan, tt.args.cVlan, tt.args.tpID)
+ assert.NotNil(t, err)
}
})
}
@@ -2308,7 +2306,8 @@
}
va.VnetsBySvlan.Set(of.VlanAny, cuncurrentMap)
dbintf.EXPECT().DelVnet(gomock.Any(), gomock.Any()).Return(nil).Times(1)
- va.DelServiceWithPrefix(tt.args.cntx, tt.args.prefix)
+ err := va.DelServiceWithPrefix(tt.args.cntx, tt.args.prefix)
+ assert.Nil(t, err)
})
}
}