openflowplugin.git
10 years agoImplemented Table Feature Multipart RPC 48/3548/3
HemaTG [Sat, 7 Dec 2013 12:01:31 +0000 (17:31 +0530)]
Implemented Table Feature Multipart RPC

Signed-off-by: HemaTG <hema.gopalkrishnan@ericsson.com>
10 years agoFix to convert Tunnel Id and Metadata BigInteger value to 64 bits (8 element byte... 52/3552/1
Deepthi V V [Sun, 8 Dec 2013 06:25:59 +0000 (11:55 +0530)]
Fix to convert Tunnel Id and Metadata BigInteger value to 64 bits (8 element byte array) as expected by the OF library.

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
10 years agoFixed add/modify/remove rpc for group/meter/flow to reach plugin 50/3550/1
Prasanna Huddar [Sat, 7 Dec 2013 16:08:29 +0000 (21:38 +0530)]
Fixed add/modify/remove rpc for group/meter/flow to reach plugin

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
10 years agoGroupConvertor:GroupType Check Added,Logging message no return. 45/3545/1
usha [Sat, 7 Dec 2013 10:58:32 +0000 (16:28 +0530)]
GroupConvertor:GroupType Check Added,Logging message no return.
Signed-off-by: usha <usha.m.s@ericsson.com>
10 years agoActionConvertor:ActionBuilder one instance is now removed,locally object are created... 44/3544/1
usha [Sat, 7 Dec 2013 10:26:36 +0000 (15:56 +0530)]
ActionConvertor:ActionBuilder one instance is now removed,locally object are created add into actionList
Signed-off-by: usha <usha.m.s@ericsson.com>
10 years agoSeparated macth conversion to MatchConvertor.java 34/3534/4
Deepthi V V [Fri, 6 Dec 2013 14:25:56 +0000 (19:55 +0530)]
Separated macth conversion to MatchConvertor.java

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Change-Id: I0c9c41e25d119f6e2e055ff0a69236c90c9987c1

10 years agoUpdated OpenflowpluginTestCommandProvider 35/3535/3
Gaurav Bhagwani [Fri, 6 Dec 2013 17:01:06 +0000 (22:31 +0530)]
Updated OpenflowpluginTestCommandProvider
-Command Line Option f4 has all set of matches
-Command Line Option f5,f6,f7 has InstructionSet , f5 includes all set of Actions

Signed-off-by: Gaurav Bhagwani <gaurav.bhagwani@ericsson.com>
Change-Id: Ic4ee86acd757432ebdf3ede6240104e2d1736b9a

10 years agoAdded a Vagrant directory for building a mininet VM 26/3526/2
Ed Warnicke [Fri, 6 Dec 2013 11:57:13 +0000 (05:57 -0600)]
Added a Vagrant directory for building a mininet VM

See the README file for details.

Change-Id: I993cb54cd7ce60e67829925c505cef90ec42acfb
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMD-SAL Statistics Manager - Did the code changes that is needed to work with commit... 29/3529/2
Anilkumar Vishnoi [Tue, 3 Dec 2013 18:05:28 +0000 (23:35 +0530)]
MD-SAL Statistics Manager - Did the code changes that is needed to work with commit 3413

Change-Id: I1659422be29993ad9f3b669cdb81f32af9c684dd
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
10 years agoGroup ADD had some fixes. 13/3513/3
Prasanna Huddar [Thu, 5 Dec 2013 19:43:07 +0000 (01:13 +0530)]
Group ADD had some fixes.
Fixed default values for watch * and also type in Actionconverter.java

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
10 years agoflow fix 16/3516/2
Michal Rehak [Thu, 5 Dec 2013 21:45:46 +0000 (22:45 +0100)]
flow fix

updated macAddress form
changed flow name to pass validation
xml-apis version

Change-Id: I43b5546a4a107c64b4b33477b9a60fe6a9341055
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoadded another flows 21/3421/1
Michal Rehak [Wed, 4 Dec 2013 01:43:49 +0000 (02:43 +0100)]
added another flows

drop+ipv4Src
drop+ethernetSrc

Change-Id: I15c29fd6ec6774e9f162c2b3f616d9b0e52dc8e3
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoAdded action bucket into group and Band types to Meter 99/3399/1
Prasanna Huddar [Tue, 3 Dec 2013 14:49:12 +0000 (20:19 +0530)]
Added action bucket into group and Band types to Meter

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
10 years agoAdded node input parameter to addMeter RPC 92/3392/3
Prasanna Huddar [Tue, 3 Dec 2013 09:54:52 +0000 (15:24 +0530)]
Added node input parameter to addMeter RPC

added node creation for new meter

Change-Id: Ieb877191c4a85828b32b8876b09ea894e5e1f272
Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoMerge "fixed ActionType mismatch, FlowConvertor - flow.isStrict() NPE"
Prasanna Huddar [Mon, 2 Dec 2013 19:29:50 +0000 (19:29 +0000)]
Merge "fixed ActionType mismatch, FlowConvertor - flow.isStrict() NPE"

10 years agoMD-SAL Statistics Manager - Fixed bug to show actions of the bucket 51/3351/3
Anilkumar Vishnoi [Mon, 2 Dec 2013 16:28:19 +0000 (21:58 +0530)]
MD-SAL Statistics Manager - Fixed bug to show actions of the bucket
send by switch in response to group description multipart request

Change-Id: Ie7e469ab1f744453137b2c0a19869d5e3832aa4c
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
10 years agofixed ActionType mismatch, FlowConvertor - flow.isStrict() NPE 47/3347/2
Michal Rehak [Wed, 20 Nov 2013 13:05:36 +0000 (14:05 +0100)]
fixed ActionType mismatch, FlowConvertor - flow.isStrict() NPE

log change
guava duplicity removed
improve logging
flow add experimenting

Change-Id: If5ec274baa488b98548e72e5ad611c0afdc6b9f8
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoMerge "updated to use new constructor to create a copy of object instead of setting...
michal rehak [Mon, 2 Dec 2013 17:20:26 +0000 (17:20 +0000)]
Merge "updated to use new constructor to create a copy of object instead of setting individually each field."

10 years agoupdated to use new constructor to create a copy of object instead of 18/3318/1
AnilGujele [Mon, 2 Dec 2013 09:35:47 +0000 (15:05 +0530)]
updated to use new constructor to create a copy of object instead of
setting individually each field.

Change-Id: Ia813352333c7c0b01393e909a055acb596401741
Signed-off-by: AnilGujele <angujele@in.ibm.com>
10 years agoFor OutputAction:PortNumber size is different for OF versions. 11/3311/1
usha [Mon, 2 Dec 2013 06:59:53 +0000 (12:29 +0530)]
For OutputAction:PortNumber size is different for OF versions.
PortNumberVersionCheck Added

Signed-off-by: usha <usha.m.s@ericsson.com>
10 years agoFixed the NPE that was preventing us from binding to port 6633 10/3310/1
Ed Warnicke [Sun, 1 Dec 2013 23:12:42 +0000 (15:12 -0800)]
Fixed the NPE that was preventing us from binding to port 6633

Failed to exclude the legacay plugin. Now we are.

Change-Id: I4ff5baa3e4700eebb824d9e4f947e92ca947d652
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMD-SAL Statistics Manager - Fetching Group/Meter feature details will be done by... 09/3309/1
Anilkumar Vishnoi [Sun, 1 Dec 2013 13:40:38 +0000 (19:10 +0530)]
MD-SAL Statistics Manager - Fetching Group/Meter feature details will be done by plugin now

Change-Id: I173d1b3ad3e0bc841a1f3a0e2fb66441e0ea1385
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
10 years agoFix the Openflowplugin{Meter,Group}TestServiceProviders 00/3300/1
Ed Warnicke [Sun, 1 Dec 2013 14:36:56 +0000 (06:36 -0800)]
Fix the Openflowplugin{Meter,Group}TestServiceProviders

Change-Id: I672fd9df6983bac97cb711d13ec2683903824548
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoSwitched to using constuctor to populate all fields by xid. 91/3291/1
Ed Warnicke [Sun, 1 Dec 2013 12:24:22 +0000 (04:24 -0800)]
Switched to using constuctor to populate all fields by xid.

Change-Id: I6e00db9d510672e77abd5301ef0dc84debcf9f23
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoReplace OpenflowplugintestCommandProvider with previous version. 88/3288/1
Ed Warnicke [Sun, 1 Dec 2013 11:55:49 +0000 (03:55 -0800)]
Replace OpenflowplugintestCommandProvider with previous version.

The current version is broken, and is incapable of actually pushing
a flow to a non-dummy node.  Because its critical today that we
actually can test and debug through to a real switch, I am restoring
the version that is capable of that.

Change-Id: Icf9f652acdf7fad4524de87d1a492b2b3bddad71
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoAdded group and meter test methods. 44/3244/11
Anilkumar Vishnoi [Sat, 30 Nov 2013 10:50:53 +0000 (16:20 +0530)]
Added group and meter test methods.

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: If90067d8aa69b54c0b4b1eaf7b95213e8eb21d4e
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
10 years agoFixed build breakages due to changes in group and meter type models. 69/3269/1
Prasanna Huddar [Sat, 30 Nov 2013 17:10:40 +0000 (22:40 +0530)]
Fixed build breakages due to changes in group and meter type models.

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
10 years agoMerge "FlowConverter bugfix"
Abhijit Kumbhare [Fri, 29 Nov 2013 20:20:16 +0000 (20:20 +0000)]
Merge "FlowConverter bugfix"

10 years agoTry to use NwTtlDec in test-provider... also fixed empty instruction list 61/3261/2
Ed Warnicke [Fri, 29 Nov 2013 17:25:45 +0000 (09:25 -0800)]
Try to use NwTtlDec in test-provider... also fixed empty instruction list

Change-Id: I3ee9fef1c96f5360b6634689d9f2ca30fdc30b62
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoFlowConverter bugfix 60/3260/1
Michal Polkorab [Fri, 29 Nov 2013 17:03:39 +0000 (18:03 +0100)]
FlowConverter bugfix

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
10 years agoadaptation to OFLibrary Error strategy 59/3259/1
Michal Rehak [Fri, 29 Nov 2013 16:43:56 +0000 (17:43 +0100)]
adaptation to OFLibrary Error strategy

OFLibrary now delivers Errors containing [type and code] number + [type and code] string, but no more version specific enums

Change-Id: Ib8fe3aefd03fbdf6083f7d6c46bc4f86f79dcb53
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoMerge "Fixes to Flow Converter to make sure that we have proper defaults"
Prasanna Huddar [Fri, 29 Nov 2013 08:53:22 +0000 (08:53 +0000)]
Merge "Fixes to Flow Converter to make sure that we have proper defaults"

10 years agoMerge "Updated test-provider to enable adding flows to non-dummy switches"
Prasanna Huddar [Fri, 29 Nov 2013 07:56:51 +0000 (07:56 +0000)]
Merge "Updated test-provider to enable adding flows to non-dummy switches"

10 years agoFixes to Flow Converter to make sure that we have proper defaults 31/3231/1
Ed Warnicke [Fri, 29 Nov 2013 01:24:52 +0000 (17:24 -0800)]
Fixes to Flow Converter to make sure that we have proper defaults

Also added MatchType

These where needed to make sure we could send a proper FLOW_MOD

The good news is, that with the test-provider in
https://git.opendaylight.org/gerrit/#/c/3230/

I can see us send a FLOW_MOD on the wire.  The bad news is
mininet rejects it :(

Change-Id: Ic19a694fcd1178063daa94a4f829fcfe724fd653
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoUpdated test-provider to enable adding flows to non-dummy switches 30/3230/1
Ed Warnicke [Thu, 28 Nov 2013 23:34:49 +0000 (15:34 -0800)]
Updated test-provider to enable adding flows to non-dummy switches

Also, renamed commands from

addFlow -> addMDFlow
removeFlow -> removeMDFlow
modifyFlow -> modifyMDFlow

to avoid conflict with existing commands.

You can now (optionally) provide a nodeId to a command like

addMDFlow openflow:1

to add the testflow to a live switch.

Change-Id: If4d65dbba5faec769d6bcbab41ae13bb991a344c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoTable Features converter to comnvert MD-SAL table features to OF lib table features. 96/3196/2
Anilkumar Vishnoi [Thu, 28 Nov 2013 11:38:35 +0000 (17:08 +0530)]
Table Features converter to comnvert MD-SAL table features to OF lib table features.
Patch set 2: Incorporated model change in ModelDrivenSwitchImpl.java

Change-Id: I831becb21cc39b5daabab6b9cc95cb81f2f3462a
Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
10 years agoMerge "Enabled registration for all rpc services"
Abhijit Kumbhare [Thu, 28 Nov 2013 15:58:51 +0000 (15:58 +0000)]
Merge "Enabled registration for all rpc services"

10 years agoEnabled registration for all rpc services 11/3211/1
Tony Tkacik [Thu, 28 Nov 2013 15:05:44 +0000 (16:05 +0100)]
Enabled registration for all rpc services

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoMerge "1. Flow convertor: Fix Ipv4 netmask and ipv6 prefix byte array calculation...
Prasanna Huddar [Thu, 28 Nov 2013 09:45:03 +0000 (09:45 +0000)]
Merge "1. Flow convertor: Fix Ipv4 netmask and ipv6 prefix byte array calculation from integer value. 2. Add node information in flow removed event."

10 years ago1. Flow convertor: Fix Ipv4 netmask and ipv6 prefix byte array calculation from integ... 76/3176/1
Deepthi V V [Thu, 28 Nov 2013 08:51:33 +0000 (14:21 +0530)]
1. Flow convertor: Fix Ipv4 netmask and ipv6 prefix byte array calculation from integer value.
2. Add node information in flow removed event.

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
10 years agoImplemented Port RPC 64/3164/1
HemaTG [Thu, 28 Nov 2013 05:24:53 +0000 (10:54 +0530)]
Implemented Port RPC

Signed-off-by: HemaTG <hema.gopalkrishnan@ericsson.com>
10 years agoRemoved old legacy code and moved parent pom.xml to root 47/3147/7
Ed Warnicke [Tue, 26 Nov 2013 22:13:55 +0000 (14:13 -0800)]
Removed old legacy code and moved parent pom.xml to root
directory.

Change-Id: I279779c1d179b74dcc1a61c7e303095499764510
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoSmall fix for 3037-5 build failure 58/3158/1
Ed Warnicke [Thu, 28 Nov 2013 00:09:29 +0000 (16:09 -0800)]
Small fix for 3037-5 build failure

https://git.opendaylight.org/gerrit/#/c/3037/
has a build failure due to falling slightly out of sync
with the model in the controller.  This fixes it.

Change-Id: I932a1e5e197b933d1409151452699694e7c5f314
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMD-SAL Statistics Manager- Implemented rpc/notification calls for group/meter statistics 37/3037/5
Ed Warnicke [Wed, 20 Nov 2013 23:39:33 +0000 (05:09 +0530)]
MD-SAL Statistics Manager- Implemented rpc/notification calls for group/meter statistics

Change-Id: I8a05923c3691d23bb4c8359f1db47af8f417ab61
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agocomments: get version from session context and 72/3072/3
usha [Mon, 25 Nov 2013 18:27:20 +0000 (23:57 +0530)]
comments: get version from session context and
setting it corresponding builders(flow,action,meter,group and port) for the OF Plugin usage

Signed-off-by: usha <usha.m.s@ericsson.com>
Change-Id: I696f98adf7d9dd0f919c529018afad87afe9a087

10 years agoAdded test-provider project. 18/3118/2
Ed Warnicke [Wed, 20 Nov 2013 01:23:28 +0000 (19:23 -0600)]
Added test-provider project.

This creates a bundle which:
1)  Provides a dummy listner for SalFlowService
2)  Provides an osgi command loadFlowData
that will write data to the MD-SAL for flows.

