genius.git
7 years agomdsalutil-api clean up Checkstyle now enforced 02/51802/1
Michael Vorburger [Mon, 13 Feb 2017 16:27:45 +0000 (17:27 +0100)]
mdsalutil-api clean up Checkstyle now enforced

Change-Id: I758925b0d5bd30bafd6b117c09f3575a52dab320
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "Fix NPE in ITM endpoint list usage"
Faseela K [Mon, 13 Feb 2017 09:28:51 +0000 (09:28 +0000)]
Merge "Fix NPE in ITM endpoint list usage"

7 years agoFix NPE in ITM endpoint list usage 64/51764/2
Alon Kochba [Sun, 12 Feb 2017 16:00:03 +0000 (18:00 +0200)]
Fix NPE in ITM endpoint list usage

This NPE is popping up in CSIT , while deleting all
transport zones and interfaces via REST API.

Change-Id: Iea4c162519a0dbfe9bb6f926e6c9895fffdab02e
Signed-off-by: Alon Kochba <alonko@hpe.com>
7 years agoBug 6952: Support for deleting TEPs in multiple TZ 52/48952/5
Hema Gopalkrishnan [Sat, 3 Dec 2016 03:23:11 +0000 (08:53 +0530)]
Bug 6952: Support for deleting TEPs in multiple TZ

Resolved merge conflict
Removed commented lines

Change-Id: Ib25a95242cbc96af0e0087f524630dd42ea4f669
Signed-off-by: Hema Gopalkrishnan <hema.gopalkrishnan@ericsson.com>
7 years agoMerge "fix for id duplication for different id keys"
Faseela K [Sun, 12 Feb 2017 01:15:07 +0000 (01:15 +0000)]
Merge "fix for id duplication for different id keys"

7 years agoMerge "Blueprint XML Config support in ITM."
Faseela K [Sat, 11 Feb 2017 05:19:19 +0000 (05:19 +0000)]
Merge "Blueprint XML Config support in ITM."

7 years agogetInterfaceInfoFromOperationalDS Optimisation 78/51578/6
Faseela K [Wed, 8 Feb 2017 18:51:55 +0000 (00:21 +0530)]
getInterfaceInfoFromOperationalDS Optimisation

vxlan:show CLI was getting stuck in one of the cluster nodes
in a scaled scenario of full mesh creation due to a datastore
reads in the call flow

Change-Id: Iab43b5c2d6eea3d77351658fe44e5f41d793b30d
Signed-off-by: Faseela K <faseela.k@ericsson.com>
7 years agofix for id duplication for different id keys 78/51678/3
Periyasamy Palanisamy [Fri, 10 Feb 2017 11:56:50 +0000 (17:26 +0530)]
fix for id duplication for different id keys

* handling id pool listener appropriately otherwise it overwrites local pool
which lead to allocation of same id to different key

Change-Id: Ibc075846a7daa07e681ce2b34dfaabf084e7d287
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
7 years agoMerge "Optimizing southbound Tunnel Events"
Faseela K [Fri, 10 Feb 2017 05:56:20 +0000 (05:56 +0000)]
Merge "Optimizing southbound Tunnel Events"

7 years agoMerge "Enforce checkstyle in arputil-impl module"
Michael Vorburger [Thu, 9 Feb 2017 15:26:36 +0000 (15:26 +0000)]
Merge "Enforce checkstyle in arputil-impl module"

7 years agoAdd missing JavaDoc to ResourceBatchingManager 60/49560/4
Michael Vorburger [Mon, 19 Dec 2016 15:11:32 +0000 (16:11 +0100)]
Add missing JavaDoc to ResourceBatchingManager

copy/pasted, with minor adjustments for clarity, from a review comment
by Vivekanandan Narasimhan in
https://git.opendaylight.org/gerrit/#/c/49491/

Change-Id: I02d513e594e17379b62ddb1a2226da3d4f3f6b8f
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoTo fix grep not working for tep:show & 04/51604/3
Edwin Anthony [Thu, 9 Feb 2017 07:46:52 +0000 (13:16 +0530)]
To fix grep not working for tep:show &
tep:show-state on karaf console

Change-Id: I59469c0c1da10d55c2bd5d1a9f87e3021c8a46cf
Signed-off-by: Edwin Anthony <n.edwin.anthony@ericsson.com>
7 years agoOptimizing southbound Tunnel Events 19/51419/5
Faseela K [Fri, 3 Feb 2017 19:21:09 +0000 (00:51 +0530)]
Optimizing southbound Tunnel Events

When a tunnel is created on OVS, there are a series of events triggered
from plugins(OVSDB and OpenFlow) based on which interface-manager does a
sequence of operations. The code is optimised to batch all these
transactions so that there will be faster programming of Table 0 flows,
and interface-state operational DS population in a scaled scenario.

Change-Id: Ie8140f59b44985c394d6d7ac37348733ba946a42
Signed-off-by: Faseela K <faseela.k@ericsson.com>
7 years agoBug 7538 InterfaceManagerTestModule temporary local work-around 77/51577/1
Michael Vorburger [Wed, 8 Feb 2017 18:53:02 +0000 (19:53 +0100)]
Bug 7538 InterfaceManagerTestModule temporary local work-around

until https://git.opendaylight.org/gerrit/#/c/51486/ finally goes in
upstream in controller ... then this will have to be reverted again.

