Merge branch 'master' into topic/netvirtsbmerge

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

Change NodeCacheManager to use Map rather than List

- Also a fix for external-ids to use the right key
- moved OvsdbDataChangeListener logging to trace level
- updated SouthboundIt#testNetVirt to add a port
- change getControllerTarget to use the local_ip from the connectionInfo

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

Offload data change event processing to separate pool

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

Anil noticed there was a race condition here where we might write
an ovsdb-node to the operatational store before recording the
TransactInvoker we needed for people to be able to use it to write to
ovsdb.  This fixes that by imposing the order:

1)  Record the TransactInvoke for the ovsdb-node (internally)
2)  Write the ovsdb-node to OPER
3)  Register callbacks for monitors from ovsdb

Change-Id: I55202678521065b1a8c2f018a9f229b6be263a48
Signed-off-by: Ed Warnicke <hagbard@gmail.com>

Enabled bridge config clean up from config data store on ovsdb node disconnect

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

Removed unused import - causing build failure

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

Fixing sonar issues. Amending earlier changes

Change-Id: I5e68b6795c10ed4ff83e7da293105525e9cf4f44
Signed-off-by: evvy <dhiraviam.natarajan@gmail.com>

Merge branch 'master' into topic/netvirtsbmerge

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: Ibcf01b02b36b0ae366f00ae8f4f3e4a0efcb3854
Signed-off-by: Sam Hague <shague@redhat.com>

Remove SouthboundMapper and SouthboundConstants dependencies

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

Extra changes for SouthboundIT

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

Fixed process{bridge,termiantion-point, connection-attributes} update
command to send the udpated Node rather then the original node.

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

Fix race condition in initial connection.

We must register the OvsdbConnectionCreateCommand prior
to registerCallback or we will get race conditions.

*Before* any bridge information can be successfully written
to the operational datastore, the OvsdbNode *must* be written.
The txInvoker guarantees writes occur in the order they were
provided to *it*.

If we have:

  txInvoker.invoke(new OvsdbNodeCreateCommand(key, null,null));
  registerCallBack();

We can guarantee that, and thus guarantee we will not have race conditions.

However, if we reverse that:

  registerCallBack();
  txInvoker.invoke(new OvsdbNodeCreateCommand(key, null,null));

We are guarenteed to have race conditions, as the results of the original
monitor dump get written to the datastore before the OvsdbNode gets written.

Please note: ovsdb is actively broken out of the box due to this race
conditions, so this must be corrected ASAP.

Change-Id: Id71221f7665ece5ec4b2eb9a0b39465618bada01
Signed-off-by: Ed Warnicke <hagbard@gmail.com>

Add break and null condition to MdsalUtils#getExternalId

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

Adding break in processOvsdbNodeEvent

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

Use new bridge dataChangeListener events

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

Fixed instanceof comparison for processOvsdbConnectionAttributeUpdates

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

Fixed instanceof comparison for iid

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

Remove duplication call for OvsdbNode augmentation

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

Client should be added to cache before we push the
info(OvsdbNodeAugmentation) to operational data store.
With the existing implementation we were putting task
in invoker queue to dump the data to operational data
store and then registtering for the connection callback.
After that it's adding client to cache. So if invoker
writes the data to operational data store before
it adds client to cache, any code listening to
OvsdbNodeAugmentaiton, might not be able to do any
operation if that key is not there in connection
manager cache. It works if invoker loose the race
of putting data to operational data store, it fails if
it succeed.

Change-Id: Ic73c5b7bbe0f94b04bf932b67b872099f2c27b5c
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 77af48ad9d278b2a7e6d54442bd23bff313e08ee)

Client should be added to cache before we push the
info(OvsdbNodeAugmentation) to operational data store.
With the existing implementation we were putting task
in invoker queue to dump the data to operational data
store and then registtering for the connection callback.
After that it's adding client to cache. So if invoker
writes the data to operational data store before
it adds client to cache, any code listening to
OvsdbNodeAugmentaiton, might not be able to do any
operation if that key is not there in connection
manager cache. It works if invoker loose the race
of putting data to operational data store, it fails if
it succeed.

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