Patch 2:  Added commands for removing and modifying the
test flow.

To use, from the OSGI console type:

addFlow
modifyFlow
removeFlow

and you will see log messages indicating the dummy
rpc handler has received the rpc calls.

This basically tests the round tripping through the MD-SAL,
{add,modify,remove}Flow write data modifications for flows
to the tree, and then you see the RPC calls routed in the logs.

Very useful for testing.

Change-Id: I654e1f5a20fe9b964f1b69cebcb23d6744113112
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Some work to try to add dumping routes

Change-Id: I798c8d4e050a39f224d1ac46609fc36667bedf47
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoTemporarily disabled the SalIntegrationTests as they are failing due 51/3151/1
Ed Warnicke [Wed, 27 Nov 2013 20:57:18 +0000 (12:57 -0800)]
Temporarily disabled the SalIntegrationTests as they are failing due
to a pax-exam bug.

Change-Id: Ie8f7f71367ba13ce0910857e29ccfed547b231bf
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMerge "removing legacy listener on port 6633"
Prasanna Huddar [Tue, 26 Nov 2013 03:25:46 +0000 (03:25 +0000)]
Merge "removing legacy listener on port 6633"

10 years agohandshake - simultaneous hello fix, improved exception throwing 76/3076/1
Michal Rehak [Mon, 25 Nov 2013 19:08:49 +0000 (20:08 +0100)]
handshake - simultaneous hello fix, improved exception throwing