Change-Id: I466b2489107172ad7f391ba6b50c4dce9f08343d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBlueprint XML Config support in ITM. 74/50274/17
Tarun Thakur [Wed, 11 Jan 2017 08:00:00 +0000 (13:30 +0530)]
Blueprint XML Config support in ITM.

- Added genius-itm-config.xml into ITM as per Blueprint standard.
- Introduced 2 params in config - def-tz-enabled and def-tz-tunnel-type
- Used new 2 config params to create/delete default-transport-zone

Change-Id: I83fd74f88ea3d6b3c30b120f76d97aa92fb6d611
Signed-off-by: Tarun Thakur <tarun.t@altencalsoftlabs.com>
7 years agoMerge "Use OVSDB external-id for ports parent ref"
Vishal Thapar [Wed, 8 Feb 2017 05:06:57 +0000 (05:06 +0000)]
Merge "Use OVSDB external-id for ports parent ref"

7 years agoEnforce checkstyle in arputil-impl module 85/51485/3
David Suarez [Mon, 6 Feb 2017 22:54:56 +0000 (23:54 +0100)]
Enforce checkstyle in arputil-impl module

Checkstyle enforcement for arputil-impl module:
- Line lengths
- Declaration of constants: name, modifiers
- Fix exception logging
- Remove Exception catching
- Formatting

Change-Id: Ib000ee126acfe6e44f797fb92267609c01f0ebfb
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agomdsalutil-api clean up Checkstyle violations (not enforced yet) 01/51401/3
Michael Vorburger [Fri, 3 Feb 2017 12:26:50 +0000 (13:26 +0100)]
mdsalutil-api clean up Checkstyle violations (not enforced yet)

org.opendaylight.genius.mdsalutil's 127/133 violations are cleaned now.

Change-Id: Iee6d3231c717a66dbad82c6c063fae5d4c4a1b8a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoUse OVSDB external-id for ports parent ref 07/49907/35
Alon Kochba [Sun, 1 Jan 2017 16:24:28 +0000 (18:24 +0200)]
Use OVSDB external-id for ports parent ref

This patch adds logic when a new termination point is added,
containing an external-id that points to an interface,
to set that interfaces parent ref to the interfaces-state
associated with this termination point.

It also adds logic for the other order - if a neutron port
(or any other ietf-interface) is added, we look for a termination
point with the relevant iface-id, to fill in as a parentRef.

Depends-On: https://git.opendaylight.org/gerrit/49906
Change-Id: If8de0c9e52f859e9ede5cfefca2b916b336f2df9
Signed-off-by: Alon Kochba <alonko@hpe.com>
7 years agoMerge "Vpn to Vni demux table for L3VPN Over VxLAN"
Vivek Srivastava [Sat, 4 Feb 2017 06:38:49 +0000 (06:38 +0000)]
Merge "Vpn to Vni demux table for L3VPN Over VxLAN"

7 years agoMade mdsalutil-api IPv4's protocolClassMap private instead of public 91/51391/3
Michael Vorburger [Fri, 3 Feb 2017 11:29:16 +0000 (12:29 +0100)]
Made mdsalutil-api IPv4's protocolClassMap private instead of public

I've verified that this public static final (so constant) field does not
actually seem to be used by any code - by simple local grep, so I could
theoretically have missed something, please double check.

The inline TODO comment on etherTypeClassMap makes me think that this
may not be workin in OSGi as originally designed, anyway?   This should
perhaps be re-architected as an OSGi service, which bundles can
contribute new types to?

I've stumbled upon this while working on Checkstyle clean-up (it
complains that this constant should normally be upper-case, like
PROTOCAL_CLASS_MAP, instead of protocolClassMap), so I had a closer
look, and upon finding that it's not actually used outside of this
class, propose to make it private.

If this must stay public for some reason that eludes me, then we would
have to put a @SuppressWarnings("checkstyle:ConstantName") on this (like
I have for Ethernet's etherTypeClassMap in
https://git.opendaylight.org/gerrit/#/c/51390/, just because I saw that
already seems to be used in some places).

Change-Id: I16035954840d28e53db852e1f1ca5621f49433b2
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "Fixing intermittent Junit failure"
Faseela K [Fri, 3 Feb 2017 16:57:01 +0000 (16:57 +0000)]
Merge "Fixing intermittent Junit failure"

7 years agoMerge "minor: mdsalutil-api just moved some methods in MDSALUtil MetaDataUtil "
Sam Hague [Fri, 3 Feb 2017 16:52:34 +0000 (16:52 +0000)]
Merge "minor: mdsalutil-api just moved some methods in MDSALUtil MetaDataUtil "

7 years agoMerge "mdsalutil-api clean up Checkstyle violations (not enforced yet)"
Sam Hague [Fri, 3 Feb 2017 16:51:26 +0000 (16:51 +0000)]
Merge "mdsalutil-api clean up Checkstyle violations (not enforced yet)"

7 years agoMerge "Fix wrong exception handling in MDSALUtil getDpnIdFromPortName()"
Sam Hague [Fri, 3 Feb 2017 16:50:36 +0000 (16:50 +0000)]
Merge "Fix wrong exception handling in MDSALUtil getDpnIdFromPortName()"

7 years agoFix wrong exception handling in MDSALUtil getDpnIdFromPortName() 06/51406/1
Michael Vorburger [Fri, 3 Feb 2017 14:53:37 +0000 (15:53 +0100)]
Fix wrong exception handling in MDSALUtil getDpnIdFromPortName()

