genius.git
7 years agoMerge "Remove an unnecessary augmentation"
Faseela K [Thu, 23 Feb 2017 18:15:22 +0000 (18:15 +0000)]
Merge "Remove an unnecessary augmentation"

7 years agoFix some problems introduced after checkstyle enforcement 68/52168/1
David [Wed, 22 Feb 2017 12:39:31 +0000 (13:39 +0100)]
Fix some problems introduced after checkstyle enforcement

ResourceBatchingManager violates some checkstyle rules. It should fix
the compilation problems.

Change-Id: I9516a85b58188e4708e73152f988ea24f5d44f41
Signed-off-by: David <david.suarez.fuentes@ericsson.com>
7 years agoMerge "Bug 7599 hwvtep ucast mac consumption performance"
Faseela K [Wed, 22 Feb 2017 09:33:00 +0000 (09:33 +0000)]
Merge "Bug 7599 hwvtep ucast mac consumption performance"

7 years agoMerge "BUG-7758: Fix creation of FLAT and VLAN networks with the same parent"
Faseela K [Wed, 22 Feb 2017 06:16:24 +0000 (06:16 +0000)]
Merge "BUG-7758: Fix creation of FLAT and VLAN networks with the same parent"

7 years agoRemove @Deprecated from interface-manager APIs 96/52096/2
Faseela K [Tue, 21 Feb 2017 08:52:17 +0000 (14:22 +0530)]
Remove @Deprecated from interface-manager APIs

Initially GENIUS was planning to move away from API models
to promote the usage of RPCs. However, given the various benefits of
using APIs, removing the Deprecated tags.

Change-Id: Ibbbf60632ede1a324a80d67a35302f84e8aa33d7
Signed-off-by: Faseela K <faseela.k@ericsson.com>
7 years agoIntro. alivenessmonitor-impl-protocols to break cyclic dependency 20/52020/3
Michael Vorburger [Fri, 17 Feb 2017 18:48:27 +0000 (19:48 +0100)]
Intro. alivenessmonitor-impl-protocols to break cyclic dependency

This change makes alivenessmonitor-impl not be dependent on
interfacemanager-api anymore, by refactoring the protocol handlers
(which are somewhat orthogonal) into a separate bundle, thus breaking a
cyclic dependency which caused issues in the BP migration (c/49175).

The real problem actually wasn't the compile time dependency of
alivenessmonitor-impl to interfacemanager-api, but the (implicit)
blueprint DI dependency to interfacemanager-impl (which itself requires
alivenessmonitor); but this solves this, because now
(only) interfacemanager-impl can depend on alivenessmonitor, and the 3rd
new
bundle alivenessmonitor-impl-protocols depends on both.

Change-Id: I4fe98dbf55e727d6704b216c5fea304e336babb2
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoDesign spec for Service Binding On Tunnels 70/51270/10
Faseela K [Tue, 31 Jan 2017 17:58:54 +0000 (23:28 +0530)]
Design spec for Service Binding On Tunnels

Change-Id: Icb3747badf76cd93df22bcb6db3dd546fcc089ee
Signed-off-by: Faseela K <faseela.k@ericsson.com>
7 years agoInterfacemanager-api : Checkstyle Enforcement 40/51940/5
Edwin Anthony [Thu, 16 Feb 2017 15:10:40 +0000 (20:40 +0530)]
Interfacemanager-api : Checkstyle Enforcement

Change-Id: I89250d986237ee75bb87ce99c4066c9f5e87d602
Signed-off-by: Edwin Anthony <n.edwin.anthony@ericsson.com>
7 years agoMerge "Genius support for Trunks"
Faseela K [Fri, 17 Feb 2017 06:31:10 +0000 (06:31 +0000)]
Merge "Genius support for Trunks"

7 years agoMerge "Nat Action added in ActionNxConntrack"
Sam Hague [Fri, 17 Feb 2017 01:47:53 +0000 (01:47 +0000)]
Merge "Nat Action added in ActionNxConntrack"

7 years agominor AlivenessMonitorUtil clean-up incl. removal of 2 unused methods 29/51929/2
Michael Vorburger [Wed, 15 Feb 2017 22:39:37 +0000 (23:39 +0100)]
minor AlivenessMonitorUtil clean-up incl. removal of 2 unused methods

