Merge branch 'topic/master/neutron-yang-migration' to branch 'master'

Merge branch 'topic/master/neutron-yang-migration' to branch 'master'
Squashed commit of the following:

commit 89fc149dd21a3fb9fab3833b8a0e4775c38f62ad
Merge: 709dd55 7d09c56
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Oct 16 20:32:10 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Conflicts:
    	openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/SecurityServicesManager.java

    Change-Id: Ib0be9f59f9801babb9892d42bf536a924068138c
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 709dd55139632d097c2003076bd16fd26164fb03
Author: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>
Date:   Sat Oct 17 02:21:07 2015 +0530

    Code refactored for security group update.

    Change-Id: Iaa838588197567e28d5e97ca4cbc526663453491
    Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>
commit eac410a5c3a66fd6f9455efabf6c3b213b813acc
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Oct 16 14:37:30 2015 +0530

    Merge branch 'master' to branch 'topic/master/neutron-yang-migration'
    Squashed commit of the following:

    commit 833ea0aba76e3e3317ca6b7e2a0d6fc99a53d9db
    Merge: 91de317 423e4d8
    Author: Flavio Fernandes <ffernand@redhat.com>
    Date:   Thu Oct 15 17:17:06 2015 +0000

        Merge "Adding copyright header to ovsdb/southbound UT"

    commit 91de31748b01a61b80796d121753ac0dff154910
    Author: Sam Hague <shague@redhat.com>
    Date:   Thu Oct 15 12:08:13 2015 -0400

        Add postman collection for NetvirtSfc

        Change-Id: Ibe16df4c9d789311b185a9f7cb0193b7a81f5aba
        Signed-off-by: Sam Hague <shague@redhat.com>
    commit 2989548e8b4191e2b050390f565789dddd6702f5
    Author: Sam Hague <shague@redhat.com>
    Date:   Thu Oct 15 09:50:46 2015 -0400

        Remove unused BundleContext from NetvirtSfc

        Change-Id: I7d9d185710f82546472d733796ebc2cba2e3a671
        Signed-off-by: Sam Hague <shague@redhat.com>
    commit 423e4d84a8e2cf602222a9bfbefba9f20b79e382
    Author: Rashmi Pujar <rpujar@inocybe.com>
    Date:   Thu Oct 15 09:39:33 2015 -0400

        Adding copyright header to ovsdb/southbound UT

        Change-Id: I92d1f02491f04177b97a1ece879da9278220801b
        Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
    commit ea352fced510fa638358b43a818adec60bfac0b3
    Merge: 249630d f7f42fb
    Author: Flavio Fernandes <ffernand@redhat.com>
    Date:   Thu Oct 15 11:59:38 2015 +0000

        Merge "All TCP & UDP SG Rules : Implementation and Unit tests added."

    commit 249630df31cdab5087fc44e32d44a4e082a12e40
    Merge: 26b0027 26ed356
    Author: Flavio Fernandes <ffernand@redhat.com>
    Date:   Thu Oct 15 11:56:48 2015 +0000

        Merge "UT for southbound/transactions/md - set 5"

    commit 26b0027005bbeb06bfe228e9dceecded20ad4724
    Merge: cb2fb88 959688e
    Author: Flavio Fernandes <ffernand@redhat.com>
    Date:   Thu Oct 15 11:51:55 2015 +0000

        Merge "Bug 4472 - netvirt: IlligalArgumentException in NAT provider"

    commit cb2fb8864b794f1a792d2614522ab36c27bd5c4d
    Merge: 241ccfe e211414
    Author: Sam Hague <shague@redhat.com>
    Date:   Thu Oct 15 01:37:31 2015 +0000

        Merge "cleanup NetvirtSfcIT"

    commit e211414c068a2f6ba80f1398ca0b38acbc67db42
    Author: Sam Hague <shague@redhat.com>
    Date:   Wed Oct 14 21:12:16 2015 -0400

        cleanup NetvirtSfcIT

        Change-Id: I1cc224a7ab4f65825feefe6de28fb787ca7e2f1c
        Signed-off-by: Sam Hague <shague@redhat.com>
    commit 959688edc325bd4adec9e760da771aeedbb2712f
    Author: Isaku Yamahata <isaku.yamahata@intel.com>
    Date:   Wed Oct 14 15:06:19 2015 -0700

        Bug 4472 - netvirt: IlligalArgumentException in NAT provider

        This patch adds work around code for ipv6 cidr notation is given.
        Otherwise following exception occurs.

        > 2015-10-14 13:38:55,125 | ERROR | ntDispatcherImpl | NeutronL3Adapter                 | 392 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.1.SNAPSHOT | ProgramRouterInterface failed for mac:FA:16:3E:E0:A8:B5 addr:fd14:5ac7:ba3::1/64 node:ovsdb://uuid/8f75c49c-52b9-4303-8633-a80f0361429b/bridge/br-int srcTunId:external destTunId:1083 action:ADD status:Not Implemented: Not Implemented (0)
        > 2015-10-14 13:38:55,126 | DEBUG | ntDispatcherImpl | ArpResponderService              | 393 - org.opendaylight.ovsdb.openstack.net-virt-providers - 1.2.1.SNAPSHOT | ipv6 address case is not implemented yet. dpid 209308480409166 segmentationId 1083 macAddressStr, ipAddress FA:16:3E:E0:A8:B5 action /fd14:5ac7:ba3:0:0:0:0:1
        > 2015-10-14 13:38:55,126 | ERROR | ntDispatcherImpl | NeutronL3Adapter                 | 392 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.1.SNAPSHOT | ProgramStaticArp failed for mac:FA:16:3E:E0:A8:B5 addr:fd14:5ac7:ba3::1 dpid:209308480409166 segOrOfPort:1083 action:ADD status:Not Implemented: Not Implemented (0)
        > 2015-10-14 13:38:55,126 | ERROR | ntDispatcherImpl | EventDispatcher                  | 392 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.1.SNAPSHOT | Exception in dispatching event NorthboundEvent [handler=NEUTRON_PORT, action=ADD, port=NeutronPort [portUUID=4b19acf4-d644-4fe7-8643-852c25cbf604, networkUUID=821f7a2b-b991-48b0-a39c-b0ef264bd321, name=, adminStateUp=true, status=ACTIVE, macAddress=FA:16:3E:E0:A8:B5, fixedIPs=[Neutron_IPs{ipAddress='fd14:5ac7:ba3::1', subnetUUID='54a7f233-1fdb-4d40-bd44-275f180e9a64'}], deviceID=738d6a7c-43bd-469d-bfed-6bcc6ffe5dca, deviceOwner=network:router_interface, tenantID=dc27e3a1cff64a1cb85c7f24899c3eee, securityGroups=[], bindinghostID=, bindingvnicType=normal, bindingvnicType=normal], subnet=null, router=null, routerInterface=null, floatingIP=null, network=null, loadBalancer=null, loadBalancerPool=null, loadBalancerPoolMember=null]
        > java.lang.IllegalArgumentException: Supplied value "fd14:5ac7:ba3::/64" does not match required pattern "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))$"
        >         at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145)[64:com.google.guava:18.0.0]
        >         at org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix.<init>(Ipv4Prefix.java:49)[216:org.opendaylight.mdsal.model.ietf-inet-types:2010.9.24.8-SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.OutboundNatService.programIpRewriteExclusion(OutboundNatService.java:167)[393:org.opendaylight.ovsdb.openstack.net-virt-providers:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programIpRewriteExclusionStage2(NeutronL3Adapter.java:1143)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programIpRewriteExclusionStage1(NeutronL3Adapter.java:1128)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programFlowsForNeutronRouterInterface(NeutronL3Adapter.java:807)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronRouterInterfaceEvent(NeutronL3Adapter.java:298)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronPortEvent(NeutronL3Adapter.java:245)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.doNeutronPortCreated(PortHandler.java:66)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.processEvent(PortHandler.java:161)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.dispatchEvent(EventDispatcherImpl.java:95)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.access$200(EventDispatcherImpl.java:28)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl$1.run(EventDispatcherImpl.java:57)[392:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
        >         at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)[:1.8.0_60]
        >         at java.util.concurrent.FutureTask.run(FutureTask.java:266)[:1.8.0_60]
        >         at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)[:1.8.0_60]
        >         at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)[:1.8.0_60]
        >         at java.lang.Thread.run(Thread.java:745)[:1.8.0_60]

        Change-Id: I1559667adde1c14b5627df3b7212e404998ce897
        Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
    commit 241ccfe97218b053f1ae09a1d7568df551b85551
    Author: Maxime Millette-Coulombe <mmcoulombe@inocybe.com>
    Date:   Wed Jul 22 11:53:30 2015 -0400

        First pass for ovsdb-ui

        Revamp of the work already done. Adding a draft of a
        logical topology viewer. The old code is still in this
        commit because the works done before will be reuse.

        Change-Id: Ia3a86cb0370cfad2ef3c2a156b412b9e029c3bf9
        Signed-off-by: Maxime Millette-Coulombe <mmcoulombe@inocybe.com>
    commit 26ed35648c8fcea96674a1f6e310f9d7930c09c8
    Author: Rashmi Pujar <rpujar@inocybe.com>
    Date:   Wed Oct 14 15:03:17 2015 -0400

        UT for southbound/transactions/md - set 5

        11. OvsdbPortRemoveCommand.java
        12. TransactionInvokerImpl.java
        13. OvsdbPortUpdateCommand.java

        Change-Id: Icd9ad76e482de5408650916f6bbf5bc73dc297c8
        Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
    commit 5c63f9ab23bd98686a93e7f745689cf95b152a0c
    Author: Sam Hague <shague@redhat.com>
    Date:   Wed Oct 14 13:29:47 2015 -0400

        neuter NetvirtSfcIT

        Change-Id: Iaca49229b1c594a9e2b5659048319880643887ec
        Signed-off-by: Sam Hague <shague@redhat.com>
    commit 1b7724f1fe1bae26cc0ffe8f86f83f3ea10fd626
    Merge: 29eeb86 09a89ea
    Author: Sam Hague <shague@redhat.com>
    Date:   Wed Oct 14 15:32:29 2015 +0000

        Merge "add ovsdb-sfc feature to test feature"

    commit 09a89eaa4496580769faf0564a0b174040682c5d
    Author: Sam Hague <shague@redhat.com>
    Date:   Wed Oct 14 10:49:05 2015 -0400

        add ovsdb-sfc feature to test feature

        Change-Id: I55c2df5791983998f696054b7728b7d1be696e33
        Signed-off-by: Sam Hague <shague@redhat.com>
    commit 29eeb865eab297a9d9642d8816dc6ffdbcd42f1f
    Merge: 378e785 864ac9f
    Author: Sam Hague <shague@redhat.com>
    Date:   Wed Oct 14 13:19:56 2015 +0000

        Merge "Add capability on southbound to NetvirtSfc"

    commit 864ac9f57ab4f369e8237d1e55c3121784e86915
    Author: Sam Hague <shague@redhat.com>
    Date:   Wed Oct 14 09:02:51 2015 -0400

        Add capability on southbound to NetvirtSfc

        Change-Id: Iffd6b7b27e701fdfa3bf663421ba72945562d0f1
        Signed-off-by: Sam Hague <shague@redhat.com>
    commit 378e78556b82bc756069145194c3cf606aa4aba0
    Merge: a8c8f4a ff01d7b
    Author: Sam Hague <shague@redhat.com>
    Date:   Wed Oct 14 04:55:31 2015 +0000

        Merge "Workaround to fix net-virt-it"

    commit ff01d7b11f98e0d5cabd5bd77a8f0dfcfe12675a
    Author: Sam Hague <shague@redhat.com>
    Date:   Wed Oct 14 00:23:59 2015 -0400

        Workaround to fix net-virt-it

        Change-Id: I10838b993f60b5e3859780d7d9f7b4c3630e312a
        Signed-off-by: Sam Hague <shague@redhat.com>
    commit a8c8f4a5010d6a2b565ca411c3541f9698f3ad49
    Merge: cfb6abf ffa3c96
    Author: Sam Hague <shague@redhat.com>
    Date:   Tue Oct 13 13:10:11 2015 +0000

        Merge "UT for southbound/transactions/md - set 4"

    commit cfb6abf8d000ebca1f7585e1cda58cd82e21f329
    Author: Anil Vishnoi <vishnoianil@gmail.com>
    Date:   Tue Oct 13 13:34:24 2015 +0530

        Fix issue that was causing integration test failure.

        In case of controller initiated connection, iid stamping
        was not happening. Before clustering code merge, iid stamping
        was done in updateData(), but after clustering code merge,
        it does not allow to make any changes to the device till
        owner of the device is selected by EntityOnwershipService,
        so updateData() was not stamping the iid to swtich. With this
        fix, once owner of the device is selected, it explictly stamp
        iid to the switch.

        NOTE: we should revert following patch before merging this patch
        https://git.opendaylight.org/gerrit/#/c/28309/1

        I ran the integration suit locally and it passes all the tests

        [main] INFO org.ops4j.pax.exam.spi.reactors.ReactorManager - suite finished
        Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 288.094 sec - in org.opendaylight.ovsdb.southbound.it.SouthboundIT

        Results :

        Tests run: 22, Failures: 0, Errors: 0, Skipped: 0

        Change-Id: I35d6e0a4fa94eef019420e9b9603873d5088a934
        Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
    commit 91c15602a6323fb4dec0dc2605c853689844aec6
    Author: Flavio Fernandes <ffernand@redhat.com>
    Date:   Tue Oct 13 11:04:46 2015 +0000

        Revert "Temp workaround to debug southbound IT"

        This reverts commit 149c5bfb602e91f07c2b98f9509d317be8fcaa3c.

        Change-Id: I78aa7b506f32e37b65cae1bfb24bbb360c5359ad
        Signed-off-by: Sam Hague <shague@redhat.com>
        Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
        Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
    commit 149c5bfb602e91f07c2b98f9509d317be8fcaa3c
    Author: Sam Hague <shague@redhat.com>
    Date:   Mon Oct 12 20:50:25 2015 -0400

        Temp workaround to debug southbound IT

        It is a timing change from the clustering code not taking into account some crazy existing code.

        This patch has a workaround that works in my local tests. I will merge it temporarily to see if the jenkins builds are good.

        Will work with Anil and Flavio on a long term solution.

        Old code:

        write ovsdb node to config ->
        -> dcl ->
        -> connect -> connect -> connectedButCallbacksNotRegistered -> putConnectionInstance
        -> updateData -> OvsdbNodeUpdateCommand - > ovsdb node - set Open_vSwitch external_ids
        *** key here is that the putConnectionInstance happened earlier in connect so now the OvsdbNodeUpdateCommand gets a chance to run and write the externalIds to the Open_vSwitch table
        ...
        OvsdbMonitorCallback -> OpenVSwitchUpdateCommand - > writes node to operational
        *** key here is that the iid (nodePath) is found by looking for the externalIds. If found, since it was written earlier, then it is used, if not the backup of using the uuid of the node is used. The IT expects the externalIds value to be there and that is the one with the form ip:port.

        In the new code:
        - putConnectionInstance() does not happen until the handleOwnership completes - too late since the updateData is processed before that
        - updateData doesn't do anything, complains about not finding client since the connectionInstance was not written earlier, therefore the externalIds are not written
        - OpenVSwitchUpdateCommand ends up using the wrong iid of the form using the uuid since the externalIds were not written.

        Change-Id: Iafbb8c4fa3dd5708f4c4bd3242e27ec72a4b4c6e
        Signed-off-by: Sam Hague <shague@redhat.com>
    commit a536890a609e1b28cce86a616c11447b839c1348
    Author: Andre Fredette <afredette@redhat.com>
    Date:   Tue Oct 6 17:33:15 2015 -0400

        Bug 4144 - Periodic ARP resolver should use unicast MAC destination
        address whenever possible; instead of broadcast

        Modified ArpResolver and GatewayMacResolverService to use the unicast DA
        when known.  The code treats the DA as known for a new ARP request if
        one of the last N=2 ARP request was answered.

        Change-Id: I2bd7791b74d41e2838edf59d6edc510b63f3c40b
        Signed-off-by: Andre Fredette <afredette@redhat.com>
    commit 1c4bfda9a0f94a2a97c58a918f945f4e1e3d4688
    Author: Vishal Thapar <vishal.thapar@ericsson.com>
    Date:   Mon Oct 12 14:22:57 2015 +0530

        hwvtep: version bump to 1.2.1

        Update hwvtep poms as per this:
        https://git.opendaylight.org/gerrit/#/c/25574/

        Change-Id: I651a4e475e9bf243497ce07386e7418141f2fc3c
        Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
    commit 685f586c67dc369259fc53a001f3d8297c6d8351
    Author: Sam Hague <shague@redhat.com>
    Date:   Fri Oct 9 16:22:56 2015 -0400

        Add setting controller for sfc it

        This patch adds setting the controller so that flows can be pushed to the switches.

        Use the following to initate the tests:

        start an ovsdb node and set it to be in passive mode: sudo ovs-vsctl set-manager ptcp:6640
        cd .../net-virt-sfc/it
        mvn -Dit.test=NetvirtSfcIT#testDoIt verify -Pintegrationtest -Dovsdbserver.ipaddress=192.168.120.31

        The above will connect to the node and set's it controller to ODL.

        Change-Id: Ibf307b668535e47fe80ba0a8b7403e53d7a40ccb
        Signed-off-by: Sam Hague <shague@redhat.com>
    commit ffa3c96aab514cfaba4e0eb543fe6956d3dfdb13
    Author: Rashmi Pujar <rpujar@inocybe.com>
    Date:   Fri Oct 9 12:37:06 2015 -0400

        UT for southbound/transactions/md - set 4

        8. OvsdbManagersUpdateCommand.java
        9. OvsdbNodeRemoveCommand.java
        10. OvsdbOperationalCommandAggregator.java

        Change-Id: I4597340cb871fb6b8558f2632ad71423a3cb8176
        Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
    commit f7f42fbacd178a843009a07bb21816afa83707b3
    Author: sangeeta.maurya <sangeeta.maurya@hp.com>
    Date:   Fri Oct 9 04:58:00 2015 +0545

        All TCP & UDP SG Rules : Implementation and Unit tests added.

        Change-Id: I4a00740fed78ab416fe22214fa7542ae7036f6fc
        Signed-off-by: sangeeta.maurya <sangeeta.maurya@hp.com>
    Change-Id: I95183dca8f6a8f628c5937e94ae7a098c536d14f
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 6380f7393d6974de911a1ee31589fae5aa6b9395
Author: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>
Date:   Fri Oct 9 00:54:24 2015 +0530

    Support added for modifying a security group associated with a port.

    Change-Id: I7bc5d4d790676eea380803af8af7591a19e9e00a
    Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>
