openflowplugin.git
7 years agoMerge "Eliminate the use of CompositeObjectRegistration"
michal rehak [Mon, 6 Jun 2016 09:43:21 +0000 (09:43 +0000)]
Merge "Eliminate the use of CompositeObjectRegistration"

8 years agoAdd the openflowplugin-blueprint-config bundles to the features xml 03/38603/6
Tom Pantelis [Mon, 9 May 2016 18:19:27 +0000 (14:19 -0400)]
Add the openflowplugin-blueprint-config bundles to the features xml

This turns on the blueprint wiring for the openflow helium plugin

Change-Id: I5725495f3a40e636bc35cb1a9281c593ad072840
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the lithium OpenflowPluginProvider 46/38646/3
Tom Pantelis [Tue, 10 May 2016 09:10:31 +0000 (05:10 -0400)]
Add blueprint wiring for the lithium OpenflowPluginProvider

Change-Id: I95d721e85f0116b7d83c6b2db475ddfc27aa70c9
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the helium inventory manager 31/38631/3
Tom Pantelis [Mon, 9 May 2016 23:36:17 +0000 (19:36 -0400)]
Add blueprint wiring for the helium inventory manager

Change-Id: Ie6685cdf636c6f707943460bc6dbcac3483442c8
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the helium StatisticsManager 02/38602/3
Tom Pantelis [Mon, 9 May 2016 18:16:41 +0000 (14:16 -0400)]
Add blueprint wiring for the helium StatisticsManager

Change-Id: I81ac14b8ea9e4d76d3088ae512a52cfc758c8688
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the helium OpenflowPluginProvider 84/38584/3
Tom Pantelis [Mon, 9 May 2016 13:31:58 +0000 (09:31 -0400)]
Add blueprint wiring for the helium OpenflowPluginProvider

Added a new bundle, openflowplugin-blueprint-config-he, containing the
blueprint XML that instantiates the SwitchConnectionProvider
and OpenflowPluginProvider instances for the helium plugin. It uses
the new SwitchConnectionProviderFactory interface added to the
openflowjava SPI.

This replaces the ConfigurableOpenFlowProviderModule which is now
deprecated but remains for backwards compatibility. The createInstance
method now obtains the OpenflowPluginProvider created via blueprint from
the OSGi registry and returns a proxy instance that delegates to the
actual instance but overrides the close method appropriately.

Patch 3 : Resolved conflict locally

Change-Id: I315444847f5a95d905a5e6adc602445c1101da5b
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoIgnore maven-metadata-local.xml produced by maven-invoker-plugin in Git 39/39039/2
Michael Vorburger [Wed, 18 May 2016 12:42:43 +0000 (14:42 +0200)]
Ignore maven-metadata-local.xml produced by maven-invoker-plugin in Git

Also remove two redundant (non-root) .gitignore files from projects

Change-Id: I21366c5a4dc96365cf34215835724e07a5f3b9ca
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoMerge "Remove M2E lifecycle-mapping <execute/> for yang-maven-plugin"
Abhijit Kumbhare [Thu, 2 Jun 2016 18:26:27 +0000 (18:26 +0000)]
Merge "Remove M2E lifecycle-mapping <execute/> for yang-maven-plugin"

8 years agoMerge "Fix bad generated path for generated sources"
Abhijit Kumbhare [Thu, 2 Jun 2016 18:25:10 +0000 (18:25 +0000)]
Merge "Fix bad generated path for generated sources"

8 years agoMerge "BUG-2771: String.split() replaced by Guava's Splitter for"
Abhijit Kumbhare [Thu, 2 Jun 2016 18:23:40 +0000 (18:23 +0000)]
Merge "BUG-2771: String.split() replaced by Guava's Splitter for"

8 years agoMerge "BUG-2771: String.split() replaced by Guava's splitter in nicira-extensions...
Abhijit Kumbhare [Thu, 2 Jun 2016 18:21:17 +0000 (18:21 +0000)]
Merge "BUG-2771: String.split() replaced by Guava's splitter in nicira-extensions Added tests, reorganised packages"

8 years agoMerge "BUG-2188 :To report (TCP) port number (for the OpenFlow connection) for switch...
Abhijit Kumbhare [Thu, 2 Jun 2016 16:51:08 +0000 (16:51 +0000)]
Merge "BUG-2188 :To report (TCP) port number (for the OpenFlow connection) for switches as the IP address is not guaranteed to be unique—especially with mininet"

8 years agoBUG-2771: String.split() replaced by Guava's Splitter for 56/39756/2
Shuva Kar [Thu, 2 Jun 2016 10:40:00 +0000 (16:10 +0530)]
BUG-2771: String.split() replaced by Guava's Splitter for

1. statistics-manager - following commit
https://git.opendaylight.org/gerrit/#/c/39019/
2. lithium ofplugin test
3. inventoryDataServiceUtil - portNoStringfromNodeConnectorID

Change-Id: If12d09a2b2fb03912cefd6a2851eee77c568f941
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoEliminate the use of CompositeObjectRegistration 10/39710/3
Robert Varga [Wed, 1 Jun 2016 13:28:09 +0000 (15:28 +0200)]
Eliminate the use of CompositeObjectRegistration