Change-Id: Ife63e7dcba169fdc82a2e414e85b948edc222b3e
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoremoving legacy listener on port 6633 73/3073/1
Michal Rehak [Mon, 25 Nov 2013 19:13:23 +0000 (20:13 +0100)]
removing legacy listener on port 6633

REQUIREMENT: remove org.opendaylight.controller:protocol_plugins.openflow from
org.opendaylight.controller:distribution.opendaylight artifact

Change-Id: Ifc101ca567eb6ae3f7f40655c2171d0870c0ab6d
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoMerge "Test cases committed. Action convertor imports updated. PortConvertor removed...
Prasanna Huddar [Mon, 25 Nov 2013 13:36:05 +0000 (13:36 +0000)]
Merge "Test cases committed. Action convertor imports updated. PortConvertor removed unwanted code,port_mod api takes input as list ."

10 years agoTest cases committed. 61/3061/1
usha [Mon, 25 Nov 2013 12:47:42 +0000 (18:17 +0530)]
Test cases committed.
Action convertor imports updated.
PortConvertor removed unwanted code,port_mod api takes input as list .

Signed-off-by: usha <usha.m.s@ericsson.com>
10 years agoThis should finish wiring up PacketIn 40/3040/1
Ed Warnicke [Sun, 24 Nov 2013 01:59:31 +0000 (17:59 -0800)]
This should finish wiring up PacketIn

