Added Mockito and PowerMock to the neutron pom.xml
Unit test coverage for AdminConfigManager
Unit test coverage for NetworkHandler

Change-Id: Ice7582e2a9f4dd5a4b7c9fdac01e86196f48ccf4
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Small Java related improvements.

Remove redundant return statement from void method,
remove redundant boxing of numeric variables,
remove statements that check a condition that is always 'true',
add braces to 'if else' statements.

Signed-off-by: Alissa Bonas <abonas@redhat.com>
Prevent NPE when an interface is already present on the switch, but no related port is configured.

Change-Id: I966b412d06450f75ea8940dc413b9973ec1fc1d1
Signed-off-by: Hugo Trippaers <hugo@trippaers.nl>
Merge "Small Java related improvements."
Merge "Prevent NPE when an interface is already present on the switch, but no related port is configured."
Merge "Added Mockito and PowerMock to the neutron pom.xml Unit test coverage for AdminConfigManager Unit test coverage for NetworkHandler"
Updating the commons parent pom to 1.4.1-SNAPSHOT and checkstyle fixes

ovsdb project depends on the controller project's 1.4.0-SNAPSHOT version of commons pom.xml.
Since the latest changes (including the jackson upgrade) is done on 1.4.1-SNAPSHOT, we have
to update to the latest.
While doing so, it caught quite a few checkstyle errors, which am fixing it along.

Change-Id: Id650ffbae93f47121a7d259d0b39c6b537c2a992
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Move the java 1.7 config to the parent pom into pluginManagement so it is enforced for neutron and northbound as well.
Merge failed due to conflicts and hence manually applying Hugo's changes on his behalf.

Change-Id: Ia704984f29c5f6a3371d27ad78001f904c54bb3a
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Fixing the ColumnSchema as per RFC7047 for a enum variable.

Enums are defined as a 1 or more atomic-type and hence the current Object[] is incorrect
and is causing deser issues with vtep schema. Fixing it with a more generic Object.
This will be properly accomodated when we have schema driven OVSDB approach is in place.

Change-Id: I0c1d2896ea34bbc3c358ca0d0818860908e0b1b1
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Merge "Fixing the ColumnSchema as per RFC7047 for a enum variable."
Fix build error, due to changes in FlowId: https://git.opendaylight.org/gerrit/#/c/4058/

Changes to fix build were based on changes done in commit 45b75a6ba76bf8b453b5f0de11ceb0c3bba1e842, file:
.../opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java

Change-Id: I635c7530cd9897d7c0ee8f1cb5209869c90f24b5
Signed-off-by: Flavio Fernandes <ff@member.org>
Merge remote-tracking branch 'odl/master'
Fixing import issue