commit d4b6c92bb6e10d84783d5ca1037018ec1c0be12f
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Fri Oct 9 16:42:53 2015 -0400

    Rev up on neutron mdsal

    Change-Id: I3a5d579455a8dcc6c5f67f420a879d78b7160be5
    Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 71ca5bff6921d7e1bc8e0ae70df94f34677d4f65
Merge: b172da3 5c20432
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Fri Oct 9 16:15:40 2015 -0400

    Merge branch 'master' into topic/master/neutron-yang-migration.wip

    Change-Id: I80eaa18b7e09acda944310fe2d6fd8bf7864aae0
    Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit b172da376fc5090347f1592786fcac62bb6c1879
Merge: 203fe0e 0cbdadc
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Thu Oct 8 20:17:59 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Conflicts:
    	openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java

    Change-Id: I170b630be63898fb2386377a65e297334ea70119
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 203fe0e97e86753f200fbbba3217e1e24330392b
Merge: 74b4518 f6b2a1e
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Wed Oct 7 00:57:16 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Change-Id: I496a2b2aade88bc318763a77d4e878e5e11e97f8
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 74b45187dc5f4c1982ae2a9554434c1546604b82
Merge: d2853aa 83cfd5b
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Oct 2 19:59:13 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Conflicts:
    	openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java

    Change-Id: Ic7d248e43b7f41fa7a17b8a2c371647e5c54e302
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit d2853aa6b7ef1aea8b93a6ed5ccbc81c1df2dc13
Merge: bdbce26 7848a77
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Thu Oct 1 14:44:12 2015 -0400

    Merge branch 'master' into topic/master/neutron-yang-migration

    Change-Id: I9c76cf1adf765b351c45fe93260ca89f596383c1
    Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit bdbce26b1905fe7d349cc65966046253e38aceb9
