openflowplugin.git
7 years agoUpdate comments and imports after DataChangeListener changes 64/45864/1
Andrej Leitner [Mon, 19 Sep 2016 16:40:43 +0000 (18:40 +0200)]
Update comments and imports after DataChangeListener changes

Change-Id: Ic8174cc2627deb12d48f6d41444f2e9b4dc60406
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
(cherry picked from commit 049ffd00ea4e24fe3fb3d4f6abeaf51390ddd316)

7 years agoFix connection closing before initialization 47/45747/2
Tomas Slusny [Tue, 13 Sep 2016 06:26:15 +0000 (08:26 +0200)]
Fix connection closing before initialization

Check if connection is fully initialized when closing
objects created during initialization phase to prevent
NPEs, what can cause incorrect close of connection
and later program unstability.

Also, increase timeout to propagate role to 10 seconds
in case of slower machine.

Resolves: bug 5271
See also: bug 6672

Change-Id: I0f009edf5fe3b382e2bfee64f72036ba599ccc5d
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoMerge "Bug 6665 Clean code" into stable/boron
Jozef Bacigal [Mon, 19 Sep 2016 12:35:55 +0000 (12:35 +0000)]
Merge "Bug 6665 Clean code" into stable/boron

7 years agoMerge "SONAR TD - StatisticsContextImpl, StatisticsManagerImpl" into stable/boron
Jozef Bacigal [Mon, 19 Sep 2016 12:35:38 +0000 (12:35 +0000)]
Merge "SONAR TD - StatisticsContextImpl, StatisticsManagerImpl" into stable/boron

7 years agoMerge "Update comments around flat-batch service" into stable/boron
Jozef Bacigal [Mon, 19 Sep 2016 12:34:41 +0000 (12:34 +0000)]
Merge "Update comments around flat-batch service" into stable/boron

7 years agoMerge "Update old links in code to deprecated DataChangeListener" into stable/boron
Jozef Bacigal [Mon, 19 Sep 2016 12:34:30 +0000 (12:34 +0000)]
Merge "Update old links in code to deprecated DataChangeListener" into stable/boron

7 years agoMerge "Convert OF samples to use DTCL instead of DCL" into stable/boron
Jozef Bacigal [Mon, 19 Sep 2016 12:34:17 +0000 (12:34 +0000)]
Merge "Convert OF samples to use DTCL instead of DCL" into stable/boron

7 years agoMerge "Convert openflowplugin-it to use DTCL instead of DCL" into stable/boron
Jozef Bacigal [Mon, 19 Sep 2016 12:34:08 +0000 (12:34 +0000)]
Merge "Convert openflowplugin-it to use DTCL instead of DCL" into stable/boron

7 years agoBug 6665 Clean code 46/45746/2
Jozef Bacigal [Thu, 8 Sep 2016 14:56:30 +0000 (16:56 +0200)]
Bug 6665 Clean code

Change-Id: Ia87a66c37f906a3351f3a982209f6778f7c8a311
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoMerge "Bug 6665 - Fix switches scalability" into stable/boron
Jozef Bacigal [Mon, 19 Sep 2016 08:26:14 +0000 (08:26 +0000)]
Merge "Bug 6665 - Fix switches scalability" into stable/boron

7 years agoSONAR TD - StatisticsContextImpl, StatisticsManagerImpl 58/45058/2
Tomas Slusny [Tue, 19 Jul 2016 12:51:28 +0000 (14:51 +0200)]
SONAR TD - StatisticsContextImpl, StatisticsManagerImpl

- Reduced cyclomatic complexity of
  StatisticsContextImpl.chooseStat
- Reduced cyclomatic complexity of
  StatisticsManagerImpl.pollStatistics
- Fixed naming of instance fields to match
  '^[a-z][a-zA-Z0-9]*$' expression

Change-Id: Ieb9d06cda534b01240ba2a952c927667ece5565b
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
(cherry picked from commit 5c853ea0a399706a0a475638f9c542945a993bd9)

7 years agoMerge "Bug 6542 FRS - prevent concurrent reconciliation node config add" into stable...
Jozef Bacigal [Mon, 19 Sep 2016 08:23:42 +0000 (08:23 +0000)]
Merge "Bug 6542 FRS - prevent concurrent reconciliation node config add" into stable/boron

7 years agoUpdate comments around flat-batch service 91/45791/1
Andrej Leitner [Tue, 13 Sep 2016 12:16:26 +0000 (14:16 +0200)]
Update comments around flat-batch service

Change-Id: I62f3ccbf38fd6f5aeb830e55c5f60923c6f8e8da
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoConvert openflowplugin-it to use DTCL instead of DCL 90/45790/1
Andrej Leitner [Wed, 14 Sep 2016 14:39:28 +0000 (16:39 +0200)]
Convert openflowplugin-it to use DTCL instead of DCL

