openflowplugin.git
8 years agoBug-5562 - Ipv4 L3-ArbitraryMask patch 71/36571/1
Sai MarapaReddy [Sat, 19 Mar 2016 06:36:20 +0000 (23:36 -0700)]
Bug-5562 - Ipv4 L3-ArbitraryMask patch
Current code expects the Arbitrary Mask to be normalized from switch.
Example:- 3.3.3.3/255.0.255.0 to 3.0.3.0/255.0.255.0
Not all switches normalizes arbitrary bit mask in the flows when they are injected.
Example:- 3.3.3.3/255.0.255.0 to 3.3.3.3/255.0.255.0
This patch ensures that the operational data store is in congruent with the flows
that are shown on the switch. Patch is built on checking the mask & comparing the
normalized stores & stats flows which ensures Ipv4 L3-ArbitraryMask works independant
of how the switches normalizes the ip addresses when flows are pushed.

Conflicts:
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java

Change-Id: Icfc6d4805c58f6483fc3ca0458b827b14c0a0cb1
Signed-off-by: Sai MarapaReddy <sai.marapareddy@gmail.com>
8 years agoMerge "BUG-5489 Group Delete not working with ovs2.5"
Anil Vishnoi [Mon, 21 Mar 2016 22:13:19 +0000 (22:13 +0000)]
Merge "BUG-5489 Group Delete not working with ovs2.5"

8 years agoMerge "Fix Mockito Generics"
michal rehak [Tue, 15 Mar 2016 09:23:12 +0000 (09:23 +0000)]
Merge "Fix Mockito Generics"

8 years agoBug 5521 - flows reconciliation 31/36131/3
Jozef Bacigal [Fri, 11 Mar 2016 14:20:43 +0000 (15:20 +0100)]
Bug 5521 - flows reconciliation

Fix missing flows by initialization/reconciliation

Change-Id: I2b3d892cb53abc1603db45c7937ae98ac4a36a79
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoFix Mockito Generics 96/36196/1
andrej.leitner [Mon, 14 Mar 2016 14:54:06 +0000 (15:54 +0100)]
Fix Mockito Generics

 *fix Generic for mockito matcher
 *fix testGroupModConvertSortedBuckets

Change-Id: I8148c94cf572440a1cb9be7a0d962c8501cb3f42
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoMerge "Correction classes names in loggers."
michal rehak [Fri, 11 Mar 2016 14:42:51 +0000 (14:42 +0000)]
Merge "Correction classes names in loggers."

8 years agoMerge "Post "Clustering optimization" updates"
michal rehak [Fri, 11 Mar 2016 14:40:25 +0000 (14:40 +0000)]
Merge "Post "Clustering optimization" updates"

8 years agoBUG-5489 Group Delete not working with ovs2.5 35/36035/1
Shuva Jyoti Kar [Thu, 10 Mar 2016 09:43:19 +0000 (15:13 +0530)]
BUG-5489 Group Delete not working with ovs2.5

Change-Id: Ie63c46e5d9def2c89e5e22e6d5ca56678b43424d
Signed-off-by: Shuva Jyoti Kar <shuva.jyoti.kar@ericsson.com>
8 years agoSuppressed INFO log messages. 26/36026/1
Hideyuki Tai [Fri, 26 Feb 2016 14:27:39 +0000 (06:27 -0800)]
Suppressed INFO log messages.

According to the Logging Best Practices in the OpenDaylight wiki,
messages at INFO level should be for operators and administrators.
However, some log messages for developers inappropriately used the INFO
level. This patch changed the log level of the messages from INFO to
TRACE.

Change-Id: I7e666149a7ea3dbdcddf7f157a5010d4fb5aee63
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
(cherry picked from commit a7b507c778ead7c2e316b1acadd55653dcb2dcaa)

8 years agoMerge "Bug:3026 - Echo response timeout needs be exported to configuration"
Kamal Rameshan [Wed, 9 Mar 2016 17:33:00 +0000 (17:33 +0000)]
Merge "Bug:3026 - Echo response timeout needs be exported to configuration"

8 years agoCorrection classes names in loggers. 83/35983/1
Jozef Bacigal [Wed, 9 Mar 2016 11:24:40 +0000 (12:24 +0100)]
Correction classes names in loggers.

- this are probably copy paste errors

Change-Id: I7ac309b218fc8250edd4ba2e65e2174fab2babcb
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoPost "Clustering optimization" updates 69/35969/1
Jozef Bacigal [Wed, 2 Mar 2016 11:25:23 +0000 (12:25 +0100)]
Post "Clustering optimization" updates

3/2/16

- small updates after clustering optimizations
- grammar policy for method names, class name and logs
- clean ups

3/3/16

- deviceState class, set SLAVE after init
- deviceStateTest updates

Change-Id: Ia38b125cb974fc15a49ce288f9880278d4db6288
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoMerge "Quick fix RPCs and DevicCtx.close"
michal rehak [Wed, 9 Mar 2016 08:55:15 +0000 (08:55 +0000)]
Merge "Quick fix RPCs and DevicCtx.close"

