X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=mapper%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fmapper%2Facs%2Fimpl%2FPnPPreProvisioningHandler.java;h=b7fee2db7c50c50e2796ca3ade309f76e5c06df8;hb=refs%2Fchanges%2F34%2F4334%2F1;hp=b6327ec7fa51ad0617e290c3dacdcde0702b4a8e;hpb=a58ada8fd244e69cf2ebe48a251fcdd4d48acec4;p=oam%2Ftr069-adapter.git diff --git a/mapper/src/main/java/org/commscope/tr069adapter/mapper/acs/impl/PnPPreProvisioningHandler.java b/mapper/src/main/java/org/commscope/tr069adapter/mapper/acs/impl/PnPPreProvisioningHandler.java index b6327ec..b7fee2d 100644 --- a/mapper/src/main/java/org/commscope/tr069adapter/mapper/acs/impl/PnPPreProvisioningHandler.java +++ b/mapper/src/main/java/org/commscope/tr069adapter/mapper/acs/impl/PnPPreProvisioningHandler.java @@ -26,10 +26,8 @@ import java.util.Map; 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.OperationOptions; import org.commscope.tr069adapter.acs.common.ParameterDTO; import org.commscope.tr069adapter.acs.common.dto.ConfigurationData; -import org.commscope.tr069adapter.acs.common.dto.TR069DeviceDetails; import org.commscope.tr069adapter.acs.common.dto.TR069OperationCode; import org.commscope.tr069adapter.acs.common.dto.TR069OperationDetails; import org.commscope.tr069adapter.acs.common.inform.BootInform; @@ -38,6 +36,7 @@ import org.commscope.tr069adapter.mapper.MOMetaData; import org.commscope.tr069adapter.mapper.MapperConfigProperties; import org.commscope.tr069adapter.mapper.sync.SynchronizedRequestHandler; import org.commscope.tr069adapter.mapper.util.MOMetaDataUtil; +import org.commscope.tr069adapter.mapper.util.NetconfToTr069MapperUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -238,18 +237,9 @@ public class PnPPreProvisioningHandler { private DeviceRPCRequest createNBIOperationRequest(String deviceId, List params) { TR069OperationDetails opDetails = new TR069OperationDetails(); opDetails.setOpCode(TR069OperationCode.SET_PARAMETER_VALUES); - opDetails.setParmeters(params); - - DeviceRPCRequest deviceRPCRequest = new DeviceRPCRequest(); - TR069DeviceDetails tr069DeviceDetails = new TR069DeviceDetails(); - tr069DeviceDetails.setDeviceId(deviceId); - deviceRPCRequest.setOpDetails(opDetails); - deviceRPCRequest.setDeviceDetails(tr069DeviceDetails); - OperationOptions options = new OperationOptions(); - options.setExecutionTimeout(300l); - deviceRPCRequest.setOptions(options); - - return deviceRPCRequest; + + return NetconfToTr069MapperUtil.handleParamsOperation(params, opDetails, deviceId); + } /**