Merge topic/master/clustering to master branch 37/27837/1
authorAnil Vishnoi <vishnoianil@gmail.com>
Fri, 2 Oct 2015 17:08:10 +0000 (22:38 +0530)
committerAnil Vishnoi <vishnoianil@gmail.com>
Fri, 2 Oct 2015 17:08:19 +0000 (22:38 +0530)
commitdb4b7c531bac5f30b34d57bf02fe3a2f310075e8
treec0333665a05900451348b443c5289b41fe9255ce
parent83cfd5bd73f79b3b10e71a13b8f6563ea37fee20
Merge topic/master/clustering to master branch
Squashed commit of the following:

commit e9e3a762ee75844b930d8251f44d2718a3358445
Merge: 2adbc25 83cfd5b
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Oct 2 19:54:23 2015 +0530

    Merge branch 'master' into topic/master/clustering

    Change-Id: I3c26c3f4095b78d869cae271b01fa1ab2609cf89
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 2adbc25b474d46f394e8f956c818383425570600
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Oct 2 07:22:44 2015 +0530

    Addressed following issuses:
    1) Fixed entity unregisteration
    2) Implemented logic for southbound provider to participate
    in entityOwnership service, Southbound plugin instance as an entity
    This will avoid all the instances to do initiatize the operational
    and config topology, only master instance (who got ownership) will do that.
    3) Properly closing listener registration for OvsdbConnectionManager listerner.

    Change-Id: I73693b4faa8a6409c81c33647836516002b4b2fd
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 193f145796924c051b36c61974df4253e68efb7e
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Thu Oct 1 16:54:41 2015 +0530

    Addressed following issues:
    1) Handled ownership change notifications for the device that is not registered by the instance.
    2) If there is no owner of the device hasOwner=false, then clean up the operational data store,
    3) For switch initiated connections, generate iid by fetching the openvswtich table row from the device.

    Change-Id: I03158a616e7c020ce8f851b8251e4162f38ba622
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit c26d79561555c23f4aec894418537cf059a1f85a
Merge: 740d21a 7848a77
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Thu Oct 1 14:42:00 2015 -0400

    Merge branch 'master' into topic/master/clustering

    Change-Id: I191e71030d6523a3d7a11765010cc1b81b9405f3
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 740d21afacb5a652a3a1d78ceff2c0d998492add
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Wed Sep 30 02:15:26 2015 +0530

    Fixed iid issue for switch initiated connections
    and refactored the code a bit

    Patch 2:Fixed unit tests.
    Conflicts:
     southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
     southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java

    Change-Id: I9f8adfba4a4f866d423503b24f400c40bd43131b
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 9079eb260e123c00625dc13e63a6f55d9bc42aea
Merge: b203967 0179232
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Tue Sep 29 12:58:54 2015 -0400

    Merge branch 'master' into topic/master/clustering

    Change-Id: I02c771238cd7447dbaa326516467259516868aa6
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit b203967504c1de8814c32e7c7c8015ebb749e154
Author: Sharad Mishra <sharad.d.mishra@intel.com>
Date:   Mon Sep 28 06:19:38 2015 -0700

    OVSDB cluster device ownership

    Only allow device owner to update device.
    Patch 2: Fixed unit test

    Change-Id: Id942a2ba16a83b19807e135a9b67f8a7eb7da003
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 218785ea03b74287de86395d1e57471ce02fe5e4
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Wed Sep 23 09:55:06 2015 -0400

    Use EntityOwnershipService to get ownership on the device.
    If ownership is granted then *this* instance of southbound
    plugin can perform actions to configure the device, rest
    two southbound plugin instanceses in the cluster will just
    hole the connection with them and won't do any operation
    of configuring the device or reading from the device.
    For controller initiated connections, all the southbound
    plugin instance will attempt to connect to the device and
    contest for ownership of the device and selected owner of
    the device will do CRUD operations. For switch initiated
    connection, only instance of southbound plugin that received
    connection from switch will contest for ownership.

    Change-Id: I349699ae0630e12bdbe18b6bd2588a651edd1f81
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit da209a4aad67400a3c938329fb393ec6f7e2439e
Merge: ec7827c 11c0865
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 29 00:44:50 2015 +0530

    Merge branch 'master' into topic/master/clustering

    Change-Id: I44ac4d66f731c0c0f56d746c563c6210eeceb978
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit ec7827c688340fa85c42942ba6559201da07286a
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Mon Sep 21 17:57:02 2015 -0400

    Add hasDeviceOwnership flag to OvsdbConnectionInstance

    Patch set 4: fix ut

    Change-Id: Id7da9071374938c16b086b0d67059aec0a7cc3a0
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 3cc32fd3d007b4c91dfbadee3920b9ae61a9283c
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Fri Sep 25 17:02:13 2015 -0400

    Set bridge controller(s) based on ovsdb node manager(s)

    Change-Id: I10bcc04aed78f874cbb8a7d9a82e59cf1b80ec82
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 628749e43002c4aa9fc8bfdf7c827cba0532eb6b
Merge: 3d7ce06 360d519
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Sat Sep 26 01:27:28 2015 +0530

    Merge branch 'master' into topic/master/clustering

    Change-Id: I20e84a6971466357c6819c7dba5d51809f9b2878
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 3d7ce0660d25080dd1a5e3927eda6d071e085d12
Merge: 8a90856 708c8c3
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Sep 25 06:07:23 2015 +0530

    Merge branch 'master' into topic/master/clustering

    Change-Id: I35038c6d7b2150d2efc9692a02d5e94bd97a8dba
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 8a908569f4e8e19e7f03f08f97d0704f9ca46cc9
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 22 01:52:42 2015 +0530

    Enable remote notification for southbound plugin

    (cherry picked from commit 01f0737be6abacaf56721731f6a19dcb13e291f0)

    Change-Id: Ida036244f3861e4d07437b49179bbf2851a212a5
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 7747c272e6ad5f52ebcae97fd14e05762bc8f790
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 22 00:05:49 2015 +0530

    Wire entity ownership service to OVSDB southbound plugin

    Change-Id: I8baa3b31f9762c4b5656b399a1a7f705c1aed9c1
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Change-Id: Iec7a1c3055dac748c81b470a3d2286b42e32397e
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
17 files changed:
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Southbound.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SouthboundImpl.java
openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java
southbound/southbound-impl/src/main/config/default-config.xml
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbDataChangeListener.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java
southbound/southbound-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/southbound/impl/rev141210/SouthboundImplModule.java
southbound/southbound-impl/src/main/yang/southbound-impl.yang
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataChangeListenerTest.java