The class has been long-deprecated, remove its users and substitute
them with proper registration subclasses.

Change-Id: Ie7534d69efb117b7d0469dce54e25a3708f065d8
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-2771: String.split() replaced by Guava's splitter in nicira-extensions 42/39742/1
Shuva Kar [Thu, 2 Jun 2016 04:28:37 +0000 (09:58 +0530)]
BUG-2771: String.split() replaced by Guava's splitter in nicira-extensions
Added tests, reorganised packages

Change-Id: I4942c5a60ef46f3aa07ec51f9760f253d88f1629
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoCorrecting test-failures during openflowplugin-periodic builds 27/39727/1
Shuva Kar [Wed, 1 Jun 2016 17:59:06 +0000 (23:29 +0530)]
Correcting test-failures during openflowplugin-periodic builds

Change-Id: Ia94fc4a405e3c128b6c5660fe1a629d47a48e8fc
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoBUG-5888: Registering entity-ownership listerner globally 29/39629/3
Shuva Kar [Tue, 31 May 2016 06:21:30 +0000 (11:51 +0530)]
BUG-5888: Registering entity-ownership listerner globally

Change-Id: I9f3208ffb718a16da34b4baaaf220629784d0333
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoMerge "BUG-5636: making table features configurable for the He plugin. DEFAULT will...
Abhijit Kumbhare [Thu, 26 May 2016 05:57:52 +0000 (05:57 +0000)]
Merge "BUG-5636: making table features configurable for the He plugin. DEFAULT will be ON, can be TURNED OFF."

8 years agoBUG-5636: making table features configurable for the He plugin. 05/39005/7
Shuva Kar [Tue, 17 May 2016 18:53:10 +0000 (00:23 +0530)]
BUG-5636: making table features configurable for the He plugin.
DEFAULT will be ON, can be TURNED OFF.

Change-Id: I16403590f068cd53806c15acde6e6ccbb3ade866
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoBug 5575 introduced counters for sync strategies 29/38329/7
Andrej Leitner [Tue, 3 May 2016 12:31:25 +0000 (14:31 +0200)]
Bug 5575 introduced counters for sync strategies

    - flat-batch & incremental
    - added more unit tests + fixed counters

Change-Id: I66d27d6d6615bdd66e9f0f2831bfb3ea51c5a691
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 flat-bulk strategy wired 28/38328/7
Andrej Leitner [Tue, 3 May 2016 12:31:20 +0000 (14:31 +0200)]
Bug 5575 flat-bulk strategy wired

  - FR-sync currently using flat-batch strategy
  - renaming, time

Change-Id: Id59ff6c15ac25649df16db9b786b1d6b85b75806
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 added strategy implementation for flat-batch + tests 27/38327/7
Andrej Leitner [Tue, 3 May 2016 12:31:13 +0000 (14:31 +0200)]
Bug 5575 added strategy implementation for flat-batch + tests

Change-Id: I667485c13d4fffd166648c339f8554a2680ccd38
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 pulled out extraction of diff items 26/38326/7
Andrej Leitner [Tue, 3 May 2016 12:31:06 +0000 (14:31 +0200)]
Bug 5575 pulled out extraction of diff items

  - added common synchronization plan execution strategy
  - added wrapper for diff input
  - removing, renaming & utils

Change-Id: If7876aac23560bb050c1ce2803bf6b732cfba544
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 added RpcResultBuilder & comments 25/38325/7
Andrej Leitner [Tue, 3 May 2016 12:30:51 +0000 (14:30 +0200)]
Bug 5575 added RpcResultBuilder & comments

Change-Id: I44e6a879b7a3fe5b53a73b4a37c1dc0ac5b4d8db
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 added JUnit tests 54/38154/8
Andrej Leitner [Wed, 27 Apr 2016 08:00:41 +0000 (10:00 +0200)]
Bug 5575 added JUnit tests

  - basic tests for forwarders, listeners and syncreactor

Change-Id: I11fb3c9ca4bd049a170ce6e04ff754399cdeb7ef
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 added listeners config/operational 53/38153/8
Andrej Leitner [Tue, 26 Apr 2016 15:02:40 +0000 (17:02 +0200)]
Bug 5575 added listeners config/operational

  - listeners for node changes in DS
  - syncup starting

Change-Id: I568620061892e3fb997771f272f2beca4c160f81
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 added SyncReactorDecorators and thread pool 52/38152/8
Andrej Leitner [Tue, 26 Apr 2016 14:20:32 +0000 (16:20 +0200)]
Bug 5575 added SyncReactorDecorators and thread pool

  - Guard, Future, Future w/compression decorators
  - thread pool and semaphore keeper

Change-Id: I4d8d3327ef3f318cc17534e789134204977550f7
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 main SyncReactor + utils 51/38151/8
Andrej Leitner [Tue, 26 Apr 2016 13:50:04 +0000 (15:50 +0200)]
Bug 5575 main SyncReactor + utils

  - synchronization reactor implementation, applicable for both - syncup and reconciliation
  - useful util methods