catch the NumberFormatException which Long.parseLong() may throw, but
almost never just any generic Exception, because that would also catch,
typically unexpectedly, various RuntimeException/s; read also
https://wiki.opendaylight.org/view/BestPractices/Coding_Guidelines#IllegalCatch

In this particular case, there is a chance that before the change to
proper exception handling this also caught NullPointerException and
IndexOutOfBoundsException, both of which I've attempted to account for.

Change-Id: I28e7d3dfde9d59a98346b38debc2e1dc5614afcf
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agominor: mdsalutil-api just moved some methods in MDSALUtil MetaDataUtil 05/51405/1
Michael Vorburger [Fri, 3 Feb 2017 14:45:11 +0000 (15:45 +0100)]
minor: mdsalutil-api just moved some methods in MDSALUtil MetaDataUtil

for Checkstyle compliance (overloaded methods must be together)

Change-Id: Id5b2256d3d77195052906db8af14c56239976191
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle: fix ParenPad violations 95/51395/1
Lorand Jakab [Fri, 3 Feb 2017 12:46:08 +0000 (14:46 +0200)]
Checkstyle: fix ParenPad violations

Enforcing no space(s) after a left parenthesis and before a right
parenthesis is a proposed change [0] which can only be merged when all
violations are fixed in projects enforcing checkstyle. This patch fixes
those violations.

[0] https://git.opendaylight.org/gerrit/#/c/51316/

Change-Id: I9374171e3023e4c453d243adcec75444edc3f1de
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
7 years agoVpn to Vni demux table for L3VPN Over VxLAN 24/50524/2
Kiran N Upadhyaya [Mon, 16 Jan 2017 18:48:55 +0000 (00:18 +0530)]
Vpn to Vni demux table for L3VPN Over VxLAN

Added a constant to represent the new vpn to vni demux table that will be
used as part of L3VPN Over VxLAN enhancement.

Change-Id: I7413069f215439dbdf95b352bea73c527926bf4d
Signed-off-by: Kiran N Upadhyaya <kiran.n.upadhyaya@ericsson.com>
7 years agomdsalutil-api clean up Checkstyle violations (not enforced yet) 90/51390/1
Michael Vorburger [Fri, 3 Feb 2017 11:19:12 +0000 (12:19 +0100)]
mdsalutil-api clean up Checkstyle violations (not enforced yet)

Change-Id: I5de264f5bf41f58844af3c0ab110d06ac4f0f033
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoFixing intermittent Junit failure 81/51281/4
Kency Kurian [Wed, 1 Feb 2017 07:17:31 +0000 (12:47 +0530)]
Fixing intermittent Junit failure

Change-Id: I358ad1a3951767da7385bb64d119c38115a1e989
Signed-off-by: Kency Kurian <kency.kurian@ericsson.com>
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
7 years agoFix merge build failure 39/51339/1
Vishal Thapar [Thu, 2 Feb 2017 11:19:48 +0000 (16:49 +0530)]
Fix merge build failure

Rebase of https://git.opendaylight.org/gerrit/#/c/45720/ is throwing an
exception due to change in base class used for OvsdbNodeListener. This
patch addresses this.

Change-Id: I3c1fe4fda502627ec66ee06bb50d47889bd738c9
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
7 years agoMerge "Code for TEP auto-config feature in ITM module"
Vivek Srivastava [Thu, 2 Feb 2017 10:33:04 +0000 (10:33 +0000)]
Merge "Code for TEP auto-config feature in ITM module"

7 years agoMerge "Optimizing tunnel configuration"
Vishal Thapar [Thu, 2 Feb 2017 10:25:34 +0000 (10:25 +0000)]
Merge "Optimizing tunnel configuration"

7 years agoDrop unnecessary "throws Exception" declarations 73/51073/4
Stephen Kitt [Thu, 26 Jan 2017 14:28:05 +0000 (15:28 +0100)]
Drop unnecessary "throws Exception" declarations

This greatly helps Checkstyle clean-ups in downstream projects!

Change-Id: Ib5e71ebe08c2b6e70cebe7518042d16c2ccd1b51
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoOptimizing tunnel configuration 24/51324/1
Faseela K [Thu, 2 Feb 2017 06:25:15 +0000 (11:55 +0530)]
Optimizing tunnel configuration

Description : Inorder to workaround some bug in ovsdb creating duplicate
tunnels, code was added in interface-manager to see if tunnel is getting
configured on a different DPN. Ideally this check is meant only for VM
migration where ports can migrate across DPNs. This check for tunnels is
resulting in scale issues when full mesh of tunnels is configured for
scaled setups. Since ovsdb bug is already fixed, removing this code
as it looks completely unnecessary.

Change-Id: I479a75890ac8d7e885fee54fef90fbc248d144e4
Signed-off-by: Faseela K <faseela.k@ericsson.com>
7 years agominor: mdsalutil-api DataStoreJobCoordinator getIncompleteTaskCount() mv 34/51134/4
Michael Vorburger [Fri, 27 Jan 2017 15:59:08 +0000 (16:59 +0100)]
minor: mdsalutil-api DataStoreJobCoordinator getIncompleteTaskCount() mv

for Checkstyle compliance (overloaded methods must be together)

