X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=acs%2Fnbi%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Facs%2Fnbi%2Fmapper%2Fservice%2FMapperRequestRESTService.java;h=5b417a0d0d99803b3df7c5956b813a8cbc9d1958;hb=76744e810f35c84ecbd1d9998e361052466e9483;hp=9ea4eec6931e4904545ec0c540a0b1d720a73a0a;hpb=ce4e2d38e3d42725f61c39dd172325d2def4bc44;p=oam%2Ftr069-adapter.git

diff --git a/acs/nbi/src/main/java/org/commscope/tr069adapter/acs/nbi/mapper/service/MapperRequestRESTService.java b/acs/nbi/src/main/java/org/commscope/tr069adapter/acs/nbi/mapper/service/MapperRequestRESTService.java
index 9ea4eec..5b417a0 100644
--- a/acs/nbi/src/main/java/org/commscope/tr069adapter/acs/nbi/mapper/service/MapperRequestRESTService.java
+++ b/acs/nbi/src/main/java/org/commscope/tr069adapter/acs/nbi/mapper/service/MapperRequestRESTService.java
@@ -1,62 +1,92 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : tr-069-adapter
- * =================================================================================================
- * Copyright (C) 2020 CommScope Inc Intellectual Property.
- * =================================================================================================
- * This tr-069-adapter software file is distributed by CommScope Inc 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
- *
- * This file 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.commscope.tr069adapter.acs.nbi.mapper.service;
-
-import static org.commscope.tr069adapter.acs.common.utils.AcsConstants.MAPPER_SERVICE_QUALILFIER;
-
-import org.commscope.tr069adapter.acs.common.DeviceRPCRequest;
-import org.commscope.tr069adapter.acs.common.exception.MapperServiceException;
-import org.commscope.tr069adapter.acs.common.mapper.ACSServiceAPI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/MapperService")
-public class MapperRequestRESTService {
-
-  private static final Logger logger = LoggerFactory.getLogger(MapperRequestRESTService.class);
-
-  @Qualifier(value = MAPPER_SERVICE_QUALILFIER)
-  @Autowired
-  ACSServiceAPI acsServiceAPI;
-
-  @PostMapping("/initiateDeviceOperation")
-  public Long initiateDeviceOperation(@RequestBody DeviceRPCRequest deviceRPCRequest) {
-    logger.debug("Received a Device operation request from Mapper");
-    Long operationId = 0l;
-    try {
-      operationId = acsServiceAPI.performDeviceOperation(deviceRPCRequest);
-      logger.debug(
-          "Successfully initiated device operation, The operation id for the request is: {}",
-          operationId);
-    } catch (MapperServiceException e) {
-      logger.error("An exception occurred while calling the device operation, Reason: {}",
-          e.getMessage());
-    }
-
-    return operationId;
-  }
-
-}
+/*
+ * ============LICENSE_START========================================================================
+ * ONAP : tr-069-adapter
+ * =================================================================================================
+ * Copyright (C) 2020 CommScope Inc Intellectual Property.
+ * =================================================================================================
+ * This tr-069-adapter software file is distributed by CommScope Inc 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
+ *
+ * This file 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.commscope.tr069adapter.acs.nbi.mapper.service;
+
+import static org.commscope.tr069adapter.acs.common.utils.AcsConstants.MAPPER_SERVICE_QUALILFIER;
+
+import org.commscope.tr069adapter.acs.common.DeviceRPCRequest;
+import org.commscope.tr069adapter.acs.common.exception.DeviceOperationException;
+import org.commscope.tr069adapter.acs.common.exception.MapperServiceException;
+import org.commscope.tr069adapter.acs.common.mapper.ACSServiceAPI;
+import org.commscope.tr069adapter.acs.common.utils.ConnectionStatusPOJO;
+import org.commscope.tr069adapter.acs.common.utils.ErrorCode;
+import org.commscope.tr069adapter.acs.requestprocessor.dao.DeviceRepository;
+import org.commscope.tr069adapter.acs.requestprocessor.entity.TR069DeviceEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/MapperService")
+public class MapperRequestRESTService {
+
+  private static final Logger logger = LoggerFactory.getLogger(MapperRequestRESTService.class);
+
+  @Qualifier(value = MAPPER_SERVICE_QUALILFIER)
+  @Autowired
+  ACSServiceAPI acsServiceAPI;
+
+  @Autowired
+  private DeviceRepository deviceRepository;
+
+  @PostMapping("/initiateDeviceOperation")
+  public Long initiateDeviceOperation(@RequestBody DeviceRPCRequest deviceRPCRequest) {
+    logger.debug("Received a Device operation request from Mapper");
+    Long operationId = 0l;
+    try {
+      operationId = acsServiceAPI.performDeviceOperation(deviceRPCRequest);
+      logger.debug(
+          "Successfully initiated device operation, The operation id for the request is: {}",
+          operationId);
+    } catch (MapperServiceException e) {
+      logger.error("An exception occurred while calling the device operation, Reason: {}",
+          e.getMessage());
+    }
+
+    return operationId;
+  }
+
+  @PostMapping("/connectionStatusOperation")
+  public ConnectionStatusPOJO connectionStatusOperation(@RequestBody String deviceId)
+      throws DeviceOperationException {
+    logger.debug("Received a Connection Status operation request from Mapper");
+    ConnectionStatusPOJO connStatusPOJO = new ConnectionStatusPOJO();
+    try {
+      TR069DeviceEntity tr069DeviceEntity = deviceRepository.findByDeviceId(deviceId);
+      if (tr069DeviceEntity == null) {
+        throw new DeviceOperationException(ErrorCode.DEVICE_NOT_EXISTS, deviceId);
+      }
+      connStatusPOJO.setStatus(tr069DeviceEntity.isConnStatus());
+      connStatusPOJO.setLastContactTime(tr069DeviceEntity.getLastUpdatedTime());
+      connStatusPOJO.setLastFailedAttemptTime(tr069DeviceEntity.getLastFailedAttemptTime());
+      connStatusPOJO.setErrorMessage(tr069DeviceEntity.getErrorMsg());
+      logger.info("connectionStatusOperation:: ConnectionStatusPOJO: {}", connStatusPOJO);
+      return connStatusPOJO;
+    } catch (DeviceOperationException doe) {
+      logger.error(doe.getMessage());
+      throw doe;
+    }
+  }
+
+}