8 years agoBug:3026 - Echo response timeout needs be exported to configuration 18/35618/4
Kamal Rameshan [Fri, 26 Feb 2016 23:39:50 +0000 (15:39 -0800)]
Bug:3026 - Echo response timeout needs be exported to configuration

Takes care of Bug-4677 : Li: Knob to configure Barrier duration

Also incorporated Jozef bacigal's hot fix in stable

Change-Id: I42697dbbb93cc40c1547b92e9665851e7f5f0b98
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
(cherry picked from commit e22904723888cfe73fff63e280e4c4c5af51b910)

8 years agoBug-5119 - Adding support for L3 address arbitraty bit mask with Unittests coverage... 63/35963/1
Sai MarapaReddy [Wed, 10 Feb 2016 23:26:04 +0000 (15:26 -0800)]
Bug-5119 - Adding support for L3 address arbitraty bit mask with Unittests coverage & indentation & addressed latest comments &  rebased

Author:     Sai MarapaReddy <sai.marapareddy@gmail.com>
Commit:     Sai MarapaReddy <sai.marapareddy@gmail.com>
Change-Id: I26ef6aef4ffdbc5047c5a2282fbdc42d7bbfcd27
Signed-off-by: Sai MarapaReddy <sai.marapareddy@gmail.com>
8 years agoQuick fix RPCs and DevicCtx.close 78/35878/2
Jozef Bacigal [Fri, 4 Mar 2016 15:11:06 +0000 (16:11 +0100)]
Quick fix RPCs and DevicCtx.close

Change-Id: I1cd92d91e1025ae3aee00418b86912f2e86580b4
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 5404 - He plugin: Meter stats not reported the first time switch connects to... 05/35905/1
Anil Vishnoi [Tue, 8 Mar 2016 03:31:07 +0000 (19:31 -0800)]
Bug 5404 - He plugin: Meter stats not reported the first time switch connects to controller

Change-Id: I970ed9bd02fd20054d552e3a6127f9766cd8ab92
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 60fd94868c75a9d49eb968f73a1ed337a38ed727)

8 years agoDo not retain DeviceState 31/35831/1
Robert Varga [Fri, 4 Mar 2016 14:36:41 +0000 (15:36 +0100)]
Do not retain DeviceState

TransactionChainManager only needs the instance identifier (or Node Id,
available from there), do not retain the entire state.

Change-Id: I93ff1fc08ebf469a907493452e9e771d59dd849f
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoDo not leak internal state 30/35830/1
Robert Varga [Fri, 4 Mar 2016 14:16:52 +0000 (15:16 +0100)]
Do not leak internal state

The state transition enum should not be visible from outside, hide it.

Change-Id: I2b3fa8af7829509b5a968eb952a53c829e189aaa
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoDo not lose thread on close 29/35829/1
Robert Varga [Fri, 4 Mar 2016 13:41:27 +0000 (14:41 +0100)]
Do not lose thread on close

We need to make sure we shutdown the spypool on close.

Change-Id: I07d7144b9ca29e35a6dc24231b525c64c8e3891a
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoUse IetInetUtil conversion 99/35099/10
Robert Varga [Fri, 19 Feb 2016 14:37:42 +0000 (15:37 +0100)]
Use IetInetUtil conversion

Instead of home-grown covnersion, use the utilities provided.

Change-Id: I9a44b8eb87f297c8d456182b7080fd9f447802c3
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoFix a guaranteed NPE 85/35785/2
Robert Varga [Fri, 4 Mar 2016 13:31:08 +0000 (14:31 +0100)]
Fix a guaranteed NPE

If we fail to decode a packet, we will end up causing a NPE in
statistics. Use the packetIn class for that instead.

Change-Id: Ib53ca939ee4a08319c2595d560bfdd99c013eba2
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoDo not override java source/target 86/35786/1
Robert Varga [Fri, 4 Mar 2016 13:34:01 +0000 (14:34 +0100)]
Do not override java source/target

odlparent already provides correct definitions (which are Java 8), so
use those.

Change-Id: Ib6d19bbe1aff0930fd9f0151e44a643fa7854e38
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Bug 4957 Cleaning code and fixing issues from manual tests"
michal rehak [Wed, 2 Mar 2016 16:46:59 +0000 (16:46 +0000)]
Merge "Bug 4957 Cleaning code and fixing issues from manual tests"

8 years agoMerge "Bug 4957: OF Role processing changes"
michal rehak [Wed, 2 Mar 2016 16:46:56 +0000 (16:46 +0000)]
Merge "Bug 4957: OF Role processing changes"

8 years agoMerge "Bug-4957 Cluster Role change fix"
michal rehak [Wed, 2 Mar 2016 16:46:53 +0000 (16:46 +0000)]
Merge "Bug-4957 Cluster Role change fix"

8 years agoMerge "Bug-4957: Make async operational DS Read"
michal rehak [Wed, 2 Mar 2016 16:27:38 +0000 (16:27 +0000)]
Merge "Bug-4957: Make async operational DS Read"