Change-Id: Ia81858e9573b6557ae52746f5142e9aa0d079132
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agomdsalutil-api clean up Checkstyle violations (not enforced yet) 31/51131/3
Michael Vorburger [Fri, 27 Jan 2017 07:51:13 +0000 (08:51 +0100)]
mdsalutil-api clean up Checkstyle violations (not enforced yet)

These are clean now:
 * src/main
    ** org.opendaylight.genius.mdsalutil.instructions
    ** org.opendaylight.genius.mdsalutil.interfaces
    ** org.opendaylight.genius.utils.batching
    ** org.opendaylight.genius.utils.clustering
    ** org.opendaylight.genius.utils.hwvtep
 * src/test

Change-Id: If81ba9be91d1e5d8bd8a9d775d53f7a21c3a71d5
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agomdsalutil-api clean up Checkstyle violations (not enforced yet) 40/51140/5
Michael Vorburger [Fri, 27 Jan 2017 17:24:30 +0000 (18:24 +0100)]
mdsalutil-api clean up Checkstyle violations (not enforced yet)

org.opendaylight.genius.mdsalutil.packet package is almost CS clean now.

Change-Id: Id8b35d4f87560d0e1c8c4f2641ceb7eafefada2a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoFcapsApplication module migration to blueprint 13/49013/15
gowri [Tue, 6 Dec 2016 08:21:27 +0000 (13:51 +0530)]
FcapsApplication module migration to blueprint

Change-Id: Iec2908d5aea02d9eb9e10c06b45179247b0a99b7
Signed-off-by: gowri <gowri.r@ericsson.com>
Signed-off-by: Gowri R <gowri.r@ericsson.com>
7 years agoTestIMdsalApiManager with assertFlowsInAnyOrder() 66/50466/7
Michael Vorburger [Sat, 14 Jan 2017 02:56:37 +0000 (03:56 +0100)]
TestIMdsalApiManager with assertFlowsInAnyOrder()

Moved here from netvirt's AclServiceTestBase

Change-Id: Ia4410d2b9bab840ec63f08c8cef8a684291f32cc
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoremove apparently un-used Class<K> eventClazz from AsyncListeners 36/51136/4
Michael Vorburger [Fri, 27 Jan 2017 16:23:26 +0000 (17:23 +0100)]
remove apparently un-used Class<K> eventClazz from AsyncListeners

Or is this useful in a very subtle (and undocumented ..) way that eludes
me?  I can sort of see the idea may have been for the generic K extends
DataTreeChangeListener<T> ... but it seems weird, to me, to have a
constructor argument that is otherwise un-used (except for a catch &
log; which BTW should never be hit anyway; more on that in a separate PR
coming up next).

Change-Id: I8370dda3e59c80782b8c9dc870d1a684f20d5f18
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "Bug 7531 : Different ids allocated for same key"
Faseela K [Tue, 31 Jan 2017 10:59:21 +0000 (10:59 +0000)]
Merge "Bug 7531 : Different ids allocated for same key"

7 years agoInterfaceManagerConfigurationTest newTunnelInterface sleep 2s -> 4s 17/51217/1
Anil Belur [Tue, 31 Jan 2017 09:05:24 +0000 (19:05 +1000)]
InterfaceManagerConfigurationTest newTunnelInterface sleep 2s -> 4s

* Fix similar to change submitted for #51184
* To unblock a problem hit on autorelease Carbon build

Change-Id: I5a7df4866ffee0d6b7a694041e52a1f4cf7e2b36
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
7 years agoCode for TEP auto-config feature in ITM module 20/45720/41
Tarun Thakur [Fri, 16 Sep 2016 09:04:08 +0000 (14:34 +0530)]
Code for TEP auto-config feature in ITM module

- to add/update/delete TEP received from southbound into ITM config datastore.
- to perform Datastore write operations in queue using DataStoreJobCoordinator.

Change-Id: I77c5a2e3db7dfb9778d52522ce1e805c3e29cb1e
Signed-off-by: Tarun Thakur <tarun.t@altencalsoftlabs.com>
7 years agomdsalutil-api clean up Checkstyle violations (not enforced yet) 38/51138/2
Michael Vorburger [Fri, 27 Jan 2017 17:04:36 +0000 (18:04 +0100)]
mdsalutil-api clean up Checkstyle violations (not enforced yet)

org.opendaylight.genius.mdsalutil.actions package is CS clean now.

Change-Id: I04b8a17f0efee953bbdad0e30baaccc53f51d678
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoClean up un-neccessary exception handling from AsyncListeners 37/51137/3
Michael Vorburger [Fri, 27 Jan 2017 16:41:23 +0000 (17:41 +0100)]
Clean up un-neccessary exception handling from AsyncListeners

The catch in close() is pointless; as close() has, intentionally, a
throws Exception.  It's up to the caller of close() to handle this.

Or was this useful in a very subtle (and undocumented ..) way that
eludes me??  I mean, registerDataChangeListener() does not have a throws
clause.  Sure it could theoretically throw some *RuntimeException, but
so what?  Even if it does, that would propagate to the caller of
registerListener() - just like that wrapping IllegalStateException as-is
now also would! So... I think all this is kind of pointless.

TaskRetryLooper used here is then, if above is valid, likewise not
required here, so also removed; does this make sense to everyone?

Class<K> eventClazz from AsyncListeners also because pointless then?
see separate https://git.opendaylight.org/gerrit/#/c/51136/ re. that.

Unless there is something I could learn, where a
registerDataChangeListener() can fail, but then pass on retry - but I'm
kind of struggling to see the scenario here.

