Code Review
/
oam
/
tr069-adapter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Device Software version management
[oam/tr069-adapter.git]
/
netconf-server
/
src
/
main
/
java
/
org
/
commscope
/
tr069adapter
/
netconf
/
rpc
/
SetConfigOperation.java
diff --git
a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/rpc/SetConfigOperation.java
b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/rpc/SetConfigOperation.java
index
b61aea9
..
b011420
100644
(file)
--- a/
netconf-server/src/main/java/org/commscope/tr069adapter/netconf/rpc/SetConfigOperation.java
+++ b/
netconf-server/src/main/java/org/commscope/tr069adapter/netconf/rpc/SetConfigOperation.java
@@
-42,10
+42,15
@@
public class SetConfigOperation extends AbstractLastNetconfOperation {
private static final String OPERATION = "operation";
\r
private static final String REMOVE_EDIT_CONFIG = "remove";
\r
private String deviceID;
\r
private static final String OPERATION = "operation";
\r
private static final String REMOVE_EDIT_CONFIG = "remove";
\r
private String deviceID;
\r
+ private String swVersion;
\r
+ private String hwVersion;
\r
\r
\r
- public SetConfigOperation(final String netconfSessionIdForReporting, String deviceID) {
\r
+ public SetConfigOperation(final String netconfSessionIdForReporting, String deviceID,
\r
+ String swVersion, String hwVersion) {
\r
super(netconfSessionIdForReporting);
\r
this.deviceID = deviceID;
\r
super(netconfSessionIdForReporting);
\r
this.deviceID = deviceID;
\r
+ this.swVersion = swVersion;
\r
+ this.hwVersion = hwVersion;
\r
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
@@
-64,7
+69,8
@@
public class SetConfigOperation extends AbstractLastNetconfOperation {
NetConfServiceBooter.getApplicationContext().getBean(NetConfServerProperties.class);
\r
\r
final String baseUrl = config.getMapperPath() + "/" + delOrEditUrl;
\r
NetConfServiceBooter.getApplicationContext().getBean(NetConfServerProperties.class);
\r
\r
final String baseUrl = config.getMapperPath() + "/" + delOrEditUrl;
\r
- NetConfResponse restResponse = XmlUtility.invokeMapperCall(baseUrl, requestXml, deviceID);
\r
+ NetConfResponse restResponse =
\r
+ XmlUtility.invokeMapperCall(baseUrl, requestXml, deviceID, swVersion, hwVersion);
\r
\r
if (restResponse != null) {
\r
ErrorCodeDetails errorCode = restResponse.getErrorCode();
\r
\r
if (restResponse != null) {
\r
ErrorCodeDetails errorCode = restResponse.getErrorCode();
\r