Change-Id: I4a0ef8043e3e9b66a92c49deb86a83b083782ccc
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 added config/operational DAOs 50/38150/8
Andrej Leitner [Tue, 26 Apr 2016 12:28:19 +0000 (14:28 +0200)]
Bug 5575 added config/operational DAOs

  - implemented pair of cached and non-cached FCN dao

Change-Id: Ic68e48d4e9a9b651c1db19dcc2f279fb5159a0ca
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 ForwardingRulesCommiters, Flow/Group/Table Forwarder 49/38149/8
Andrej Leitner [Tue, 26 Apr 2016 11:33:22 +0000 (13:33 +0200)]
Bug 5575 ForwardingRulesCommiters, Flow/Group/Table Forwarder

  (coming from FRM)
  - added interfaces and implementation of add, update and remove
    of Flows, Groups, Meters and TableFeatures

Change-Id: I0168434e2ac56959ff6086952d2a2ad152e252ee
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug 5575 forwardingrules-sync (initial commit) 48/38148/8
Andrej Leitner [Tue, 26 Apr 2016 11:15:44 +0000 (13:15 +0200)]
Bug 5575 forwardingrules-sync (initial commit)

 - initial commit
 - added FRS bluerpint and provider
 - added pom and feature files

Change-Id: I95695e4a7a01c43c6a7ba0bc161762f61cea82fd
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoMerge "BUG-4117: notification supplier - rename"
Abhijit Kumbhare [Mon, 23 May 2016 22:06:02 +0000 (22:06 +0000)]
Merge "BUG-4117: notification supplier - rename"

8 years agoMerge "BUG-5602: OFP-Li implements a YANG notification which notifies its application...
Abhijit Kumbhare [Mon, 23 May 2016 21:55:00 +0000 (21:55 +0000)]
Merge "BUG-5602: OFP-Li implements a YANG notification which notifies its applications of the removal of a flow entry on the event of receiving FLOW_REMOVED message from a switch."

8 years agoBUG-4117: notification supplier - rename 04/39204/8
Shuva Kar [Sat, 21 May 2016 10:03:38 +0000 (15:33 +0530)]
BUG-4117: notification supplier - rename

 - renamed from old-notification-supplier to notification-supplier
 - reason: prefix 'old' usually gets strongly misleading after
     a couple of releases

Bringing Michal's draft to master

Change-Id: I0fd387571714cda943042671f9aa454003fe5bed
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoMerge "Bug 5692: Treat null store-stats in direct stats RPC input as false."
Jozef Bacigal [Mon, 23 May 2016 07:05:24 +0000 (07:05 +0000)]
Merge "Bug 5692: Treat null store-stats in direct stats RPC input as false."

8 years agoMerge "BUG-4117: add support of Old Notif. for Statistics"
Abhijit Kumbhare [Sat, 21 May 2016 01:21:50 +0000 (01:21 +0000)]
Merge "BUG-4117: add support of Old Notif. for Statistics"

8 years agoMerge "BUG-4117: add support of Old Notif. for Statistics"
Abhijit Kumbhare [Sat, 21 May 2016 01:18:36 +0000 (01:18 +0000)]
Merge "BUG-4117: add support of Old Notif. for Statistics"

8 years agoMerge "BUG-4117: add support of Old Notif. for Flow Statistics"
Abhijit Kumbhare [Sat, 21 May 2016 01:12:09 +0000 (01:12 +0000)]
Merge "BUG-4117: add support of Old Notif. for Flow Statistics"

8 years agoMerge "BUG-4117: add support for meter and group old Notif"
Abhijit Kumbhare [Sat, 21 May 2016 01:10:05 +0000 (01:10 +0000)]
Merge "BUG-4117: add support for meter and group old Notif"

8 years agoMerge "BUG-4117: add support for flow old Notif"
Abhijit Kumbhare [Sat, 21 May 2016 01:06:54 +0000 (01:06 +0000)]
Merge "BUG-4117: add support for flow old Notif"

8 years agoMerge changes from topic 'BUG-4117'
Abhijit Kumbhare [Fri, 20 May 2016 22:46:25 +0000 (22:46 +0000)]
Merge changes from topic 'BUG-4117'

* changes:
  BUG-4117: add impl for FlowCapableNode Connector notif.
  BUG-4117: add impl for FlowCapableNode notification

8 years agoMerge "BUG-4117: preparation for FlowCapableNode notification impl."
Abhijit Kumbhare [Fri, 20 May 2016 21:18:56 +0000 (21:18 +0000)]
Merge "BUG-4117: preparation for FlowCapableNode notification impl."

8 years agoBug 5692: Treat null store-stats in direct stats RPC input as false. 55/39155/1
Shigeru Yasuda [Fri, 20 May 2016 05:51:26 +0000 (14:51 +0900)]
Bug 5692: Treat null store-stats in direct stats RPC input as false.

