fix import extra separations

[transportpce.git] / inventory / src / main / java / org / opendaylight / transportpce / inventory / DeviceInventory.java

diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/DeviceInventory.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/DeviceInventory.java
index 63e0d41cbb5184d10519fd1e05fecd9554f0720c..07ad030675e6acd9eb3614297d0d492bbb8f1ecc 100644 (file)
--- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/DeviceInventory.java
+++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/DeviceInventory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 AT&T and others. All rights reserved.
+ * Copyright © 2016 AT&T and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -12,27 +12,19 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Pattern;
-
 import javax.sql.DataSource;
-
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.transportpce.common.Timeouts;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.Info;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DeviceInventory {
     private static final String INSERT_ALARM_STRING =
         "insert into inv_alarm_info(nodeid, probablecause, direction,extension,location,"
-            + "notificationid,type,raisetime,severity,circuitid,circuitpack,connection,degree,iface,"
-            + "internallink,physicallink,service,shelf,sharedriskgroup,port,portcircuitpack, create_date, update_date) "
-            + "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        + "notificationid,type,raisetime,severity,circuitid,circuitpack,connection,degree,iface,"
+        + "internallink,physicallink,service,shelf,sharedriskgroup,port,portcircuitpack, create_date, update_date) "
+        + "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
     private static final Logger LOG = LoggerFactory.getLogger(DeviceInventory.class);
 
@@ -41,7 +33,7 @@ public class DeviceInventory {
     private final DeviceTransactionManager deviceTransactionManager;
 
     public DeviceInventory(DataSource dataSource, INode inode,
-            DeviceTransactionManager deviceTransactionManager) {
+                           DeviceTransactionManager deviceTransactionManager) {
         this.dataSource = dataSource;
         this.inode = inode;
         this.deviceTransactionManager = deviceTransactionManager;
@@ -51,47 +43,35 @@ public class DeviceInventory {
         LOG.info("Initializing {}", DeviceInventory.class.getName());
     }
 
-    public void initializeDevice(String deviceId) throws InterruptedException, ExecutionException {
-        InstanceIdentifier<Info> infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class);
-        Optional<Info> infoOpt =
-                this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, infoIID,
-                        Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+    public void initializeDevice(String deviceId, String openRoadmVersion)
+        throws InterruptedException, ExecutionException {
 
-        Info deviceInfo;
-        if (infoOpt.isPresent()) {
-            deviceInfo = infoOpt.get();
-        } else {
-            LOG.warn("Could not get device info from DataBrooker");
-            return;
-        }
-        LOG.info("Creating Device Inventory {}", deviceInfo);
-        if (!this.inode.nodeExists(deviceId)) {
+        LOG.info("Creating Device Inventory for device {} with version {}", deviceId, openRoadmVersion);
+        if (!inode.dataExists("inv_dev_info", " node_id = '" + deviceId + "'")) {
             LOG.info("Adding node {} to inventory", deviceId);
-            this.inode.addNode(deviceInfo);
-            this.inode.getRoadmShelves(deviceId);
-            this.inode.getCircuitPacks(deviceId);
+            inode.addNode(deviceId, openRoadmVersion);
         }
     }
 
     /**
      * Stores the alarm into DB using {@link PreparedStatement}.
      *
-     * @param alarmString an alarm string
+     * @param alarmString an alarm
      * @return number of rows inserted
      */
     public int storeAlarm(String alarmString) {
         String delimiter = "|";
         String[] splitAlarmString = alarmString.split(Pattern.quote(delimiter));
         int count = 0;
-        try (Connection connection = this.dataSource.getConnection();
-                PreparedStatement statement = connection.prepareStatement(INSERT_ALARM_STRING)) {
+        try (Connection connection = dataSource.getConnection();
+             PreparedStatement statement = connection.prepareStatement(INSERT_ALARM_STRING)) {
             LOG.debug("Inserting prepared stmt for {} query", INSERT_ALARM_STRING);
-            SimpleDateFormat simpleDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            java.util.Date startTimetamp = new Date();
-            String startTimetampStr = simpleDate.format(startTimetamp);
+            SimpleDateFormat myTimeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+            Date startTimetamp = new Date();
+            String startTimetampStr = myTimeStamp.format(startTimetamp);
 
             for (int i = 0; i < 21; i++) {
-                String value = (splitAlarmString.length >= (i + 1)) ? splitAlarmString[i] : "";
+                String value = (splitAlarmString.length >= i + 1) ? splitAlarmString[i] : "";
                 LOG.debug("Setting parameter {}, to {} in the insert alarm query", i + 1, value);
                 statement.setString(i + 1, value);
             }