openflowplugin.git
7 years agoMerge "DevManager functionality add"
michal rehak [Tue, 21 Jun 2016 09:01:40 +0000 (09:01 +0000)]
Merge "DevManager functionality add"

7 years agoMerge "DevCtx to DevMng"
michal rehak [Tue, 21 Jun 2016 09:01:35 +0000 (09:01 +0000)]
Merge "DevCtx to DevMng"

7 years agoMerge "Dependency devCtx removed from StatCtx"
michal rehak [Tue, 21 Jun 2016 09:01:30 +0000 (09:01 +0000)]
Merge "Dependency devCtx removed from StatCtx"

7 years agoMerge "DeviceRegistry facade"
michal rehak [Tue, 21 Jun 2016 09:01:23 +0000 (09:01 +0000)]
Merge "DeviceRegistry facade"

7 years agoMerge "RPCContext dependency from DevCtx removed"
michal rehak [Tue, 21 Jun 2016 09:01:14 +0000 (09:01 +0000)]
Merge "RPCContext dependency from DevCtx removed"

7 years agoMerge "RPCEnabled flag moved from DeviceCtx"
michal rehak [Tue, 21 Jun 2016 09:01:00 +0000 (09:01 +0000)]
Merge "RPCEnabled flag moved from DeviceCtx"

7 years agoMerge "Conductor RPC registration moved"
michal rehak [Tue, 21 Jun 2016 09:00:56 +0000 (09:00 +0000)]
Merge "Conductor RPC registration moved"

7 years agoMerge "Conductor to OFPManager dependency"
michal rehak [Tue, 21 Jun 2016 09:00:52 +0000 (09:00 +0000)]
Merge "Conductor to OFPManager dependency"

7 years agoMerge "Generify Managers"
michal rehak [Tue, 21 Jun 2016 09:00:48 +0000 (09:00 +0000)]
Merge "Generify Managers"

7 years agoMerge "Generic API for contexts"
michal rehak [Tue, 21 Jun 2016 09:00:43 +0000 (09:00 +0000)]
Merge "Generic API for contexts"

7 years agoMerge "Statistics gathering"
michal rehak [Tue, 21 Jun 2016 09:00:39 +0000 (09:00 +0000)]
Merge "Statistics gathering"

7 years agoMerge "LifeCycle conductor changes"
michal rehak [Tue, 21 Jun 2016 09:00:35 +0000 (09:00 +0000)]
Merge "LifeCycle conductor changes"

7 years agoMerge "RoleManager changes"
michal rehak [Tue, 21 Jun 2016 09:00:31 +0000 (09:00 +0000)]
Merge "RoleManager changes"

7 years agoMerge "DeviceState changes"
michal rehak [Tue, 21 Jun 2016 09:00:25 +0000 (09:00 +0000)]
Merge "DeviceState changes"

7 years agoMerge "deviceContext changes"
michal rehak [Tue, 21 Jun 2016 09:00:21 +0000 (09:00 +0000)]
Merge "deviceContext changes"

7 years agoMerge "Statistics context and manager changes"
michal rehak [Tue, 21 Jun 2016 09:00:16 +0000 (09:00 +0000)]
Merge "Statistics context and manager changes"

7 years agoMerge "rpcContext small changes"
michal rehak [Tue, 21 Jun 2016 09:00:12 +0000 (09:00 +0000)]
Merge "rpcContext small changes"

7 years agoMerge "roleContext NodeId change"
michal rehak [Tue, 21 Jun 2016 09:00:07 +0000 (09:00 +0000)]
Merge "roleContext NodeId change"

7 years agoMerge "Statistics manager context map holder change"
michal rehak [Tue, 21 Jun 2016 09:00:02 +0000 (09:00 +0000)]
Merge "Statistics manager context map holder change"

7 years agoMerge "DeviceManager map key change"
michal rehak [Tue, 21 Jun 2016 08:59:57 +0000 (08:59 +0000)]
Merge "DeviceManager map key change"