8 years agoMerge "Bug-4957 Fix SalRoleService blocking call"
michal rehak [Wed, 2 Mar 2016 16:27:35 +0000 (16:27 +0000)]
Merge "Bug-4957 Fix SalRoleService blocking call"

8 years agoMerge "Bug-4957: Double candidate, close processing"
michal rehak [Wed, 2 Mar 2016 16:27:32 +0000 (16:27 +0000)]
Merge "Bug-4957: Double candidate, close processing"

8 years agoMerge "Bug-4957: Double candidate, introduced roleCtx states"
michal rehak [Wed, 2 Mar 2016 16:27:28 +0000 (16:27 +0000)]
Merge "Bug-4957: Double candidate, introduced roleCtx states"

8 years agoMerge "Bug-4957: Double candidate, clean up"
michal rehak [Wed, 2 Mar 2016 16:27:25 +0000 (16:27 +0000)]
Merge "Bug-4957: Double candidate, clean up"

8 years agoMerge "Bug-4957 Double candidate Onwership initial commit"
michal rehak [Wed, 2 Mar 2016 16:27:22 +0000 (16:27 +0000)]
Merge "Bug-4957 Double candidate Onwership initial commit"

8 years agoMerge "Bug 4957 Fix Cluster Role change for Statistics Polling"
michal rehak [Wed, 2 Mar 2016 16:27:19 +0000 (16:27 +0000)]
Merge "Bug 4957 Fix Cluster Role change for Statistics Polling"

8 years agoMerge "Bug 4957 Fix Cluster Role change for RPC registration"
michal rehak [Wed, 2 Mar 2016 16:27:15 +0000 (16:27 +0000)]
Merge "Bug 4957 Fix Cluster Role change for RPC registration"

8 years agoBug 4957 Cleaning code and fixing issues from manual tests 85/35585/1
Vaclav Demcak [Thu, 25 Feb 2016 13:15:04 +0000 (14:15 +0100)]
Bug 4957 Cleaning code and fixing issues from manual tests

 *Initialization Device info collecting
  -Device Info collecting is async function and it could finish
   with unactive connection (bug stat collecting always return true)
   so we need to check actual state before we finish MASTER
   roleChange.
  -We don't wish to commit any data and we are able to close
   NEW Transaction. So we try to do it.

 *SalRoleServiceImpl changes
  -add result FutureCallback for release semafor guard
  -add check for cancel for every loop
  -fix return failed future for InterruptedException

 *Change close method for all Managers
  -Fix close method in RoleManager we not suspend TxEntity
  -Use consumingIterator for cleaning manager's contexts
  -Use concumingIterator for close in RpcContext

 *Additional clean
  -clean RoleContext for TxLockOwned
  -fix not propagated Excepton from DeviceContext#onDeviceContextLevelUp
  -clean RoleManager
  -add check for Connection state for statistics
  -fix tests

Change-Id: I04d19e4c0a0e87e4158cd2ca25da32fe15cfef22
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoMerge "Pre-compute ipv4 masks"
michal rehak [Tue, 1 Mar 2016 14:00:05 +0000 (14:00 +0000)]
Merge "Pre-compute ipv4 masks"

8 years agoBug 4957: OF Role processing changes 74/35474/2
Vaclav Demcak [Mon, 22 Feb 2016 14:52:38 +0000 (15:52 +0100)]
Bug 4957: OF Role processing changes

* change init order to CM -> DM -> SM -> RPC -> Role -> DM
* set default Role setup to Slave by init phase
* Fix order of verify for put to contextsList before call
  addDeviceCotextCloseHander for every CtxManagers
  - prevention for unexpected not finished Contexts
* add more precise logging
* fix tests

Change-Id: I9492a96d0725823d7901e98af81e0e3961e9f414
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBug-4957 Cluster Role change fix 73/35473/2
Vaclav Demcak [Mon, 22 Feb 2016 14:52:38 +0000 (15:52 +0100)]
Bug-4957 Cluster Role change fix

* TxManager shutdown fail has to clean DS (put empty Node)
* DeviceCtx onRoleChange needs call Device Initialization
  functionality but we need to know when we are able to
  put fresh data in to Oper DS and when we could jump
  write functionality
* DeviceCtx contract change for method OnClusterRoleChange

Note: Cluster Master to Slave change could finish during
initialization phase or TxManager could fail in submitting
last transaction state. So we needs a marker for "something
unexpected is happend" and we have to put fresh data to
Operational DataStore

Change-Id: I18e8c0d75e2e5cf195d9a98c1e096fb5517fab72
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
8 years agoBug 2951 - ipv6 addresses containing zeros in input flow should be handled in operati... 20/35520/1
Anil Vishnoi [Sun, 28 Feb 2016 03:43:22 +0000 (19:43 -0800)]
Bug 2951 - ipv6 addresses containing zeros in input flow should be handled in operational flows

Change-Id: I60955de3c9c28825de46520f8ccdd272ca62838d
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoBug-4957: Make async operational DS Read 72/35472/1
Vaclav Demcak [Sat, 20 Feb 2016 13:07:14 +0000 (14:07 +0100)]
Bug-4957: Make async operational DS Read