Change-Id: I8a3f3b690bef5d29dcd9b51e243bd83ad5c501c6
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoConvert OF samples to use DTCL instead of DCL 89/45789/1
Andrej Leitner [Wed, 14 Sep 2016 14:25:50 +0000 (16:25 +0200)]
Convert OF samples to use DTCL instead of DCL

Change-Id: I53eebe8672996ed4351240a8c649e6c2815e8a0c
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoUpdate old links in code to deprecated DataChangeListener 88/45788/1
Andrej Leitner [Tue, 13 Sep 2016 12:57:50 +0000 (14:57 +0200)]
Update old links in code to deprecated DataChangeListener

 - update old links to DataChangeListener in comments, logs,
   names of variables since DataTreeChangeListener is already used
 - optimize imports and cleanup

Change-Id: I20f3359f5f7c4bbd3af844bc45506a5575c98285
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 6665 - Fix switches scalability 12/45712/1
Jozef Bacigal [Thu, 8 Sep 2016 09:25:30 +0000 (11:25 +0200)]
Bug 6665 - Fix switches scalability

- Stop gathering services if going to be slave or disconected
- Duplicate code removed in role context
- Lifecycle service LOG info cleaning
- Propagate close even if we are in close state
- NPE in statistics manager
- Test correction

Change-Id: Iaad1a8ed4abc3d39014713ca018d6357f8a95267
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoBumping versions by 0.0.1 for next dev cycle 87/45687/1
Anil Belur [Thu, 15 Sep 2016 23:17:50 +0000 (09:17 +1000)]
Bumping versions by 0.0.1 for next dev cycle

Change-Id: If04c10d7c9a489faec364428265f5a979dadcd70
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
7 years agoBUG-6595: Adding a retry for the issue when the 25/45125/5
Shuva Kar [Sat, 3 Sep 2016 13:40:02 +0000 (19:10 +0530)]
BUG-6595: Adding a retry for the issue when the
mastership of the switch hasnot been established while
the port status is processed

Change-Id: I5c49bb4a6c4f223150d44d200f32cd1108dac0f7
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoMerge "Bug 6176 - Decrease logging level in Sal-F/G/M-Service and use synchronized...
Thanh Ha [Tue, 6 Sep 2016 15:13:41 +0000 (15:13 +0000)]
Merge "Bug 6176 - Decrease logging level in Sal-F/G/M-Service and use synchronized BiMap" into stable/boron

7 years agoBug 6554 Fix rejecting connections 28/45228/1
Jozef Bacigal [Mon, 22 Aug 2016 11:42:50 +0000 (13:42 +0200)]
Bug 6554 Fix rejecting connections

- two way device context close removed
- txManager lambda improvements
- txManager logs improvements
- device context lazy initialization
- role context close improvement

Change-Id: I1a9f5890f267ada9a2978f9a92f792ab2411c1aa
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
(cherry picked from commit 5eb3934ab14beb9646f039e09f698dd1b118fb9b)

7 years agoRevert "BUG6595: Adding a retry for getting a transactionsafely" 04/45104/1
Anil Vishnoi [Fri, 2 Sep 2016 17:30:02 +0000 (17:30 +0000)]
Revert "BUG6595: Adding a retry for getting a transactionsafely"

This reverts commit b26b58ec652a1e7d8eb77f571b39604bf5e3cc86.

Change-Id: Ifcbbdbff26b3f1bbf7b9af336ea048403dcdde9a
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoBug 6176 - Decrease logging level in Sal-F/G/M-Service and use synchronized BiMap 93/44893/4
Andrej Leitner [Tue, 30 Aug 2016 15:09:28 +0000 (17:09 +0200)]
Bug 6176 - Decrease logging level in Sal-F/G/M-Service and use synchronized BiMap

 - decrease logging level to prevent overloading of netty
   thread with logging errors (seen in troughput test)
 - despite the fact that unsuccesful RPCresult brings errors
   from device there is no reason for throwing error since
   it is not error of karaf ot OFP itself (therefore debug)
 - change BiMap to synchronized because of ConcurrentModificationException
   seen in tests

Change-Id: Ia37212647a9c119ecd51d6685ea8fffb8ee94a39
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBUG6595: Adding a retry for getting a transactionsafely 49/45049/1
Shuva Kar [Fri, 2 Sep 2016 05:21:41 +0000 (10:51 +0530)]
BUG6595: Adding a retry for getting a transactionsafely

since the RCA for the issue pointed to the fact that the
mastership of the switch hadnot been established while
the port status is processed.

Change-Id: If243a051b8417b35160144213dd268f1c2bf4225
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoBUG-6595: Need more information in logging 24/45024/2
Shuva Kar [Thu, 1 Sep 2016 16:33:25 +0000 (22:03 +0530)]
BUG-6595: Need more information in logging

Enabling port information in the logging to
understand better which port status addition
is failing