7 years agoMerge "RPC Manager Context Map holder change"
michal rehak [Tue, 21 Jun 2016 08:59:53 +0000 (08:59 +0000)]
Merge "RPC Manager Context Map holder change"

7 years agoMerge "Context close handler changed"
michal rehak [Tue, 21 Jun 2016 08:59:48 +0000 (08:59 +0000)]
Merge "Context close handler changed"

7 years agoMerge "Connection context create device info"
michal rehak [Tue, 21 Jun 2016 08:59:43 +0000 (08:59 +0000)]
Merge "Connection context create device info"

7 years agoMerge "Device Info"
michal rehak [Tue, 21 Jun 2016 08:59:37 +0000 (08:59 +0000)]
Merge "Device Info"

7 years agoMerge "Device Info API"
michal rehak [Tue, 21 Jun 2016 08:59:33 +0000 (08:59 +0000)]
Merge "Device Info API"

7 years agoMerge "BUG-6064: switching updates off as on a node updated we need not trigger recon...
Anil Vishnoi [Sat, 18 Jun 2016 07:35:21 +0000 (07:35 +0000)]
Merge "BUG-6064: switching updates off as on a node updated we need not trigger reconciliation"

7 years agoRemove references to statistics-manager-config 85/40485/2
Vratko Polak [Fri, 17 Jun 2016 11:35:33 +0000 (13:35 +0200)]
Remove references to statistics-manager-config

as it was removed in https://git.opendaylight.org/gerrit/#/c/39133
so features cannot depend on that.

Also, forwardingrules-manager-config is removed from artifacts.

Change-Id: I6d0d9b8e03cde16361230cbdec8a3e18a55530d2
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
7 years agoDevManager functionality add 59/40159/7
Jozef Bacigal [Fri, 10 Jun 2016 11:38:22 +0000 (13:38 +0200)]
DevManager functionality add

- Moved mothods from context to manager

Change-Id: Ie8abe3ec95756ff633b4b1d9a7242c251fbd93c3
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoDevCtx to DevMng 56/40156/7
Jozef Bacigal [Fri, 10 Jun 2016 11:09:01 +0000 (13:09 +0200)]
DevCtx to DevMng

onClusterRoleChange moved to manager

Change-Id: I520e81adff9382127c29cd9b1902f402eb0bb4ac
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoDependency devCtx removed from StatCtx 54/40154/7
Jozef Bacigal [Fri, 10 Jun 2016 10:26:33 +0000 (12:26 +0200)]
Dependency devCtx removed from StatCtx

Change-Id: Id79e3ad8e3f69a7562a7b773dc9d06890ed2bc3f
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoDeviceRegistry facade 42/40142/7
Jozef Bacigal [Fri, 10 Jun 2016 08:10:57 +0000 (10:10 +0200)]
DeviceRegistry facade

Change-Id: Ie5f3238896b09e719eafdd307048d061ea680abc
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoRPCContext dependency from DevCtx removed 13/40113/7
Jozef Bacigal [Thu, 9 Jun 2016 14:30:36 +0000 (16:30 +0200)]
RPCContext dependency from DevCtx removed

Change-Id: Ic7cc6f9cf4e15f6999e19c7f1ef8fc77e404442b
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoRPCEnabled flag moved from DeviceCtx 12/40112/7
Jozef Bacigal [Thu, 9 Jun 2016 14:25:37 +0000 (16:25 +0200)]
RPCEnabled flag moved from DeviceCtx

Change-Id: I00003764f524a550858d85226da7cacd95ded5f1
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoConductor RPC registration moved 07/40107/8
Jozef Bacigal [Thu, 9 Jun 2016 13:11:46 +0000 (15:11 +0200)]
Conductor RPC registration moved

Change-Id: I5448991aa0f56fa8f4f802df0265ac457edfe75b
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoConductor to OFPManager dependency 03/40103/7
Jozef Bacigal [Thu, 9 Jun 2016 10:53:18 +0000 (12:53 +0200)]
Conductor to OFPManager dependency