* don't block netty thread for reading oper. DS for clean
  Tables in collecting FlowStat
* fix tests

Change-Id: I32df820c69f07e7bc00b71a87c4c0c07d43c9312
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
8 years agoBug-4957 Fix SalRoleService blocking call 71/35471/1
Vaclav Demcak [Sat, 20 Feb 2016 12:13:15 +0000 (13:13 +0100)]
Bug-4957 Fix SalRoleService blocking call

 - SalRoleService invoke blocking calls for GenerationId
   and for change Role. Both with 10 sec wait. Block any
   threads for this time is danger in any way. But archit.
   change replace Akka / DS threads with netty and we
   get deadlock for netty thread.

Change-Id: If801baf8698977251ebef88d145b6e03d6a80e83
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
8 years agoBug-4957: Double candidate, close processing 42/34142/2
Vaclav Demcak [Tue, 2 Feb 2016 10:24:34 +0000 (11:24 +0100)]
Bug-4957: Double candidate, close processing

 - close has one extra state: Master unregistred NodeEntity and
   some another ClusterNode win election (but it is in close process
   too) so we are not able to propagate role change correctly and
   we could delegate possible Delete Node from correct ClusterNode.

Change-Id: I5e8235686632699b7d827735c75eb0348fadc36c
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug-4957: Double candidate, introduced roleCtx states 40/34140/2
Vaclav Demcak [Tue, 2 Feb 2016 14:09:45 +0000 (15:09 +0100)]
Bug-4957: Double candidate, introduced roleCtx states

    - introduced roleContext states
    - organized methods used by roleContext lifecycle state
      transitions to use uniformed pattern with
      exceptions if behavior differs for given combination
      of state and role

Change-Id: I53531fd6d168c38b3fdae457d432dacfdf5e5a9c
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug-4957: Double candidate, clean up 37/34137/2
Vaclav Demcak [Tue, 2 Feb 2016 12:52:21 +0000 (13:52 +0100)]
Bug-4957: Double candidate, clean up

    - getting rid of twisted futures
    - simplifying code paths
    - decreasing amount of failure handling places
      upon the same code path

Change-Id: I4e54f4644a919538aa4297f600a835004db7e3b6
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug-4957 Double candidate Onwership initial commit 36/34136/2
Jozef Bacigal [Wed, 27 Jan 2016 22:17:12 +0000 (23:17 +0100)]
Bug-4957 Double candidate Onwership initial commit

  Note: Doulbe candidate Ownership is fixing missing
        TxChain management from Distributed DataStore.

 -Add init suport for TxEntity processing
 -fix ownershipChange find correct RoleCtx by entity

Change-Id: I0ef898483c33e80a59e19e0e3c1b83b628cf88af
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 Fix Cluster Role change for Statistics Polling 35/34135/2
Jozef Bacigal [Wed, 27 Jan 2016 22:17:12 +0000 (23:17 +0100)]
Bug 4957 Fix Cluster Role change for Statistics Polling

 -polling statistics can be done for every Role, what we
  realy want to fix, is check an actual Role from DeviceState
  before polling.

Change-Id: I6cedfab0a47022632178af71c54c7c59516b5f83
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 Fix Cluster Role change for RPC registration 34/34134/2
Jozef Bacigal [Wed, 27 Jan 2016 22:17:12 +0000 (23:17 +0100)]
Bug 4957 Fix Cluster Role change for RPC registration

-we have to registred RPC for LEADER and unregistred
 RPC for FOLLOWER for every role change.

Change-Id: I53e862dd46cb0feb4ba1221345ebe0d542df1097
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoPre-compute ipv4 masks 93/35293/3
Robert Varga [Tue, 23 Feb 2016 21:57:20 +0000 (22:57 +0100)]
Pre-compute ipv4 masks

Instead of computings masks over and over again, store them as
pre-computed arrays and clone them on access. Also make methods static.

Change-Id: I10c379fa0d5aaf8dd15f8d51d7de3ece1ebd48d3
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "BUG-5020 Handling exception while submission"
Abhijit Kumbhare [Thu, 11 Feb 2016 23:08:09 +0000 (23:08 +0000)]
Merge "BUG-5020 Handling exception while submission"

8 years agoBUG-5020 Handling exception while submission 05/34505/4
Shuva Jyoti Kar [Thu, 11 Feb 2016 20:03:12 +0000 (01:33 +0530)]
BUG-5020 Handling exception while submission

Change-Id: I755c0f85d25fd7f30b77c9ea6765c5e0c185153b
Signed-off-by: Shuva Jyoti Kar <shuva.jyoti.kar@ericsson.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoBug 5327 - LLDP spoof warning in 3-node cluster 03/34503/1
Anil Vishnoi [Thu, 11 Feb 2016 19:32:57 +0000 (11:32 -0800)]
Bug 5327 - LLDP spoof warning in 3-node cluster