I've run into this while looking more closely at the AsyncListeners for
Checktyle violations clean up.  Of course, we could also just put a
@SuppressWarnings("checkstyle:IllegalCatch") - but it seemed wrong to
me, in this particular case, so I'm suggesting to change it.

Change-Id: I0feef33bcf5bfbf7329371aa6eaf2160a98c4528
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agomdsalutil-api clean up Checkstyle violations (not enforced yet) 41/51141/4
Michael Vorburger [Fri, 27 Jan 2017 17:32:32 +0000 (18:32 +0100)]
mdsalutil-api clean up Checkstyle violations (not enforced yet)

org.opendaylight.genius.mdsalutil.matches package is CS clean now.

Change-Id: Iea28d160dc90696a676a529630d51b7da95d6091
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoInterfaceManagerConfigurationTest vlanInterfaceTests sleep 2s -> 4s 84/51184/1
Michael Vorburger [Mon, 30 Jan 2017 13:38:54 +0000 (14:38 +0100)]
InterfaceManagerConfigurationTest vlanInterfaceTests sleep 2s -> 4s

to unblock a problem hit by Anil Belur on autorelease

It works with 2s locally, but may be slower on buid VMs.

PS: This is a quick fix / hack / workaround; of course, the real long
term solution is to find ways to not need Thread.sleep() at all .. I'd
like like to complete earlier work in this regard, but haven't gotten to
it yet.

Change-Id: I01e0380952ba8c3ee906fae5469dc1b2970d0185
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoXtendBeanGenerator support and MatchInfoHelper equals 56/51156/1
Stephen Kitt [Fri, 27 Jan 2017 23:42:22 +0000 (00:42 +0100)]
XtendBeanGenerator support and MatchInfoHelper equals

This patch adds a few missing pieces in the ActionInfo/MatchInfo
redesigns, necessary for some of NetVirt's tests:
* ActionNxConntrack needs getters so that XtendBeanGenerator can be
  used;