Change-Id: I19676bd3285975d345ca29b44845cf60e9670b55
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
8 years agoMerge "Bug 5914 - Flow statistics don't show up on the same flow id, if flow uses...
Abhijit Kumbhare [Thu, 19 May 2016 17:24:28 +0000 (17:24 +0000)]
Merge "Bug 5914 - Flow statistics don't show up on the same flow id, if flow uses IPv6 match with subnet mask"

8 years agoBug 5692 - Direct statistics RPC 44/38744/15
Tomas Slusny [Wed, 11 May 2016 17:03:01 +0000 (19:03 +0200)]
Bug 5692 - Direct statistics RPC

- Added new RPCs for direct gathering of statistics
  with optional flag of storing the statistics to DS/operational

Change-Id: I9d94595f9fb4f5e93f22958c64dd6cf3d4c19bcc
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug 5692 - Statistics ON/OFF 34/38634/9
Tomas Slusny [Tue, 10 May 2016 11:48:51 +0000 (13:48 +0200)]
Bug 5692 - Statistics ON/OFF

- Removed DeviceState.getRole
- Statistics are properly shut down when device changes to state other than Master
- Statistics are properly started only when device becomes Master
- LifecycleConductor now have access to StatisticsManager

Change-Id: I68e437b758c6e6a4343d815e5cf3d2570ef28aef
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug 5914 - Flow statistics don't show up on the same flow id, 85/39085/1
Anil Vishnoi [Thu, 19 May 2016 04:46:39 +0000 (21:46 -0700)]
Bug 5914 - Flow statistics don't show up on the same flow id,
if flow uses IPv6 match with subnet mask

Patch2: Added unit test

Change-Id: I566c84334a096229274925d223bb906be643f326
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoRemove M2E lifecycle-mapping <execute/> for yang-maven-plugin 43/39043/1
Michael Vorburger [Wed, 18 May 2016 13:05:15 +0000 (15:05 +0200)]
Remove M2E lifecycle-mapping <execute/> for yang-maven-plugin

This appears to be broken anyway (causing:
org.apache.maven.plugin.MojoExecutionException: yang-to-sources: Unable
to parse yang files from
/home/vorburger/dev/ODL/git/openflowplugin/applications/forwardingrules-manager/src/main/yang;
Caused by:
org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException:
Imported module [config] was not found. [at null:6:1])

In https://github.com/vorburger/opendaylight-eclipse-setup, the
workspace wide lifecycle mapping for yang-maven-plugin is ignore.

In the future, I'm hoping that I'll be able to bundle yangide in
opendaylight-eclipse-setup, and it will correctly configure code
generation.

Change-Id: I8c1640482912eb05ea3fb07e9d55d82f90ab6ebd
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoFix bad generated path for generated sources 41/39041/1
Michael Vorburger [Wed, 18 May 2016 13:01:22 +0000 (15:01 +0200)]
Fix bad generated path for generated sources

The yang-maven-plugin appears to generate code into
target/generated-sources/sal and target/generated-sources/config, and
not (anymore?) into src/main/yang-gen-sal & src/main/yang-gen-config.

Without making this change, there is a lot of red in Eclipse at least,
because generate code is not seen on the classpath.

I wonder in fact how this could ever have even worked in CLI mvn build,
or other IDEs.

Change-Id: Ib2c67bd7b52f1e038626161d29886457c3db8566
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
8 years agoMerge "Bug 5591 - Changed DeviceContext to DeviceState in translate methods of Messag...
Jozef Bacigal [Tue, 17 May 2016 07:04:16 +0000 (07:04 +0000)]
Merge "Bug 5591 - Changed DeviceContext to DeviceState in translate methods of MessageTranslator classes - Added util static method createWithOook to AggregateFlowsInTableService   and to OpendaylightFlowStatisticsServiceImpl (calls DeviceContext.oook() before   creating instance of the service)"

8 years agoBug 5590 - writeToTransaction+submitTransaction 78/36878/6
Tomas Slusny [Wed, 30 Mar 2016 11:41:17 +0000 (13:41 +0200)]
Bug 5590 - writeToTransaction+submitTransaction
- New interface TxFacade, DeviceContext now implements this interface
- Changed constructor of SalTableServiceImpl to accept TxFacade and NodeId
- Changed MultipartRequestOnTheFlyCallback to not need the DeviceContext and accept TxFacade
- Updated some methods in StatisticGatheringUtils to not depend on DeviceContext (because of change above)
- Updated usages of these classes according to changes.
- Updated tests

Change-Id: Ib4f7a075e27999bc57c324601123bd0e18bd83d4
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug 5591 92/38592/2
Tomas Slusny [Mon, 18 Apr 2016 14:26:04 +0000 (16:26 +0200)]
Bug 5591
- Changed DeviceContext to DeviceState in translate methods of MessageTranslator classes
- Added util static method createWithOook to AggregateFlowsInTableService
  and to OpendaylightFlowStatisticsServiceImpl (calls DeviceContext.oook() before
  creating instance of the service)

