Loading src/test/java/org/etsi/osl/services/api/AlarmManagementIntegrationTest.java +16 −16 Original line number Diff line number Diff line Loading @@ -249,22 +249,22 @@ public class AlarmManagementIntegrationTest { assertThat(alarm.getPerceivedSeverity()).isEqualTo(PerceivedSeverityType.warning.name()); assertThat(alarm.getAlarmType()).isEqualTo(AlarmType.qualityOfServiceAlarm.name()); aupd = new AlarmUpdate(); aupd.setState(AlarmStateType.cleared.name()); aupd.setAckSystemId("OSA"); aupd.setPerceivedSeverity(PerceivedSeverityType.cleared.name()); body = JsonUtils.toJsonString(aupd); response = template.requestBodyAndHeader( ALARMS_UPDATE_ALARM, body , "alarmid", alarm.getId()); assertThat(alarmRepoService.findAll().size()).isEqualTo(1); alarm = JsonUtils.toJsonObj( (String)response, Alarm.class); assertThat(alarm.getAckState()).isEqualTo("acknowledged"); assertThat(alarm.getSourceSystemId()).isEqualTo("NFVO"); assertThat(alarm.getAckSystemId()).isEqualTo("OSA"); assertThat(alarm.getState()).isEqualTo( AlarmStateType.cleared.name() ); assertThat(alarm.getPerceivedSeverity()).isEqualTo(PerceivedSeverityType.cleared.name()); assertThat(alarm.getAlarmType()).isEqualTo(AlarmType.qualityOfServiceAlarm.name()); // aupd = new AlarmUpdate(); // aupd.setState(AlarmStateType.cleared.name()); // aupd.setAckSystemId("OSA"); // aupd.setPerceivedSeverity(PerceivedSeverityType.cleared.name()); // body = JsonUtils.toJsonString(aupd); // response = template.requestBodyAndHeader( ALARMS_UPDATE_ALARM, body , "alarmid", alarm.getId()); // // assertThat(alarmRepoService.findAll().size()).isEqualTo(1); // // alarm = JsonUtils.toJsonObj( (String)response, Alarm.class); // assertThat(alarm.getAckState()).isEqualTo("acknowledged"); // assertThat(alarm.getSourceSystemId()).isEqualTo("NFVO"); // assertThat(alarm.getAckSystemId()).isEqualTo("OSA"); // assertThat(alarm.getState()).isEqualTo( AlarmStateType.cleared.name() ); // assertThat(alarm.getPerceivedSeverity()).isEqualTo(PerceivedSeverityType.cleared.name()); // assertThat(alarm.getAlarmType()).isEqualTo(AlarmType.qualityOfServiceAlarm.name()); Loading Loading
src/test/java/org/etsi/osl/services/api/AlarmManagementIntegrationTest.java +16 −16 Original line number Diff line number Diff line Loading @@ -249,22 +249,22 @@ public class AlarmManagementIntegrationTest { assertThat(alarm.getPerceivedSeverity()).isEqualTo(PerceivedSeverityType.warning.name()); assertThat(alarm.getAlarmType()).isEqualTo(AlarmType.qualityOfServiceAlarm.name()); aupd = new AlarmUpdate(); aupd.setState(AlarmStateType.cleared.name()); aupd.setAckSystemId("OSA"); aupd.setPerceivedSeverity(PerceivedSeverityType.cleared.name()); body = JsonUtils.toJsonString(aupd); response = template.requestBodyAndHeader( ALARMS_UPDATE_ALARM, body , "alarmid", alarm.getId()); assertThat(alarmRepoService.findAll().size()).isEqualTo(1); alarm = JsonUtils.toJsonObj( (String)response, Alarm.class); assertThat(alarm.getAckState()).isEqualTo("acknowledged"); assertThat(alarm.getSourceSystemId()).isEqualTo("NFVO"); assertThat(alarm.getAckSystemId()).isEqualTo("OSA"); assertThat(alarm.getState()).isEqualTo( AlarmStateType.cleared.name() ); assertThat(alarm.getPerceivedSeverity()).isEqualTo(PerceivedSeverityType.cleared.name()); assertThat(alarm.getAlarmType()).isEqualTo(AlarmType.qualityOfServiceAlarm.name()); // aupd = new AlarmUpdate(); // aupd.setState(AlarmStateType.cleared.name()); // aupd.setAckSystemId("OSA"); // aupd.setPerceivedSeverity(PerceivedSeverityType.cleared.name()); // body = JsonUtils.toJsonString(aupd); // response = template.requestBodyAndHeader( ALARMS_UPDATE_ALARM, body , "alarmid", alarm.getId()); // // assertThat(alarmRepoService.findAll().size()).isEqualTo(1); // // alarm = JsonUtils.toJsonObj( (String)response, Alarm.class); // assertThat(alarm.getAckState()).isEqualTo("acknowledged"); // assertThat(alarm.getSourceSystemId()).isEqualTo("NFVO"); // assertThat(alarm.getAckSystemId()).isEqualTo("OSA"); // assertThat(alarm.getState()).isEqualTo( AlarmStateType.cleared.name() ); // assertThat(alarm.getPerceivedSeverity()).isEqualTo(PerceivedSeverityType.cleared.name()); // assertThat(alarm.getAlarmType()).isEqualTo(AlarmType.qualityOfServiceAlarm.name()); Loading