-/*\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.ves;\r
-\r
-import org.commscope.tr069adapter.acs.common.DeviceInform;\r
-import org.commscope.tr069adapter.acs.common.DeviceRPCRequest;\r
-import org.commscope.tr069adapter.acs.common.DeviceRPCResponse;\r
-import org.commscope.tr069adapter.mapper.MapperConfigProperties;\r
-import org.commscope.tr069adapter.mapper.acs.impl.PnPPreProvisioningHandler;\r
-import org.commscope.tr069adapter.mapper.model.NetConfServerDetails;\r
-import org.commscope.tr069adapter.mapper.model.VESNotification;\r
-import org.commscope.tr069adapter.mapper.model.VESNotificationResponse;\r
-import org.slf4j.Logger;\r
-import org.slf4j.LoggerFactory;\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 VESNotificationSender {\r
-\r
- private static final Logger LOG = LoggerFactory.getLogger(VESNotificationSender.class);\r
-\r
- @Autowired\r
- MapperConfigProperties config;\r
-\r
- @Autowired\r
- PnPPreProvisioningHandler pnpPreProvisioningHandler;\r
-\r
- @Autowired\r
- VESNotificationSender vesnotiSender;\r
-\r
- @Autowired\r
- RestTemplate restTemplate;\r
-\r
- public VESNotificationResponse sendNotification(DeviceInform deviceInform,\r
- NetConfServerDetails serverInfo) {\r
- final String uri = getUri();\r
- LOG.debug("Posting ves event to ves notifier {}", uri);\r
-\r
- VESNotification vesNotifi = new VESNotification();\r
- if (deviceInform != null) {\r
- vesNotifi.seteNodeBName(\r
- pnpPreProvisioningHandler.getEnodeBName(deviceInform.getDeviceDetails().getDeviceId(),\r
- deviceInform.getDeviceDetails().getSoftwareVersion(),\r
- deviceInform.getDeviceDetails().getHardwareVersion()));\r
- } else {\r
- vesNotifi.seteNodeBName(serverInfo.getEnodeBName());\r
- }\r
- vesNotifi.setNetconfDetails(serverInfo);\r
- vesNotifi.setDevnotification(deviceInform);\r
-\r
- return restTemplate.postForObject(uri, vesNotifi, VESNotificationResponse.class);\r
- }\r
-\r
- public DeviceRPCResponse sendEditConfigNotification(DeviceRPCRequest deviceRPCRequest) {\r
- final String uri = config.getVerConfigUri() + "/editConfig";\r
- LOG.debug("Posting edit config request to ves agent {}", uri);\r
- return restTemplate.postForObject(uri, deviceRPCRequest, DeviceRPCResponse.class);\r
- }\r
-\r
- public DeviceRPCResponse sendGetConfigNotification(DeviceRPCRequest deviceRPCRequest) {\r
- final String uri = config.getVerConfigUri() + "/getConfig";\r
- LOG.debug("Posting get config request to ves agent {}", uri);\r
- return restTemplate.postForObject(uri, deviceRPCRequest, DeviceRPCResponse.class);\r
- }\r
-\r
-\r
- private String getUri() {\r
- return config.getVesUri();\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.ves;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.commscope.tr069adapter.acs.common.DeviceInform;
+import org.commscope.tr069adapter.acs.common.DeviceRPCRequest;
+import org.commscope.tr069adapter.acs.common.DeviceRPCResponse;
+import org.commscope.tr069adapter.acs.common.ParameterDTO;
+import org.commscope.tr069adapter.mapper.MapperConfigProperties;
+import org.commscope.tr069adapter.mapper.acs.impl.PnPPreProvisioningHandler;
+import org.commscope.tr069adapter.mapper.model.NetConfServerDetails;
+import org.commscope.tr069adapter.mapper.model.VESNotification;
+import org.commscope.tr069adapter.mapper.model.VESNotificationResponse;
+import org.commscope.tr069adapter.mapper.util.MOMetaDataUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+@Component
+public class VESNotificationSender {
+
+ private static final Logger LOG = LoggerFactory.getLogger(VESNotificationSender.class);
+
+ @Autowired
+ MapperConfigProperties config;
+
+ @Autowired
+ PnPPreProvisioningHandler pnpPreProvisioningHandler;
+
+ @Autowired
+ VESNotificationSender vesnotiSender;
+
+ @Autowired
+ RestTemplate restTemplate;
+
+ @Autowired
+ MOMetaDataUtil metaDataUtil;
+
+ public VESNotificationResponse sendNotification(DeviceInform deviceInform,
+ NetConfServerDetails serverInfo) {
+ final String uri = getUri();
+ LOG.debug("Posting ves event to ves notifier {}", uri);
+
+ VESNotification vesNotifi = new VESNotification();
+ if (deviceInform != null) {
+ // Replace TR-069 parameter names with NETCONF parameter names
+ List<ParameterDTO> parameters = deviceInform.getParameters();
+ if (parameters != null && !parameters.isEmpty()) {
+ List<ParameterDTO> netconfParameters = new ArrayList<>();
+ for (ParameterDTO param : parameters) {
+ String paramXPath = metaDataUtil.getNetconfXPathNameByTR69NameWithIndexes(
+ param.getParamName(), deviceInform.getDeviceDetails().getSoftwareVersion(),
+ deviceInform.getDeviceDetails().getHardwareVersion());
+ if (paramXPath != null)
+ netconfParameters
+ .add(new ParameterDTO(paramXPath, param.getParamValue(), param.getDataType()));
+ else {
+ LOG.warn("Skipping param {}, as it is not present in mapping configuration",
+ param.getParamName());
+ }
+ }
+ vesNotifi.setNetconfParameters(netconfParameters);
+ }
+ vesNotifi.seteNodeBName(
+ pnpPreProvisioningHandler.getEnodeBName(deviceInform.getDeviceDetails().getDeviceId(),
+ deviceInform.getDeviceDetails().getSoftwareVersion(),
+ deviceInform.getDeviceDetails().getHardwareVersion()));
+ } else {
+ vesNotifi.seteNodeBName(serverInfo.getEnodeBName());
+ }
+ vesNotifi.setNetconfDetails(serverInfo);
+ vesNotifi.setDevnotification(deviceInform);
+
+ return restTemplate.postForObject(uri, vesNotifi, VESNotificationResponse.class);
+ }
+
+ public DeviceRPCResponse sendEditConfigNotification(DeviceRPCRequest deviceRPCRequest) {
+ final String uri = config.getVerConfigUri() + "/editConfig";
+ LOG.debug("Posting edit config request to ves agent {}", uri);
+ return restTemplate.postForObject(uri, deviceRPCRequest, DeviceRPCResponse.class);
+ }
+
+ public DeviceRPCResponse sendGetConfigNotification(DeviceRPCRequest deviceRPCRequest) {
+ final String uri = config.getVerConfigUri() + "/getConfig";
+ LOG.debug("Posting get config request to ves agent {}", uri);
+ return restTemplate.postForObject(uri, deviceRPCRequest, DeviceRPCResponse.class);
+ }
+
+
+ private String getUri() {
+ return config.getVesUri();
+ }
+
+}
Code Review / oam / tr069-adapter.git / blobdiff