Change-Id: I957ab21fcd9e439a6e0e228dc2156bf571c98385
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoMerge "BUG-5573: Altering the HandshakePool to have a LinkedBlockingQueue instead...
Jozef Bacigal [Mon, 16 May 2016 13:57:54 +0000 (13:57 +0000)]
Merge "BUG-5573: Altering the HandshakePool to have a LinkedBlockingQueue instead of an ArrayBlockingQueue with size 20. The main difference between ArrayBlockingQueue and LinkedBlockingQueue is clear from constructor one has underlying data structure Array and other linkedList."

8 years agoBug 5543 - JUnit tests update 15/38915/3
Tomas Slusny [Tue, 3 May 2016 12:10:33 +0000 (14:10 +0200)]
Bug 5543 - JUnit tests update

Change-Id: I7bfcec5ad87213870d3043a3ea00c098e21391b9
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
8 years agoMerge "BUG 5680 - TxManager init submit fix"
Jozef Bacigal [Mon, 16 May 2016 11:43:46 +0000 (11:43 +0000)]
Merge "BUG 5680 - TxManager init submit fix"

8 years agoBUG-5573: Altering the HandshakePool to have a LinkedBlockingQueue instead of an 84/38284/4
Shuva Kar [Mon, 2 May 2016 15:11:40 +0000 (20:41 +0530)]
BUG-5573: Altering the HandshakePool to have a LinkedBlockingQueue instead of an
ArrayBlockingQueue with size 20. The main difference between
ArrayBlockingQueue and LinkedBlockingQueue is clear from constructor one
has underlying data structure Array and other linkedList.

ArrayBlockingQueue uses single-lock double condition algorithm and
LinkedBlockingQueue is variant of the "two lock queue" algorithm and it
has 2 locks 2 conditions ( takeLock , putLock)

In scenarios that involve adding and removing elemenst LinkedBlockingQueue
performs better than ArrayBlockingQueue.

Change-Id: I08f077552599d663857db2ca6d33a86e3b5eb01e
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoMerge "Bug 5592 - NodeId+DatapathId in Services (remove dependency on DeviceContext...
Jozef Bacigal [Mon, 16 May 2016 09:11:58 +0000 (09:11 +0000)]
Merge "Bug 5592 - NodeId+DatapathId in Services (remove dependency on DeviceContext) - Changed AbstractService.getVersion and AbstractService.getDatapathId to return data from DeviceState - Added AbstractService.getNodeId what returns nodeId from DeviceState - Updated all ocurences of getting above 3 values in subclasses to use these methods - Updated tests (in most of them, DeviceState was not mocked)"

8 years agoMerge "BUG-4148: Improving the logging levels, adding more information wherever required"
Abhijit Kumbhare [Mon, 16 May 2016 06:17:01 +0000 (06:17 +0000)]
Merge "BUG-4148: Improving the logging levels, adding more information wherever required"

8 years agoBUG-2188 :To report (TCP) port number (for the OpenFlow connection) 00/38900/1
Shuva Kar [Sun, 15 May 2016 07:01:24 +0000 (12:31 +0530)]
BUG-2188 :To report (TCP) port number (for the OpenFlow connection)
for switches as the IP address is not guaranteed to be unique—especially
with mininet

Bringing https://git.opendaylight.org/gerrit/#/c/14317 to master

Change-Id: I2a74b8760829447c22aa92fb933be4810f31bf99
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoMerge "BUG-5841: Enhances bulk-o-matic to stress test Data Store and Openflowplugin...
Abhijit Kumbhare [Sat, 14 May 2016 06:35:12 +0000 (06:35 +0000)]
Merge "BUG-5841: Enhances bulk-o-matic to stress test Data Store and Openflowplugin RPC Added asciidoc for the same"

8 years agoBUG-5841: Enhances bulk-o-matic to stress test Data Store and Openflowplugin RPC 47/37047/5
Faiz Ilahi Kothari [Mon, 4 Apr 2016 06:03:52 +0000 (11:33 +0530)]
BUG-5841: Enhances bulk-o-matic to stress test Data Store and Openflowplugin RPC
Added asciidoc for the same

- Takes JSON input from REST to provision flows
- Different options to push to DS or Openflowplugin
- Results are printed to karaf.log

Change-Id: I231e9278a7292ac2424751a0689f632d3382c497
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoMerge "BUG-5839: Removing groups and meters on being stale-marked"
Abhijit Kumbhare [Sat, 14 May 2016 04:54:06 +0000 (04:54 +0000)]
Merge "BUG-5839: Removing groups and meters on being stale-marked"

8 years agoMerge "BUG-4148: Improving the logging in flow/group/meter to provide more contextual...
Abhijit Kumbhare [Sat, 14 May 2016 04:23:00 +0000 (04:23 +0000)]
Merge "BUG-4148: Improving the logging in flow/group/meter to provide more contextual information as to the success/failure of the operation"

8 years agoMerge "Add custom compare for ArpMatch objects"
Anil Vishnoi [Sat, 14 May 2016 00:52:00 +0000 (00:52 +0000)]
Merge "Add custom compare for ArpMatch objects"