Change-Id: I0e3ddec37f4a685c374384198337e6ca18dbe14e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoSupport for reporting PortDesc and PortStatus changes 98/2998/4
Ed Warnicke [Fri, 22 Nov 2013 12:46:16 +0000 (13:46 +0100)]
Support for reporting PortDesc and PortStatus changes

Also cleaned up logging in MultipartMessageDescToNodeUpdatedTranslator
Expanded functions in InventoryDataServiceUtil
Added PortTranslatorUtil to expose reusable translator methods.

Change-Id: I4a5e1a5b12bab46a08ce2aafb9cb3e64240be3bd
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoSwitched to using IMDMessageTranslator<OfHeader, List<DataObject>>> in MDController 34/3034/1
Ed Warnicke [Sat, 23 Nov 2013 16:00:56 +0000 (08:00 -0800)]
Switched to using IMDMessageTranslator<OfHeader, List<DataObject>>> in MDController

Switched to using IMDMessageTranslator<OfHeader, List<DataObject>>> in MDController
from IMDMessageTranslator<OfHeader,<DataObject>>.

This was required because when you unpack a MultiPartReply, you may need
to translate it into many resulting MD-SAL DataObjects.  For example
a MultiPartReply with body MultipartReplyPortDesc would result in
many NodeConnectorUpdated messages.

