@Getter
@AllArgsConstructor
-class MessageDTO {
+class Message {
private long timestamp;
private String configuration;
}
}
@GetMapping("cm-history")
- public List<MessageDTO> getAllConfigurationChanges() {
+ public List<Message> getAllConfigurationChanges() {
return service.getAllMessages();
}
@GetMapping("/less")
- public List<MessageDTO> less(@RequestParam(value = "offset", required = false, defaultValue = "${spring.kafka.default-offset}") long offset) {
+ public List<Message> less(@RequestParam(value = "offset", required = false, defaultValue = "${spring.kafka.default-offset}") long offset) {
return service.getLastMessages(offset);
}
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
this.consumerFactory = consumerFactory;
}
- List<MessageDTO> getAllMessages() {
- List<MessageDTO> messages = new ArrayList<>();
- String clientID = Long.toString(Instant.now().getEpochSecond());
- try (Consumer<String, String> consumer = consumerFactory.createConsumer(clientID, clientID)) {
+ List<Message> getAllMessages() {
+ List<Message> messages = new ArrayList<>();
+ String clientId = Long.toString(Instant.now().getEpochSecond());
+ try (Consumer<String, String> consumer = consumerFactory.createConsumer(clientId, clientId)) {
consumer.subscribe(TOPICS_TO_SUBSCRIBE);
ConsumerRecords<String, String> consumerRecords = consumer.poll(CONSUMING_DURATION_IN_MS);
consumerRecords.forEach(
consumerRecord ->
- messages.add(new MessageDTO(consumerRecord.timestamp(), consumerRecord.value())));
+ messages.add(new Message(consumerRecord.timestamp(), consumerRecord.value())));
log.debug(String.format("consumed %d messages", consumerRecords.count()));
- }
+ }
return messages;
}
- List<MessageDTO> getLastMessages(long offset) {
- List<MessageDTO> messages = new ArrayList<>();
+ List<Message> getLastMessages(long offset) {
+ List<Message> messages = new ArrayList<>();
try (Consumer<String, String> consumer = createConsumer(offset)) {
ConsumerRecords<String, String> consumerRecords = consumer.poll(CONSUMING_DURATION_IN_MS);
consumerRecords.forEach(consumerRecord ->
- messages.add(new MessageDTO(consumerRecord.timestamp(), consumerRecord.value())));
+ messages.add(new Message(consumerRecord.timestamp(), consumerRecord.value())));
}
return messages;
}
private Consumer<String, String> createConsumer(long offsetFromLastIndex) {
- String clientID = Long.toString(Instant.now().getEpochSecond());
- Consumer<String, String> consumer = consumerFactory.createConsumer(clientID, clientID);
+ String clientId = Long.toString(Instant.now().getEpochSecond());
+ Consumer<String, String> consumer = consumerFactory.createConsumer(clientId, clientId);
consumer.subscribe(TOPICS_TO_SUBSCRIBE);
seekConsumerTo(consumer, offsetFromLastIndex);
return consumer;
@Getter
@AllArgsConstructor
-public class NetconfConfigurationTO {
+public class NetconfConfiguration {
private String configuration;
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
import java.util.Map;
+
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
class EmbeddedKafkaConfig {
@Bean
- KafkaTemplate<String, String> kafkaTemplate(){
+ KafkaTemplate<String, String> kafkaTemplate() {
return new KafkaTemplate<>(producerFactory());
}
@Bean
@Autowired
- ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory(ConsumerFactory<String, String> consumerFactory){
+ ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory(ConsumerFactory<String, String> consumerFactory) {
ConcurrentKafkaListenerContainerFactory<String, String> containerFactory = new ConcurrentKafkaListenerContainerFactory<>();
containerFactory.setConsumerFactory(consumerFactory);
return containerFactory;
}
@Bean
- ConsumerFactory<String, String> consumerFactory(){
+ ConsumerFactory<String, String> consumerFactory() {
Map<String, Object> consumerProperties =
KafkaTestUtils.consumerProps("sender", "false", embeddedKafka.getEmbeddedKafka());
consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
import java.time.Instant;
import java.util.List;
+
import org.assertj.core.api.Assertions;
import org.assertj.core.util.Lists;
import org.junit.Test;
private static final String MESSAGE_2 = "message 2";
private static final String MESSAGE_1 = "message 1";
- private static final List<MessageDTO> ALL_MESSAGES = Lists.newArrayList(new MessageDTO(Instant.now().getEpochSecond(), MESSAGE_1),
- new MessageDTO(Instant.now().getEpochSecond(), MESSAGE_2),
- new MessageDTO(Instant.now().getEpochSecond(), MESSAGE_3));
+ private static final List<Message> ALL_MESSAGES = Lists.newArrayList(new Message(Instant.now().getEpochSecond(), MESSAGE_1),
+ new Message(Instant.now().getEpochSecond(), MESSAGE_2),
+ new Message(Instant.now().getEpochSecond(), MESSAGE_3));
@Mock
private StoreService service;
public void lessShouldTakeAllMessagesTest() {
when(service.getLastMessages(3)).thenReturn(ALL_MESSAGES);
- List<MessageDTO> lessResponse = storeController.less(3);
+ List<Message> lessResponse = storeController.less(3);
assertResponseContainsExpectedMessages(lessResponse, 3, MESSAGE_1, MESSAGE_2, MESSAGE_3);
}
@Test
public void lessShouldTakeTwoMessagesTest() {
- when(service.getLastMessages(2)).thenReturn(Lists.newArrayList(new MessageDTO(Instant.now().getEpochSecond(), MESSAGE_1)));
+ when(service.getLastMessages(2)).thenReturn(Lists.newArrayList(new Message(Instant.now().getEpochSecond(), MESSAGE_1)));
- List<MessageDTO> lessResult = storeController.less(2);
+ List<Message> lessResult = storeController.less(2);
assertResponseContainsExpectedMessages(lessResult, 1, MESSAGE_1);
}
@Test
- public void shouldGetAllMessages(){
+ public void shouldGetAllMessages() {
when(service.getAllMessages()).thenReturn(ALL_MESSAGES);
- List<MessageDTO> allMsgResult = storeController.getAllConfigurationChanges();
+ List<Message> allMsgResult = storeController.getAllConfigurationChanges();
assertResponseContainsExpectedMessages(allMsgResult, 3, MESSAGE_1, MESSAGE_2, MESSAGE_3);
}
- private void assertResponseContainsExpectedMessages(List<MessageDTO> actualMessages, int expectedMessageCount, String... expectedMessages){
- Assertions.assertThat(actualMessages.stream().map(MessageDTO::getConfiguration))
- .hasSize(expectedMessageCount)
- .containsExactly(expectedMessages);
+ private void assertResponseContainsExpectedMessages(List<Message> actualMessages, int expectedMessageCount, String... expectedMessages) {
+ Assertions.assertThat(actualMessages.stream().map(Message::getConfiguration))
+ .hasSize(expectedMessageCount)
+ .containsExactly(expectedMessages);
}
}
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
}
@Test
- public void testShouldReturnAllAvailableMessages(){
+ public void testShouldReturnAllAvailableMessages() {
- List<MessageDTO> actualMessages = service.getAllMessages();
+ List<Message> actualMessages = service.getAllMessages();
assertResponseContainsExpectedMessages(actualMessages, 3, MESSAGE_1, MESSAGE_2, MESSAGE_3);
}
@Test
- public void testShouldGetLastMessagesRespectingOffset(){
+ public void testShouldGetLastMessagesRespectingOffset() {
- List<MessageDTO> wantedLastMsg = service.getLastMessages(1L);
+ List<Message> wantedLastMsg = service.getLastMessages(1L);
assertResponseContainsExpectedMessages(wantedLastMsg, 1, MESSAGE_3);
}
@Test
- public void testShouldGetAll3Messages() {
- List<MessageDTO> wantedLastMsgs = service.getLastMessages(3L);
+ public void testShouldGetAll3Messages() {
+ List<Message> wantedLastMsgs = service.getLastMessages(3L);
assertResponseContainsExpectedMessages(wantedLastMsgs, 3, MESSAGE_1, MESSAGE_2, MESSAGE_3);
}
- private void prepareProducer(){
+ private void prepareProducer() {
kafkaTemplate.send("config", "message1");
kafkaTemplate.send("config", "message2");
kafkaTemplate.send("config", "message3");
}
- private void assertResponseContainsExpectedMessages(List<MessageDTO> actualMessages, int expectedMessageCount, String... expectedMessages){
- assertThat(actualMessages.stream().map(MessageDTO::getConfiguration))
- .hasSize(expectedMessageCount)
- .containsExactly(expectedMessages);
+ private void assertResponseContainsExpectedMessages(List<Message> actualMessages, int expectedMessageCount, String... expectedMessages) {
+ assertThat(actualMessages.stream().map(Message::getConfiguration))
+ .hasSize(expectedMessageCount)
+ .containsExactly(expectedMessages);
}
}
}
@Test
- void properlyReadXML() throws IOException, JNCException {
+ void properlyReadXml() throws IOException, JNCException {
when(netconfSession.getConfig()).thenReturn(nodeSet);
when(nodeSet.toXMLString()).thenReturn(EXPECTED_STRING_XML);
import com.tailf.jnc.Element;
import com.tailf.jnc.JNCException;
+
import java.io.IOException;
import java.nio.file.Files;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
@InjectMocks
NetconfConfigurationService service;
- private static String CURRENT_CONFIG_XML_STRING =
- "<config xmlns=\"http://onap.org/pnf-simulator\" xmlns:nc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
- + " <itemValue1>100</itemValue1>\n"
- + " <itemValue2>200</itemValue2>\n"
- + "</config>\n";
+ private static String CURRENT_CONFIG_XML_STRING =
+ "<config xmlns=\"http://onap.org/pnf-simulator\" xmlns:nc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
+ + " <itemValue1>100</itemValue1>\n"
+ + " <itemValue2>200</itemValue2>\n"
+ + "</config>\n";
@BeforeEach
void setUp() {
}
@Test
- void testShouldThrowExceptionWhenCurrentConfigurationDoesNotExists() throws IOException, JNCException{
+ void testShouldThrowExceptionWhenCurrentConfigurationDoesNotExists() throws IOException, JNCException {
when(reader.getRunningConfig()).thenThrow(JNCException.class);
assertThatThrownBy(() -> service.getCurrentConfiguration()).isInstanceOf(JNCException.class);
}
@Test
- void testShouldEditConfigurationSuccessfully() throws IOException, JNCException{
+ void testShouldEditConfigurationSuccessfully() throws IOException, JNCException {
byte[] bytes =
- Files.readAllBytes(ResourceUtils.getFile("classpath:updatedConfig.xml").toPath());
+ Files.readAllBytes(ResourceUtils.getFile("classpath:updatedConfig.xml").toPath());
MockMultipartFile editConfigXmlContent = new MockMultipartFile("editConfigXml", bytes);
ArgumentCaptor<Element> elementCaptor = ArgumentCaptor.forClass(Element.class);
doNothing().when(editor).editConfig(elementCaptor.capture());
@Test
void testShouldRaiseExceptionWhenMultipartFileIsInvalidXmlFile() throws IOException {
byte[] bytes =
- Files.readAllBytes(ResourceUtils.getFile("classpath:invalidXmlFile.xml").toPath());
+ Files.readAllBytes(ResourceUtils.getFile("classpath:invalidXmlFile.xml").toPath());
MockMultipartFile editConfigXmlContent = new MockMultipartFile("editConfigXml", bytes);
assertThatThrownBy(() -> service.editCurrentConfiguration(editConfigXmlContent)).isInstanceOf(JNCException.class);
@Test
void shouldSendMultipartToServer() throws IOException {
//given
- String loadModelAddress = modelLoaderService.getBackendAddress();
makeMockClientReturnStatusOk(httpClient, HttpPost.class);
ArgumentCaptor<HttpPost> postArgumentCaptor = ArgumentCaptor.forClass(HttpPost.class);
MultipartFile yangMmodel = mock(MultipartFile.class);
String moduleName = "moduleName";
when(yangMmodel.getInputStream()).thenReturn(getEmptyImputStream());
when(initialConfig.getInputStream()).thenReturn(getEmptyImputStream());
+ String loadModelAddress = modelLoaderService.getBackendAddress();
//when
LoadModelResponse response = modelLoaderService.loadYangModel(yangMmodel, initialConfig, moduleName);
void shouldSendDeleteRequestToServer() throws IOException {
//given
String yangModelName = "sampleModel";
- String deleteModelAddress = modelLoaderService.getDeleteAddress(yangModelName);
makeMockClientReturnStatusOk(httpClient, HttpDelete.class);
ArgumentCaptor<HttpDelete> deleteArgumentCaptor = ArgumentCaptor.forClass(HttpDelete.class);
+ String deleteModelAddress = modelLoaderService.getDeleteAddress(yangModelName);
//when
LoadModelResponse response = modelLoaderService.deleteYangModel(yangModelName);
Code Review / integration / simulators / pnf-simulator.git / commitdiff