Change-Id: Ia11625018060033ebfeef7b0a99bad28d0026eb2
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "MdSalUtilTest no longer extends @deprecated AbstractDataBrokerTest"
Michael Vorburger [Thu, 16 Feb 2017 16:05:05 +0000 (16:05 +0000)]
Merge "MdSalUtilTest no longer extends @deprecated AbstractDataBrokerTest"

7 years agoMerge "Fix issues related to checkstyle compliance"
Vivek Srivastava [Thu, 16 Feb 2017 15:56:33 +0000 (15:56 +0000)]
Merge "Fix issues related to checkstyle compliance"

7 years agoMerge "alivenessmonitor-impl reduce dependency to interfacemanager-api"
Michael Vorburger [Thu, 16 Feb 2017 15:53:58 +0000 (15:53 +0000)]
Merge "alivenessmonitor-impl reduce dependency to interfacemanager-api"

7 years agoMerge "Change ITMManagerRpcservice Test frm Mock to Guice"
Michael Vorburger [Thu, 16 Feb 2017 15:50:40 +0000 (15:50 +0000)]
Merge "Change ITMManagerRpcservice Test frm Mock to Guice"

7 years agoMerge "Fix issues related to checkstyle compliance"
Michael Vorburger [Thu, 16 Feb 2017 15:49:46 +0000 (15:49 +0000)]
Merge "Fix issues related to checkstyle compliance"

7 years agoNat Action added in ActionNxConntrack 85/49685/6
Aswin Suryanarayanan [Wed, 21 Dec 2016 09:25:51 +0000 (14:55 +0530)]
Nat Action added in ActionNxConntrack

Change-Id: Id9c112e2490bd98192ef003d28c2065476c28c09
Signed-off-by: Aswin Suryanarayanan <asuryana@redhat.com>
7 years agoalivenessmonitor-impl AlivenessProtocolHandlerLLDP dead code removed 28/51928/3
Michael Vorburger [Wed, 15 Feb 2017 20:20:59 +0000 (21:20 +0100)]
alivenessmonitor-impl AlivenessProtocolHandlerLLDP dead code removed

I obviously have no idea what this code really does, but something looks
very wrong in this handlePacketIn() method .. all of that code does
NOTHING, literally (dead code).  --  Can this entire class be removed?

Change-Id: I181c82acff2af6e80953a1554f35d33fc86b5465
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoChange ITMManagerRpcservice Test frm Mock to Guice 32/51832/3
Tarun Thakur [Tue, 14 Feb 2017 07:31:05 +0000 (13:01 +0530)]
Change ITMManagerRpcservice Test frm Mock to Guice

ITM RPC service Test cases are re-written in Guice framework.

Change-Id: I8a2f8a5bee35c9e5edc74292eeb1f1d75cc5056c
Signed-off-by: Tarun Thakur <tarun.t@altencalsoftlabs.com>
7 years agoFix issues related to checkstyle compliance 33/51933/2
David [Thu, 16 Feb 2017 00:27:09 +0000 (01:27 +0100)]
Fix issues related to checkstyle compliance

Fix issues related to checkstyle compliance in module
fcapsapplication-impl:
- Copyright sections
- Line lengths
- Order imports
- Declaration of constants: name, modifiers
- Formatting
- Exception catching
- Change name of variables
- Checkstyle enforcement activated

Change-Id: I342fae60e3be3addad147a08d309a743dec37f95
Signed-off-by: David <david.suarez.fuentes@ericsson.com>
7 years agoMerge "ITM Auto-config: Change other_config to ExternalId"
Faseela K [Thu, 16 Feb 2017 09:15:36 +0000 (09:15 +0000)]
Merge "ITM Auto-config: Change other_config to ExternalId"

7 years agoalivenessmonitor-impl reduce dependency to interfacemanager-api 27/51927/4
Michael Vorburger [Wed, 15 Feb 2017 20:11:22 +0000 (21:11 +0100)]
alivenessmonitor-impl reduce dependency to interfacemanager-api

All code removed here is completely dead code, this should be low risk.