The change cascaded through several places that presumed on
dealing with IMDMessageTranslator<OfHeader, DataObject>>,
but with small exceptions it was only a signature change.

Also taught the TicketProcessorFactory to ignore translations
that return null (as that has become the convention when you
can't really translate a message for whatever reason).  Now
TicketProcessorFactory just drops null translations.
Ideally, we would throw and catch an exception for this case...
but maybe later.

This is done in preparation for commits to handle various
MultipartReply messages.

Change-Id: I387c96d1d064d3128622a27e262954812ee31836
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Conflicts:

openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PortStatusMessageToNodeConnectorUpdatedTranslator.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java

Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoAdded translator for flow removed OF message and fixed issues in Flow convertor. 40/2940/4
Deepthi V V [Thu, 21 Nov 2013 12:08:10 +0000 (17:38 +0530)]
Added translator for flow removed OF message and fixed issues in Flow convertor.

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Change-Id: If142094c3ef7f455388d6a1ca9dfd45381795e3d

10 years agoMerge "Add Translator for MultipartDescReply"
Prasanna Huddar [Fri, 22 Nov 2013 08:42:33 +0000 (08:42 +0000)]
Merge "Add Translator for MultipartDescReply"

10 years agoMerge "Moved discoveryservice.java from internal to md.discovery dir."
Abhijit Kumbhare [Thu, 21 Nov 2013 23:13:21 +0000 (23:13 +0000)]
Merge "Moved discoveryservice.java from internal to md.discovery dir."

10 years agoAdd Translator for MultipartDescReply 61/2961/1
Ed Warnicke [Wed, 20 Nov 2013 00:41:38 +0000 (18:41 -0600)]
Add Translator for MultipartDescReply

This successfully adds to the information visible
via RESTCONF for inventory.

Also, there's InventoryDataServiceUtils... full of handiness.

Change-Id: Id28b08cff0bb68a2c8ebcee30af8753a947f8559
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMoved discoveryservice.java from internal to md.discovery dir. 60/2960/1
Prasanna Huddar [Thu, 21 Nov 2013 16:43:28 +0000 (22:13 +0530)]
Moved discoveryservice.java from internal to md.discovery dir.

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
10 years agoMerge "Fixed race condition in Activation."
michal rehak [Thu, 21 Nov 2013 16:24:54 +0000 (16:24 +0000)]
Merge "Fixed race condition in Activation."

10 years agoFixed race condition in Activation. 54/2954/1
Ed Warnicke [Thu, 21 Nov 2013 14:44:13 +0000 (06:44 -0800)]
Fixed race condition in Activation.

Change-Id: I79d9c80a66d7a380eb9eeb122ee7bc0eae6d31e1
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoupdated message dispatcher to send the multipart request message to library 35/2935/1
AnilGujele [Thu, 21 Nov 2013 11:19:50 +0000 (16:49 +0530)]
updated message dispatcher to send the multipart request message to library

Change-Id: Ic567edf6c0156a590481b27eda9f69c28821b7fe
Signed-off-by: AnilGujele <angujele@in.ibm.com>
10 years agoError/Experimenter converters 13/2913/4
Prasanna Huddar [Wed, 20 Nov 2013 15:07:54 +0000 (20:37 +0530)]
Error/Experimenter converters

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I47b62f91444842fa896495d880fd442268ecb3a7

10 years agoConvertor:MeterConverter in modeldrivenimpl corrected to MeterConvertor. 97/2897/2
usha [Wed, 20 Nov 2013 11:23:44 +0000 (16:53 +0530)]
Convertor:MeterConverter in modeldrivenimpl corrected to MeterConvertor.

added comment regarding special port numbers

Change-Id: I9096664787ad4b54fe31014331a2aa5da473b197
Signed-off-by: usha <usha.m.s@ericsson.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoThese convertors are used decoding the SAL data to OF Data 96/2896/3
usha [Wed, 20 Nov 2013 10:55:31 +0000 (16:25 +0530)]
These convertors are used decoding the SAL data to OF Data

Signed-off-by: usha <usha.m.s@ericsson.com>
Change-Id: Ic09e5554765e448e251d6d1fdf79416e2f7387b6

10 years agoAdded PopListner for PacketIn 48/2848/2
Ed Warnicke [Tue, 19 Nov 2013 00:37:17 +0000 (18:37 -0600)]
Added PopListner for PacketIn

Change-Id: I4927d1a1215e021a9a3c7eea3c26c9a37fc4af92
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agopopListener mapping 45/2845/1
Michal Rehak [Thu, 14 Nov 2013 17:52:32 +0000 (18:52 +0100)]
popListener mapping

fixed sample - rpc return types
minor code tidyup

Change-Id: I9ed2d55bb07ad4442343141bc7594924e56630cc
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoWorked Colin Dixon's PktIn into the Translator Framework 33/2833/2
Ed Warnicke [Mon, 18 Nov 2013 16:05:52 +0000 (10:05 -0600)]
Worked Colin Dixon's PktIn into the Translator Framework

Change-Id: Iadd1b847abb2bdce0336f1b55f9f9735fd0272e9
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoWired up a NotificationPopListner that will notify the MD-SAL 29/2829/2
Ed Warnicke [Mon, 18 Nov 2013 15:30:53 +0000 (09:30 -0600)]
Wired up a NotificationPopListner that will notify the MD-SAL

Any and all Notification messages get fired at the MD-SAL.

Change-Id: I646671f7f46a98362d916900ea2589e3f40f107e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMade Notification and Data service available from SessionManager 27/2827/2
Ed Warnicke [Mon, 18 Nov 2013 14:46:34 +0000 (08:46 -0600)]
Made Notification and Data service available from SessionManager

This was so we can use them conviently throughout the plugin.

Change-Id: I878780b84c6ecb57e352a419c3ef44b524a3e26b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agofixed API change initiated by fix in library 31/2831/1
Michal Rehak [Mon, 18 Nov 2013 15:56:41 +0000 (16:56 +0100)]
fixed API change initiated by fix in library

Change-Id: Ia6e32ae7ac59e5bb3a88c732578c061efda32c17
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoSwitched to basing the local distribution on controller 01/2801/1
Ed Warnicke [Sun, 17 Nov 2013 15:05:53 +0000 (09:05 -0600)]
Switched to basing the local distribution on controller

This reduces the number of steps for a change in controller
to be pulled into openflowplugin/distribution/base

Before you'd have to build controller, then integration,
the openflowplugin.  Now you just have to build controller
then openflowplugin.

Change-Id: I0dc70c94b38a2475773bd5fc40e2a43a1dcf0e0b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoFixed breakage from changes in openflowjava (which were my fault :( ). 96/2796/1
Ed Warnicke [Sun, 17 Nov 2013 01:44:47 +0000 (19:44 -0600)]
Fixed breakage from changes in openflowjava (which were my fault :( ).

Change-Id: Idc8a3c5acd9ba2bd40115db5308eaf28428d12f6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agofix of BUG-146 92/2792/1
Michal Rehak [Sat, 16 Nov 2013 08:44:08 +0000 (09:44 +0100)]
fix of BUG-146

todos removed

Change-Id: Ife0ebc4784d81573a0c8d35c81239953e40a8b09
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoModelDrivenSwitch for RPC and converter 86/2786/1
HemaTG [Fri, 15 Nov 2013 15:35:49 +0000 (21:05 +0530)]
ModelDrivenSwitch for RPC and converter

Signed-off-by: HemaTG <hema.gopalkrishnan@ericsson.com>
10 years agofixing some spelling and formatting issues including a lot of trailing whitespace 49/2749/3
Colin Dixon [Thu, 14 Nov 2013 16:40:24 +0000 (10:40 -0600)]
fixing some spelling and formatting issues including a lot of trailing whitespace

Change-Id: I724dc470753a9c97db36df870645df704530ef22
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agopreparing QueueKeeper and message translation 10/2710/2
Michal Rehak [Sun, 10 Nov 2013 10:17:27 +0000 (11:17 +0100)]
preparing QueueKeeper and message translation

added generics to translator
fixing handshake tests
handshake separated
IT adapted to handshake modifications

Change-Id: Ia606a9fec990ca640819e888398f3b095351f38f
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoInserting Xid for RPC calls FlowMod, GroupMod and MeterMod 97/2697/7
Yugandhar [Wed, 13 Nov 2013 09:15:41 +0000 (14:45 +0530)]
Inserting Xid for RPC calls FlowMod, GroupMod and MeterMod

fixed rpc return types

Change-Id: I1c7b9b302d38fba3ed7bafee47b0188acacb13c2
Signed-off-by: Yugandhar <ysarraju@in.ibm.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoOutput of flow parameter made in sync with MD-SAL models 46/2746/1
Prasanna Huddar [Thu, 14 Nov 2013 16:25:28 +0000 (21:55 +0530)]
Output of flow parameter made in sync with MD-SAL models

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
10 years agoInitial onSessionRemove work to remove Inventory Node when the session is removed. 62/2662/2
Ed Warnicke [Tue, 12 Nov 2013 12:10:26 +0000 (06:10 -0600)]
Initial onSessionRemove work to remove Inventory Node when the session is removed.

Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoFixed openflow uri to be openflow:# instead of openflow://# 14/2614/2
Ed Warnicke [Mon, 11 Nov 2013 15:56:51 +0000 (09:56 -0600)]
Fixed openflow uri to be openflow:# instead of openflow://#

The reason for this is a bug in the JAXRS spec where it
doesn't correctly handle escaped / characters:

https://java.net/jira/browse/JAX_RS_SPEC-70

Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoAdded NodeRef to UpdatedNode to allow correct catching of notification 08/2608/2
Ed Warnicke [Mon, 11 Nov 2013 12:05:07 +0000 (06:05 -0600)]
Added NodeRef to UpdatedNode to allow correct catching of notification
by inventory-manager.

changed IT paxexam container into forked

Change-Id: Ib9ce7aa1a4407da4d0d4ff83c10fca4e0fce4fbc
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoadapting to OFLibrary change 03/2603/1
Michal Rehak [Mon, 11 Nov 2013 11:26:37 +0000 (12:26 +0100)]
adapting to OFLibrary change

Change-Id: I77de3e01d7d5005e6d09f8acdb8f7171d198458c
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agosite improvement, warnings removal, applied queueKeeper, fixed tests, errorHandler... 73/2573/1
Michal Rehak [Thu, 7 Nov 2013 16:04:35 +0000 (17:04 +0100)]
site improvement, warnings removal, applied queueKeeper, fixed tests, errorHandler in separate class

Change-Id: I44071a4bb381150679e15cc15ea2ee4d8683317f
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoAdded out put variable to Group/Meter 71/2571/1
Prasanna Huddar [Sat, 9 Nov 2013 14:06:21 +0000 (19:36 +0530)]
Added out put variable to Group/Meter

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
10 years agoMerge "Added a distribution directory that excludes old OF plugin and includes new...
Prasanna Huddar [Fri, 8 Nov 2013 11:00:39 +0000 (11:00 +0000)]
Merge "Added a distribution directory that excludes old OF plugin and includes new one"

10 years agoAdded a distribution directory that excludes old OF plugin and includes new one 43/2543/1
Ed Warnicke [Thu, 7 Nov 2013 22:29:53 +0000 (16:29 -0600)]
Added a distribution directory that excludes old OF plugin and includes new one

Change-Id: Id65a7b146877335b884c00c4861bc63c3a9c10d2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoAdding support and unit-test for ErrorMessage 81/2481/2
Yugandhar [Thu, 7 Nov 2013 09:55:14 +0000 (15:25 +0530)]
Adding support and unit-test for ErrorMessage

Change-Id: I571fb08a21d2b1235b3722168ec005ece2bc995a
Signed-off-by: Yugandhar <ysarraju@in.ibm.com>
10 years agoproposal of queueKeeper and default implementation preserving message order 58/2458/1
Michal Rehak [Wed, 6 Nov 2013 16:39:00 +0000 (17:39 +0100)]
proposal of queueKeeper and default implementation preserving message order

Change-Id: Iba334b48a4909bdfcbecba3113f7c70d296a5964
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agosending hello upon connection established 57/2457/1
Michal Rehak [Thu, 31 Oct 2013 16:15:59 +0000 (17:15 +0100)]
sending hello upon connection established

hello with versionBitmap
update tests regarding handshake

Change-Id: If75c944fbb3f7a180c4e2d292042e59db52b6273
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agofixed it-test (added bundles) 83/2383/2
Michal Rehak [Tue, 5 Nov 2013 12:37:27 +0000 (13:37 +0100)]
fixed it-test (added bundles)

ConnectionConductorImpl.onHelloMessage now delegates it's previous content to new thread

Change-Id: Ib88560515f80a01ab8ab70157df34adcecaaa915
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoextended integration tests with OFLibrary, improved error handling for threads 85/2285/1
Michal Rehak [Wed, 30 Oct 2013 15:47:36 +0000 (16:47 +0100)]
extended integration tests with OFLibrary, improved error handling for threads

Change-Id: I7bc1f752ec0a97f69401b7a2f3612dd370189a98
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoHooking up SessionManager to Conductor for ListenerMap 81/2281/1
Yugandhar [Thu, 31 Oct 2013 09:01:55 +0000 (14:31 +0530)]
Hooking up SessionManager to Conductor for ListenerMap

Change-Id: Ie644ff4a0c937da1635aeab60686129b57ec952e
Signed-off-by: Yugandhar <ysarraju@in.ibm.com>
10 years agoMerge "changed pom structure, removed dependency on controller parent pom"
Abhijit Kumbhare [Wed, 30 Oct 2013 15:24:25 +0000 (15:24 +0000)]
Merge "changed pom structure, removed dependency on controller parent pom"

10 years agochanged pom structure, removed dependency on controller parent pom 63/2163/4
Michal Rehak [Fri, 25 Oct 2013 12:49:17 +0000 (14:49 +0200)]
changed pom structure, removed dependency on controller parent pom

Change-Id: I13a084328291cb32e698a84a378b3d1c22e16cf3
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoProcessing of OF Messages PacketIn, FlowRemoved, PortStatus, Experimenter 03/2203/2
Yugandhar [Mon, 28 Oct 2013 07:05:38 +0000 (12:35 +0530)]
Processing of OF Messages PacketIn, FlowRemoved, PortStatus, Experimenter

Change-Id: I493ad22b5964ec3632ae111a313c3e5850a8a079
Signed-off-by: Yugandhar <ysarraju@in.ibm.com>
10 years agofixed model-flow-base impacts 38/2238/1
Michal Rehak [Tue, 29 Oct 2013 10:51:21 +0000 (11:51 +0100)]
fixed model-flow-base impacts

added shutdown to MDController to enable multiple it-test run

Change-Id: Idc65e7d95989e5851e39655d30c53b944f025118
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoMerge "handled review comments (sending rpc message to library and version negotiation )"
Abhijit Kumbhare [Tue, 29 Oct 2013 01:32:42 +0000 (01:32 +0000)]
Merge "handled review comments (sending rpc message to library and version negotiation )"

10 years agohandled review comments (sending rpc message to library and version 02/2202/1
AnilGujele [Mon, 28 Oct 2013 06:57:39 +0000 (12:27 +0530)]
handled review comments (sending rpc message to library and version
negotiation )

Change-Id: I7c6162aacb6bcf985ef7993575302e3608dcc380
Signed-off-by: AnilGujele <angujele@in.ibm.com>