Change-Id: I9eb116fa58e85ddb711ca423071ee1d78a088f19
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoBug 6542 FRS - prevent concurrent reconciliation node config add 14/44714/1
Andrej Leitner [Fri, 26 Aug 2016 11:18:03 +0000 (13:18 +0200)]
Bug 6542 FRS - prevent concurrent reconciliation node config add

 - unregister for reconciliation if there was an attempt but no
   config present for node
 - when node config is added essentially reconciliation is done
 - junit updates

Change-Id: Ic8f759e1638285ef7e82a35a0c9d330a2b0340e7
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 6524 FlowDescriptor instead of SwitchFlowId in FRS 75/44675/1
Andrej Leitner [Wed, 24 Aug 2016 14:10:27 +0000 (16:10 +0200)]
Bug 6524 FlowDescriptor instead of SwitchFlowId in FRS

Change-Id: Ibb02c310be27f02c7543e157d2f5e7ca7cc430a8
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 6513 Remove FD from registry immediately 58/44558/8
Andrej Leitner [Tue, 23 Aug 2016 13:15:14 +0000 (15:15 +0200)]
Bug 6513 Remove FD from registry immediately

 - remove FlowDescriptor from DeviceFlowRegistry immeadiately
   instead of marking it as to-be-removed
 - updated tests

Change-Id: I269a510fa67b6d04181039515aaefda90b53b827
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 6465 Controller goes into slave mode 84/44484/1
Jozef Bacigal [Wed, 17 Aug 2016 11:52:50 +0000 (13:52 +0200)]
Bug 6465 Controller goes into slave mode

- Changed lifecycle service in order to
create lazy initilization of context in cluster
- Removed clustering initialization per context
- Changed reconnect strategy if not in disconnecting state
- Some performance improvements
- Removed OFManager general API

Change-Id: I37e8f99a0590633a3e5c179b092c6b1c65e9cb1d
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoBUG-5464,5954: making table features configurable for the Li plugin. 83/44483/1
Shuva Kar [Sat, 30 Jul 2016 11:28:10 +0000 (16:58 +0530)]
BUG-5464,5954: making table features configurable for the Li plugin.
DEFAULT will be OFF, can be TURNED ON.

Change-Id: I22a7ad0cb74515d7c203f851a62be0b4a896ea1d
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoBug 5596 Singleton API test 82/44482/1
Jozef Bacigal [Tue, 16 Aug 2016 12:01:00 +0000 (14:01 +0200)]
Bug 5596 Singleton API test

- added missing test for lifecycle service
- added missing test for role context

Change-Id: I306a668fa7748c3b1ee658f5225ba64bea6412e9
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoBug 5596 - restart devices management improvement 80/44480/1
Jozef Bacigal [Thu, 11 Aug 2016 10:54:43 +0000 (12:54 +0200)]
Bug 5596 - restart devices management improvement

Change-Id: I61b384062e780eec342d7b7eb0ffa05bc0f6c7de
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoBug 6357 - FRM integration with singleton 79/44479/1
Andrej Leitner [Fri, 5 Aug 2016 11:03:20 +0000 (13:03 +0200)]
Bug 6357 - FRM integration with singleton

 - using ClusterSingletonServiceProvider instead if EOS
 - junit tests update

Change-Id: I07033627ba08e64f58fff117be57dcfe0f030d52
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 5596 Initial commit failed 78/44478/1
Jozef Bacigal [Wed, 10 Aug 2016 08:25:08 +0000 (10:25 +0200)]
Bug 5596 Initial commit failed

- added closing connection after unsuccessful initial submit
- added enum with possible connection state after handshake

Change-Id: I62e06f8189dc593bc40267c96d253fdfe53b3a20
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoDeviceFlowRegistry - prevent NPE 77/44477/1
Tomas Slusny [Thu, 4 Aug 2016 11:33:55 +0000 (13:33 +0200)]
DeviceFlowRegistry - prevent NPE

- Added more nonNull filters to DeviceFlowRegistry.fillFromDatastore
- Added nonNull filters when printing debug info of added flows
  in LifecycleServiceImpl
- Added more JUnit tests to test fail cases of DeviceFlowRegistry.fill
- More detailed log output for DeviceFlowRegistry

Change-Id: Iec965c8a3cee8d2c0c3276a00a4494f786344e4e
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5596 Changes when closing device 76/44476/1
Jozef Bacigal [Wed, 27 Jul 2016 07:25:48 +0000 (09:25 +0200)]
Bug 5596 Changes when closing device

- speed up device closing process
- prevent to wait for closing device context
- log improvements
- Added nonNull filters when filling DeviceFlowRegistry
- Updated unit tests to test for above case

Change-Id: Ib6b22b1622f2eb6f97101719c3f746c129d05499
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoBug 5596 Cleaning lifecycle conductor 75/44475/1
Jozef Bacigal [Tue, 26 Jul 2016 13:18:41 +0000 (15:18 +0200)]
Bug 5596 Cleaning lifecycle conductor

- removed lifecycle conductor

Change-Id: I7143726358c7d2145e2109e269e8d50e2c865a1f
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoBug 5596 Cleaning part 4 74/44474/1
Jozef Bacigal [Mon, 25 Jul 2016 14:46:25 +0000 (16:46 +0200)]
Bug 5596 Cleaning part 4