Change-Id: I0bb970d9de99a162dd5f09ae8376151755da617d
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoMerge "BUG-4099: Groups pointing to ports"
Anil Vishnoi [Thu, 11 Feb 2016 18:53:07 +0000 (18:53 +0000)]
Merge "BUG-4099: Groups pointing to ports"

8 years agoMerge "Bug 5050: Correctly deregister routed RPC."
Anil Vishnoi [Thu, 11 Feb 2016 06:31:30 +0000 (06:31 +0000)]
Merge "Bug 5050: Correctly deregister routed RPC."

8 years agoMerge "Bug 4957 Add async shuttingDown method for TransactionChainManager"
michal rehak [Tue, 9 Feb 2016 18:16:27 +0000 (18:16 +0000)]
Merge "Bug 4957 Add async shuttingDown method for TransactionChainManager"

8 years agoMerge "Bug 4957 Fix Last No Master RoleCtx cleaning"
michal rehak [Tue, 9 Feb 2016 18:16:24 +0000 (18:16 +0000)]
Merge "Bug 4957 Fix Last No Master RoleCtx cleaning"

8 years agoMerge "Bug 4957 Fix blocking call to Init RoleGet"
michal rehak [Tue, 9 Feb 2016 18:16:21 +0000 (18:16 +0000)]
Merge "Bug 4957 Fix blocking call to Init RoleGet"

8 years agoMerge "Bug 4957 OpenflowPluginProviderImpl.close() fixing"
michal rehak [Tue, 9 Feb 2016 18:16:17 +0000 (18:16 +0000)]
Merge "Bug 4957 OpenflowPluginProviderImpl.close() fixing"

8 years agoMerge "Bug 4957 Fix methods for change TxChainManager"
michal rehak [Tue, 9 Feb 2016 18:16:13 +0000 (18:16 +0000)]
Merge "Bug 4957 Fix methods for change TxChainManager"

8 years agoMerge "Bug 4957 Clean unnecessary code"
michal rehak [Tue, 9 Feb 2016 18:16:09 +0000 (18:16 +0000)]
Merge "Bug 4957 Clean unnecessary code"

8 years agoMerge "Bug 4957 Wiring new TxChainManager lifecycle"
michal rehak [Tue, 9 Feb 2016 18:15:58 +0000 (18:15 +0000)]
Merge "Bug 4957 Wiring new TxChainManager lifecycle"

8 years agoMerge "Bug 4957 Role lifecycle support for TxChainManager in DeviceContext"
michal rehak [Tue, 9 Feb 2016 09:20:42 +0000 (09:20 +0000)]
Merge "Bug 4957 Role lifecycle support for TxChainManager in DeviceContext"

8 years agoMerge "Bug 4957 Fix RoleChangeLifecyle (init, close, life)"
michal rehak [Tue, 9 Feb 2016 09:20:36 +0000 (09:20 +0000)]
Merge "Bug 4957 Fix RoleChangeLifecyle (init, close, life)"

8 years agoMerge "Bug 4957 Fixing DeviceCtx lifeCycle"
michal rehak [Tue, 9 Feb 2016 09:20:32 +0000 (09:20 +0000)]
Merge "Bug 4957 Fixing DeviceCtx lifeCycle"

8 years agoMerge "Bug 4957 TxChainManager lifecycle startup cleaning"
michal rehak [Tue, 9 Feb 2016 09:20:27 +0000 (09:20 +0000)]
Merge "Bug 4957 TxChainManager lifecycle startup cleaning"

8 years agoMerge "Bug 4957 RoleContext updated with initialization"
michal rehak [Tue, 9 Feb 2016 09:20:22 +0000 (09:20 +0000)]
Merge "Bug 4957 RoleContext updated with initialization"

8 years agoMerge "Bug 4957 No empty transaction for every connection fix"
michal rehak [Tue, 9 Feb 2016 09:20:13 +0000 (09:20 +0000)]
Merge "Bug 4957 No empty transaction for every connection fix"

8 years agoBUG-4099: Groups pointing to ports 78/34278/1
Shuva Jyoti Kar [Mon, 8 Feb 2016 18:05:35 +0000 (23:35 +0530)]
BUG-4099: Groups pointing to ports

Signed-off-by: Shuva Jyoti Kar <shuva.jyoti.kar@ericsson.com>
8 years agoBug 5050: Correctly deregister routed RPC. 72/34272/1
Hideyuki Tai [Thu, 21 Jan 2016 21:04:17 +0000 (13:04 -0800)]
Bug 5050: Correctly deregister routed RPC.

OfEntityManager of the OpenFlow plugin (the Helium version) forgot to
update the flag which represented if it had registered its routed RPC,
when it deregistered the routed RPC. As the result, when the OpenFlow
plugin tried to register and deregister the routed RPC more than once,
it wrongly skipped to reregister the routed RPC from the second time of
the registeration, since it thought the RPC had been already registered.
When the plugin failed to get the response to a Role Request message,
the plugin faced such a situation.

Change-Id: I3f5bf59e254e58f20649ec205656a03debdd4eb5
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
(cherry picked from commit 8566438a6f43ee39c22d70b0c13327d9da66f397)