Change-Id: I5ea32dcd1b1ac2ed583f98f103d7f20b70d2bf6f
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoGenerify Managers 02/40102/7
Jozef Bacigal [Thu, 9 Jun 2016 10:39:21 +0000 (12:39 +0200)]
Generify Managers

-gainContex for each manager

Change-Id: Ifa4a60e8a529bbf194a82a0d7622faa9bbb427ec
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoGeneric API for contexts 01/40101/7
Jozef Bacigal [Thu, 9 Jun 2016 10:34:33 +0000 (12:34 +0200)]
Generic API for contexts

Change-Id: I1f919b99007dbc310830a43941162947fad32987
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoStatistics gathering 91/40091/7
Jozef Bacigal [Thu, 9 Jun 2016 08:43:12 +0000 (10:43 +0200)]
Statistics gathering

-device context split

Change-Id: Ib0276ff78281bbc56d085e5c46fd8cd30833e351
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoLifeCycle conductor changes 87/40087/7
Jozef Bacigal [Thu, 9 Jun 2016 07:39:46 +0000 (09:39 +0200)]
LifeCycle conductor changes

Change-Id: I02509e60dc168e55ad4146f25ae9b32e7f919011
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoRoleManager changes 86/40086/7
Jozef Bacigal [Thu, 9 Jun 2016 07:33:18 +0000 (09:33 +0200)]
RoleManager changes

- changed key of contexts map from node to device info

Change-Id: I57809460950d7e5aa72b5ca37baa79a410034101
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoDeviceState changes 23/40023/8
Jozef Bacigal [Wed, 8 Jun 2016 12:01:50 +0000 (14:01 +0200)]
DeviceState changes

- basic device info removed from device state
- in device context added method to return device info
- jeopardy flag added to tests

Change-Id: I466f87c595033c72cb588ca3f00d2c222b46070d
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agodeviceContext changes 19/40019/7
Jozef Bacigal [Wed, 8 Jun 2016 10:45:05 +0000 (12:45 +0200)]
deviceContext changes

Change-Id: I8b0e7c98b61e5453cb683c4cb96c2ce7d83ddf87
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoStatistics context and manager changes 17/40017/7
Jozef Bacigal [Wed, 8 Jun 2016 10:37:55 +0000 (12:37 +0200)]
Statistics context and manager changes

Change-Id: Ifb9b27f5a6419f959d3faac4a6de4fff60cff3b4
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agorpcContext small changes 15/40015/7
Jozef Bacigal [Wed, 8 Jun 2016 10:25:21 +0000 (12:25 +0200)]
rpcContext small changes

Change-Id: I8e545fa6e2fdfb86da310a7307e511e378fc18e3
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoroleContext NodeId change 14/40014/7
Jozef Bacigal [Wed, 8 Jun 2016 10:22:15 +0000 (12:22 +0200)]
roleContext NodeId change

- roleContext returning now DeviceInfo instead od nodeId

Change-Id: I957b869d0bde82898809eac922e8f9f1512693db
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoStatistics manager context map holder change 02/40002/7
Jozef Bacigal [Wed, 8 Jun 2016 08:37:24 +0000 (10:37 +0200)]
Statistics manager context map holder change

Change-Id: I8346d74296b677850f689f5b9419156b9f2056f1
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoDeviceManager map key change 01/40001/6
Jozef Bacigal [Wed, 8 Jun 2016 08:32:22 +0000 (10:32 +0200)]
DeviceManager map key change

Change-Id: I94f2488a7152472e728cc5123d905183a999030f
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoRPC Manager Context Map holder change 00/40000/8
Jozef Bacigal [Wed, 8 Jun 2016 08:29:22 +0000 (10:29 +0200)]
RPC Manager Context Map holder change

Change-Id: Idda280f8c8296361a964736a71fc3f73938d4f97
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoContext close handler changed 97/39997/6
Jozef Bacigal [Wed, 8 Jun 2016 07:21:40 +0000 (09:21 +0200)]
Context close handler changed