Change-Id: I967cab5cb220bfbd91ff32552c0d9e8e157ab0fd
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoBug 5596 Cleaning part 3 73/44473/1
Jozef Bacigal [Mon, 25 Jul 2016 13:41:35 +0000 (15:41 +0200)]
Bug 5596 Cleaning part 3

- Role Context
- Role Manager
- Rpc Context
- Rpc Manager

Change-Id: If9a144950a86abfef51fb3cb70c2a22e52e7fa37
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoBug 5596 Cleaning part 2 72/44472/1
Jozef Bacigal [Mon, 25 Jul 2016 12:44:08 +0000 (14:44 +0200)]
Bug 5596 Cleaning part 2

- Statistics Context
- Statistics Manager

Change-Id: I29fc3c358207039184811e09d5c98368656a9ee0
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoBug 5596 Cleaning part 1 71/44471/1
Jozef Bacigal [Mon, 25 Jul 2016 12:00:28 +0000 (14:00 +0200)]
Bug 5596 Cleaning part 1

- Device Context
- Device Manager
- Device State

Change-Id: I85a1269f1acc17a3e09cbe1d92fb993a9be5a4da
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoBug 5596 Added cluster provider 70/44470/1
Jozef Bacigal [Tue, 19 Jul 2016 13:45:12 +0000 (15:45 +0200)]
Bug 5596 Added cluster provider

Change-Id: I1954b28bfaaf026aebb171fb5c51ef26a6df585c
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoBug 5596 Change of start up services 69/44469/1
Jozef Bacigal [Tue, 19 Jul 2016 07:35:06 +0000 (09:35 +0200)]
Bug 5596 Change of start up services

Change-Id: I6bae36251f4d01e6d851f8f09a976e790665ef20
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoBug 5596 Created lifecycle service 05/43905/3
Jozef Bacigal [Mon, 18 Jul 2016 13:46:41 +0000 (15:46 +0200)]
Bug 5596 Created lifecycle service

- created general API for cluster services
- changed OFPContext and OFPManager API

Change-Id: I6506a1dcc328e98aca21446d46b8dd09445a4b61
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoBug 6133 - and more improvements 00/43900/3
Jozef Bacigal [Fri, 22 Jul 2016 07:54:24 +0000 (09:54 +0200)]
Bug 6133 - and more improvements

- LOGs improvements
- RoleContext closing speed up
- Race condition for protocol v 1.0
- OVS remains in disconected state bug 6133

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

7 years agoBUG-6458: 81/44281/2
Shuva Kar [Thu, 18 Aug 2016 11:00:27 +0000 (16:30 +0530)]
BUG-6458:

The issue occurred since during update the older
flowregistry key wasnot getting removed when the
newer one was getting stored. This was because the
match/priority/cookie all forms part of the flow-registry
key.

Change-Id: Ibed34e79b6310723f7c8078bf54b8a2b4f9ab2b2
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoMerge "Bug 6366 - of-switch-config-pusher - DTCL instead of DTL" into stable/boron
Jozef Bacigal [Thu, 18 Aug 2016 07:43:12 +0000 (07:43 +0000)]
Merge "Bug 6366 - of-switch-config-pusher - DTCL instead of DTL" into stable/boron

7 years agoMerge "Sonar - technical debt of FRS app" into stable/boron
Jozef Bacigal [Thu, 18 Aug 2016 07:42:54 +0000 (07:42 +0000)]
Merge "Sonar - technical debt of FRS app" into stable/boron

7 years agoAdding learn action - Bug 6445 84/44084/1
Slava [Thu, 28 Jul 2016 12:27:28 +0000 (15:27 +0300)]
Adding learn action - Bug 6445

Change-Id: Iab58e54230003dc8a5ea48bbc7a4d173c305cf8f
Signed-off-by: Slava <slava.radune@hpe.com>
(cherry picked from commit 122bf80)

7 years agoMerge "Bug 6374 topology-manager - DTCL instead of DTL" into stable/boron
Shuva Jyoti Kar [Tue, 16 Aug 2016 11:32:27 +0000 (11:32 +0000)]
Merge "Bug 6374 topology-manager - DTCL instead of DTL" into stable/boron

7 years agoMerge "SONAR TD - FlatBatchUtil, DeviceInitializationUtils" into stable/boron
Shuva Jyoti Kar [Tue, 16 Aug 2016 11:32:01 +0000 (11:32 +0000)]
Merge "SONAR TD - FlatBatchUtil, DeviceInitializationUtils" into stable/boron

7 years agoMerge "SONAR TD - Remove unused fields, fix naming" into stable/boron
Shuva Jyoti Kar [Tue, 16 Aug 2016 11:31:51 +0000 (11:31 +0000)]
Merge "SONAR TD - Remove unused fields, fix naming" into stable/boron