Add NeutronL3Adapter back now that neutron wires correctly

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

Merge branch 'master' into topic/netvirtsb_merge

Conflicts:
southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java

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

Merge "MdsalUtils#getOtherConfig() & MdsalUtils#getExternalIds()." into topic/netvirtsb

Merge "Fixed few things: ** Added support for deleting bridge from config data store to keep configuration sane *.* Fixed bridge creation (it was not creating integration bridge when second compute node connects" into topic/netvirtsb

Merge "Fixing log level : Too much log making debugging hard" into topic/netvirtsb

Merge "Implemented getAllBridgedOnOvsNode" into topic/netvirtsb

MdsalUtils#getOtherConfig() & MdsalUtils#getExternalIds().

Patch Set 1: useless formatting
Patch Set 2: remove trailing space
Patch Set 3&4: MdsalUtils#getOtherConfig()
Patch Set 5: remove trailing space
Patch Set 6: MdsalUtils#getExternalIds()

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

Fixed few things:
** Added support for deleting bridge from config data store
to keep configuration sane
*.* Fixed bridge creation (it was not creating integration bridge
when second compute node connects

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

Fixing log level : Too much log making debugging hard

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

Implemented getAllBridgedOnOvsNode

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

Implemented addPatchTerminationPoint()

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

MdsalUtils : Delete termination point from bridge

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

Reenable neutron I*Aware services

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

Merge "Remove mdsal-node utils" into topic/netvirtsb

MdsalUtils : Implemented create tunnel termination point on bridge node

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

MdsalUtils : Add internal termination point on ovsdb bridge

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

Remove mdsal-node utils

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

Refactor MdSalUtils class to

*.* Clean up the duplication methods
*.* Refactor methods to avoid confusion whether it's reading from data store
or extracting from provided method
*.* Arranged code for better readability

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

Remove lib and schema from netvirt

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

MdSalUtils : Implemented getPorts from {node, operational data store}

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

SouthboundIT tests for Bridge external_ids and other_config

Tests create, read and delete functionality for bridge external_ids and
other_config.  Future changesets will utilize work here to test update
of bridges.

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

Fixed OvsdbDataChangeListner bridge update processing

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

Merge "Southbound-IT: add test to verify dpdk enabled switch."

Implemented processing of Bridge Update

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

Keep netvirt pom exporting packages

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

Merge branch 'master' into topic/netvirtsb_merge

Conflicts:
openstack/net-virt/pom.xml
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/NetworkingProviderManager.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java

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

Quick and Dirty fix for bridge controller ip address
Rather the using the hardcoded value, using the  local host ip address.
This is dirty fix, we should remove it once we get the valid fix using
the connectionInfo local ip address. I think local ip address issues is now
fixed for conncetion-info, so we can probably use that. We need to merge the
 master to netvirtsb branch, that will bring that fix.
With this fix, netvirt create br-int and install all the pipeline flow
successfully.

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

OvsdbDataChangeListner : Implemented processing of openvswitch (ovsdb connection) updates

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

Workaround for INeutron bundles not letting services start

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

OvsdbDataChangeListner : Implemented processing of port/interface update

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

OvsdbDataChangeListner : Implemented processing of bridge deletion

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

OvsdbDataChangeListener : Implemented processing of new bridge creation

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

Fix SouthboundIT by disconnecting after each test

SouthboundIT requires disconnection from OVSDB after each test.

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

OvsdbDataChangeListener : Implemented ovsdb node disconnection processing

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

OvsdbDataChangeListener : Implemented port (termination point) delete event processing

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

Southbound-IT: add test to verify dpdk enabled switch.

This test will

1. Check if it is a DPDK node.
2. Test exits if its not a DPDK node. If DPDK node then,
3. Create a netdev bridge.
4. Verifies that a netdev bridge was created.
5. Creates a dpdk port.
6. Verifies that a dpdk port was added.
7. deletes bridge and disconnects node.
8. Test fails if any of the 3-7 step fails.

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

ovsdbDataChangeListener : Implemented Termination point creation processing
Patch 2: rebased patch

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

Remove OvsdbConfigurationService

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

Fix javadoc JDK8 compatibility

JDK8 is more picky about javadoc correctness -- fix it up so we can pass
compilation.

Change-Id: Iae446e890afe91c6ca0b670c2ea53f18793b5e99
Signed-off-by: Robert Varga <rovarga@cisco.com>

Sort reported nodes

The order of the nodes is asserted by the unit tests -- make sure this
is predictable across JDK versions.

Change-Id: I804024fe66530aa380dbd48907268fc12a4d3085
Signed-off-by: Robert Varga <rovarga@cisco.com>

Remove explicit export-package

net-virt-providers/OF13Provider requires the
org.opendaylight.ovsdb.openstack.netvirt package to be visible. Instead
of hard-coding the exported packages, allow the bundle plugin to decide
what to export.

Change-Id: Iac66eeaf70854712b9dc5917c748d519178968e5
Signed-off-by: Robert Varga <rovarga@cisco.com>

Merge "User provided bridge external-ids not making to operational/OVSDB."

Add missing handleInterfaceDelete for tunnel case

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

SouthboundHandler@processOpenVSwitchUpdate

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

Remove old interface delete row processing

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

update NetvirtIT to include remove of flowCapableNode processing

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

SouthboundHandler#triggerUpdates

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

Remove FlowCapableNodeDataChangeListener

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

Add SouthboundHandler#processBridgeUpdate

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

User provided bridge external-ids not making to operational/OVSDB.

When setting up a new bridge with user provided external-ids to
config datastore, these external-ids get dropped and only the iid
shows up as bridge external-id in ovsdb/oper datastore. This patch
fixes that issue.

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

Fixing issue with interface update.
Currently by mistake it updates the port uuid (in operation tp) using interface uuid.

Change-Id: Ia4f3dfdb676c377dab83dda11148222640e6bf78
Signed-off-by: Amit Mandke <ammandke@cisco.com>

Merge "Fix for bridge other config in mdsal."

Add SouthboundHandler#processInterfaceUpdate

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

Implemented SouthboundHandler#processInterfaceDelete()

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

Add MdsalUtils API stubs

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

Merge "Add ovsdbUpdate() to OvsdbInventoryListener" into topic/netvirtsb

Add ovsdbUpdate() to OvsdbInventoryListener

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

Fixed check-style error

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

Fix for bridge other config in mdsal.

bridge other config are not showing up in operational or ovsdb.

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

Get correct dpid so that pipeline flows are programmed.

This commit also fixes the initialzeOpenflowRules.

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

AbstractServices need unique flowIds in order to avoid rules coalescing

This is a follow up from gerrit https://git.opendaylight.org/gerrit/#/c/19410/.
When assembling different flow rules for different match, it is important
to make their flowIds unique. By not doing that, openflowPlugin will treat
them as one; and that is what gets pushed to OF capable node.

Also removed cases when writeFlow() was being invoked twice for no reason.

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

Fixed issue with connection-info->{local-ip,local-port} not being stored

Use of ConnectionInfo as a key in OvsdbConnectionManager
should only have remote{Ip,port} info... so:

1)  Introduced a method suppressLocalIpPort() to SouthboundMapper
    to strip localIp/Port info out of a ConnectionInfo if needed
