Default Tunnels deleted from config 66/78766/6
authorVishal Thapar <vthapar@redhat.com>
Thu, 13 Dec 2018 17:01:46 +0000 (22:31 +0530)
committerVishal Thapar <vthapar@redhat.com>
Wed, 19 Dec 2018 04:47:47 +0000 (04:47 +0000)
commitdf12dde0c70ae3bcf9e5fc6093f49a50e551136a
tree32b7a2551e40d720ff7f8a2e1a937f1193e4f879
parent168065f6c43519c34a4fe1e5612e967d57be5e74
Default Tunnels deleted from config

When configuring integration bridge, we copy
bridge parameters from operational to configuration
to avoid overwriting them. If any tunnel ports were
added to config before we copyBridgeConfig, they
get overwritten and are lost.

Fix is to use a merge instead of put when copying
bridge to config. This operation is done only
during initial bringup, so overhead of using
merge is acceptable.

JIRA: NETVIRT-1541

Change-Id: I003032883ebae5e405b4d7b849fb2043179f63ff
Signed-off-by: Vishal Thapar <vthapar@redhat.com>
elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java