BTW: Now only AlivenessProtocolHandlerARP still needs interfacemanager
API.. if that could be removed as well, then we could resolve the cyclic
dependency that is causing us pain... could it refactored?

Change-Id: Idba767b1f59cc255d59f5d1751983a9a2d48620e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agointerfacemanager-shell : Checkstyle Enforcement 37/51937/1
Faseela K [Thu, 16 Feb 2017 07:36:01 +0000 (13:06 +0530)]
interfacemanager-shell : Checkstyle Enforcement

Change-Id: I406a957160481b2463d2c88d705d67d2360939cf
Signed-off-by: Faseela K <faseela.k@ericsson.com>
7 years agoFix issues related to checkstyle compliance 25/51925/2
David [Wed, 15 Feb 2017 18:55:02 +0000 (19:55 +0100)]
Fix issues related to checkstyle compliance

Fix issues related to checkstyle compliance in module
fcapsappjmx:
- Copyright sections
- Line lengths
- Order imports
- Declaration of constants: name, modifiers
- Formatting
- Checkstyle enforcement activated

Change-Id: If4e6131025190ba4c38504053273f7114a3bbc09
Signed-off-by: David <david.suarez.fuentes@ericsson.com>
7 years agoMerge "Revert I466b2489107172ad7f391ba6b50c4dce9f08343d"
Michael Vorburger [Wed, 15 Feb 2017 20:35:17 +0000 (20:35 +0000)]
Merge "Revert I466b2489107172ad7f391ba6b50c4dce9f08343d"

7 years agoRemove an unnecessary augmentation 09/51909/1
Miguel Duarte [Wed, 15 Feb 2017 14:15:02 +0000 (15:15 +0100)]
Remove an unnecessary augmentation

The Ovsdb node was being augmented twice - in ItmUtils, and in
OvsdbNodeListener.

With this small change, it is only augmented once in OvsdbNodeListener,
then passed as a parameter into the ItmUtils.

Change-Id: I933fc794c25573371262df746309f215d9706ba5
Signed-off-by: Miguel Duarte <miguel.duarte.de.mora.barroso@ericsson.com>
7 years agoITM Auto-config: Change other_config to ExternalId 99/50299/17
Tarun Thakur [Wed, 11 Jan 2017 09:37:10 +0000 (15:07 +0530)]
ITM Auto-config: Change other_config to ExternalId

Change TEP fields configuration from other_config to external_ids.
Parse TEP params from external_ids list of ovsdb node, and then use it
for add/update/delete TEP in ITM Config DS.

Change-Id: I29f2a7aabb12ac97b896956f931e6d8fba89df83
Signed-off-by: Tarun Thakur <tarun.t@altencalsoftlabs.com>
7 years agoTunnels in DOWN state in scaled scenario 60/51760/4
Faseela K [Sun, 12 Feb 2017 09:46:40 +0000 (15:16 +0530)]
Tunnels in DOWN state in scaled scenario

In a scaled environment, some of the tunnels remain in DOWN
state after ITM full mesh creation. This is due to a race condition
when openflow port add and bfd port status messages are processed
out of order. Making the code more robust against such races.

Change-Id: Ic239c15605c2e446aa8a465b09508cfcc0b18eb0
Signed-off-by: Faseela K <faseela.k@ericsson.com>
7 years agoMerge "Prepare Karaf 4 migration: move old features"
Michael Vorburger [Tue, 14 Feb 2017 16:05:43 +0000 (16:05 +0000)]
Merge "Prepare Karaf 4 migration: move old features"

7 years agoRevert I466b2489107172ad7f391ba6b50c4dce9f08343d 52/51852/1
Faseela K [Tue, 14 Feb 2017 10:37:37 +0000 (16:07 +0530)]
Revert I466b2489107172ad7f391ba6b50c4dce9f08343d

Reverting the temporary work around as part of
Bug 7538 InterfaceManagerTestModule temporary local work-around

Change-Id: I976934978d2d3ddd69052b449d623aa6f1fc527c
Signed-off-by: Faseela K <faseela.k@ericsson.com>
7 years agoMerge "Remove specific version for maven-bundle-plugin"
Michael Vorburger [Tue, 14 Feb 2017 10:19:30 +0000 (10:19 +0000)]
Merge "Remove specific version for maven-bundle-plugin"

