../ves-nf-oam-adopter-app/target/site/jacoco-ut/jacoco.xml,
../ves-nf-oam-adopter-app/target/site/jacoco-aggregate/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
- <sonar.scanner.version>4.4.0.2170</sonar.scanner.version>
+ <sonar.scanner.version>3.8.0.2131</sonar.scanner.version>
<sonar.exclusions>
**/api/**,
**/model/**,
--- /dev/null
+/*
+ * ============LICENSE_START=======================================================
+ * O-RAN-SC
+ * ================================================================================
+ * Copyright © 2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.o.ran.oam.nf.oam.adopter.snmp.manager;
+
+import java.time.LocalDateTime;
+import java.util.Optional;
+import org.o.ran.oam.nf.oam.adopter.api.VesEventNotifier;
+import org.o.ran.oam.nf.oam.adopter.snmp.manager.api.TimeZoneOffsetService;
+import org.o.ran.oam.nf.oam.adopter.snmp.manager.mapper.SnmpMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.snmp4j.CommandResponder;
+import org.snmp4j.CommandResponderEvent;
+import org.snmp4j.smi.UdpAddress;
+
+class SnmpCommandResponder implements CommandResponder {
+
+ private static final Logger LOG = LoggerFactory.getLogger(SnmpCommandResponder.class);
+ private final TimeZoneOffsetService timeZoneOffsetService;
+ private final SnmpMapper mapper;
+ private final VesEventNotifier vesEventNotifier;
+
+ public SnmpCommandResponder(final TimeZoneOffsetService timeZoneOffsetService, final SnmpMapper mapper,
+ final VesEventNotifier vesEventNotifier) {
+ this.timeZoneOffsetService = timeZoneOffsetService;
+ this.mapper = mapper;
+ this.vesEventNotifier = vesEventNotifier;
+ }
+
+ /**
+ * This method will be called whenever a pdu is received on the given port
+ * specified in the listen() method.
+ */
+ @Override
+ public synchronized void processPdu(final CommandResponderEvent cmdRespEvent) {
+ LOG.info("Received PDU");
+ final var pdu = cmdRespEvent.getPDU();
+ if (pdu == null) {
+ LOG.warn("Ignoring PDU.");
+ return;
+ }
+
+ final UdpAddress address = (UdpAddress) cmdRespEvent.getPeerAddress();
+ final var optZoneId = timeZoneOffsetService.getTimeZone(address.getInetAddress().getHostAddress());
+ final String timeZone = Optional.ofNullable(optZoneId)
+ .map(zoneId -> "UTC" + LocalDateTime.now().atZone(zoneId).getOffset()
+ .toString()).orElse(null);
+
+ mapper.toEvent(address, timeZone, pdu).flatMapCompletable(vesEventNotifier::notifyEvents)
+ .doOnSubscribe(result -> LOG.debug("SNMP Trap processing started"))
+ .doOnComplete(() -> LOG.debug("SNMP Trap processed successfully"))
+ .doOnError(error -> LOG.error("Failed to process SNMP Trap", error)).subscribe();
+ }
+}
import org.o.ran.oam.nf.oam.adopter.snmp.manager.api.TimeZoneOffsetService;
import org.o.ran.oam.nf.oam.adopter.snmp.manager.mapper.SnmpMapper;
-public class SnmpManagerImpl implements AutoCloseable {
+public class SnmpManager implements AutoCloseable {
private static final String SNMP_MANAGER_THREAD = "SnmpManager";
private final Thread snmpThread;
/**
* Default constructor.
*/
- public SnmpManagerImpl(final String host, final int port, final SnmpMapper mapper,
+ public SnmpManager(final String host, final int port, final SnmpMapper mapper,
final VesEventNotifier vesEventNotifier, final TimeZoneOffsetService timeZoneOffsetService) {
final var trapListener = new SnmpTrapListener(host, port, mapper, vesEventNotifier, timeZoneOffsetService);
this.snmpThread = new Thread(trapListener, SNMP_MANAGER_THREAD);
package org.o.ran.oam.nf.oam.adopter.snmp.manager;
-import com.google.gson.Gson;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.Optional;
import org.o.ran.oam.nf.oam.adopter.api.VesEventNotifier;
import org.o.ran.oam.nf.oam.adopter.snmp.manager.api.TimeZoneOffsetService;
import org.o.ran.oam.nf.oam.adopter.snmp.manager.mapper.SnmpMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.snmp4j.CommandResponder;
-import org.snmp4j.CommandResponderEvent;
import org.snmp4j.MessageDispatcher;
import org.snmp4j.MessageDispatcherImpl;
import org.snmp4j.Snmp;
import org.snmp4j.util.MultiThreadedMessageDispatcher;
import org.snmp4j.util.ThreadPool;
-final class SnmpTrapListener implements CommandResponder, Runnable {
+final class SnmpTrapListener implements Runnable {
private static final Logger LOG = LoggerFactory.getLogger(SnmpTrapListener.class);
private static final int THREADS_SIZE = 2;
private final String hostPortAddress;
- private final SnmpMapper mapper;
- private final VesEventNotifier vesEventNotifier;
- private final Gson gson = new Gson();
- private final TimeZoneOffsetService timeZoneOffsetService;
+ private final SnmpCommandResponder commandResponder;
public SnmpTrapListener(final String host, final Integer port, final SnmpMapper mapper,
final VesEventNotifier vesEventNotifier, final TimeZoneOffsetService timeZoneOffsetService) {
LOG.info("SnmpTrapListener listening on {}:{}", host, port);
this.hostPortAddress = host + "/" + port;
- this.mapper = mapper;
- this.vesEventNotifier = vesEventNotifier;
- this.timeZoneOffsetService = timeZoneOffsetService;
+ this.commandResponder = new SnmpCommandResponder(timeZoneOffsetService, mapper, vesEventNotifier);
}
@Override
}
}
- @SuppressFBWarnings("WA_NOT_IN_LOOP")
private synchronized void listenSnmp(final MessageDispatcher dispatcher,
final DefaultUdpTransportMapping snmpTarget) {
- try (final var snmp = new Snmp(dispatcher, snmpTarget)) {
- snmp.addCommandResponder(this);
- snmpTarget.listen();
- LOG.debug("Listening on {}", snmpTarget);
- wait();
- } catch (final InterruptedException | IOException ex) {
- Thread.currentThread().interrupt();
- }
- }
-
- /**
- * This method will be called whenever a pdu is received on the given port
- * specified in the listen() method.
- */
- @Override
- public synchronized void processPdu(final CommandResponderEvent cmdRespEvent) {
- LOG.info("Received PDU");
- final var pdu = cmdRespEvent.getPDU();
- if (pdu == null) {
- LOG.warn("Ignoring PDU.");
- return;
- }
-
- final UdpAddress address = (UdpAddress) cmdRespEvent.getPeerAddress();
- final var optZoneId = timeZoneOffsetService.getTimeZone(address.getInetAddress().getHostAddress());
- final String timeZone = Optional.ofNullable(optZoneId)
- .map(zoneId -> "UTC" + LocalDateTime.now().atZone(zoneId).getOffset().toString()).orElse(null);
-
- mapper.toEvent(address, timeZone, pdu)
- .flatMapCompletable(vesEventNotifier::notifyEvents)
- .doOnSubscribe(result -> LOG.debug("SNMP Trap processing started"))
- .doOnComplete(() -> LOG.debug("SNMP Trap processed successfully"))
- .doOnError(error -> LOG.error("Failed to process SNMP Trap", error))
- .subscribe();
+ do {
+ try (final var snmp = new Snmp(dispatcher, snmpTarget)) {
+ snmp.addCommandResponder(commandResponder);
+ snmpTarget.listen();
+ LOG.debug("Listening on {}", snmpTarget);
+ wait();
+ } catch (final InterruptedException | IOException ex) {
+ Thread.currentThread().interrupt();
+ }
+ } while (snmpTarget.isListening());
}
}
package org.o.ran.oam.nf.oam.adopter.snmp.manager.configurations;
import org.o.ran.oam.nf.oam.adopter.api.VesEventNotifier;
-import org.o.ran.oam.nf.oam.adopter.snmp.manager.SnmpManagerImpl;
+import org.o.ran.oam.nf.oam.adopter.snmp.manager.SnmpManager;
import org.o.ran.oam.nf.oam.adopter.snmp.manager.api.TimeZoneOffsetService;
import org.o.ran.oam.nf.oam.adopter.snmp.manager.mapper.SnmpMapper;
import org.o.ran.oam.nf.oam.adopter.snmp.manager.properties.SnmpManagerProperties;
}
@Bean
- public SnmpManagerImpl getSnmpManagerService() {
- return new SnmpManagerImpl(snmpManagerProperties.getHost(), snmpManagerProperties.getPort(), snmpMapper,
+ public SnmpManager getSnmpManagerService() {
+ return new SnmpManager(snmpManagerProperties.getHost(), snmpManagerProperties.getPort(), snmpMapper,
vesEventNotifier, timeZoneOffsetService);
}
}
@Autowired
private SnmpManagerProperties snmpManagerProperties;
@Autowired
- private SnmpManagerImpl snmpManager;
+ private SnmpManager snmpManager;
@MockBean
private TimeZoneOffsetService timeZoneOffsetService;
Code Review / oam / nf-oam-adopter.git / commitdiff