Merge: 0ecfc12 0179232
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Thu Oct 1 03:48:35 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Conflicts:
    	integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ovsdbclient/OvsdbTestBase.java
    	northbound/src/test/java/org/opendaylight/ovsdb/northbound/NodeResourceTest.java
    	northbound/src/test/java/org/opendaylight/ovsdb/northbound/OvsdbNorthboundV3Test.java

    Change-Id: Ie64d7e8d21250859b583a5f6b1b5b112a4b70c84
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 0ecfc1294aa2e1047162215cb9d1bb38d0bc70fb
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Sat Sep 26 04:50:05 2015 +0530

    Fix minor changese in NeutronSecurityRule attributes values

    Change-Id: Ib2fb0b195dd9e671627acfcd8741246c035fc237
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 98290241988633a61aa36bd0de6756c2f27f8817
Merge: 387c461 708c8c3
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Sep 25 08:13:48 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Change-Id: I4d2d1cda0138e4647580b790ce9131c077e09f81
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 387c4618bf4d52acf2cfa5e3ea1772975c6541ac
Merge: 8d6fd60 b398044
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Thu Sep 24 02:39:11 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Conflicts:
    	integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
    	ovsdb-plugin-compatibility-layer/src/test/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConnectionServiceImplTest.java
    	plugin-shell/src/test/java/org/opendaylight/ovsdb/plugin/shell/PrintCacheTest.java
    	plugin/src/test/java/org/opendaylight/ovsdb/plugin/impl/ConnectionServiceImplTest.java

    Change-Id: Ic5c81688c9cf8cf7fccdbe8c90eb90d8cbd66c94
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 8d6fd60eec27d9373fb8687b1418436f1e94eb9f
Merge: fed891b 5bc4327
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Sep 18 22:16:41 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit fed891b235315b840c70bced882c7972d1bf49f7
Merge: 985d450 b388ea4
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Thu Sep 17 14:13:28 2015 +0000

    Merge "Misc Fix: Handle neutron port that is not associated with a tenant id" into topic/master/neutron-yang-migration

commit 985d45084a55be99873992d75400d52210d81de0
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Thu Sep 17 01:13:45 2015 -0400

    SecGroup: Handle cases when security group has empty rules

    Change-Id: I54ef43f6a4afd9fc571c8dcf9bf843007452c968
    Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit b388ea424d6a072bdec66cc792598415744e06d0
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Thu Sep 17 01:01:56 2015 -0400

    Misc Fix: Handle neutron port that is not associated with a tenant id

    (e.g. external gw port)

    Change-Id: I2e3496303d78767b691d9129bc14c86572ce8acf
    Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 99081a0ab8dbed12ec76c4230256a5f918989cdc
Author: Stephen Kitt <skitt@redhat.com>
Date:   Wed Sep 16 11:14:03 2015 +0200

    Document how to use Docker Compose

    Fig has been obsoleted by Docker Compose. Some distributions have now
    replaced Fig entirely (e.g. Fedora 22); this patch documents Docker
    Compose as an alternative to Fig.

    Change-Id: Ia33bb8633e7c2f039857b98ba96e9b8b343d0394
    Signed-off-by: Stephen Kitt <skitt@redhat.com>
commit 9bb0f33598e40c6a5829b8be56597f90b534162b
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Wed Sep 16 02:19:35 2015 -0400

    A few cleanups

    * use plain String concatenation instead of StringBuilder where appropriate
    * simplify single-use return variables
    * <> operator
    * avoid calling new String()

    Change-Id: I56e99426daeda620a37059417588e5ee4fb99c76
    Also-By: Stephen Kitt <skitt@redhat.com>
    Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit a2fdb4a16358da8c2bc565c3b84589290f5de9d8
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 15 22:58:34 2015 +0000

    Revert "Use single-argument form of firstKeyOf()"

    This reverts commit e19e4e3f10f65054aba16a94c082180f24b9beb6.

    This is breaking the net-virt code. Bridges are not getting created when OVSDB server connects to the controller. Probably happening because of single argument firstKeyOf() method.

    Change-Id: I76ab5f86f7329f741e30fd21eaed436391f793b8
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 64d86b6ad9b7fd54eaf708cb7654177fea344ef4
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Wed Sep 16 01:59:24 2015 +0530

    Added Security Group and Security Rule data change listeners

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 218b94228d407a5cc8d9c52550eabc2ef96e0a29
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Wed Sep 16 01:23:46 2015 +0530

    Fixed the instanceof checks

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 4167a9762eb08930c86209028a21c618f167bb29
Merge: 1188baa b085ce8
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 15 21:43:34 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 1188baa0e84249e202aab52d82dbb435552801aa
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 15 04:41:56 2015 +0530

    Fixed classcast exceptions while processing the events

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 79e5a3a8271e4021cb79d6a83177866bd1acc771
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 15 01:17:25 2015 +0530

    Fix single feature test failures

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit d1d6e81d0cf0dc21aa64c8e94ab993622c8f574d
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Mon Sep 14 17:52:24 2015 +0530

    Fixed local lbaas code to accomodate the model changes done in neutron yang models

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 1393eb861d1011c2285e065e28dc971dc52eae76
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Sat Sep 12 04:01:33 2015 +0530

    Added dummy provider as a dependency

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 09354754ab1fdf042327667f467f88483f24ab38
Merge: 272a6c1 53770e6
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Sep 11 17:01:33 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Conflicts:
    	openstack/net-virt/pom.xml
    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 272a6c15978aabae127a112f18f27d537828e931
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Wed Sep 2 18:11:28 2015 -0400

    Add NeutronLoadBalancerPoolMemberChangeListener

    Plus other minor fixes.

    Patch set 2: resolve fixmes.

    Change-Id: I75e6106f1cf5bb72370983bebe9568704dcef36a
    Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 5c815ff07f95721790a1dab87210bd19b82f3a15
Merge: 4029f04 55ff806
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Wed Sep 2 20:24:08 2015 +0000

    Merge "Add NeutronLoadBalancerPoolChangeListener" into topic/master/neutron-yang-migration

commit 55ff80613eb153260007d3d2006cbe6354819db6
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Wed Sep 2 16:09:49 2015 -0400

    Add NeutronLoadBalancerPoolChangeListener

    Change-Id: Icb570f780c3f67e3ee67dc3366fc059e981ff176
    Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 4029f04004d7db4e1f4562f26b98b3966c1092db
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Wed Sep 2 11:37:25 2015 -0400

    Cosmetics: Fix Copyright (try 2)

    Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit d8169714e9fe8880f3a10c680851ff500e4b1696
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Mon Aug 31 04:08:06 2015 +0530

    Fixed unit tests

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 6f4f4005cf28367b5d2e10d50246189abaa8f600
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Mon Aug 31 03:20:03 2015 +0530

    Implemented INeutronFloatingIPAware notification provider.
    This implementation subscribe for data change notification from /neutorn/floatingips/floatingip path
    and call the *iaware methods according to the changes (create, update, delete) it receives
    from data store.

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 60445afc56d355a593223221d2182a6f3c53a307
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Mon Aug 31 02:31:20 2015 +0530

    Implemented INeutronRouterAware notification provider.
    This implementation subscribe for data change notification from /neutorn/routers/router path
    and call the *iaware methods according to the changes (create, update, delete) it receives
    from data store.

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit fda2cd8556790bacff1e55efc1276f899cdb8b9c
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Mon Aug 31 02:06:13 2015 +0530

    Implemented INeutronPortAware notification provider.
    This implementation subscribe for data change notification from /neutorn/ports/port path
    and call the *iaware methods according to the changes (create, update, delete) it receives
    from data store.

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 8a67f0db43b6c07d2560916b21cfb9c46f57bf7f
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Mon Aug 31 01:32:01 2015 +0530

    Implemented INeutronSubnetAware notification provider.
    This implementation subscribe for data change notification from /neutorn/subnets/subnet path
    and call the *iaware methods according to the changes (create, update, delete) it receives
    from data store.

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit cdcc657f2e684c8595f7ff76553c3ea3255ba395
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Aug 28 23:49:14 2015 +0530

    Implement Neutron Network data change listener
    This patch listens on the /Neutron/Networks/Network path of Neutron network yang model and
    convert it to NeutronNetwork pojo (existing pojo's that's in use by net-virt) and call the
    respective method of implementor of INeutronNetworkAware interface

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit fb7c9891641b1b4822a8dbade472da55779d1300
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Sat Aug 29 03:10:44 2015 +0530

    Add CRUD interface implementation to ovsdb net-virt.
    This code is borrowed from the neutron northbound project. I cleaned up few of the CRUD implementation file that is not required
    for the net-virt. Few of the existing CRUD interface implementation is still based on the ConcurrentHashMap, which we need to migrate
    to the data store based implementation. This patch hooks these services locally so that only ovsdb net-virt can consume these services

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit a2c8738b0b703eaa6c04f6f49694e1fe035216ad
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Aug 28 20:35:46 2015 +0530

    Code refactoring: moved CRUD interface and IAware interface to their own packages

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 76d01ae3060835cbcd9bd469058033e7bcd5dc48
Merge: cb5f2d9 ff7ddc7
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Sat Aug 29 03:39:18 2015 +0530

    Merge branch 'master' into topic/master/neutron-yang-migration

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit cb5f2d9d3ebc9952030aecd83e7a71c770fe41ea
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Thu Aug 27 17:51:23 2015 +0530

    Neutron-Yang-Migration: Intial code for translator layer

    Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Change-Id: Id18f4fc26f018673f08ef10ddd86850922b7265b
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>