8 years agoBug 5592 - NodeId+DatapathId in Services (remove dependency on DeviceContext) 83/37083/5
Tomas Slusny [Mon, 4 Apr 2016 14:43:14 +0000 (16:43 +0200)]
Bug 5592 - NodeId+DatapathId in Services (remove dependency on DeviceContext)
- Changed AbstractService.getVersion and AbstractService.getDatapathId to return data from DeviceState
- Added AbstractService.getNodeId what returns nodeId from DeviceState
- Updated all ocurences of getting above 3 values in subclasses to use these methods
- Updated tests (in most of them, DeviceState was not mocked)

Change-Id: Ie0b38788d66687c07d1a6265006d0026076f8dc9
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoAdd custom compare for ArpMatch objects 49/38749/1
Josh [Thu, 21 Apr 2016 16:19:46 +0000 (18:19 +0200)]
Add custom compare for ArpMatch objects

The problem here was that layer3MatchEquals was falling through to
the default compare where the generated equals() method is called
which was comparing the mac addresses case sensitive. This caused
an IT test we're working on in netvirt to fail because certain ARP
flows were not making their way into the operational store. This
only occurs on the beryllium branch but not on master as this
method has a fully different implementation there.

Change-Id: I3aa6e79b48741f656ae036b16743e0e097623593
Signed-off-by: Josh <jhershbe@redhat.com>
8 years agoBUG 5680 - TxManager init submit fix 27/37427/2
andrej.leitner [Mon, 11 Apr 2016 09:13:09 +0000 (11:13 +0200)]
BUG 5680 - TxManager init submit fix

Initial submit could fail with unexpected reason and we have to catch it, because we could have distributed DS without corect Node path and sub-path initialization. Added initCommit property.
TODO: think about alternative solution (try to reinit whole Node)

Change-Id: I6a12fb1a9542312408d76a774dd7c0ff66328e47
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBUG-5602: OFP-Li implements a YANG notification which notifies its 39/38639/2
Shuva Kar [Tue, 10 May 2016 16:40:36 +0000 (22:10 +0530)]
BUG-5602: OFP-Li implements a YANG notification which notifies its
applications of the removal of a flow entry on the event of receiving
FLOW_REMOVED message from a switch.

Change-Id: I3496effc0313e38702907e0e0eaf202f460d2406
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoBug 5595 - RpcContext nodeId+xidSequencer (remove dependency on DeviceContext) 48/37048/3
Tomas Slusny [Thu, 31 Mar 2016 13:31:55 +0000 (15:31 +0200)]
Bug 5595 - RpcContext nodeId+xidSequencer (remove dependency on DeviceContext)
- Changed RpcContextImpl to not depend on DeviceContext.
- Moved isStatisticsRpcEnabled to DeviceManager and DeviceContext
- Updated RpcContextManagerImpl to use new RpcContextImpl constructor
- Updated tests

Change-Id: If658c506caeb257cde32084e81089b604d8484e3
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug-5523 Lifecycle conductor changes 66/38566/4
Jozef Bacigal [Wed, 4 May 2016 12:43:07 +0000 (14:43 +0200)]
Bug-5523 Lifecycle conductor changes

- changed lifecycle conductor from static thread safe singleton
to singleton created in OpenFlowPluginImpl as are managers defined

Change-Id: I1bd21b2e3a842ce3152882a746a2b9efd3f2cb83
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug-5523 CloseConnection changes 25/38225/5
Jozef Bacigal [Tue, 26 Apr 2016 12:49:03 +0000 (14:49 +0200)]
Bug-5523 CloseConnection changes

- dependency of deviceContext removed from starting
- lifecycle conductor thread safe now
- role manager was not removing context from map
- test update

Change-Id: Iadafdfb8f377326bfb76e9163ad66656b16c15f3
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug-5523 RoleManager changes 24/38224/2
Jozef Bacigal [Fri, 15 Apr 2016 11:13:57 +0000 (13:13 +0200)]
Bug-5523 RoleManager changes

- all functionality moved to role manager
- role context hold only information about status
- life cycle conductor defined as listener to role change
- able to register listener to start/stop master services
- timer for initialization device disabled
- added thrown exception when not able to write to transaction
- added junit tests

Change-Id: I741cde5c8161dde8c45f27c6a2e1f99617a613bf
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoMerge "Remove nexusproxy property"
Abhijit Kumbhare [Thu, 5 May 2016 21:31:00 +0000 (21:31 +0000)]
Merge "Remove nexusproxy property"

8 years agoBUG-5839: Removing groups and meters on being stale-marked 69/37769/2
Shuva Kar [Tue, 19 Apr 2016 02:59:32 +0000 (08:29 +0530)]
BUG-5839: Removing groups and meters on being stale-marked

Change-Id: I18f752b7e099a7c423e569de23d957e4f32779c7
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoBUG-4148: Improving the logging levels, adding more information wherever required 74/38274/3
Shuva Kar [Mon, 2 May 2016 14:26:09 +0000 (19:56 +0530)]
BUG-4148: Improving the logging levels, adding more information wherever required

Change-Id: I165db99bf76c52dc5c7a20ce84b0058e6a45058d
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoBUG-4148: Improving the logging in flow/group/meter to provide more contextual 54/38254/4
Shuva Kar [Mon, 2 May 2016 08:17:23 +0000 (13:47 +0530)]
BUG-4148: Improving the logging in flow/group/meter to provide more contextual
information as to the success/failure of the operation