8 years agoMerge "BUG-5192: FRM skips reconciliation"
michal rehak [Mon, 8 Feb 2016 09:01:35 +0000 (09:01 +0000)]
Merge "BUG-5192: FRM skips reconciliation"

8 years agoBug-4866 - [Clustering]: Switch state resync is not 07/34207/1
Anil Vishnoi [Fri, 5 Feb 2016 04:50:18 +0000 (20:50 -0800)]
Bug-4866 - [Clustering]: Switch state resync is not
happening after controller restart [Routed RPC issue]

Change-Id: I6ca6b8c2a4a38b908571300eab0fda3cda078af7
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoBug-5198 : He Plugin:Inventory manager is deleting 06/34206/1
Anil Vishnoi [Wed, 3 Feb 2016 05:05:54 +0000 (21:05 -0800)]
Bug-5198 : He Plugin:Inventory manager is deleting

the node from inventory data store, when switch disconnect from slave node.

Change-Id: I19155e84444b57eab94157c34eaa32952fecf3f2
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 69da70673ed8afe48eec65ed5ffab750e6cac444)

8 years agoBug-5160 - He plugin : Device ownership change should not send nodeAdded notification 05/34205/1
Anil Vishnoi [Mon, 1 Feb 2016 08:23:03 +0000 (00:23 -0800)]
Bug-5160 - He plugin : Device ownership change should not send nodeAdded notification

Change-Id: I027101f22a6a5e38ff2ebce6ab603b6c92928c17
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 3fc75a38d7b8883fcfd4cedffdeca7c4e55c1577)

8 years agoFixed following issues 02/34202/1
Anil Vishnoi [Tue, 26 Jan 2016 07:20:58 +0000 (23:20 -0800)]
Fixed following issues
1) Statistics collector to stop writing when
device is not connected and rpc's are deregistered
2) Stop send default slave role
3) Disable aggregate statistics (working on better implementation)

Change-Id: I3cb9e347e0cbe3f18222380c784ef4edc724b449
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 5c3f50ee20b4899f763e42fa4d640717106dc0c0)

8 years agoSend node details notification up to the application, 95/34195/1
Anil Vishnoi [Tue, 26 Jan 2016 02:49:03 +0000 (18:49 -0800)]
Send node details notification up to the application,
once switch role is configured. Currently application were getting notified when switch Description message
received by the controller, and application assume that switch is configured and ready to use.
This patch, send the desc request when switch role is configured and it's ready to use

Change-Id: I8a02c209c4796b7aa01161257d523139fdc9c881
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 636fd4b5cdf0751c684b0c6996523a9fedb5c63a)

8 years agoFix table 0 initialization in Inventory-manager 92/34192/1
Anil Vishnoi [Sun, 24 Jan 2016 00:17:30 +0000 (16:17 -0800)]
Fix table 0 initialization in Inventory-manager

Patch 2: OF plugin should not explictly try to cleanup the
operational data store (inventory), that's the job
of Inventory-manager.

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

8 years agoTable features support for existing openflowplugin 85/34185/1
Anil Vishnoi [Fri, 22 Jan 2016 04:45:04 +0000 (20:45 -0800)]
Table features support for existing openflowplugin

Patch 2 : Fixes javadoc error

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

8 years agoSet entity ownership service as mandatory true 82/34182/1
Anil Vishnoi [Wed, 20 Jan 2016 05:35:12 +0000 (21:35 -0800)]
Set entity ownership service as mandatory true

Patch v2: Disabled openflowplugin internal IT tests,
because openflowplugin module uses EOS service and there
is no implementation for In Memory Data Store. Openflowplugin
IT loads old openflowplugin implementation and In Memory Data
Store, but after making old openflowplugin clsuter aware, it uses
EntityOwnershipService, and that's where these IT tests fails,
because there is no EOS implementation for IMDS. Apart from that
these integration tests are bare minimal and we do have all these
tests upstream CSIT.

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

8 years agoClustering support for existing design (FRM,IM,SM) - add retry mechanisms to avoid... 85/27585/16
Kavitha_Ramalingam [Tue, 29 Sep 2015 13:20:39 +0000 (18:50 +0530)]
Clustering support for existing design (FRM,IM,SM) - add retry mechanisms to avoid race conditions between cluster role change and yang notification process

Change-Id: Ie83dceae61d483f4ab34e305062db36d296b8b08
Signed-off-by: Hariharan_Sethuraman <Hariharan_Sethuraman@dell.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit f43a6bcc47e197288e3ab060ef60b9278895fa3f)

8 years agoBug 4957 Add async shuttingDown method for TransactionChainManager 29/34129/2
Vaclav Demcak [Sat, 23 Jan 2016 15:03:25 +0000 (16:03 +0100)]
Bug 4957 Add async shuttingDown method for TransactionChainManager

 -close method for not finished TransactinChain can clear
  netty and finish whole close for master in md-sal thread