* MatchIcmpv4 and MatchIcmpv6 need builders (because
  XtendBeanGenerator can't find the constructor);
* MatchInfoHelper needs to implement equals (and hashCode) so that its
  subclasses' equals implementation will give the correct result.

Change-Id: Iea986dcf4129e778c9c7387fcfc9405dd0bdc877
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoMerge "Enforce checkstyle in countermanager module"
David Suarez [Fri, 27 Jan 2017 17:43:43 +0000 (17:43 +0000)]
Merge "Enforce checkstyle in countermanager module"

7 years agoAction redesign: drop obsolete code 38/49938/9
Stephen Kitt [Mon, 2 Jan 2017 10:15:23 +0000 (11:15 +0100)]
Action redesign: drop obsolete code

Once netvirt and sfc have migrated to the new ActionInfo-based
classes, all the deprecated ActionType-based code can be deleted.

Change-Id: Ie98ab6078710a462df0275b40e22b303962c2482
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoMatchInfo clean-up 11/50611/5
Stephen Kitt [Wed, 18 Jan 2017 10:35:22 +0000 (11:35 +0100)]
MatchInfo clean-up

This removes all the obsolete code, and must not be merged before all
downstream users have migrated to the new classes.

Change-Id: I9800c88b80e490bf5c8505ccec1ca0b91d2acf7a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoEnforce checkstyle in countermanager module 27/50827/2
David Suarez [Mon, 23 Jan 2017 14:59:26 +0000 (15:59 +0100)]
Enforce checkstyle in countermanager module

Checkstyle enforcement for countermanager module:

- Fix exception logging
- Remove Exception catching
- Remove catching of NPE
- PollerThread was meant to be an inner class, now it is
- Formatting

Change-Id: I196dbc68b326f201402b84a08a3a95014571d563
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agoInstructionInfo redesign: clean up 48/49948/7
Stephen Kitt [Mon, 2 Jan 2017 15:49:07 +0000 (16:49 +0100)]
InstructionInfo redesign: clean up

Once downstream users have upgraded to the new InstructionInfo
descendants, we can remove InstructionType altogether, and turn
InstructionInfo into an interface.

This patch also changes the AbstractActionInfoList descendants to use
composition rather than inheritance.

Change-Id: Ibfe3cc841f6ad89b29d72e7a4243718059d1c1c5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoUse standard static Logger in AsyncDataTreeChangeListenerBase & Co. 10/51010/1
Michael Vorburger [Wed, 25 Jan 2017 15:08:47 +0000 (16:08 +0100)]
Use standard static Logger in AsyncDataTreeChangeListenerBase & Co.

I thought it was a smart idea to "use non-static Logger so that logs
easily identifies actual listener class", but in hindsight it clearly
wasn't; this was stupid (of me), because when users configure logging
this is confusing.

Change-Id: I2aaa86cf1dc99f9b5f3e748cb6799f836b2663e0
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "Enforce checkstyle in lockmanager-impl module"
Michael Vorburger [Wed, 25 Jan 2017 13:34:09 +0000 (13:34 +0000)]
Merge "Enforce checkstyle in lockmanager-impl module"

7 years agoRemove debug prints for DataTreeChanges 99/50999/1
Alon Kochba [Wed, 25 Jan 2017 10:42:07 +0000 (12:42 +0200)]
Remove debug prints for DataTreeChanges

Remove excessive debug prints for any DataTreeChange,
this caused logs to blow up in CSIT runs with a high
DEBUG level, since the actual changes printed to the
log are huge.

Change-Id: I76422b9abde319a84760e7a22c655fc3db822ab0
Signed-off-by: Alon Kochba <alonko@hpe.com>
7 years agoBug 7531 : Different ids allocated for same key 52/50352/9
Kency Kurian [Thu, 12 Jan 2017 11:19:05 +0000 (16:49 +0530)]
Bug 7531 : Different ids allocated for same key

Fixed the issue when allocate id for same idKey returns different idValue.
 - Updates a map with a future object if the map is empty during allocate.
 - Also remove from map once data is written in order to avoid stale
   entries.
 - If there is already an entry wait until the future completes.

Also while testing found out that the deleteIdPool RPC was not working
since the listener registration got missed after blueprint migration.

Fixed the JUnit failures.

Change-Id: I0ad4882603ef6472dcd3b780e31175a1a19b49d1
Signed-off-by: Kency Kurian <kency.kurian@ericsson.com>
7 years agoEnforce checkstyle in lockmanager-impl module 03/50803/2
David Suarez [Mon, 23 Jan 2017 11:54:14 +0000 (12:54 +0100)]
Enforce checkstyle in lockmanager-impl module

Checkstyle enforcement for lockmanager-impl module.

Change-Id: I75fa5c9f0baf4e3c10a269b593d7227238394cef
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agoReplace mockito-all by mockito-core (see Bug 7662) 63/50863/1
Michael Vorburger [Mon, 23 Jan 2017 18:58:42 +0000 (19:58 +0100)]
Replace mockito-all by mockito-core (see Bug 7662)

Change-Id: If97b6260f8682c20352d71c9d00de959efc0a45d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMust always use mockito-core instead of mockito-all 31/50831/1
Michael Vorburger [Mon, 23 Jan 2017 15:19:47 +0000 (16:19 +0100)]
Must always use mockito-core instead of mockito-all

to prevent NoSuchMethodError: org.hamcrest.Matcher ...

Bug 7662 related
Change-Id: I6988023775e35ca3e0babb29aa90b9e1c4eb30fa
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMatchInfo redesign 62/50062/10
Stephen Kitt [Thu, 5 Jan 2017 14:22:35 +0000 (15:22 +0100)]
MatchInfo redesign

Change-Id: I83cb7d9a0ab04116f8796dd1b53cc125e237d981
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agomdsalutil-api Organize Imports for Checkstyle compliance 37/50637/3
Michael Vorburger [Wed, 18 Jan 2017 18:07:18 +0000 (19:07 +0100)]
mdsalutil-api Organize Imports for Checkstyle compliance

Change-Id: If3b907cde8a56d4e2c1627c857d995f26b61eb18
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "Enforce checkstyle in itm-api module"
Michael Vorburger [Fri, 20 Jan 2017 17:31:16 +0000 (17:31 +0000)]
Merge "Enforce checkstyle in itm-api module"

7 years agoEnforce checkstyle in itm-api module 17/50717/2
David Suarez [Fri, 20 Jan 2017 13:41:52 +0000 (14:41 +0100)]
Enforce checkstyle in itm-api module

Checkstyle enforcement for itm-api module

There are two FIXMEs that will be removed in a separate patch when
itm-impl is checkstyle-enforced.

Change-Id: Ic94e01aa994965ccdaa39f7af52ee167c99395bd
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agomdsalutil-api various minor cleanups later for Checkstyle compliance 38/50638/4
Michael Vorburger [Wed, 18 Jan 2017 18:26:19 +0000 (19:26 +0100)]
mdsalutil-api various minor cleanups later for Checkstyle compliance

Change-Id: If31889a6ff22d48519493f0cce8dfdf4b62183cd
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "Fix problems with checkstyle in alivenessmonitor-impl module"
Vishal Thapar [Fri, 20 Jan 2017 13:57:40 +0000 (13:57 +0000)]
Merge "Fix problems with checkstyle in alivenessmonitor-impl module"

7 years agoFix problems with checkstyle in alivenessmonitor-impl module 46/50546/5
David Suarez [Tue, 17 Jan 2017 11:39:08 +0000 (12:39 +0100)]
Fix problems with checkstyle in alivenessmonitor-impl module

Fix several problems found by checkstyle:
- Line lengths
- Unchecked exceptions
- Exception logging
- Formatting
- Redundant public modifier in constructors

This patch is the last of two and it includes the enforcement section
in POM.

Change-Id: Ic556e797a4694d9c148fee20fa96d29d0d70d6c6
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agoMerge "InterfaceManagerConfigurationTest @Rule LogRule"
Michael Vorburger [Thu, 19 Jan 2017 17:03:36 +0000 (17:03 +0000)]
Merge "InterfaceManagerConfigurationTest @Rule LogRule"

7 years agoMerge "BUG 7576 - print error only if not spurious update"
Faseela K [Thu, 19 Jan 2017 16:11:17 +0000 (16:11 +0000)]
Merge "BUG 7576 - print error only if not spurious update"

7 years agoMerge "Enforce checkstyle in lockmanager-api module"
Vishal Thapar [Thu, 19 Jan 2017 15:53:20 +0000 (15:53 +0000)]
Merge "Enforce checkstyle in lockmanager-api module"

7 years agoMerge "Enforce checkstyle in fcaps-api module"
Vishal Thapar [Thu, 19 Jan 2017 15:52:08 +0000 (15:52 +0000)]
Merge "Enforce checkstyle in fcaps-api module"

7 years agoInterfaceManagerConfigurationTest @Rule LogRule 80/50180/5
Michael Vorburger [Tue, 10 Jan 2017 13:20:21 +0000 (14:20 +0100)]
InterfaceManagerConfigurationTest @Rule LogRule

see https://git.opendaylight.org/gerrit/#/c/49499/

Change-Id: I59f48f73794e309739d4a03b57bb9757a87aa451
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "Fix problems with checkstyle in interfacemanager-api module"
Vishal Thapar [Thu, 19 Jan 2017 15:40:49 +0000 (15:40 +0000)]
Merge "Fix problems with checkstyle in interfacemanager-api module"

7 years agoMerge "Add dependency to infrautils-testutils to genius.testutils POM"
Sam Hague [Thu, 19 Jan 2017 15:40:18 +0000 (15:40 +0000)]
Merge "Add dependency to infrautils-testutils to genius.testutils POM"

7 years agoMerge "ITM new style component test (empty)"
Michael Vorburger [Thu, 19 Jan 2017 15:35:09 +0000 (15:35 +0000)]
Merge "ITM new style component test (empty)"

7 years agoMerge "ChainableDataTreeChangeListener with addBeforeListener()"
Sam Hague [Thu, 19 Jan 2017 15:33:55 +0000 (15:33 +0000)]
Merge "ChainableDataTreeChangeListener with addBeforeListener()"

7 years agoMerge "Added ability to set mask for ethernet source/destination match"
Vivek Srivastava [Thu, 19 Jan 2017 15:28:52 +0000 (15:28 +0000)]
Merge "Added ability to set mask for ethernet source/destination match"

7 years agoEnforce checkstyle in fcaps-api module 66/50666/1
David Suarez [Thu, 19 Jan 2017 12:50:12 +0000 (13:50 +0100)]
Enforce checkstyle in fcaps-api module

Checkstyle enforcement for fcaps-api module.

Change-Id: I7ec50fd5830f5cd78b379eab0ff31f4c08371f10
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agoEnforce checkstyle in lockmanager-api module 64/50664/1
David Suarez [Thu, 19 Jan 2017 12:31:06 +0000 (13:31 +0100)]
Enforce checkstyle in lockmanager-api module

Checkstyle enforcement for lockmanager-api module.

Change-Id: Ie345aa80e5afd0e90c086f562a8daa8804cc0767
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agoFix concurrency issue TestIMdsalApiManager assertFlows() 60/49360/5
Michael Vorburger [Wed, 14 Dec 2016 14:33:34 +0000 (15:33 +0100)]
Fix concurrency issue TestIMdsalApiManager assertFlows()

This is step #1 of 3 to fixing occasionally seen (not repro; flaky)
ConcurrentModification in the AclServiceStatefulTest >
AclServiceTestBase.newInterfaceWithDstAllPorts >
newInterfaceWithDstAllPortsCheck:55 ->
AclServiceTestBase.assertFlowsInAnyOrder.

For code review, assume that getFlows() is, about to become, private.

Change-Id: I78c1208d777b825efc37be40d7d059a7a07cb4d6
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBUG 7576 - print error only if not spurious update 13/50613/2
Guy Sela [Wed, 18 Jan 2017 11:23:53 +0000 (13:23 +0200)]
BUG 7576 - print error only if not spurious update

Change-Id: I03fa7e7e859d35cf5acbe21e49f093ac0ad89fe2
Signed-off-by: Guy Sela <guy.sela@hpe.com>
7 years agoFix problems with checkstyle in interfacemanager-api module 10/50610/2
David Suarez [Wed, 18 Jan 2017 10:30:36 +0000 (11:30 +0100)]
Fix problems with checkstyle in interfacemanager-api module

Fix several problems found by checkstyle:

- Incomplete JavaDoc
- Formatting
- Line lengths
- Re-order methods and constructors
- Optimize imports

Change-Id: I52c5a63967406f03289750d3eca8931dc11e70d9
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agoChainableDataTreeChangeListener with addBeforeListener() 87/49487/7
Michael Vorburger [Tue, 13 Dec 2016 18:22:42 +0000 (19:22 +0100)]
ChainableDataTreeChangeListener with addBeforeListener()

in addition to addAfterListener(), to properly "track" asynchronous
event processing more reliably than with the current implementation.

The new approach also also to catch "forgotten" await() on close() at
the end of a @Test.

Verified that netvirt's AclServiceStatelessTest/AclServiceStatefulTest
(AclServiceTestBase), which is so far the only use of AsyncEventsWaiter
in master, still pass with this change.

This change has 0 impact on run-time production code performance; its
just test infrastructure which registered chained listeners, in test
wiring/configuration (Guice), only.

Change-Id: I8f3a6dd2bf2fd7d4e85655d8911d734e6d0089bf
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoITM impl Organize Imports for Checkstyle compliance 48/50248/3
Michael Vorburger [Tue, 10 Jan 2017 23:40:41 +0000 (00:40 +0100)]
ITM impl Organize Imports for Checkstyle compliance

as well as converting some tabs to spaces etc.

Change-Id: Ie6ecab9595bacd81dfac4d033cec71589bd2fefb
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Change-Id: Ie6ecab9595bacd81dfac4d033cec71589bd2fefb
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoIgnoring a Junit test case in Idmanager to unblock autorelease 00/50600/1
Kiran N Upadhyaya [Wed, 18 Jan 2017 07:30:28 +0000 (13:00 +0530)]
Ignoring a Junit test case in Idmanager to unblock autorelease

Change-Id: Ia4ad1b479c6ab89235376c604753b2e91f61f8d1
Signed-off-by: Kiran N Upadhyaya <kiran.n.upadhyaya@ericsson.com>
7 years agoITM new style component test (empty) 94/49494/5
Michael Vorburger [Fri, 16 Dec 2016 17:43:46 +0000 (18:43 +0100)]
ITM new style component test (empty)

It's empty, but still already very useful as-is, because even without
real test methods in it yet it will already ensure non-regression at
least of all the internal binding wiring start-up.

This change all introduces dumb hard-coded cache invalidation.  This is
required because we've seen that without doing this @After ItmTest,
other tests start to fail, because there are isolation issues.  The real
solution is to de-static-ify all this stuff, but that's a bit more work,
so for now, and in order to unblock and enable people to write new style
component tests in ITM, this "hack" seems a good short term solution.

Change-Id: Ie12e43d6097bc50ff95d2edbff1926e5d4520193
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "Order imports to comply with checkstyle"
Faseela K [Tue, 17 Jan 2017 16:01:17 +0000 (16:01 +0000)]
Merge "Order imports to comply with checkstyle"

7 years agoMerge "Action redesign: nx_resubmit backwards compatibility"
David Suarez [Tue, 17 Jan 2017 13:13:33 +0000 (13:13 +0000)]
Merge "Action redesign: nx_resubmit backwards compatibility"

7 years agoOrder imports to comply with checkstyle 97/50497/4
David Suarez [Mon, 16 Jan 2017 09:51:35 +0000 (10:51 +0100)]
Order imports to comply with checkstyle

Re-order imports to comply with checkstyle in alivenessmonitor-impl
module.

Change-Id: Id0b5b94015a268a5c9616c850a0296214ee9d7e7
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agoInstruction redesign: add missing equals/hashCode 08/50508/2
Stephen Kitt [Mon, 16 Jan 2017 15:13:55 +0000 (16:13 +0100)]
Instruction redesign: add missing equals/hashCode

Change-Id: I418b9bcd1e08c910fb8fa9bb83d44c7befee3ed1
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoAdd dependency to infrautils-testutils to genius.testutils POM 09/50509/2
Michael Vorburger [Mon, 16 Jan 2017 15:50:05 +0000 (16:50 +0100)]
Add dependency to infrautils-testutils to genius.testutils POM

This is just "for convenience" - projects can add a single dependency to
genius.testutils POM to get all commonly used testutils together,
instead of having to remember each one of them.

Change-Id: Ie58eb0d9f41a65742687bf6f0b1ad998622abd20
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoDataStoreJobCoordinator API for pending tasks count (useful for testing) 29/49529/9
Periyasamy Palanisamy [Mon, 19 Dec 2016 06:46:56 +0000 (12:16 +0530)]
DataStoreJobCoordinator API for pending tasks count (useful for testing)

* added counter for jobs_incomplete
* exposing API for getIncompleteTaskCount

Test Driven Development (TDD) so includes self unit test.

Change-Id: I6b1d824804ab73c0b57929d8fe057bc783231308
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoAction redesign: nx_resubmit backwards compatibility 07/50507/1
Stephen Kitt [Mon, 16 Jan 2017 15:17:00 +0000 (16:17 +0100)]
Action redesign: nx_resubmit backwards compatibility

ActionNxResubmit doesn't set the old tables up correctly, this patch
fixes this.

Change-Id: Ia5596b16118bea0dc5e6981dba19393f0311f486
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoMerge "Bug 7466 - NPE thrown for interface without lport tag"
Faseela K [Mon, 16 Jan 2017 14:37:37 +0000 (14:37 +0000)]
Merge "Bug 7466 - NPE thrown for interface without lport tag"

7 years agoMerge "Minor cleanup and formatting"
Faseela K [Mon, 16 Jan 2017 11:14:34 +0000 (11:14 +0000)]
Merge "Minor cleanup and formatting"

7 years agoAdded ability to set mask for ethernet source/destination match 89/50489/1
Yakir Dorani [Mon, 16 Jan 2017 09:47:09 +0000 (11:47 +0200)]
Added ability to set mask for ethernet source/destination match

Change-Id: I61143c5ff7c046d8d2d73012feee204d2b0bd4cb
Signed-off-by: Yakir Dorani <yakir.dorani@hpe.com>
7 years agoInstructionInfo redesign 45/49945/4
Stephen Kitt [Mon, 2 Jan 2017 14:30:03 +0000 (15:30 +0100)]
InstructionInfo redesign

This follows the same principles as the ActionInfo redesign; given the
small number of classes involves, the redesign is done in a two
commits (this backwards-compatible change, introducing the new
InstructionInfo descendents, and another clean-up which will be
applicable once the downstream users of InstructionInfo have been
fixed).

Change-Id: Ibfa7a8dc65f36c5f599dbdeffc24508fd136e198
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoMinor cleanup and formatting 83/50483/1
David Suarez [Sun, 15 Jan 2017 18:29:13 +0000 (19:29 +0100)]
Minor cleanup and formatting

- Minor clean and formatting.
- Speedup lastIndexOf changing to char.

Change-Id: I56f47b90ffb36a057b1b7b3e7faa3b4b154bd35c
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>