Change-Id: Ica94dbca7559f0afff1f8dfe5695ed8d0bf6376e
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoWIP: BUG-5464: scaling issue 59/36559/5
Jozef Bacigal [Wed, 23 Mar 2016 14:04:35 +0000 (15:04 +0100)]
WIP: BUG-5464: scaling issue

    - pull up table-features to flow-cabable-node
    - fix adjanced logic
    - remove augmentation of flow-capable-node (redundant table-features)
    - fixed unit test

Change-Id: I798f87420330cfd71045eac3de61291a10abdafa
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoMerge "Derive distributuon/karaf pom from karaf-parent"
Jozef Bacigal [Tue, 26 Apr 2016 07:11:23 +0000 (07:11 +0000)]
Merge "Derive distributuon/karaf pom from karaf-parent"

8 years agoMerge "Log at ERROR level when add/remove flow fail"
Abhijit Kumbhare [Mon, 25 Apr 2016 23:06:30 +0000 (23:06 +0000)]
Merge "Log at ERROR level when add/remove flow fail"

8 years agoLog at ERROR level when add/remove flow fail 81/38081/6
Alexis de Talhouët [Mon, 25 Apr 2016 19:38:06 +0000 (15:38 -0400)]
Log at ERROR level when add/remove flow fail

Change-Id: I78c14450e6ba235c99a74efff68c0a38ed4ce739
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
8 years agoMerge "Log at ERROR level when request context failed to close"
Abhijit Kumbhare [Mon, 25 Apr 2016 21:22:10 +0000 (21:22 +0000)]
Merge "Log at ERROR level when request context failed to close"

8 years agoLog at ERROR level when request context failed to close 85/38085/1
Alexis de Talhouët [Mon, 25 Apr 2016 20:03:14 +0000 (16:03 -0400)]
Log at ERROR level when request context failed to close

And also log the whole exception as the message can be null

 RequestContextUtil               | 190 - org.opendaylight.openflowplugin.impl - 0.3.0.SNAPSHOT | Request context wasn't closed. Exception message: null

Change-Id: Ib5d3f263db0baf83bc2d978a2c3e9f2cb1317b0c
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
8 years agoLog at ERROR level when the queue isn't set... 84/38084/1
Alexis de Talhouët [Mon, 25 Apr 2016 19:53:00 +0000 (15:53 -0400)]
Log at ERROR level when the queue isn't set...

... as this results in failing the request.
This helps debug, and I believe should be turned
at error level

Change-Id: Ib5152371f449bc81d69b216a2061db7eed624d5a
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
8 years agoDerive distributuon/karaf pom from karaf-parent 62/38062/1
Tom Pantelis [Mon, 25 Apr 2016 14:41:16 +0000 (10:41 -0400)]
Derive distributuon/karaf pom from karaf-parent

This picks up the recent changes to the karaf distro from a common
place.

Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoMerge "Bug 5589 - Deprecate PortNumberCache"
Jozef Bacigal [Mon, 25 Apr 2016 07:41:54 +0000 (07:41 +0000)]
Merge "Bug 5589 - Deprecate PortNumberCache"

8 years agoMerge changes from topic 'bug-5574'
Jozef Bacigal [Thu, 21 Apr 2016 12:53:18 +0000 (12:53 +0000)]
Merge changes from topic 'bug-5574'

* changes:
  BUG-5574: added flat-bulk service registration
  BUG-5574: flat batch proposal
  BUG-5574: bulk meters proposal
  BUG-5574: introduces sal-groups-batch service impl
  BUG-5574: sal-flows-batch proposal

8 years agoBUG-5574: added flat-bulk service registration 90/37790/2
Michal Rehak [Mon, 4 Apr 2016 18:17:05 +0000 (20:17 +0200)]
BUG-5574: added flat-bulk service registration

    - added registration/unregistation for flat-batch routed service

Change-Id: I95d005aeb12d1b817c643ffc11a6f5343361d5a4
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit b5ffe8525d85dcf92d38a1eab96e4f3d2836aad0)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBUG-5574: flat batch proposal 22/36722/6
Michal Rehak [Mon, 21 Mar 2016 17:02:39 +0000 (18:02 +0100)]
BUG-5574: flat batch proposal

    - yang model
    - implementation proposal
    - flat batch util
    - unit tests

Change-Id: I4406eaa19024348e63e2cc6d07039949ba8aa941
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 60ddc33574168296cf1b59f59a1cbb998cecfc36)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBUG-5574: bulk meters proposal 09/36309/6
Michal Rehak [Wed, 16 Mar 2016 12:48:00 +0000 (13:48 +0100)]
BUG-5574: bulk meters proposal

    - added bulk API implementation for groups
    - with parametrized barrier-after support
    - MeterUtil
    - unit tests