7 years agoMerge "SONAR TD - Group actions redundancy" into stable/boron
Jozef Bacigal [Tue, 16 Aug 2016 11:16:57 +0000 (11:16 +0000)]
Merge "SONAR TD - Group actions redundancy" into stable/boron

7 years agoMerge "SONAR TD - Sal*ServiceImpl" into stable/boron
Jozef Bacigal [Tue, 16 Aug 2016 11:16:50 +0000 (11:16 +0000)]
Merge "SONAR TD - Sal*ServiceImpl" into stable/boron

7 years agoMerge "SONAR TD - AbstractService" into stable/boron
Jozef Bacigal [Tue, 16 Aug 2016 11:16:44 +0000 (11:16 +0000)]
Merge "SONAR TD - AbstractService" into stable/boron

7 years agoMerge "SONAR TD - *ToNotificationTransformer private constr." into stable/boron
Jozef Bacigal [Tue, 16 Aug 2016 11:16:37 +0000 (11:16 +0000)]
Merge "SONAR TD - *ToNotificationTransformer private constr." into stable/boron

7 years agoMerge "Technical debt MeterUtil, GroupUtil, FlowUtil" into stable/boron
Jozef Bacigal [Tue, 16 Aug 2016 11:16:30 +0000 (11:16 +0000)]
Merge "Technical debt MeterUtil, GroupUtil, FlowUtil" into stable/boron

7 years agoMerge "Drop Felix Gogo" into stable/boron
Jozef Bacigal [Tue, 16 Aug 2016 11:16:19 +0000 (11:16 +0000)]
Merge "Drop Felix Gogo" into stable/boron

7 years agoMerge "Bug 6372 table-miss-enforcer - DTCL instead of DTL" into stable/boron
Shuva Jyoti Kar [Tue, 16 Aug 2016 07:04:07 +0000 (07:04 +0000)]
Merge "Bug 6372 table-miss-enforcer - DTCL instead of DTL" into stable/boron

7 years agoRemoved duplicate declaration in pom.xml. 28/44028/1
Hideyuki Tai [Thu, 21 Jul 2016 13:54:42 +0000 (06:54 -0700)]
Removed duplicate declaration in pom.xml.

The pom.xml in the model directory had duplicate declaration of
ietf-yang-types-20130715.

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

7 years agoMerge "Bug 6278: Switch to use odlparent's karaf-parent" into stable/boron
Shuva Jyoti Kar [Tue, 16 Aug 2016 02:06:39 +0000 (02:06 +0000)]
Merge "Bug 6278: Switch to use odlparent's karaf-parent" into stable/boron

7 years agoSonar - technical debt of FRS app 65/43965/3
Andrej Leitner [Mon, 8 Aug 2016 09:39:02 +0000 (11:39 +0200)]
Sonar - technical debt of FRS app

Change-Id: I2951c3e85f3599aec951844289de22e25b652a36
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoSONAR TD - Remove unused fields, fix naming 92/43992/1
Tomas Slusny [Tue, 2 Aug 2016 11:11:11 +0000 (13:11 +0200)]
SONAR TD - Remove unused fields, fix naming

- Added private constructor to EventsTimeCounter
- Removed unused fields
- Fixed naming of constants

Change-Id: I4321e2b75af71abb3473eef5e5cc6b92e36c76c4
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoSONAR TD - FlatBatchUtil, DeviceInitializationUtils 87/43987/1
Tomas Slusny [Tue, 2 Aug 2016 10:58:01 +0000 (12:58 +0200)]
SONAR TD - FlatBatchUtil, DeviceInitializationUtils

- Removed unused fields
- Reduced cyclomatic complexity of code
- Added private constructor to DeviceInitializationUtils

Change-Id: I280c9534ad87a6d6826e2a209d07edb1ff25c624
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
(cherry picked from commit 81ec040affdf77f72ae1060436e7010386f410ed)

7 years agoBug 6278: Switch to use odlparent's karaf-parent 86/43986/1
Ryan Goulding [Thu, 28 Jul 2016 16:01:29 +0000 (12:01 -0400)]
Bug 6278: Switch to use odlparent's karaf-parent

Change-Id: If65dbe7d41cee7f14f56479634627d107df50d6f
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoSONAR TD - Group actions redundancy 81/43981/1
Tomas Slusny [Mon, 15 Aug 2016 11:38:13 +0000 (13:38 +0200)]
SONAR TD - Group actions redundancy

- Moved logic that converts list of action types to group actions bitmap
  to single method in GroupUtil

Change-Id: Ie8fc71945c4a5412c5adf88cb66d26f2d9a9a229
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
(cherry picked from commit 44da2880eee5acbc7da23f82c4807b0337efed66)

7 years agoSONAR TD - Sal*ServiceImpl 80/43980/1
Tomas Slusny [Wed, 3 Aug 2016 11:51:46 +0000 (13:51 +0200)]
SONAR TD - Sal*ServiceImpl

- Changes some anonymous classes to named inner classes
- Shortened big lambda in SalFlatBatchService