Change-Id: I14c3c6b0168313dd84bff22525b42ce634a1e75c
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoConnection context create device info 95/39995/7
Jozef Bacigal [Wed, 8 Jun 2016 07:11:50 +0000 (09:11 +0200)]
Connection context create device info

Change-Id: I2aa02133fe7b182e0e74ee5c13d48004c102c18c
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoDevice Info 58/39958/7
Jozef Bacigal [Tue, 7 Jun 2016 14:27:07 +0000 (16:27 +0200)]
Device Info

- deviceContextLevelUp changed from NodeId to DeviceInfo class

Change-Id: I37689518eace32aaf4bdb46a9a23fbbf4cd686c7
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoRemove not existing config files 63/40463/2
Luis Gomez [Fri, 17 Jun 2016 02:18:11 +0000 (19:18 -0700)]
Remove not existing config files

This is not a problem right away but it could be in future when
deprecated artifacts get clean from nexus.

Change-Id: I1e4a7fc91ae9ede02f1f599bd285c53b1fdddaea
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
7 years agoDevice Info API 57/39957/3
Jozef Bacigal [Tue, 7 Jun 2016 14:14:59 +0000 (16:14 +0200)]
Device Info API

API for encapsulate basic device information.
Should be created in Connection context after successful connect.

Change-Id: I7d21dc254364f91964cf9043824206d1a5967456
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoMerge "Bug 5921 EOS inJeopardy flag"
michal rehak [Thu, 16 Jun 2016 16:11:02 +0000 (16:11 +0000)]
Merge "Bug 5921 EOS inJeopardy flag"

7 years agoMerge "Bug 6060 failed to push master role request occasionally"
michal rehak [Thu, 16 Jun 2016 16:05:11 +0000 (16:05 +0000)]
Merge "Bug 6060 failed to push master role request occasionally"

7 years agoBUG-6064: switching updates off as on a node updated we need not trigger 46/40346/5
Shuva Kar [Wed, 15 Jun 2016 01:34:13 +0000 (07:04 +0530)]
BUG-6064: switching updates off as on a node updated we need not trigger
reconciliation

Change-Id: Ib0af4c0441f92713738985e65ff95b9149bbf787
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoRemove lldp speaker config yang and XML 39/39139/4
Tom Pantelis [Mon, 16 May 2016 23:43:46 +0000 (19:43 -0400)]
Remove lldp speaker config yang and XML

Change-Id: Ib7f4ae9ea0fd08a20b5a23c34b562584fa832d89
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
7 years agoRemove of-switch-config-pusher config yang and XML 38/39138/4
Tom Pantelis [Mon, 16 May 2016 23:29:32 +0000 (19:29 -0400)]
Remove of-switch-config-pusher config yang and XML

Change-Id: Iea979f71db1a28ddbf3f6069538e7c36be0c1856
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
7 years agoRemove table-miss-enforcer config yang and XML 37/39137/4
Tom Pantelis [Mon, 16 May 2016 23:19:51 +0000 (19:19 -0400)]
Remove table-miss-enforcer config yang and XML

Change-Id: I3434c35f61a1694a6aec9b68a93f00111c8ca9d4
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
7 years agoRemove topology lldp discovery config yang and XML 36/39136/4
Tom Pantelis [Mon, 16 May 2016 23:00:10 +0000 (19:00 -0400)]
Remove topology lldp discovery config yang and XML

Change-Id: If4fea220714fc49fcfe38dcab2e3bd9a70fa8f72
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
7 years agoBug 5921 EOS inJeopardy flag 70/40370/1
Jozef Bacigal [Wed, 15 Jun 2016 11:39:08 +0000 (13:39 +0200)]
Bug 5921 EOS inJeopardy flag

- if inJeopardy flag occurs then handle it as
  MASTER to SLAVE change on main candidate registry
  and remove txCandidate

Change-Id: I655034e8317823887e8e3cc62304c4c931353bf4
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoBug 6060 failed to push master role request occasionally 66/40366/1
Jozef Bacigal [Wed, 15 Jun 2016 10:19:55 +0000 (12:19 +0200)]
Bug 6060 failed to push master role request occasionally

