Development of NETCONF RPCs for tr-069 adapter to

[oam/tr069-adapter.git] / mapper / src / main / java / org / commscope / tr069adapter / mapper / acs / ACSRequestSender.java

diff --git a/mapper/src/main/java/org/commscope/tr069adapter/mapper/acs/ACSRequestSender.java b/mapper/src/main/java/org/commscope/tr069adapter/mapper/acs/ACSRequestSender.java
index 01ed76a..c3fe629 100644 (file)
--- a/mapper/src/main/java/org/commscope/tr069adapter/mapper/acs/ACSRequestSender.java
+++ b/mapper/src/main/java/org/commscope/tr069adapter/mapper/acs/ACSRequestSender.java
@@ -1,44 +1,58 @@
-/*\r
- * ============LICENSE_START========================================================================\r
- * ONAP : tr-069-adapter\r
- * =================================================================================================\r
- * Copyright (C) 2020 CommScope Inc Intellectual Property.\r
- * =================================================================================================\r
- * This tr-069-adapter software file is distributed by CommScope Inc under the Apache License,\r
- * Version 2.0 (the "License"); you may not use this file except in compliance with the License. You\r
- * may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,\r
- * either express or implied. See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ===============LICENSE_END=======================================================================\r
- */\r
-\r
-package org.commscope.tr069adapter.mapper.acs;\r
-\r
-import org.commscope.tr069adapter.acs.common.DeviceRPCRequest;\r
-import org.commscope.tr069adapter.mapper.MapperConfigProperties;\r
-import org.springframework.beans.factory.annotation.Autowired;\r
-import org.springframework.stereotype.Component;\r
-import org.springframework.web.client.RestTemplate;\r
-\r
-@Component\r
-public class ACSRequestSender {\r
-\r
-  private RestTemplate restTemplate = new RestTemplate();\r
-\r
-  @Autowired\r
-  MapperConfigProperties config;\r
-\r
-  public Long sendRequest(DeviceRPCRequest deviceRPCRequest) {\r
-    String uri = getUri();\r
-    return restTemplate.postForObject(uri, deviceRPCRequest, Long.class);\r
-  }\r
-\r
-  private String getUri() {\r
-    return config.getSbiUri();\r
-  }\r
-\r
-}\r
+/*
+ * ============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.mapper.acs;
+
+import org.commscope.tr069adapter.acs.common.DeviceRPCRequest;
+import org.commscope.tr069adapter.acs.common.utils.ConnectionStatusPOJO;
+import org.commscope.tr069adapter.mapper.MapperConfigProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+@Component
+public class ACSRequestSender {
+
+  private RestTemplate restTemplate = new RestTemplate();
+
+  @Autowired
+  MapperConfigProperties config;
+
+  public Long sendRequest(DeviceRPCRequest deviceRPCRequest) {
+    String uri = getUri();
+    return restTemplate.postForObject(uri, deviceRPCRequest, Long.class);
+  }
+
+  public ConnectionStatusPOJO sendConnectionStatusReq(String deviceId) {
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(MediaType.APPLICATION_JSON);
+    HttpEntity<String> entity = new HttpEntity<>(deviceId, headers);
+    return restTemplate.postForObject(getUriForConnStatus(), entity, ConnectionStatusPOJO.class);
+  }
+
+  private String getUri() {
+    return config.getSbiUri();
+  }
+
+  private String getUriForConnStatus() {
+    return config.getConnStatusUri();
+  }
+}