Change-Id: I04d9f73ba92928144b2de1d2a86b8c4feac0ad22
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
(cherry picked from commit 5c2b5676715352cc935daa146c660e6b79c7bd03)

7 years agoSONAR TD - AbstractService 79/43979/1
Tomas Slusny [Mon, 18 Jul 2016 09:50:11 +0000 (11:50 +0200)]
SONAR TD - AbstractService

- Remove WAIT_TIME, PRIMARY_CONNECTION unused fields
- Changed buildRequest to throw ServiceException
  instead of generic Exception

Change-Id: If5620887623c2119065a4120e91189120441bbda
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
(cherry picked from commit c53071b939c82b032d8ec6468c531f4abd79fa4c)

7 years agoSONAR TD - *ToNotificationTransformer private constr. 78/43978/1
Tomas Slusny [Wed, 20 Jul 2016 12:27:55 +0000 (14:27 +0200)]
SONAR TD - *ToNotificationTransformer private constr.

- Added private constructors to ToNotificationTransformer classes

Change-Id: If64db7a5922ffdc613685c56d077ada7d1c38c7f
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
(cherry picked from commit 70a6663897b6d25e7748a148b74f6d12bb51a0b3)

7 years agoTechnical debt MeterUtil, GroupUtil, FlowUtil 77/43977/1
miroslav.macko [Thu, 21 Jul 2016 09:44:08 +0000 (11:44 +0200)]
Technical debt MeterUtil, GroupUtil, FlowUtil

- Reduce anonymous classes number of lines
- Remove unused "LOG" field

Change-Id: I8d7fe786edc7f82d35abd9a6bb097e52118d6827
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
(cherry picked from commit 340e46e9d770c6aa21ac2dc3dd6d2ed1639a1656)

7 years agoDrop Felix Gogo 76/43976/1
Stephen Kitt [Wed, 29 Jun 2016 16:17:54 +0000 (18:17 +0200)]
Drop Felix Gogo

This is obsolete and appears to be unused.

Change-Id: I755c976567bde2747ec332b0834cc58fdc2ee22d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit 96eb290ba1b9f05606f83541453a5d7d07898158)

7 years agoRemoved unused logger and fixed javadoc links 66/43966/2
Andrej Leitner [Wed, 10 Aug 2016 07:43:24 +0000 (09:43 +0200)]
Removed unused logger and fixed javadoc links

Change-Id: I595c97b39b6093d0b96f1f00a2bbc08274c8fda5
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 6380 lldp-speaker - DTCL instead of DTL 63/43963/1
Andrej Leitner [Wed, 10 Aug 2016 08:43:26 +0000 (10:43 +0200)]
Bug 6380 lldp-speaker - DTCL instead of DTL

 - lldp-speaker app converted to use DataTreeChangeListener
   instead of deprecated DataChangeListener
 - updated tests

Change-Id: I8d424e8bc6c93e2addc25a9149177ca6f7b90a27
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 6366 - of-switch-config-pusher - DTCL instead of DTL 56/43956/2
Andrej Leitner [Tue, 9 Aug 2016 12:19:17 +0000 (14:19 +0200)]
Bug 6366 - of-switch-config-pusher - DTCL instead of DTL

 - of-switch-config-pusher app converted to use DataTreeChangeListener
   instead of deprecated DataChangeListener
 - updated tests

Change-Id: Ic0f125ac87b52f67febbb16924227152a2bf7b25
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 6374 topology-manager - DTCL instead of DTL 42/43942/2
Andrej Leitner [Tue, 9 Aug 2016 16:15:02 +0000 (18:15 +0200)]
Bug 6374 topology-manager - DTCL instead of DTL

 - topology-manager app converted to use DataTreeChangeListener
   instead of deprecated DataChangeListener
 - updated tests

Change-Id: Ibc242d4dbd4238153813762bd8ed56510ccf2706
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 6372 table-miss-enforcer - DTCL instead of DTL 48/43948/1
Andrej Leitner [Tue, 9 Aug 2016 12:41:12 +0000 (14:41 +0200)]
Bug 6372 table-miss-enforcer - DTCL instead of DTL

 - table-miss-enforcer app converted to use DataTreeChangeListener
   instead of deprecated DataChangeListener
 - updated tests

Change-Id: I74c2c6755c1d6604a25bfee8d58d79787bef1c48
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug5822:Ensuring that the flowId, is unique for a flow 40/43740/1
Shuva Kar [Sun, 31 Jul 2016 14:07:24 +0000 (19:37 +0530)]
Bug5822:Ensuring that the flowId, is unique for a flow
in a table

* also optimising map/list accresses
*reducing addFlow rpc latency

Change-Id: Ida607fc7134c0488c7c3bcc82e38966be2325e71
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
(cherry picked from commit 7cd1a52c3c6b025e7797a92b8bf25b7b97d9aec5)

