Introducing simple merge strategy for config subsystem
authorTomas Olvecky <tolvecky@cisco.com>
Wed, 9 Jul 2014 13:27:09 +0000 (15:27 +0200)
committerTomas Olvecky <tolvecky@cisco.com>
Thu, 10 Jul 2014 12:49:08 +0000 (14:49 +0200)
commit3739e46da94a816f81bd55e4c15a59bf497a79a5
tree141a8852f4ec580c82610b0b15d16b1061335bba
parent9d7cbce667d38fb884623625607bcd6c6935be56
Introducing simple merge strategy for config subsystem

MergeEditStrategy wasn't really merging.
Now it is, but only for ObjectName[].
However, since ObjectName[] is 90% of the interesting
cases, this should get us a long way.

This is needed to be able to handle reasonably
extension, with the ability to wire in multiple
extension modules independently, as we need to do
for things like OF extension.

Change-Id: Ieca579cbc6781d77f489f5f754490c8da8f65188
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
12 files changed:
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ServiceRegistryWrapper.java
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/Services.java
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategy.java
opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategyTest.java [new file with mode: 0644]
opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfConfigPersisterITTest.java
opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java
opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java
opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfMonitoringITTest.java
opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/SSLUtil.java
opendaylight/netconf/netconf-it/src/test/resources/logback-test.xml [moved from opendaylight/netconf/netconf-it/src/test/resources/logback.xml with 83% similarity]
opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps1.xml [new file with mode: 0644]
opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps2.xml [new file with mode: 0644]