summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/devicemanager-openroadm
diff options
context:
space:
mode:
Diffstat (limited to 'sdnr/wt/devicemanager-openroadm')
-rwxr-xr-xsdnr/wt/devicemanager-openroadm/installer/pom.xml2
-rw-r--r--sdnr/wt/devicemanager-openroadm/provider/pom.xml1
-rw-r--r--sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/DeviceManagerOpenroadmImpl.java2
-rw-r--r--sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmDeviceChangeNotificationListener.java6
-rw-r--r--sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmInventoryInput.java5
-rw-r--r--sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmNetworkElement.java5
6 files changed, 3 insertions, 18 deletions
diff --git a/sdnr/wt/devicemanager-openroadm/installer/pom.xml b/sdnr/wt/devicemanager-openroadm/installer/pom.xml
index fb3131c6d..2750d6094 100755
--- a/sdnr/wt/devicemanager-openroadm/installer/pom.xml
+++ b/sdnr/wt/devicemanager-openroadm/installer/pom.xml
@@ -20,7 +20,7 @@
~ ============LICENSE_END=======================================================
~
-->
-
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/sdnr/wt/devicemanager-openroadm/provider/pom.xml b/sdnr/wt/devicemanager-openroadm/provider/pom.xml
index 5eeae51e0..a8f2c91be 100644
--- a/sdnr/wt/devicemanager-openroadm/provider/pom.xml
+++ b/sdnr/wt/devicemanager-openroadm/provider/pom.xml
@@ -65,6 +65,7 @@
<version>1.9.10</version>
<scope>test</scope>
</dependency>
+
<!-- end for testing -->
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/DeviceManagerOpenroadmImpl.java b/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/DeviceManagerOpenroadmImpl.java
index efda889b9..fc5aabaa7 100644
--- a/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/DeviceManagerOpenroadmImpl.java
+++ b/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/DeviceManagerOpenroadmImpl.java
@@ -81,13 +81,13 @@ public class DeviceManagerOpenroadmImpl implements AutoCloseable {
}
// end of public methods
+ // private methods
/**
* Used to close all Services, that should support AutoCloseable Pattern
*
* @param toClose
* @throws Exception
*/
- // private methods
private void close(AutoCloseable... toCloseList) {
for (AutoCloseable element : toCloseList) {
if (element != null) {
diff --git a/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmDeviceChangeNotificationListener.java b/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmDeviceChangeNotificationListener.java
index 32f8cb0cb..f055c598a 100644
--- a/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmDeviceChangeNotificationListener.java
+++ b/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmDeviceChangeNotificationListener.java
@@ -78,9 +78,7 @@ public class OpenroadmDeviceChangeNotificationListener implements OrgOpenroadmDe
sb.append(", ");
}
sb.append(edit);
-
EventlogBuilder eventlogBuilder = new EventlogBuilder();
-
InstanceIdentifier<?> target = edit.getTarget();
if (target != null) {
eventlogBuilder.setObjectId(target.getPathArguments().toString());
@@ -91,13 +89,11 @@ public class OpenroadmDeviceChangeNotificationListener implements OrgOpenroadmDe
eventlogBuilder.setAttributeName(target.getTargetType().getName());
}
eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue());
-
eventlogBuilder.setNewValue(String.valueOf(edit.getOperation()));
eventlogBuilder.setTimestamp(notification.getChangeTime());
eventlogBuilder.setCounter(counter);
eventlogBuilder.setSourceType(SourceType.Netconf);
databaseProvider.writeEventLog(eventlogBuilder.build());
-
log.info("onDeviceConfigChange (2) {}", sb);
counter++;
}
@@ -107,7 +103,6 @@ public class OpenroadmDeviceChangeNotificationListener implements OrgOpenroadmDe
public void onCreateTechInfoNotification(CreateTechInfoNotification notification) {
// TODO Auto-generated method stub
log.info("onCreateTechInfoNotification(1){}", notification);
-
EventlogBuilder eventlogBuilder = new EventlogBuilder();
eventlogBuilder.setId(notification.getShelfId()).setAttributeName(notification.getShelfId())
.setObjectId(notification.getShelfId()).setNodeId(this.netconfAccessor.getNodeId().getValue())
@@ -115,7 +110,6 @@ public class OpenroadmDeviceChangeNotificationListener implements OrgOpenroadmDe
databaseProvider.writeEventLog(eventlogBuilder.build());
log.info("Create-techInfo Notification written ");
counter++;
-
}
// end of public methods
diff --git a/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmInventoryInput.java b/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmInventoryInput.java
index be79c7ba7..d67db8a03 100644
--- a/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmInventoryInput.java
+++ b/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmInventoryInput.java
@@ -45,11 +45,6 @@ public class OpenroadmInventoryInput {
private final NetconfAccessor accessor;
// end of variables
- /**
- * @param netconfAccessor
- * @param readDevice
- */
-
// constructors
public OpenroadmInventoryInput(NetconfAccessor netconfAccessor, OrgOpenroadmDevice readDevice) {
this.openRoadmDevice = readDevice;
diff --git a/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmNetworkElement.java b/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmNetworkElement.java
index 98e5e4659..5fa438497 100644
--- a/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmNetworkElement.java
+++ b/sdnr/wt/devicemanager-openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmNetworkElement.java
@@ -110,11 +110,6 @@ public class OpenroadmNetworkElement implements NetworkElement {
readInterfaceData(device);
// Writing initial alarms at the time of device registration
initialAlarmReader.faultService();
- // faultEventListener.initCurrentProblemStatus(this.netconfAccessor.getNodeId(),
- // oScaFaultListener.writeFaultData(this.sequenceNumber));
- // oScaFaultListener.writeAlarmLog(oScaFaultListener.writeFaultData(this.sequenceNumber));
- // this.sequenceNumber = this.sequenceNumber + 1;
-
pmDataEntity = this.openRoadmPmData.buildPmDataEntity(this.openRoadmPmData.getPmData(this.netconfAccessor));
if (!pmDataEntity.isEmpty()) {
this.databaseService.doWritePerformanceData(pmDataEntity);