7 years agoMerge "Fix Ipv6 format compression" into stable/boron
Jozef Bacigal [Thu, 11 Aug 2016 15:13:11 +0000 (15:13 +0000)]
Merge "Fix Ipv6 format compression" into stable/boron

7 years agoFix Ipv6 format compression 43/43643/3
Andrej Leitner [Wed, 10 Aug 2016 15:07:15 +0000 (17:07 +0200)]
Fix Ipv6 format compression

 - removed regex and replaced with existing methods
 - altered method that compresses Ipv6Address to take it
   as argument and not to accept any string
 - used Ipv6Address instead of String
 - updated IpConversionUtilTest
 - fixed yang descriptions

Change-Id: I303d3f3c68bf463de9f017e0e65ec36adaf4e489
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoSupport new matches and actions in ovs nsh patch 97/43697/1
Yi Yang [Mon, 18 Apr 2016 01:47:05 +0000 (09:47 +0800)]
Support new matches and actions in ovs nsh patch

New matches: encap_eth_type, encap_eth_src, encap_eth_dst, nsh_np, nsh_mdtype, tun_gpe_np
New actions: push_nsh, pop_nsh
Rebase and change topic back to 37937
Fixed some Unit test failures

Change-Id: I20dbc6e1c04de34d3221b6cbfa652aafe75e5510
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
7 years agoUpdate .gitreview for stable/boron 83/43383/1
Thanh Ha [Mon, 8 Aug 2016 21:40:33 +0000 (17:40 -0400)]
Update .gitreview for stable/boron

Change-Id: I6caf2ebe1e13b331fc17b6157ed0e9f8ef7d4f32
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
7 years agoMerge "Bug 5540 - ActionConvertor ordering"
Shuva Jyoti Kar [Mon, 8 Aug 2016 18:48:02 +0000 (18:48 +0000)]
Merge "Bug 5540 - ActionConvertor ordering"

7 years agoMerge "BUG-6354: Altering the log-level to trace for triggering the loop whilw retrie...
Shuva Jyoti Kar [Mon, 8 Aug 2016 13:24:51 +0000 (13:24 +0000)]
Merge "BUG-6354: Altering the log-level to trace for triggering the loop whilw retrieving the flowId."

7 years agoBug 5540 - ActionConvertor ordering 00/43300/1
Tomas Slusny [Mon, 8 Aug 2016 07:32:28 +0000 (09:32 +0200)]
Bug 5540 - ActionConvertor ordering

- Fixed ordering of actions in ActionConvertor

Change-Id: I84c7d8bebb3b6ded2f52d97ab45232daa71a75e7
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoMerge "Mask Support for TCP and UDP ports in nicira extension "
Anil Vishnoi [Sun, 7 Aug 2016 19:24:54 +0000 (19:24 +0000)]
Merge "Mask Support for TCP and UDP ports in nicira extension "

7 years agoBUG-6354: Altering the log-level to trace for triggering the 77/43277/2
Shuva Kar [Sun, 7 Aug 2016 09:30:29 +0000 (15:00 +0530)]
BUG-6354: Altering the log-level to trace for triggering the
loop whilw retrieving the flowId.

Change-Id: I9664bd98fd20d5e57dbd55aff4c9676306ae2dd8
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoBug 6259 - ArbitraryBitMask compare 33/43233/2
Tomas Slusny [Fri, 5 Aug 2016 12:56:30 +0000 (14:56 +0200)]
Bug 6259 - ArbitraryBitMask compare

- Updated MatchComparatorHelper to compare properly
  address-no-mask + arbitrary-bitmask fields with
  ipv4/6-source

Change-Id: Id58a715769c16cc443547055ee770b5306f210ae
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoMerge "Device*Registry quickfix - add failed"
Shuva Jyoti Kar [Fri, 5 Aug 2016 10:38:18 +0000 (10:38 +0000)]
Merge "Device*Registry quickfix - add failed"

7 years agoMerge "Sonar issues"
Jozef Bacigal [Fri, 5 Aug 2016 08:52:53 +0000 (08:52 +0000)]
Merge "Sonar issues"

7 years agoDevice*Registry quickfix - add failed 31/43131/3
Andrej Leitner [Thu, 4 Aug 2016 15:47:49 +0000 (17:47 +0200)]
Device*Registry quickfix - add failed

 - remove *Descriptor from cache if add* request failed
 [*-Flow/Group/Meter]

Change-Id: I7b88db179c54de9670e2f7ecb4903074aa4dc6a9
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
7 years agoBug 5540 - Remove ConvertorManager singleton 56/41756/13
Tomas Slusny [Tue, 12 Jul 2016 11:59:50 +0000 (13:59 +0200)]
Bug 5540 - Remove ConvertorManager singleton

- Removed singleton from ConvertorManager
- Added ConvertorManagerFactory
- Now ConvertorManager lookup is also based on Openflow version
- New test for ConvertorManager