2)  Insured that *all* gets to the clients map in OvsdbConnectionManager
    use that method before doing a lookup
3)  Insured that *all* puts to the clients map in OvsdbConnectionManager
    use that method before writing.

Also in passing fixed disconnect to just get the connectionInfo from
the ovsdbNode it has, instead of doing a convoluted dance and
removed the then no longer used createConnectionInfo(ovsdbNode) from
SouthboundMapper.

Change-Id: Idb2b16d52ec23267584c69c6e474652dd25a4ab0
Signed-off-by: Ed Warnicke <hagbard@gmail.com>

Add support for openflow node callbacks

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

Work around bug 3005: RoutingService needs special care to keep from rule coalescing

When rules with for RoutingService only differ on match for tun_id, the existing openflow implementation does
not distinguish them as separate rules and overrides them into a single OF entry. That is very bad for L3
forwarding, when there are more than 2 subnets, or when multiple tenants use overlapping prefixes.

Until bug 3005 is fixed, we will leverage cookie to force openflow to treat the rule as unique. Fortunately
this is easily done by using the src_tun_id itself as the cookie (i.e. no cache is needed).

Also, add segmentation info in logs for when router interface is being programmed.

vagrant@devstack-control:/vagrant/puppet/scripts$ sudo ovs-ofctl -O OpenFlow13 dump-flows br-int | grep table=60
 cookie=0x0, duration=561.894s, table=60, n_packets=219, n_bytes=26397, priority=0 actions=goto_table:70
 cookie=0x3ea, duration=468.025s, table=60, n_packets=0, n_bytes=0, priority=2048,ip,tun_id=0x3ea,nw_dst=3.0.0.0/24 actions=set_field:fa:16:3e:d6:0c:aa->eth_src,dec_ttl,set_field:0x3eb->tun_id,goto_table:70
 cookie=0x3e9, duration=470.048s, table=60, n_packets=0, n_bytes=0, priority=2048,ip,tun_id=0x3e9,nw_dst=3.0.0.0/24 actions=set_field:fa:16:3e:d6:0c:aa->eth_src,dec_ttl,set_field:0x3eb->tun_id,goto_table:70
 cookie=0x3eb, duration=467.009s, table=60, n_packets=0, n_bytes=0, priority=2048,ip,tun_id=0x3eb,nw_dst=2.0.0.0/24 actions=set_field:fa:16:3e:2d:28:89->eth_src,dec_ttl,set_field:0x3ea->tun_id,goto_table:70
 cookie=0x3eb, duration=469.035s, table=60, n_packets=0, n_bytes=0, priority=2048,ip,tun_id=0x3eb,nw_dst=1.0.0.0/24 actions=set_field:fa:16:3e:25:0d:1b->eth_src,dec_ttl,set_field:0x3e9->tun_id,goto_table:70
 cookie=0x3e9, duration=489.275s, table=60, n_packets=0, n_bytes=0, priority=2048,ip,tun_id=0x3e9,nw_dst=2.0.0.0/24 actions=set_field:fa:16:3e:2d:28:89->eth_src,dec_ttl,set_field:0x3ea->tun_id,goto_table:70
 cookie=0x3ea, duration=488.184s, table=60, n_packets=0, n_bytes=0, priority=2048,ip,tun_id=0x3ea,nw_dst=1.0.0.0/24 actions=set_field:fa:16:3e:25:0d:1b->eth_src,dec_ttl,set_field:0x3e9->tun_id,goto_table:70