- race condition when EOS is too quick
- first we need to add a entity into watch list and then register
  not to miss any notification from EOS

Change-Id: I305612c4668c9cc1ad89a75270a94f45c613ab94
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
7 years agoRemove forwarding-rules manager config yang and XML 35/39135/4
Tom Pantelis [Mon, 16 May 2016 22:18:16 +0000 (18:18 -0400)]
Remove forwarding-rules manager config yang and XML

Change-Id: I5f2ea4bff14c45cea9f247be16f07b1e90f85682
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
7 years agoMerge changes from topic 'blueprint'
Anil Vishnoi [Wed, 15 Jun 2016 02:55:32 +0000 (02:55 +0000)]
Merge changes from topic 'blueprint'

* changes:
  Remove inventory manager config yang and XML
  Remove statistics manager config yang and XML

7 years agoRemove inventory manager config yang and XML 34/39134/5
Tom Pantelis [Mon, 16 May 2016 22:09:43 +0000 (18:09 -0400)]
Remove inventory manager config yang and XML

Change-Id: I47b550deadd08e002fe4388f707f9cbfe3b3bb64
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
7 years agoMerge "BUG-2771: Converting String.split() to Guava Splitter for Inventory Utils"
Abhijit Kumbhare [Sun, 12 Jun 2016 02:35:52 +0000 (02:35 +0000)]
Merge "BUG-2771: Converting String.split() to Guava Splitter for Inventory Utils"

7 years agoRemove statistics manager config yang and XML 33/39133/5
Tom Pantelis [Mon, 16 May 2016 22:00:55 +0000 (18:00 -0400)]
Remove statistics manager config yang and XML

Change-Id: I56c38dcb3ca57e9ccc7a4d37e2873ea8b29cb515
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
7 years agoMerge changes from topic 'blueprint'
Anil Vishnoi [Thu, 9 Jun 2016 01:41:20 +0000 (01:41 +0000)]
Merge changes from topic 'blueprint'

* changes:
  Add blueprint wiring for the drop-test app
  Add blueprint wiring for the bulk-o-matic app
  Add blueprint wiring for the lldp-speaker app
  Add blueprint wiring for the of-switch-config-pusher app
  Add blueprint wiring for the table-miss-enforcer app

7 years agoMerge "BUG:5888 - Changing FRM from clustered DCN to clustered DTCN"
Anil Vishnoi [Wed, 8 Jun 2016 06:33:56 +0000 (06:33 +0000)]
Merge "BUG:5888 - Changing FRM from clustered DCN to clustered DTCN"

7 years agoMerge changes from topic 'blueprint'
Anil Vishnoi [Tue, 7 Jun 2016 19:26:47 +0000 (19:26 +0000)]
Merge changes from topic 'blueprint'

* changes:
  Add blueprint wiring for the topology manager app
  Add blueprint wiring for the TopologyLldpDiscovery app
  Add blueprint wiring for the ForwardingRulesManager app

7 years agoBug 5920 Do not wipe out device when there is not configuration 89/39589/7
Andrej Leitner [Mon, 30 May 2016 08:30:44 +0000 (10:30 +0200)]
Bug 5920 Do not wipe out device when there is not configuration

   When device appears in operational DS either syncup is done or the event is skipped:
    - syncup in case there is record for the device in config DS
    - if there is not, device should remain untouched
   (+update tests)

Change-Id: I0b9f579f9987f886ad5d1dc4307d3d053aa53cea
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
7 years agoRefator names & imports (frsync) 08/39308/15
Andrej Leitner [Fri, 27 May 2016 12:21:31 +0000 (14:21 +0200)]
Refator names & imports (frsync)

  - fix typos, guard & executor factory rename
  - junit test for guard decorator
  - add missing parameter descriptions
  - remove unused local variables and suppress warnings
  - remove commented usage of incremental strategy
  - edit access level modifiers
  - organize and remove unused imports