Change-Id: Ib23fa304143d6e2fb7f09781acc1fd0c6a3be5e8
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5540 - Multiple convert types for one convertor 07/41707/8
Tomas Slusny [Tue, 12 Jul 2016 11:27:11 +0000 (13:27 +0200)]
Bug 5540 - Multiple convert types for one convertor

- Now convertor can specify multiple source types to convert
- Changed previous method of getting multiple source types from
  single source type to throw warning when it is used

Change-Id: If1e4cc9087f71dd5a0a38c10b053f7239de78998
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5540 - ConvertorManager DataContainer source, one Convertor interface 32/41632/9
Tomas Slusny [Mon, 11 Jul 2016 07:26:38 +0000 (09:26 +0200)]
Bug 5540 - ConvertorManager DataContainer source, one Convertor interface

- Changed source type for Convertor interface and ConvertorManager to must extend
  YANG DataContainer
- Started using getImplementedInterface() to get source type

Change-Id: Ic229c278516074f42218b45a5040d3601b386bd7
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5540 - ConvertorProcessor DataContainer source, optimization 47/41547/9
Tomas Slusny [Fri, 8 Jul 2016 09:38:47 +0000 (11:38 +0200)]
Bug 5540 - ConvertorProcessor DataContainer source, optimization

- Changed source type for ConvertorProcessor to must extend
  YANG DataContainer
- Removed double lookups
- Changed map with conversions to concurrent hash map
- Stopped using reflection for getting source type,
  instead use getImplementedInterface() from DataContainer

Change-Id: I82e4ded70526a9219125340e5dbf3b6f05d77296
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5540 - ConvertorManager optimization, concurrency 46/41546/9
Tomas Slusny [Fri, 8 Jul 2016 07:03:02 +0000 (09:03 +0200)]
Bug 5540 - ConvertorManager optimization, concurrency

- Split ConvertorManager functionality to interfaces ConvertorRegistrator and
  ConvertorExecutor
- Changed convertor maps to concurrent hash maps
- registerConvertor now returns old convertor if already registered instead of boolean
- Better type extraction from collections
- Removed duplicate map lookups
- Better log messages

Change-Id: I38c6bc119861fef844535c50740c65fa7ae43192
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5540 - FlowConvertor, FlowStatsResponseConvertor, FlowInstructionResponseConvertor 94/40994/21
Tomas Slusny [Wed, 29 Jun 2016 07:08:38 +0000 (09:08 +0200)]
Bug 5540 - FlowConvertor, FlowStatsResponseConvertor, FlowInstructionResponseConvertor

- Reworked FlowConvertor, FlowStatsResponseConvertor to use new ConvertorManager design
- Added FlowInstructionResponseConvertor (moved some loic from FlowStatsResponseConvertor)
- Updated tests and usages accordingly

Change-Id: Iff2dc752aab73473adb955394cf852d7524fddd9
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5540 - PacketOutConvertor 86/40986/19
Tomas Slusny [Wed, 29 Jun 2016 06:54:36 +0000 (08:54 +0200)]
Bug 5540 - PacketOutConvertor

- Reworked PacketOutConvertor to use new ConvertorManager design
- Updated tests and usage of PacketOutConvertor accordingly

Change-Id: I9df612a7d9c3b9604c8119f86d2266723066e68a
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5540 - GroupConvertor, GroupStatsConvertor, GroupDescStatsConvertor 44/40944/19
Tomas Slusny [Tue, 28 Jun 2016 13:59:50 +0000 (15:59 +0200)]
Bug 5540 - GroupConvertor, GroupStatsConvertor, GroupDescStatsConvertor

- Reworked GroupConvertor and GroupStatsConvertor to new ConvertorManager design
- Added GroupDescStatsConvertor (moved some logic from GroupStatsConvertor)
- Updated (and fixed) tests, and updated usages accordingly

Change-Id: Iabae7191ceeefeb208487ab5cf0280e8f8186c3e
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5540 - ActionConvertor, ActionResponseConvertor 37/40937/19
Tomas Slusny [Tue, 28 Jun 2016 12:55:02 +0000 (14:55 +0200)]
Bug 5540 - ActionConvertor, ActionResponseConvertor

- Reworked ActionConvertor to use new ConvertorManager desing
- Added new ActionResponseConvertor (moved a bit of logic from ActionConvertor)
- Updated tests and usages accordingly

Change-Id: I76a9b345942272dc555e4d75766968931ee4ecdb
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
7 years agoBug 5540 - PortConvertor, MatchConvertor 77/40877/23
Tomas Slusny [Mon, 27 Jun 2016 14:10:40 +0000 (16:10 +0200)]
Bug 5540 - PortConvertor, MatchConvertor

- Reworked MatchConvertorImpl and MatchConvertorV10Impl (extracted some logic from it)
- Added MatchResponseConvertor and MatchV10ResponseConvertor
- Updated and added new tests, and updated usage of match convertors
- Reworked PortConvertor to use new ConvertorManager design
- Updated tests and usage of PortConvertor accordingly

Change-Id: If53d7c521bf4a718a466ec7cd11d28e57d8cf4bd
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>