Change-Id: I9146894ae0b1f630706b8aea6b85a13c8ce3364b
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 26fa4ba6f87c23e159b74526f6fb849f0ceb4783)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBug 5589 - Deprecate PortNumberCache 07/37807/2
Tomas Slusny [Tue, 19 Apr 2016 12:08:09 +0000 (14:08 +0200)]
Bug 5589 - Deprecate PortNumberCache

- New class - Port to NodeConnectorRef converter
- New test - Conversion between port and NodeConnectorRef
- Methods in PortNumberCache are now deprecated
- Replaced use of above methods in PacketReceivedTranslator with new methods
- Modified tests for PacketReceivedTranslator to work with new methods

Change-Id: Icb04e3f8699d436b549ea670b1e3c42d2e057026
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug 5747 Introduced snapshot gathering marks 09/37809/2
Michal Rehak [Thu, 7 Apr 2016 18:45:34 +0000 (20:45 +0200)]
Bug 5747 Introduced snapshot gathering marks

Added timestamp of statistics collection start and finish
and successful collection flag.

Change-Id: If00fbb7532f292d69602de7857db73fabc5fd49f
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBUG-5574: introduces sal-groups-batch service impl 08/36308/5
Michal Rehak [Tue, 15 Mar 2016 17:54:41 +0000 (18:54 +0100)]
BUG-5574: introduces sal-groups-batch service impl

 - added bulk API implementation for groups
 - with parametrized barrier-after support
 - added tests

Change-Id: If3e3d70d4ceb8eeb4a9902e2ea7f4bad26d9c934
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 134bd7a822a5a3d76ec82f3bd7ad6abf1a933a60)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBUG-5574: sal-flows-batch proposal 07/36307/5
Michal Rehak [Mon, 14 Mar 2016 15:44:21 +0000 (16:44 +0100)]
BUG-5574: sal-flows-batch proposal

    - added common model for attaching barrier
    - added bulk API implementation for flows
      - with parametrized barrier-after support
    - added tests

Change-Id: I4e941d3654dc142e1d1d64a2258e629016e95a0e
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 79e8e834f0cbbccfbff99e51e4ddd854dd812d19)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoRevert "Fix "Bug 5589 - Deprecate PortNumberCache"" 85/37785/1
Michal Rehak [Tue, 19 Apr 2016 07:14:53 +0000 (09:14 +0200)]
Revert "Fix "Bug 5589 - Deprecate PortNumberCache""

This reverts commit 0cd77f8ef3c8045fba03dde20044a08ec44e29f5.
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Change-Id: I852bf5dc979ef8a581b3d8326413451cd21cc83a

8 years agoRemove nexusproxy property 59/37759/1
Luis Gomez [Mon, 18 Apr 2016 23:09:55 +0000 (16:09 -0700)]
Remove nexusproxy property

Change-Id: Ie6cc211e3e4a5b39ef6a09c23cb737eab6c57a96
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
8 years agoMerge "Bug 5592 - DeviceContext -> DeviceState in *ToNotificationTransformer classes"
Jozef Bacigal [Mon, 18 Apr 2016 12:28:36 +0000 (12:28 +0000)]
Merge "Bug 5592 - DeviceContext -> DeviceState in *ToNotificationTransformer classes"

8 years agoMerge "Fix "Bug 5589 - Deprecate PortNumberCache" - New class that can convert Device...
Jozef Bacigal [Mon, 18 Apr 2016 12:18:45 +0000 (12:18 +0000)]
Merge "Fix "Bug 5589 - Deprecate PortNumberCache" - New class that can convert DeviceState to NodeConnectorRef and NodeConnectorRef to port number. - 1 test that will verify if conversion between DeviceState and NodeConnectorRef is valid. - Made methods in PortNumberCache deprecated and replaced use of them in PacketReceivedTranslator with new methods. - Modified tests for PacketReceivedTranslator to work with new methods."

8 years agoFix "Bug 5589 - Deprecate PortNumberCache" 40/36740/5
Tomas Slusny [Thu, 24 Mar 2016 13:08:02 +0000 (14:08 +0100)]
Fix "Bug 5589 - Deprecate PortNumberCache"
- New class that can convert DeviceState to NodeConnectorRef and NodeConnectorRef to port number.
- 1 test that will verify if conversion between DeviceState and NodeConnectorRef is valid.
- Made methods in PortNumberCache deprecated and replaced use of them in PacketReceivedTranslator with new methods.
- Modified tests for PacketReceivedTranslator to work with new methods.

Change-Id: I4960fd701ce0bf905208806c94e6ba1b7684a0cd
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoDo not deploy the karaf artifact 53/36353/2
Thanh Ha [Wed, 16 Mar 2016 22:33:40 +0000 (18:33 -0400)]
Do not deploy the karaf artifact

The karaf artifact is only used for testing. It does not need to be
released to the world.

Change-Id: Ieca324babbf2cf8ac710808fdf40134981ed38e5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoBug-5534:RoleService does not take care of rpc errors 23/36523/5
Kamal Rameshan [Wed, 16 Mar 2016 00:24:01 +0000 (17:24 -0700)]
Bug-5534:RoleService does not take care of rpc errors

Change-Id: Id65e597f5952b689dec176c29ae9e78284123ce2
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>