7 years agoPrepare Karaf 4 migration: move old features 23/50923/6
Stephen Kitt [Tue, 24 Jan 2017 09:17:30 +0000 (10:17 +0100)]
Prepare Karaf 4 migration: move old features

This sets the stage for the Karaf 4 migration (which needs dluxapps,
ovsdb and openflowplugin first, on top of patches which are already in
progress for yangtools, mdsal, controller, infrautils and netconf).

Bug: 7623
Change-Id: Icf20f546c6a65870a07b546c3fb945c1fca303b4
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoMerge "Checkstyle enforcement - idmanager-shell"
Faseela K [Tue, 14 Feb 2017 07:31:17 +0000 (07:31 +0000)]
Merge "Checkstyle enforcement - idmanager-shell"

7 years agoRemove specific version for maven-bundle-plugin 26/51826/1
David Suarez [Fri, 10 Feb 2017 00:05:22 +0000 (01:05 +0100)]
Remove specific version for maven-bundle-plugin

Remove specific version for maven-bundle-plugin to avoid problems like:
https://bugs.opendaylight.org/show_bug.cgi?id=7537

Change-Id: I7997ef221ab16e7fe4a6c422f5886587e66d0e06
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
7 years agoGenius support for Trunks 51/51751/2
Vishal Thapar [Sat, 11 Feb 2017 14:17:54 +0000 (19:47 +0530)]
Genius support for Trunks

Trunk Port API adds certain use cases which are currently not supported in
InterfaceManager. These include but not restricted to:

1. Interface membership will not be known at creation but come as an
upate later. There is no means to know at creation if it will become a
trunk member later or not.
2. Trunk member interfaces will not have any termination point, so
parentRefs will never be updated from southbound event. Trunk members will
add parentRefs through an interface update.
3. Trunk member interface can go from member to trunk if it is removed
from a trunk as subport.
4. Trunk member interface's parentRefs can be removed if it is removd from
a trunk as subport.

This means IFM now needs to support use cases where if2Vlan and parentRef
augmentations of an interface can change dynamically.

Related gerrits:
https://git.opendaylight.org/gerrit/#/q/topic:vlan-aware-vms

Change-Id: Ie240c1307547cce17463e2ff16a223aa72807d4c
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
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 agoMdSalUtilTest no longer extends @deprecated AbstractDataBrokerTest 87/51487/3
Michael Vorburger [Mon, 6 Feb 2017 23:26:07 +0000 (00:26 +0100)]
MdSalUtilTest no longer extends @deprecated AbstractDataBrokerTest

use new AbstractConcurrentDataBrokerTest instead - and fix MDSALManager

Bug: 7538
Change-Id: Iaad38472581f7271f894650f255bda0c6a48aae8
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 agoCheckstyle enforcement - idmanager-shell 98/51698/1
Faseela K [Fri, 10 Feb 2017 18:32:16 +0000 (00:02 +0530)]
Checkstyle enforcement - idmanager-shell

Change-Id: I5c43b3c5f4de7b52198b6d19b2859eb6c044171c
Signed-off-by: Faseela K <faseela.k@ericsson.com>
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 agoBUG-7758: Fix creation of FLAT and VLAN networks with the same parent 61/51561/1
Alon Kochba [Wed, 8 Feb 2017 15:14:05 +0000 (17:14 +0200)]
BUG-7758: Fix creation of FLAT and VLAN networks with the same parent

Change-Id: Ia0e08c3ef22de39769c6f81e978060501107a0c2
Signed-off-by: Alon Kochba <alonko@hpe.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 agoBug 7599 hwvtep ucast mac consumption performance 13/51513/3
Akash [Tue, 7 Feb 2017 12:37:28 +0000 (18:07 +0530)]
Bug 7599 hwvtep ucast mac consumption performance

Adding batching support by adding BlockingQueue for each shrad
which can be used for batching resources across whole application
easily without creating there own batching queue.

Change-Id: I9b2fcab374b59295bf92f5a000a85dc111425a1f
Signed-off-by: Akash <a.k.sahu@ericsson.com>
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>