Commit 3bd6760d authored by PERRIER Guillaume's avatar PERRIER Guillaume
Browse files

Merge branch 'develop' of gitlab.in2p3.fr:opsportal/sf3 into develop

parents 777625ca 47ab7ef6
......@@ -57,10 +57,10 @@ parameters:
EOSC_AAI_AUTHORIZE: test
EOSC_AAI_TOKEN: test
ggusUrlP: "ggursuel"
lavoisierInstance: 'cclavoisierfr.in2p3.fr'
aupUrlParam: "ulr"
ldap.login: 'cer'
ldap.pwd: 'cer'
cclavoisier01_cert: ../../../path
......
......@@ -255,30 +255,33 @@ class CronController extends Controller
return new JsonResponse($e->getMessage(), $e->getStatusCode());
}
$response="no alarms removed";
if ($type === 'rod'){
if ($type == 'rod'){
$lavoisierService->notify('RodDelete1');
$lavoisierService->notify('RodDelete2');
$lavoisierService->notify('RodDelete3');
$response="remove $type alarms ok !";
sleep(10);
}
if ($type === 'csi'){
if ($type == 'csi'){
$lavoisierService->notify('CsiDelete1');
$lavoisierService->notify('CsiDelete2');
$lavoisierService->notify('CsiDelete3');
sleep(10);
$response="remove $type alarms ok !";
}
if ($type === 'csi'){
if ($type == 'csi'){
$lavoisierService->notify('DASHBOARD_alarms_sec');
}else{
$lavoisierService->notify('DASHBOARD_alarms');
}
return new Response("remove $type alarms ok !");
return new Response($response);
}
......
......@@ -230,7 +230,6 @@ class SLAControllerTest extends WebTestCase
"the controller method called is not slaReportsAction");
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertGreaterThan(0, $this->crawler->filter('td span.av')->count());
$this->assertGreaterThan(0, $this->crawler->filter('td span.re')->count());
$this->assertGreaterThan(0, $this->crawler->filter('td span.violation')->count());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment