Remove redundant semi-colons

Change-Id: I4a9d36022a333d90c2b3fc716d9aca9334c15a66
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Clean up enums

enums are static, and their constructors private, by default.

Change-Id: I6be729d10fa2e81b87a5a4afcc91ed1a30e3ea97
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Clean up collections

Use interfaces instead of concrete implementations where appropriate.
Use the Java 7 <> operator.
Avoid Lists.newArrayList() if new ArrayList<>() is sufficient.

Change-Id: I70ebe6ebc7c79f8d742fdd71fc6419461a7aaa65
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Merge "Unit Test for ovsdb southbound OvsdbConnectionManager.java" into stable/lithium

Merge "Added unit tests for ovsdb/southbound lithium branch" into stable/lithium

Merge "Add UT for SouthboundMapper and SouthboundProvider" into stable/lithium

Ovsdb-UI : Change icon and attempt to fix invisible vxlan

- Change the icon for ones more appropriate.
- Attempt to solve the invisible vxlan when using
a "triange" vxlan topology.
- Change the logical dialog to be "half-static".
The position will be set one time and will keep the
last given instead of trying to appear near the related node.

Change-Id: I1bdd92a5b97c9f8638c5415391c02f3deb6d168a
Signed-off-by: Maxime Millette-Coulombe <mmcoulombe@inocybe.com>

Unit Test for ovsdb southbound OvsdbConnectionManager.java

- added UT for vsdbDataChangeListener.java (no need to cherry pick patch 27361

Change-Id: I272d716e3d8b3df9bdaea5fc0009c809c8e25933
Signed-off-by: rpujar <rpujar@inocybe.com>
(cherry picked from commit ef682a0e6a1b8a7fe4aa87a831729933c0d96856)

Added unit tests for ovsdb/southbound lithium branch

Change-Id: Iab67bab14a90ef39678756e7bd9c8852bf111f40
Signed-off-by: mserngawy <melserngawy@inocybe.com>
(cherry picked from commit cf3e86ebee7a42e212194d3e3f1bbbd6359e1f33)

Add UT for SouthboundMapper and SouthboundProvider

Change-Id: I38776516b120cc16d123d37dcafb8d19c6fd7e21
Signed-off-by: mserngawy <melserngawy@inocybe.com>
(cherry picked from commit 3a52bd31ce8fa9d9dd494811fe4441183414018d)

Bug 4546 - Southbound plugin throws java.lang.IllegalStateException
 while shutting down and loops forever

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

UT for ovsdb.southbound transact package

1. TransactInvokerImpl.java
2. TransactCommandAggregator.java
3. TransactUtils.java

Change-Id: If360ba8f07a9715ff60225809fbc987afba59516
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>

Merge "Adding code to test the all the supportted interfaces by OVS-DPDK [dpdk, dpdkr, dpdkvhostuser,....others]" into stable/lithium

Adding code to test the all the supportted interfaces by OVS-DPDK [dpdk, dpdkr, dpdkvhostuser,....others]

Change-Id: Ied5750ef7ff095e13dcd731c8cfe25823620926e
Signed-off-by: Praveen Mala <praveen.mala@intel.com>

Adding code to test the OVS-DPDK datapath type: netdev

Change-Id: I599df4f0f910a1e7e18ee230ac562cbea6ac3b03
Signed-off-by: Praveen Mala <praveen.mala@intel.com>

Fix ovsdb-ui to use stable/lithium version of commons parent

ovsdb-ui incorrectly depends on a future version of commons parent
causing autorelease to fail the build.

Change-Id: I33ca52f542447f7eb069b89ec02b810d6badc001
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Merge "UT for southbound/transactions/md" into stable/lithium

Merge "UT for SouthboundUtil.java" into stable/lithium

Merge "UT for southbound/transactions/md - set 3" into stable/lithium

Merge "UT for southbound/transactions/md - set 2" into stable/lithium

Merge "Added Unit Tests for ovsdb/southbound" into stable/lithium

Merge "UT for southbound/transactions/md - set 5" into stable/lithium

Merge "UT for southbound/transactions/md - set 4" into stable/lithium

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>
(cherry picked from commit 26ed35648c8fcea96674a1f6e310f9d7930c09c8)

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>
(cherry picked from commit ffa3c96aab514cfaba4e0eb543fe6956d3dfdb13)

UT for southbound/transactions/md - set 3

6. OvsdbControllerUpdateCommand.java
7. OvsdbManagersRemovedCommand.java

Change-Id: Idcb7ff1ad8f414cb243ae766e69d6437d0bee93f
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
(cherry picked from commit ea32373f46715c41376f1473b121e5cc723c46f0)

UT for southbound/transactions/md - set 2

4. OvsdbBridgeUpdateCommand.java
5. OvsdbControllerRemovedCommand.java

Change-Id: Idc469c08351b1e98129dd9e798c07a660d782709
Signed-off-by: rpujar <rpujar@inocybe.com>
(cherry picked from commit cfcc6d4b4288e44bdbcb9de4cf5ac0de97f741f6)

UT for southbound/transactions/md

1. AbstractTransactionCommand.java
2. OpenVSwitchUpdateCommand.java
3. OvsdbBridgeRemovedCommand.java

Change-Id: I7655dec526bc06b770c533dd082eb403bc89a2c7
Signed-off-by: rpujar <rpujar@inocybe.com>
(cherry picked from commit ba1ac0433a93468260f0e00e693ba1a928c14e14)

UT for SouthboundUtil.java

Change-Id: I87e3577ab2f262ec7f50b6c185a41f49b1e607ed
Signed-off-by: rpujar <rpujar@inocybe.com>
(cherry picked from commit bf634aac7eb1da8021841fa05959762a2c6bf3ab)

Added Unit Tests for ovsdb/southbound

InstanceIdentifierCodecTest.java and OvsdbSchemaContantsTest.java

Change-Id: I91e356dfc6bfc41bac081b9792ff99bfc931c3ae
Signed-off-by: rpujar <rpujar@inocybe.com>
(cherry picked from commit a3372e6f62b7b3e9d00b0d1a73886464e6fc511a)

Unit test for ovsdb.southbound.ovsdb.transact

Change-Id: I200bf945bf2d8875d5e8de23c101420092a9161e
Signed-off-by: Mohamed El-Serngawy <melserngawy@inocybe.com>

If node joins the cluster after application master instance
is selected, it doesn't get any notification about the ownership
change of the application, so it does not initiate the ovsdb manager,
It should check if any other instance is master instance,
if yes, consider itself slave and start the Ovsdb Manager.

Patch 2: Register entity ASAP, to minimize the delta for missing
ownership change notifications

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

Merge changes I4a00740f,I31fad80f into stable/lithium

* changes:
  All TCP & UDP SG Rules : Implementation and Unit tests added.
  Custom ICMP SG Rule: 1)Modification in ICMP matcher 2)Unit Test Improvement (Check added to validate if some values are set properly).

Merge "Bug 4472 - netvirt: IlligalArgumentException in NAT provider" into stable/lithium

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

Change-Id: I4a00740fed78ab416fe22214fa7542ae7036f6fc
Signed-off-by: sangeeta.maurya <sangeeta.maurya@hp.com>

Custom ICMP SG Rule:
1)Modification in ICMP matcher
2)Unit Test Improvement (Check added to validate if some values are set
properly).

Change-Id: I31fad80f6dd278372abe2b1a6aac95935aef5f17
Signed-off-by: sangeeta.maurya <sangeeta.maurya@hp.com>
(cherry picked from commit 99f9a373e9bc410933421692148b87f177ab4879)

Added Security Rule for Custom ICMP

Change-Id: I5f813b3695c2fd21e03a0ccf215e49b891059154
Signed-off-by: sangeeta.maurya <sangeeta.maurya@hp.com>
(cherry picked from commit 055d8e4b6b06dabd5b2c9949d9ee1b96b6abb39e)

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>

Merge "First pass for ovsdb-ui" into stable/lithium

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>

Workaround to fix net-virt-it

Change-Id: I10838b993f60b5e3859780d7d9f7b4c3630e312a
Signed-off-by: Sam Hague <shague@redhat.com>

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>

Merge "Bug 4144 - Periodic ARP resolver should use unicast MAC destination address whenever possible; instead of broadcast" into stable/lithium

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>

Merge "If controller joins the cluster late, and the owner of the device is already decided, EntityOwnershipService won't notify new candidate that register for ownership. Adding a proactive check on the ownership state of the device, so if it's already owned, adding the connection instances in the connection cache." into stable/lithium

Merge "Remove unused code" into stable/lithium

Remove unused code

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

If controller joins the cluster late, and the owner of the device
is already decided, EntityOwnershipService won't notify new candidate that register
for ownership. Adding a proactive check on the ownership state of the device,
so if it's already owned, adding the connection instances in the connection cache.

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

Bumping versions by 0.0.1 after the Lithium SR2 release

Change-Id: Ie7e993606f87c4fae11d899f4c39f9fd6fcf096a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Applying the Lithium SR2 release patch

Change-Id: I31e03a437910bd84e8ea194836ec066133692c77
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Revert "If controller joins the cluster late, and the owner of the device"

This reverts commit 91461a3aef97eb358ac0fe7d96b448c5f6ede0ca.

Change-Id: Ifc1a0254f9d37d5ed3ebcd3a3644f280269b3b71
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

If controller joins the cluster late, and the owner of the device
is already decided, EntityOwnershipService won't notify new candidate that register
for ownership. Adding a proactive check on the ownership state of the device,
so if it's already owned, adding the connection instances in the connection cache.

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

Send a canonical IPv4 prefix in table 60 routing rules

Testing with userspace OVS with DPDK uncovered that the routing
rules that go into table 60 were getting rejected.

Messages from ovs-vswitchd.log:

... |nx_match|WARN|Rejecting NXM/OXM entry
    0:32768:12:1:8 with 1-bits in value for bits wildcarded by the mask.

... |connmgr|INFO|br-int<->tcp:10.11.21.7:6653:
    sending OFPBMC_BAD_WILDCARDS error reply to OFPT_FLOW_MOD message

Clearing the non-prefix bits resolved the problem and the flows were
successfully added.

v2 - split up long line into two more readable lines

Change-Id: I42a0c63e6e837197d29bb8333f12e822a5f15d91
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Added postman collection and postman environment
files for Southbound plugin to test in Single and 3 Node cluster environment

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

Merge topic/lithium/clustering to stable/lithium

Squashed commit of the following:

commit ef3f50b7e81b5b0444eacaa839017cf34aaa2f23
Merge: 9fd9a7a 0e717af
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Oct 2 19:52:17 2015 +0530

    Merge branch 'stable/lithium' into topic/lithium/clustering

    Change-Id: I5cdf030079161d33af86913b23558ec45498ed73
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 9fd9a7a80c2ae75107a4155576b4a95f6b907e4d
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 481b70edc87a291b645d80bb67f69e12c77a65a0
Merge: d726cd3 5fee911
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Thu Oct 1 23:06:03 2015 +0000

    Merge "Merge branch 'stable/lithium' into topic/lithium/clustering" into topic/lithium/clustering

commit 5fee9116d826b7511589b45641adf6fa5bc157e8
Merge: 7b6cd2b 681ae55
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Oct 2 04:10:13 2015 +0530

    Merge branch 'stable/lithium' into topic/lithium/clustering

    Change-Id: I055a8e00c0d224c0875f6113684927593226c38f
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit d726cd3b57b015dcaad889fd03ec96027e198c2a
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 7b6cd2b93adf3bbbf4eb9c4a60257fab5aed27a0
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

    Change-Id: I9f8adfba4a4f866d423503b24f400c40bd43131b
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 358ef8aa54263caa72fb835fbc9a4bb37cb5691a
Merge: 82f28e0 9103379
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Tue Sep 29 12:56:22 2015 -0400

    Merge branch 'stable/lithium' into topic/lithium/clustering

    Change-Id: If27864a3d853385b422cc9aaba3dc23fca802601
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 82f28e03944e854df852dcc5824b71324ca39df5
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.

    Change-Id: Id942a2ba16a83b19807e135a9b67f8a7eb7da003
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 7b1e0328c5a5da3ad31c58bd30ae50cf1fd46862
Merge: d01183e 9cd49f0
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 29 00:48:27 2015 +0530

    Merge branch 'stable/lithium' into topic/lithium/clustering

    Change-Id: Iad45a2d4b9ad3eafb13463a463aeaa896dc02806
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit d01183ea4f33a6216ee5c94401ba721e461022e6
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 00167c30be1e2926ccceb48502a9f424ee08343b
Merge: 49aaba8 4fde41f
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Sep 25 23:47:15 2015 +0000

    Merge "Set bridge controller(s) based on ovsdb node manager(s)" into topic/lithium/clustering

commit 4fde41f910a5109b225fe3d5235c12cd56cbdc3b
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 49aaba8873fa3f8826d91c41d942fbfaee067ad2
Merge: 8b2b4be 781c88f
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Sat Sep 26 01:28:43 2015 +0530

    Merge branch 'stable/lithium' into topic/lithium/clustering

    Change-Id: I2adaf053b143cc76127990704b15378d7f58867f
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 8b2b4bed83f69aa849de250d4967831b8a8e1256
Merge: 5fa97d5 35e5357
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Sep 25 15:54:47 2015 +0000

    Merge "Revert "Only device owner will update device."" into topic/lithium/clustering

commit 35e5357bd100788de045293baf3c60921c5f041b
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Sep 25 15:54:10 2015 +0000

    Revert "Only device owner will update device."

    This reverts commit 07b2e8ac2b6ca66a8337500a839512c2e687300c.

    Change-Id: Ifd075d7760ac27a7c95752b3168f906943bf5c40
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 5fa97d59f2631ba2005cc4d6bee8dbf6effc39e4
Merge: 1da612c 07b2e8a
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Sep 25 07:32:57 2015 +0000

    Merge "Only device owner will update device." into topic/lithium/clustering

commit 1da612c218efeba185a7a810b271a422eb6fe0be
Merge: 1da353f fb84217
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Wed Sep 23 17:53:16 2015 -0400

    Merge branch 'stable/lithium' into topic/lithium/clustering

    Change-Id: I371e89297feff8b3a72d71e320e59eeeab319bcb
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 07b2e8ac2b6ca66a8337500a839512c2e687300c
Author: Sharad Mishra <sharad.d.mishra@intel.com>
Date:   Tue Sep 22 12:36:26 2015 -0400

    Only device owner will update device.

Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
Change-Id: Icaed026fba6d4ee603ba0f6b452d23c0b089b157
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Merge "Use the memorized service reference" into stable/lithium

Bug 4277 - Deleted Network flow entries retained in br-int, if network associated and disassociated from virutalrouter interface

        Remove the mac cache after deleting the DHCP neutron port l3 flows

Patch set 2: Move all other caches updated in delete into cleanupRouterCache()

Change-Id: I0c29ba4976ddfd484415d851ad5a2df97d61b19a
Signed-off-by: ravi_sabapathy <ravi_sabapathy@dell.com>

Merge "BUG 4208 - Unstack and restack existing compute" into stable/lithium

BUG 4208 - Unstack and restack existing compute

Loop through all the ports in the same network
and add the VM's unicast mac rule of the destination
node in the source node.
Change-Id: I73c0056e1a8386ffbab71a7a5732e81791eb6c88
Signed-off-by: ravi_sabapathy <ravi_sabapathy@dell.com>

Less restriction on shared networks: it can be allowed on externals

Change-Id: I0a66758731eb35a73623c6f663792b9dffbfec08
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Use the memorized service reference

Currently when dispatching "event handler added" events we retrieve
the appropriate service reference from the bundle context, but this
seems to cause problems when multiple services are registered for the
same interfaces. Since we know the service reference we got when
registering the service involved, we can just pass that.

Some more debugging information should help track down other issues of
this type.

Change-Id: Iac54595aed388165711a7c4a3d86577646c59d4f
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Merge "L3: Add eth to br-ex" into stable/lithium

L3: Add eth to br-ex

Change-Id: I89d917bb51d7f54d585d71076319eedd752b42d0
Signed-off-by: Badrinath <badrinath_viswanatha@dell.com>

Controller initiated connections always connect to one manager
listening in ptcp: mode. In clustered mode, all the three controller
will connect to the device, and in case any of the connection will flip
that instance will remove OvsdbNode from operational data store because
it will see only one manager in manager list. But because switch is
listening in passive mode, there can be multiple connection to same manager.
To handle this scenario, this patch adds number_of_connection attribute
to OvsdbNodeAugmentation to maintain the number of active connection to
specific manager. In case of switch initiated connection this value is
going to be 1 for each manager, but in case switch listening in passive
mode, this value will represent active connections (extraced from
Manager tables status column n_connections attributes).

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

Bug 3989 -- Fix the original patch. Original patch can break
the functioning if there are more then one data change and
the first data change is OvsdbNodeAugmentation for which connection
already exist. It will return out of OnDataChanged() when it see
that connection already exist, without processing rest of the
data

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

Fix ovsdb node update in clustered environment
In cluster environment same switch can be connected to multiple
controller instance running southbound plugin. In the existing implementation
if device disconnect from any of the controller instances OVSDB-SB remove
OvsdbNode from operational data store. In cluster environment that will
break contract with customer, given that device is still connected to
atleast one of the two controller instances running. This patch modifying the
behavior where controller will see if its the only connected controller,
then it will delete the data from operational data store, else it will skip
any clean up from operational data store, because other instances will anyway
update about the disconnected controller manager entry in the managers list.

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

Revert "Merge branch 'stable/lithium' into topic/lithium/clustering"

This reverts commit b2521f1b24493f7a9cad3165e470ba41331cf90d.

Change-Id: I8395afaeb9c0d1ad6658c4fa9400d0d0acd98220
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Merge branch 'stable/lithium' into topic/lithium/clustering

Change-Id: I371e89297feff8b3a72d71e320e59eeeab319bcb
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Add YangInstanceIdentifer to InstanceIdentifier converter method

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

Added manager list to Ovsdb Node.
For application southbound plugin only give a device level view and not a connection level view.
To make net-virt cluster aware, it needs to the managers of the ovsdb server, so that
when it creates ovs bridges, it can connect them to the same controllers through OF plugin

Tests:
ovs-vsctl set-manager tcp:ip:6640
ovs-vsctl set-manager tcp:ip:6640 tcp:ip2:6640
ovs-vsctl set-manager tcp:ip:6640
ovs-vsctl del-manager

Change-Id: I8b68fef9583f4fbcc330a0e9fc239015851b3f7c
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 3509e4828e7176b99f4f53a1ef22124f1d586e91)

Added manager list to Ovsdb Node.
For application southbound plugin only give a device level view and not a connection level view.
To make net-virt cluster aware, it needs to the managers of the ovsdb server, so that
when it creates ovs bridges, it can connect them to the same controllers through OF plugin

Tests:
ovs-vsctl set-manager tcp:ip:6640
ovs-vsctl set-manager tcp:ip:6640 tcp:ip2:6640
ovs-vsctl set-manager tcp:ip:6640
ovs-vsctl del-manager

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

Add hasDeviceOwnership flag to OvsdbConnectionInstance

Change-Id: Id7da9071374938c16b086b0d67059aec0a7cc3a0
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Enable remote notification for southbound plugin

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

Wire entity ownership service to OVSDB southbound plugin

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

Fix Java 8 javadoc compatibility

Change-Id: Iee2be4381922d7fb8a08b42192f277dcd2600a85
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Merge "SecGroup: Handle cases when security group has empty rules" into stable/lithium

Bug 3989: clear the connection info

When disconnecting, we need to clear the connection info to avoid
thinking we're still connected later.

Add assertions in the southbound IT tests to make sure we don't
connect twice.

Change-Id: I778a2cb9ab957db02146f5a2b3a6658129ba7219
Signed-off-by: Stephen Kitt <skitt@redhat.com>

SecGroup: Handle cases when security group has empty rules

Change-Id: I54ef43f6a4afd9fc571c8dcf9bf843007452c968
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

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>
(cherry picked from commit df0401056be4d7e24eb48c630a318e1a8fd23fea)

Updating fix for bug 3989 based on discussion in OVSDB meeting

Signed-off-by: Raksha Madhava Bangera <raksha.madhava.bangera@intel.com>
Updating the patch as per review comments

Signed-off-by: Raksha Madhava Bangera <raksha.madhava.bangera@intel.com>
Removing whitespace
(cherry picked from commit b24e78eea3a72416da8a8a676df998f95dbf89a0)

Change-Id: Ie5a685445a14dab06c70e840a4e7f988981cb7bb
Signed-off-by: Raksha Madhava Bangera <raksha.madhava.bangera@intel.com>

Clean up plugin management

A number of plugins are managed by odlparent, so use that instead of
variables (even inherited) and remove unnecessary entries (i.e.
specified identically in odlparent).

Change-Id: I1d6d4072cfdfa59e6891b8bee29a9cb562f93335
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit 742e86f4d12163f43f39a83504231a2d2b02d73c)

Bug 4045 - ipv6 work around

When running tempest, the following exceptions occurs because
ipv6 is not supported yet. This patch is work around for now.
TODO: support IPv6 and remove this work around

> 2015-08-25 15:00:12,428 | ERROR | ntDispatcherImpl | EventDispatcher                  | 400 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.0.SNAPSHOT | Exception in dispatching event NorthboundEvent [handler=NEUTRON_ROUTER, action=DELETE, port=null, subnet=null, router=NeutronRouter [id=55dc4fd2-0e5f-4ec8-b589-18616dfaa6a1, name=tempest-router--44999886, adminStateUp=false, status=ACTIVE, tenantID=86d8df7573f24bc68e0a75846812839d, external_gateway_info=NeutronRouterNetworkReference [networkID=7d526ede-cfd0-45ec-897f-607471dd801e enableSNAT=true externalFixedIPs=[Neutron_IPs{ipAddress='172.24.4.62', subnetUUID='9a799aec-5f1f-4a2d-b3ed-a109f6c89bcb'}, Neutron_IPs{ipAddress='2001:db8::3e', subnetUUID='5178fb71-6683-4cf6-a1e7-095da5b9962a'}]], distributed=false, gw_port_id=2419ec70-21e8-4a3b-aa52-82ec9dd7f698, routes=[], interfaces={}], routerInterface=NeutronRouterInterface [subnetUUID=009ab797-30df-4c55-87f4-5142a9f8b444, portUUID=900abbc5-4db9-4bec-8777-0018f2950751, id=55dc4fd2-0e5f-4ec8-b589-18616dfaa6a1, tenantID=86d8df7573f24bc68e0a75846812839d], floatingIP=null, network=null, loadBalancer=null, loadBalancerPool=null, loadBalancerPoolMember=null]
> java.lang.IllegalArgumentException: Supplied value "fdfd:7da6:14e6:0:f816:3eff:fe43:c114/32" 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)[39: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)[49:org.opendaylight.yangtools.model.ietf-inet-types:2010.9.24.8-SNAPSHOT]
>         at org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils.iPv4PrefixFromIPv4Address(MatchUtils.java:1133)[401:org.opendaylight.ovsdb.openstack.net-virt-providers:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.L3ForwardingService.programForwardingTableEntry(L3ForwardingService.java:64)[401:org.opendaylight.ovsdb.openstack.net-virt-providers:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programL3ForwardingStage2(NeutronL3Adapter.java:689)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programL3ForwardingStage1(NeutronL3Adapter.java:670)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.updateL3ForNeutronPort(NeutronL3Adapter.java:640)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronRouterInterfaceEvent(NeutronL3Adapter.java:310)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.RouterHandler.processEvent(RouterHandler.java:208)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.dispatchEvent(EventDispatcherImpl.java:95)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.access$200(EventDispatcherImpl.java:28)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl$1.run(EventDispatcherImpl.java:57)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)[:1.7.0_79]
>         at java.util.concurrent.FutureTask.run(FutureTask.java:262)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)[:1.7.0_79]
>         at java.lang.Thread.run(Thread.java:745)[:1.7.0_79]

Change-Id: If886c3867665660c8f90a72f567420f48f3fd6ad
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

Fix for defect 4135

https://bugs.opendaylight.org/show_bug.cgi?id=4135

If integration bridge or external bridge exist prior to
connecting to ODL, then the pre-existing bridge is not added.
But the side effect is that the controller is not set on
this bridge.
Current code checks to see if the bridge already exists on the node. This
patch adds a check to see if the bridge exists on CONFIG datastore. If the
bridge does not exist on config, it indicates that the bridge existed prior
to ODL connection, and it adds the bridge.

(cherry picked from commit 920e5d6676bbcd7204dd077f5e19a139edb8b57a)

Change-Id: Iddf0e8463585346c06f86f0924ee0e3e5b8bdb31
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>

Added IPV4, Custom TCP and UDP SG rules.

Change-Id: I442745135b5ccb778b1f0b11962f50b1f2d5ff5b
Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>

Merge "Bug 4163 - null pointer exception NeutronL3Adapter.getExternalNetworkSubnet" into stable/lithium

Merge "Replace StringBuilder with more efficient String concatenation" into stable/lithium

Bug 4163 - null pointer exception NeutronL3Adapter.getExternalNetworkSubnet

INuetronXXXCache may return null. So null pointer check is necessary.
In fact in NeutronL3Adapter there are null pointer checks in other place.
This is the only place missing the check.

Patch set 2: Merge changes from https://git.opendaylight.org/gerrit/#/c/25546/2

> 2015-08-20 14:10:06,140 | ERROR | ntDispatcherImpl | EventDispatcher                  | 400 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.0.SNAPSHOT | Exception in dispatching event NorthboundEvent [handler=NEUTRON_PORT, action=ADD, port=NeutronPort [portUUID=1f781e25-ae88-4210-a296-096a3c04adb4, networkUUID=7d526ede-cfd0-45ec-897f-607471dd801e, name=, adminStateUp=true, status=null, macAddress=FA:16:3E:62:5A:34, fixedIPs=[Neutron_IPs{ipAddress='172.24.4.55', subnetUUID='9a799aec-5f1f-4a2d-b3ed-a109f6c89bcb'}, Neutron_IPs{ipAddress='2001:db8::37', subnetUUID='5178fb71-6683-4cf6-a1e7-095da5b9962a'}], deviceID=3fb41370-be5a-4ba4-8141-e8392d9eb878, deviceOwner=network:router_gateway, tenantID=c079de68c26e4dec9b1867f4af272fb9, securityGroups=[], bindinghostID=, bindingvnicType=normal, bindingvnicType=normal], subnet=null, router=null, routerInterface=null, floatingIP=null, network=null, loadBalancer=null, loadBalancerPool=null, loadBalancerPoolMember=null]
> java.lang.NullPointerException
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.getExternalNetworkSubnet(NeutronL3Adapter.java:1262)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.triggerGatewayMacResolver(NeutronL3Adapter.java:1278)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronPortEvent(NeutronL3Adapter.java:208)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.doNeutronPortCreated(PortHandler.java:66)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.processEvent(PortHandler.java:161)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.dispatchEvent(EventDispatcherImpl.java:95)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.access$200(EventDispatcherImpl.java:28)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl$1.run(EventDispatcherImpl.java:57)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)[:1.7.0_79]
>         at java.util.concurrent.FutureTask.run(FutureTask.java:262)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)[:1.7.0_79]
>         at java.lang.Thread.run(Thread.java:745)[:1.7.0_79]