Change-Id: I37beaac81e2fcc08889ee0de96dee684d21f92cb
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBUG-5192: FRM skips reconciliation 22/34122/1
Jozef Bacigal [Tue, 2 Feb 2016 17:40:54 +0000 (18:40 +0100)]
BUG-5192: FRM skips reconciliation

    - if FRM starts upon dirty DS/operational
      then update part of dataChangeEvent is used
      and reconciliation is forced

Change-Id: I486b467cb278b86c06d497f7fe598263476f635b
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
(cherry picked from commit d19e54f3f0f9a85e87e70ca3fb97a2cb7a1bab85)

8 years agoBug 4957 Fix Last No Master RoleCtx cleaning 96/33396/6
Vaclav Demcak [Fri, 22 Jan 2016 23:25:41 +0000 (00:25 +0100)]
Bug 4957 Fix Last No Master RoleCtx cleaning

 -sometimes Ownership made election for disconnected Devices
  and the ownership change didn't propagate down to Device.
  So entity ownership send a last msg with (wasOnwer=false,
  isOwner=false,hasOwner=false) so we have to check if we
  close RoleCtx (it means close CandidateRegistration) and
  clean DS.

Change-Id: I6efc13a839ddad62dec83bba3ceae94a64842b60
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
8 years agoBug 4957 Fix blocking call to Init RoleGet 59/33259/7
Vaclav Demcak [Wed, 20 Jan 2016 21:53:45 +0000 (22:53 +0100)]
Bug 4957 Fix blocking call to Init RoleGet

* we don't want to block netty channel by init Role Get

Change-Id: I9bdf7051128fb364b9d7f1c0205c206883265a57
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 OpenflowPluginProviderImpl.close() fixing 52/33252/8
Jozef Bacigal [Wed, 20 Jan 2016 19:43:40 +0000 (20:43 +0100)]
Bug 4957 OpenflowPluginProviderImpl.close() fixing

 - added close invocation of all underlying managers
 - added TODOs for later reconsideration
 - OFPlugin-Li closing process has to wait for cleaning OperDS
   so we could have unclosed (MASTER) instances in context of
   RoleManager. Fist step was merge OpenflowOwnershipListener
   with RoleManager because Manager is here for managing
   all not finished RoleCtx.
   Second step was unregistred new OwnershipListener (RoleManager)
   as OwnershipListener and for every undstanding RoleCtx ask
   OwnershipService for actual state. If the Entity is still
   registred, NOOP otherwise clean OperDS.

Change-Id: Ie041d6e0fb02b153850d8c9645740cf1164b6ac5
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 Fix methods for change TxChainManager 73/33173/7
Vaclav Demcak [Tue, 19 Jan 2016 18:34:15 +0000 (19:34 +0100)]
Bug 4957 Fix methods for change TxChainManager

 -we realy don't need two separate method for initRoleChange
  and roleChange because method initialSubmitWriteTransaction
  will activate TxChainManager for Master and Slave role too
 -fix bad condition for Activate/Deactivate TxChainManager
 -we set RoleManager as DeviceContextClosedHandler so we have
  to remove ClosedHandler from RoleContext

Change-Id: I4bb36b7fc2f4043761cc53b492422af7dee8eb69
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 Clean unnecessary code 72/33172/7
Vaclav Demcak [Sun, 17 Jan 2016 19:22:22 +0000 (20:22 +0100)]
Bug 4957 Clean unnecessary code

Change-Id: If0ab1ff9db2a4c91c5312fe218fe4d6cf7f572c2
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 Wiring new TxChainManager lifecycle 71/33171/7
Vaclav Demcak [Sun, 17 Jan 2016 10:30:46 +0000 (11:30 +0100)]
Bug 4957 Wiring new TxChainManager lifecycle

* TransactionChainManager constructor change
* OpenflowOwnershipListener should be a last in MASTER
  Node connection close instance (clean OwnershipListers)
* RoleManager - check registration for RoleCtx
* RoleContext - should hold a last DeviceCtx instance for MASTER

Change-Id: I55977f0bf1af3ade36f02f7c097a4472d4989ae7
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 Role lifecycle support for TxChainManager in DeviceContext 70/33170/7
Vaclav Demcak [Sun, 17 Jan 2016 01:49:27 +0000 (02:49 +0100)]
Bug 4957 Role lifecycle support for TxChainManager in DeviceContext

* DeviceContext
 - add onClusterRoleChange method for role change
 - add onInitClusterRoleChange method for role change
   in new connection initialization phase
 - modify onDeviceDisconnectedFromCluster method
* TransactionChainManager
 - add activateTransactionManager method
 - add deactivetTransactionManager method

Change-Id: Ibfcb3ddfa74067152a65e5f5c3122f14ebb9d617
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 Fix RoleChangeLifecyle (init, close, life) 67/33167/8
Vaclav Demcak [Sat, 16 Jan 2016 22:17:32 +0000 (23:17 +0100)]
Bug 4957 Fix RoleChangeLifecyle (init, close, life)

 - OpenflowOnwerhipListener
   - add jdoc
   - remove own threadPool
   - add unregistration method
 - RoleManager
   - add check w/Exception for RoleChangeListener
   - add check w/Exception for RoleContext
 - RoleContext
   - add notes and deprecated markers