Change-Id: I5e1767df2aa1dce77001161b0148d0717aefef6c
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
7 years agoMerge "Bug 5953: Fixed NPE in FlowRemovedTranslator."
Jozef Bacigal [Tue, 7 Jun 2016 07:28:23 +0000 (07:28 +0000)]
Merge "Bug 5953: Fixed NPE in FlowRemovedTranslator."

7 years agoBUG:5888 - Changing FRM from clustered DCN to clustered DTCN 84/38884/11
Shuva Kar [Fri, 13 May 2016 16:41:13 +0000 (22:11 +0530)]
BUG:5888 - Changing FRM from clustered DCN to clustered DTCN

Change-Id: I60435b5216036b66791251639f0537ed2ef832f7
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoFix unused import warnings 11/39711/5
Robert Varga [Wed, 1 Jun 2016 13:43:29 +0000 (15:43 +0200)]
Fix unused import warnings

This is just a pass at reorganizing imports where eclipse
warns of unused import.

Change-Id: I143fc2662dde58de9c40068563f37fb544363c5d
Signed-off-by: Robert Varga <rovarga@cisco.com>
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 blueprint wiring for the drop-test app 75/38875/4
Tom Pantelis [Fri, 13 May 2016 12:57:12 +0000 (08:57 -0400)]
Add blueprint wiring for the drop-test app

Also removed yhe config yang and XML file as this is a test app and
backeards compatibility is not needed.

Change-Id: I2415b81872ada6fd0d603cbe115b8cff02745d04
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the bulk-o-matic app 37/38837/4
Tom Pantelis [Wed, 11 May 2016 01:44:14 +0000 (21:44 -0400)]
Add blueprint wiring for the bulk-o-matic app

Change-Id: I6a2454fde67c776854b91a804ffa54d025d73e89
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the lldp-speaker app 36/38836/4
Tom Pantelis [Wed, 11 May 2016 01:06:50 +0000 (21:06 -0400)]
Add blueprint wiring for the lldp-speaker app

Change-Id: Iab911edca42540835c668cf20d7b00dd673e9428
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the of-switch-config-pusher app 35/38835/4
Tom Pantelis [Tue, 10 May 2016 22:12:49 +0000 (18:12 -0400)]
Add blueprint wiring for the of-switch-config-pusher app

Change-Id: I38c0cbac5882468853a73882d717bb57b93d9c63
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the table-miss-enforcer app 34/38834/4
Tom Pantelis [Tue, 10 May 2016 21:49:30 +0000 (17:49 -0400)]
Add blueprint wiring for the table-miss-enforcer app

Change-Id: Ic257f017d95ff5c58c74a6a6abcb0045b31b68b1
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the topology manager app 33/38833/4
Tom Pantelis [Tue, 10 May 2016 15:44:31 +0000 (11:44 -0400)]
Add blueprint wiring for the topology manager app

Change-Id: I83906f6125c61f34654b729754ed65527a200b9e
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the TopologyLldpDiscovery app 32/38832/4
Tom Pantelis [Tue, 10 May 2016 14:23:14 +0000 (10:23 -0400)]
Add blueprint wiring for the TopologyLldpDiscovery app

Change-Id: Iae04ce7a7dc6b6f2389d4792a8c16de1605c9cdd
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoAdd blueprint wiring for the ForwardingRulesManager app 31/38831/3
Tom Pantelis [Tue, 10 May 2016 13:19:11 +0000 (09:19 -0400)]
Add blueprint wiring for the ForwardingRulesManager app

Change-Id: Iaa552cd6361031ca9dc96def6976c762d3985ac1
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
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 agoBUG-2771: Converting String.split() to Guava Splitter 74/39774/2
Shuva Kar [Thu, 2 Jun 2016 14:39:57 +0000 (20:09 +0530)]
BUG-2771: Converting String.split() to Guava Splitter
for Inventory Utils

Change-Id: I70eaaebae0a9ad879aba5fa3313d01450af6194d
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
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>