Change-Id: I900e3ab959917fda35dd5f073b0cf89b32edc031
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

Merge "Bug 4160 - null pointer exception in getDHCPServerPort()" into stable/lithium

Replace StringBuilder with more efficient String concatenation

Just replaces the StringBuilder with a more efficient/readable
String concatenation operation.

Change-Id: Idce8fed3d4e207ff1a95cf24267a41fa8682a08a
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

Use org.junit instead of junit.framework

Change-Id: I8f7a2ba960eef28ec34885f6a7f9119d1c51d421
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Mention "fig up" and sudo for integration tests

Change-Id: Ifa3d0f633a7008b8e0aa5e15f722adb054c0d6d3
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit b63ef03e3cb90c64d240f02a41969fb5da05870f)

Fixing Test Failures with the Change# 24618

Change-Id: I884560f24d8d503d99f07119395629350ab582c2
Signed-off-by: Arun S. Yerra <arunsarat@yahoo.com>

Fix for BUG 4067 (LBaaS flows don't get installed in the switch.)

LbaaS is installing the OF Flows in opendaylight-inventory CONFIG data store with NodeId stored in OVSDB topology data tree, but openflow plugin doesn't have any node with this node Id as they are based on DPID.

Other NetVirt Provider Services map the OVSDB node Id to Southbound DPID, but LBaaS is not doing the mapping.

Fix is to get the corresponding DPID and create the Node Id that can be understood by the Openflow plugin and install the flow.

Change-Id: Ifd08df4d7729ebe6270db1afe239c3e8188dc229
Signed-off-by: Arun S. Yerra <arunsarat@yahoo.com>

OVSDB netvirt southbound - set correct datapath type for OVS with DPDK

When creating bridges from netvirt, check if the OVSDB node supports
'dpdk' interfaces.  If it does, then specify the datapath type
so that the bridge will be created with the 'netdev' datapath type.

Change-Id: I581b4148fe402fcab539c287922b74058abf0c72
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Bumping versions by 0.0.1 after the Lithium SR1 release

Change-Id: Ie1d9f30cd587a91688c9ee86c86991c6d7c2fde1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Applying the Lithium SR1 release patch

Change-Id: I9e21fc05a39071025c3ee0f6e17fbbe0a98c9729
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Revert "OVSDB netvirt southbound - set correct datapath type for OVS with DPDK"

This reverts commit 6989a273149b5908fb2c2ae56d8f9fdb01cd05e0.

Change-Id: Ibdc52b8ced0d64842ae27cbb068a5bd3b97f1659
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Revert "Merge changes from topic '24618' into stable/lithium"

This reverts commit fee81ff402d6e6944ebf3f76be599c2e48ef9c5b, reversing
changes made to 6989a273149b5908fb2c2ae56d8f9fdb01cd05e0.

Change-Id: I16b18282347d2204f3b2567d3b41c06735f2ee50
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Revert "Merge "Mention "fig up" and sudo for integration tests" into stable/lithium"

This reverts commit b2cfba38709c8f7b009dc33b36ebe2659b8470f4, reversing
changes made to fee81ff402d6e6944ebf3f76be599c2e48ef9c5b.

Change-Id: Ib6097a45d12024b5602d5d7d8ec3971de3ae4462
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Revert "Use org.junit instead of junit.framework"

This reverts commit 45f306975708fa8f252a7f8ef475e80f07e4040f.

Change-Id: I592088b4c7edcb47a057c7f4cfbc8dec76af3e49
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>