Change-Id: I0269d0568a67619a1329f596ec8a02007e331bb0
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 Fixing DeviceCtx lifeCycle 60/33160/9
Vaclav Demcak [Sat, 16 Jan 2016 22:17:32 +0000 (23:17 +0100)]
Bug 4957 Fixing DeviceCtx lifeCycle

 - validate unique DeviceCtx registration in DeviceManager
 - onDeviceContextLevelUp has to stop PacketInFiltering for slave too
 - simplification of teardown
 - invocation of closeHanders in reverse order

Change-Id: I6f4f172e9cb7497c91a03712a4c5d571e99b7f41
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 TxChainManager lifecycle startup cleaning 53/33153/8
Jozef Bacigal [Thu, 14 Jan 2016 21:34:12 +0000 (22:34 +0100)]
Bug 4957 TxChainManager lifecycle startup cleaning

 - when proceeding connectionContext to deviceManager
   we rely on fact that for given nodeId there must NOT
   exist deviceContext. If there is one then connection
   will be refused because previous session is not fully
   tore down
 - any exceptions thrown by proceeding connectionContext
   will result into disconnection
 - first thing to do for new deviceContext is to build up
   close mechanism

Change-Id: I860768c69849652d36ed9078016ffd9bf5f20c6a
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 RoleContext updated with initialization 40/33140/7
Michal Polkorab [Thu, 14 Jan 2016 05:19:51 +0000 (06:19 +0100)]
Bug 4957 RoleContext updated with initialization

 - introduced blocking waiting for device role
 - we probably need blocking call to EntityOwnershipService
   for Netty thread

Change-Id: I4a89f07b9594975dae77219af09a9909f4a39dcd
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 4957 No empty transaction for every connection fix 37/33137/4
Vaclav Demcak [Thu, 14 Jan 2016 05:09:10 +0000 (06:09 +0100)]
Bug 4957 No empty transaction for every connection fix

Every new connection populate transaction in posthandshake
process. So in closing time every (MASTER / SLAVES) instances
make concurent modification submit.
We would like to prevent to have some data for SLAVES in
postHandshake process in transactionManager.

* move initialization NodeInfo data from DeviceManagerImpl
to new util class : DeviceInitializationUtils

Change-Id: I2e70e53e7b21409fe61270690a502d8222ccaec7
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug-5159 : Statistics transaction failure exception don't include node details 41/33841/1
Anil Vishnoi [Mon, 1 Feb 2016 07:11:18 +0000 (23:11 -0800)]
Bug-5159 : Statistics transaction failure exception don't include node details

Change-Id: I6d8847e447a7add183cc1ab1298309ef724ff747
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoBUG-2625: update equinox 63/33663/1
Robert Varga [Wed, 27 Jan 2016 21:23:25 +0000 (22:23 +0100)]
BUG-2625: update equinox

This bumps dependency to equinox 3.9.1

Change-Id: If55f3853cfc8c21f9770dd7b4e69b7a61dd2a91a
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-5001: eliminate executor 60/33560/1
Robert Varga [Tue, 26 Jan 2016 15:44:33 +0000 (16:44 +0100)]
BUG-5001: eliminate executor

Keeping an executor around just to execute tasks synchronously simply
does not make sense. Refactor the code so that it executes in the
calling thread.

Change-Id: Icc5e16f4475b8b461a1a6e8baca102ba66c2565a
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-5001: clean up state transitions 21/33521/3
Robert Varga [Tue, 26 Jan 2016 10:04:35 +0000 (11:04 +0100)]
BUG-5001: clean up state transitions

This is preliminary code cleanup, reducing visibility and moving methods
around so their scope and assumptions can be analyzed.

Change-Id: I2699a19a897635447c54eb4beeac3cc70c64f1f5
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBump yangtools to 1.0.0-SNAPSHOT 68/33268/3
Thanh Ha [Thu, 21 Jan 2016 20:52:47 +0000 (15:52 -0500)]
Bump yangtools to 1.0.0-SNAPSHOT

Change-Id: I6fcaa3f30b53cd35f5d8f619d960ace449019a0a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoBump version to correct Boron version 51/33051/1
Thanh Ha [Wed, 20 Jan 2016 01:06:21 +0000 (20:06 -0500)]
Bump version to correct Boron version

Change-Id: I2efd271ae201d9c6e65b268f43b0bb85f2cf1853
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoMerge "BUG-4117: initial commit for new App Old-Notification-Supplier"
Abhijit Kumbhare [Tue, 19 Jan 2016 18:15:21 +0000 (18:15 +0000)]
Merge "BUG-4117: initial commit for new App Old-Notification-Supplier"

8 years agoBump versions by 0.1.0 for next dev cycle 20/32720/1
Thanh Ha [Fri, 15 Jan 2016 04:48:57 +0000 (23:48 -0500)]
Bump versions by 0.1.0 for next dev cycle

Change-Id: Id7c06ca3613b07098353a8237398b5535b7adaf2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>