Ref: https://gist.github.com/f3ba1edbab72b26c8d97
Ref: http://www.flaviof.com/blog/work/how-to-odl-with-openstack-part2.html

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

Merge branch 'master' into topic/netvirtsbmerge

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

Merge "Add testGetOvsdbNodes to it"

Set the controller

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

Add testGetOvsdbNodes to it

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

Add is_connected to mdsal

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

Fix for NPE during GBP testing.

This addresses an NPE that happens if the
controller entry "isConnected" isn't set but
is referenced.

Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Merge branch 'master' into topic/netvirtsb2

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

Process ovsdb node created dataChanges

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

Merge "Add OpenFlow node reference to the bridge."

Add bridge fails on older OVS versions (< v1.10)

To recreate -

Run "ovs-vsctl add-br br0" on OVS 1.9 or lower.
The above command fails with SchemaVersionMismatchException.

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

Merge "Update TerminationPoint operational data on ovsdb port/interface update"

Update TerminationPoint operational data on ovsdb port/interface update

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

Fix NPE in operational Bridge remove.

To Recreate -

1. Run 'ovs-vsctl add-br br0'
2. Verify that bridge is added.
3. Run 'ovs-vsctl del-br br0'
4. The logs show NPE and br0 is not removed from operational/ovsdb.

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

Merge branch 'master' into topic/netvirtsb2

Signed-off-by: Sam Hague <shague@redhat.com>
Conflicts:
southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java

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

Add working integration-test

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

Remove assumes from southbound-it now that deletes from operational work

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