openflowplugin.git
9 years agoBug 1588 - OFConstants.java moved to openflowplugin-api module 30/10630/4
Martin Bobak [Fri, 29 Aug 2014 20:37:33 +0000 (22:37 +0200)]
Bug 1588 - OFConstants.java moved to openflowplugin-api module

Change-Id: I71eb2432d78a87734a24699f4973ab3bd8cd3087
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1254 - increase UT coverage 39/10639/2
Martin Bobak [Fri, 29 Aug 2014 20:17:28 +0000 (22:17 +0200)]
Bug 1254 - increase UT coverage

Change-Id: I520491294faa25d46ab86b8d8ae306f5f419dcdb
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoRemoved hard coded distribution management URLs 92/10492/2
Devin Avery [Fri, 29 Aug 2014 17:31:38 +0000 (13:31 -0400)]
Removed hard coded distribution management URLs

Replaced with variables.

Signed-off-by: Devin Avery <devin.avery@brocade.com>
9 years agoBug 1544 - Explicit LLDP flow to punt whole LLDP packets to the controller 78/10478/4
Martin Bobak [Wed, 27 Aug 2014 21:13:35 +0000 (23:13 +0200)]
Bug 1544 - Explicit LLDP flow to punt whole LLDP packets to the controller

Change-Id: I2943e1d13828212f8a9912ceb3f155bc034f8808
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoOpenflowJava UDP support corresponding change 47/10447/3
Michal Polkorab [Mon, 18 Aug 2014 11:41:35 +0000 (13:41 +0200)]
OpenflowJava UDP support corresponding change

 - DO NOT MERGE until https://git.opendaylight.org/gerrit/#/c/10432/ is merged

Change-Id: I499bc7375a67296d96049c34dcaf9ad70c6420c6
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug-1421 - Chaining of results and updateFlow 48/10348/3
Kamal Rameshan [Tue, 26 Aug 2014 22:27:26 +0000 (15:27 -0700)]
Bug-1421 - Chaining of results and updateFlow

1. Chained the flowmod results when more than one flows are added/updated
2. Fixed updateFlow when match/priority were changed. After RemoveFlow, add flow was being passed in as null.
3. Create a common set of methods to be used for both add and update flow tasks

Change-Id: I5d3576150bc5da79764c1b311e9c51df387f8c6f
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
9 years agoInventoryDataServiceUtil shifted to new API 69/10369/4
Martin Bobak [Mon, 25 Aug 2014 18:49:28 +0000 (20:49 +0200)]
InventoryDataServiceUtil shifted to new API

Change-Id: I1e53e13bdb503f34238d971d4fb88332cab06c1f
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoFixed dataBroker - copy from working distribution config 67/10367/6
Martin Bobak [Tue, 26 Aug 2014 04:55:37 +0000 (06:55 +0200)]
Fixed dataBroker - copy from working distribution config

Change-Id: Id0c95c18cc4b39ecdf51593520771ce07f5266bd
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1254 - increase UT coverage 31/10331/3
Martin Bobak [Tue, 26 Aug 2014 19:42:42 +0000 (21:42 +0200)]
Bug 1254 - increase UT coverage

Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoReplace harcoded URLs, updated out of date dependencies 24/10324/2
Devin Avery [Tue, 26 Aug 2014 17:02:42 +0000 (13:02 -0400)]
Replace harcoded URLs, updated out of date dependencies

1) Replaced hardcoded URLs with nexusproxy variables
2) Replaced out of date dependencies that were hardcoded
   with variables / dependency management.

Change-Id: Iea97ba79a532f5f73f31b80f63e6ef1072291acb
Signed-off-by: Devin Avery <devin.avery@brocade.com>
9 years agoRemoved wrong imports 50/10450/1
Martin Sunal [Thu, 28 Aug 2014 13:09:39 +0000 (15:09 +0200)]
Removed wrong imports

Signed-off-by: Martin Sunal <msunal@cisco.com>
9 years agoAdded exemplary ofjava thread model configuration 51/9651/3
Michal Polkorab [Mon, 4 Aug 2014 14:11:10 +0000 (16:11 +0200)]
Added exemplary ofjava thread model configuration

Depends on https://git.opendaylight.org/gerrit/#/c/9650/

 + one compatibility change

Change-Id: Ibc920a9b9e88681beee112e5d9966a07ac86117f
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoRemoved implementation of RPC get-node-ip-address 82/10382/2
Martin Sunal [Wed, 27 Aug 2014 14:47:36 +0000 (16:47 +0200)]
Removed implementation of RPC get-node-ip-address

implementation of RPC get-node-ip-address from flow-node-inventory is removed.
This RPC is not needed anymore. IP address is stored in datastore.

Signed-off-by: Martin Sunal <msunal@cisco.com>
9 years agoBug 1254 - Increase UT coverage 62/10262/2
Martin Bobak [Mon, 25 Aug 2014 19:55:56 +0000 (21:55 +0200)]
Bug 1254 - Increase UT coverage

Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoStores and gets IP address of a flow capable node 16/9616/8
Martin Sunal [Sat, 2 Aug 2014 17:28:40 +0000 (19:28 +0200)]
Stores and gets IP address of a flow capable node

- implements RPCs get-node-ip-address from flow-node-inventory.yang
depends on https://git.opendaylight.org/gerrit/#/c/9612/
- impelementation is done by using switch IP address from OFJava
depends on https://git.opendaylight.org/gerrit/#/c/9615/
- stores IP address of OF capable switch to data store (depends on Bug 1585)

Change-Id: I5b46106cf94109ddddd8cf5353d749e40c43b0ec
Signed-off-by: Martin Sunal <msunal@cisco.com>
9 years agoBug 1596: Fixed stats issue and NPE 96/10296/3
Prashaanth [Tue, 26 Aug 2014 10:56:18 +0000 (16:26 +0530)]
Bug 1596: Fixed stats issue and NPE

Signed-off-by: Prashaanth <prashaanthr92@gmail.com>
9 years agoBug 1254 - Increase UT coverage 57/10257/2
Martin Bobak [Mon, 25 Aug 2014 19:17:00 +0000 (21:17 +0200)]
Bug 1254 - Increase UT coverage

Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug-1421 - MD-SAL app cannot create a flow entry which adds a VLAN tag with the speci... 80/10280/3
Kamal Rameshan [Tue, 26 Aug 2014 05:18:40 +0000 (22:18 -0700)]
Bug-1421 - MD-SAL app cannot create a flow entry which adds a VLAN tag with the specified VLAN ID into untagged frame

Change-Id: I9bbda50487b26479f51e4a00582e1fbb9f8f98f1
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
9 years agoMerge "Added a signum to the SetMetaDataMask BigInt constructor"
Abhijit Kumbhare [Tue, 26 Aug 2014 05:32:04 +0000 (05:32 +0000)]
Merge "Added a signum to the SetMetaDataMask BigInt constructor"

9 years agoAdded a signum to the SetMetaDataMask BigInt constructor 59/10159/1
Brent Salisbury [Fri, 22 Aug 2014 08:16:59 +0000 (04:16 -0400)]
Added a signum to the SetMetaDataMask BigInt constructor

-OF TestCommandProvider doesnt appear functional atm, but
I did test the Java API calls from elsewhere. The test
function should now work. Below is the instantiated flowmod:
(Match) metadata=0x100/0xffffff0000000101 actions=drop

Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
9 years agoMerge "Bug 1088 :flow id in operational not matched; after removal not removed comple...
Abhijit Kumbhare [Thu, 21 Aug 2014 17:44:46 +0000 (17:44 +0000)]
Merge "Bug 1088 :flow id in operational not matched; after removal not removed completely Statistics manager uses custom comparators to compare the flows it receive from switch against the flows available in the config data store. Comparator was failing to match flow against the config flow because of two issues 1) Port number convertion at openflow plugin includes prefix openflow:1: to the port number. Prefix is not required,so removed it. 2) Mac address in the flow match, received from openflow plugin has different case (e.g XX:XX:XX:XX:XX:XX) then the one in config data store (e.g xx:xx:xx:xx:xx:xx). Default MacAddress class equals fails because of different case of mac address string. This need to be fixed in statistics manager module in controller."

9 years agoBUG-1458: apply 'create parents' bandaid 10/9610/5
Robert Varga [Sat, 2 Aug 2014 16:17:22 +0000 (18:17 +0200)]
BUG-1458: apply 'create parents' bandaid

Prevents exceptions being thrown, but results in pretty much no
performance at all.

Change-Id: I01306dddc8ed42efdccd22732535a4a464de74d6
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1545 - set default switch configuration after handshake 02/10102/3
Martin Bobak [Mon, 18 Aug 2014 21:05:59 +0000 (23:05 +0200)]
Bug 1545 - set default switch configuration after handshake

Change-Id: I06d08a66738b9bf10522264a079e5fcf19acf755
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1088 :flow id in operational not matched; after removal not removed completely 36/10136/2
Anilkumar Vishnoi [Tue, 19 Aug 2014 14:51:36 +0000 (20:21 +0530)]
Bug 1088 :flow id in operational not matched; after removal not removed completely
Statistics manager uses custom comparators to compare the flows it receive from
switch against the flows available in the config data store. Comparator was failing
to match flow against the config flow because of two issues
1) Port number convertion at openflow plugin includes prefix openflow:1: to the port
number. Prefix is not required,so removed it.
2) Mac address in the flow match, received from openflow plugin has different case
(e.g XX:XX:XX:XX:XX:XX) then the one in config data store (e.g xx:xx:xx:xx:xx:xx).
Default MacAddress class equals fails because of different case of mac address string.
This need to be fixed in statistics manager module in controller.

Change-Id: I8d10baa64af92dc9be4dd62c1c59c33344ac843d
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
9 years agoWorking features file and karaf distro 14/10114/5
Ed Warnicke [Wed, 20 Aug 2014 22:56:41 +0000 (17:56 -0500)]
Working features file and karaf distro

This feature file works, and has a test to keep it working.

You can try it out with

cd distributions/karaf
mvn clean install
cd target/assembly/bin
./karaf

Then point mininet at it (you can see logs with
log:display) and checkout:

http://localhost:8181/restconf/operational/network-topology:network-topology/

(note the port 8181, not port 8080)

Change-Id: I70fd72cba621be12605f8d65101536a782b7f8ab
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoHotFix Bug 1581 - DroptestRPC doesn't work with Cbench 06/10106/2
Vaclav Demcak [Wed, 20 Aug 2014 15:57:38 +0000 (17:57 +0200)]
HotFix Bug 1581 - DroptestRPC doesn't work with Cbench

* DroptestRpcSender is initialized for command on only, but check
command has to be case insesitive in DropTestCommandProvider (fixed)
* add input validation

Change-Id: Ia7131442d22b436290058082ed8a374a90ea35f8
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoFixing some changes to feature file 99/8099/13
André Martins [Tue, 8 Jul 2014 14:04:43 +0000 (10:04 -0400)]
Fixing some changes to feature file

Change-Id: I8c7a384a8c37450997da4348b73ecbe28b99e042
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
Signed-off-by: André Martins <aanm@ua.pt>
9 years agoBUG - 1491 tp_dst/tp_src in OF13 67/10067/3 topic/netsal
Timotej Kubas [Tue, 19 Aug 2014 15:08:49 +0000 (17:08 +0200)]
BUG - 1491 tp_dst/tp_src in OF13
- set_tp_dst and set_tp_src actions handling hotfix for OF13
- "wrapping" of these actions into SetField action in case of using OF13 protocol

Change-Id: I09625b7c6cdb9ceef5e95d07daa6feabcd32bc61
Signed-off-by: Timotej Kubas <tkubas@cisco.com>
9 years agoBug 1596 - OpenflowpluginTestCommandProvider stopped working 66/10166/2
Martin Bobak [Wed, 20 Aug 2014 00:14:51 +0000 (02:14 +0200)]
Bug 1596 - OpenflowpluginTestCommandProvider stopped working

Change-Id: I83a0dd0a48722e3726caa5607d8914251eebf4db
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG-1557 crypting error 90/9990/3
Michal Rehak [Fri, 15 Aug 2014 19:26:54 +0000 (21:26 +0200)]
BUG-1557 crypting error

- changed to warning
- added beautiful message

Change-Id: I99f999900893f50f704fb95a03e32537d2940358
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoRevert "Added the BufferId value on PacketIn." 74/10074/1
Moiz Raja [Tue, 19 Aug 2014 17:30:56 +0000 (10:30 -0700)]
Revert "Added the BufferId value on PacketIn."

This reverts commit 6b45074c71dc31d0f17d06fd2f0885adb56429f7.

Change-Id: If94e01cb4f14305c0116d499f0d80f0e49cceb5b
Signed-off-by: Moiz Raja <moraja@cisco.com>
9 years agoAdded the BufferId value on PacketIn. 48/10048/2
André Martins [Mon, 18 Aug 2014 23:07:54 +0000 (00:07 +0100)]
Added the BufferId value on PacketIn.

Depends on https://git.opendaylight.org/gerrit/#/c/9968/

Change-Id: I5f5eb93d9ed6383839103989121a99bc0841f428
Signed-off-by: André Martins <aanm@ua.pt>
9 years agoChanged artifactId to the proper naming convention. 69/9969/2
André Martins [Fri, 15 Aug 2014 02:14:31 +0000 (03:14 +0100)]
Changed artifactId to the proper naming convention.

See https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines

Change-Id: I08289e6a6a0d8c54b7d2ae695678156a7e503847
Signed-off-by: André Martins <aanm@ua.pt>
9 years agoCurrently, we ignore the 'order' field in the action-list. 14/9214/9
Kamal Rameshan [Tue, 22 Jul 2014 04:22:18 +0000 (23:22 -0500)]
Currently, we ignore the 'order' field in the action-list.
This patch fixes that.

We should probably do something similar for other 'ordered'
things.

Change-Id: I0ed424c8a1f9a1c1eb71ff400a7347b8baff3b01
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Bug-1338:Order comparator for Action, Instruction and TableFeatures

1. Created a generic Order Comparator to be used for ordering Action, Instructions and TableFeatures
2. Fixed the tests to have the mandatory Order as part of the Action creation.
3. Depends on Controller gerrit : https://git.opendaylight.org/gerrit/#/c/9802/
4. Added OrderComparatorTest for OrderComparator

Change-Id: I0ed424c8a1f9a1c1eb71ff400a7347b8baff3b01
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
9 years agoBug 1254 - increase UT coverage 18/9918/2
Martin Bobak [Wed, 13 Aug 2014 05:56:07 +0000 (07:56 +0200)]
Bug 1254 - increase UT coverage

- fixed NPE in OpenflowPortUtils#getPortLogicalName when OpenFlowVersion was
  UNSUPPORTED
- added unit test for fix

Change-Id: I22e54e0d7e9b9c6a07534d03399634021de39235
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1492 - java.lang.IllegalArgumentException: 'Ipv4Address 24/9924/4
Jan Hajnar [Wed, 13 Aug 2014 17:06:50 +0000 (19:06 +0200)]
Bug 1492 - java.lang.IllegalArgumentException: 'Ipv4Address
[_value=<ADDR>]' is not an IP string literal.

* changed explicit toString() call on Ipv4Address object to getValue().
* added tests for IpPrefix creation
* removed redundant fillBitMaskFromMap method

Change-Id: I38d333a126b0834c27ab0378bb7262c968b5809a
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
9 years agoBreak spurious dependencies 49/9849/5
Ed Warnicke [Mon, 11 Aug 2014 05:11:27 +0000 (00:11 -0500)]
Break spurious dependencies

DO NOT MERGE until https://git.opendaylight.org/gerrit/#/c/9846/
has been merged in controller.

Change-Id: I11c9eb8e9b34705faec684d54cff63c0671d4f41
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBUG-496 IT failing 62/9962/1
Michal Rehak [Thu, 14 Aug 2014 21:47:47 +0000 (23:47 +0200)]
BUG-496 IT failing

- increased wait time for openflowPluginProvider bean in order to prevent
  random bean resolve timeout

Change-Id: I118d5b68e536615f916979bb4c5eda619861513c
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBUG-496 IT failing 54/9954/1
Michal Rehak [Thu, 14 Aug 2014 16:57:29 +0000 (18:57 +0200)]
BUG-496 IT failing

- configSubsystem configuration used for IT (sal-binding-it) was
  significantly changed - adopted those changes to ofplugin-it

Change-Id: Ic79a8a0ed0e7e868d4627bd962cb9ab7309a46b7
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug 1299 - OF10 plugin sending Stats Request type 13 14/9914/2
Anilkumar Vishnoi [Wed, 13 Aug 2014 11:20:36 +0000 (16:50 +0530)]
Bug 1299 - OF10 plugin sending Stats Request type 13
Once node connect to the plugin, it sends port desciption statistics request to the node.
This statistic request is only defined for openflow 1.3+ switches. Added the condition
to avoid sending this request to openflow 1.0 switch

Change-Id: I10a81a7e83efc0e75eb4581ea24b226626625a26
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
9 years agoBUG-1455: improve thread safety/performance 08/9508/5
Vaclav Demcak [Mon, 11 Aug 2014 14:49:03 +0000 (16:49 +0200)]
BUG-1455: improve thread safety/performance

There were couple of things wrong with this code: flipping 'starving'
field needlessly, which could end up in needless calls to notify().
Split that field into local state and volatile status indicator.

finished is not volatile, so the checks can actually get removed at
runtime, breaking the shutdown() functionality. Also an explicit ping()
is needed to wake a starving harvester.

Change-Id: I58b46a3f2e593e3873c47c30d2fe0d22d4304e8f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoExporting the packages explicitely in order for exposing all the api bundles to external 55/9855/1
Madhu Venugopal [Mon, 11 Aug 2014 12:36:03 +0000 (05:36 -0700)]
Exporting the packages explicitely in order for exposing all the api bundles to external
bundles which depend on the API framework to expand the extensibility support into other bundles.

Change-Id: I8d9fb4e8f27f8289f116ac591bb59b23c6437985
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
9 years agoFix potential performance problems reported by findbugs 94/9794/2
Robert Varga [Thu, 7 Aug 2014 16:07:18 +0000 (18:07 +0200)]
Fix potential performance problems reported by findbugs

Reported things are inefficient number instatiantions, so this is very
safe.

Change-Id: If865d3748f79a046b3546249facc29968dd25d2d
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd missing group action registrations to make it possible to use 23/9723/2
Rob Adams [Tue, 5 Aug 2014 22:39:31 +0000 (15:39 -0700)]
Add missing group action registrations to make it possible to use
the Nicira actions in a group.

Change-Id: I616d3c494d2a7942a8d6142dfda342d1fc785a56
Signed-off-by: Rob Adams <readams@readams.net>
9 years agoAdd support for Nicira OUTPUT_REG action 71/9671/4
Rob Adams [Mon, 4 Aug 2014 21:15:20 +0000 (14:15 -0700)]
Add support for Nicira OUTPUT_REG action

Change-Id: I61405e0d87444471c2b2a96662d95e46c93c43b0
Signed-off-by: Rob Adams <readams@readams.net>
9 years agoExtension support - easy lookup for toOFJava 93/9393/11
Michal Rehak [Fri, 11 Jul 2014 09:04:39 +0000 (11:04 +0200)]
Extension support - easy lookup for toOFJava

- added new type of converter with registration based on case augment type
- flow makes it to device and breaks in statistics
- rebased
- added converter type for Action from OFJava to MD-SAL
- fixed stats
- renamed openflowplugin-nicira-extension and moved stuff (mimic change 9522)
- action lookup is based in case type
- simplified nicira action models
- removed ofplugin action augmentations
- added augmentations for actions under nodes/node/group..

- for fixing dependencies in INTEGRATION following change must be merged
  https://git.opendaylight.org/gerrit/#/c/9614/

PatchSet9:
Squashed in:
https://git.opendaylight.org/gerrit/#/c/9522/8
https://git.opendaylight.org/gerrit/#/c/9004/35
https://git.opendaylight.org/gerrit/#/c/8933/10
https://git.opendaylight.org/gerrit/#/c/8932/7

Change-Id: I7616615225fdadedf45e22e4aca6668e25447001
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoMerge "Fix unit test coverage not being reported"
Prasanna Huddar [Wed, 6 Aug 2014 14:11:15 +0000 (14:11 +0000)]
Merge "Fix unit test coverage not being reported"

9 years agoFix unit test coverage not being reported 30/9730/2
Robert Varga [Wed, 6 Aug 2014 04:52:38 +0000 (06:52 +0200)]
Fix unit test coverage not being reported

Jacoco configuration is needed and sonar needs to be pointed in the
right direction.

Change-Id: Icaa16fc6512d2b242ee325363e04f17df52c1a7a
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRemove stale dependency on model-flow-management artifact 95/9695/2
Giovanni Meo [Tue, 5 Aug 2014 13:10:06 +0000 (15:10 +0200)]
Remove stale dependency on model-flow-management artifact

- model-flow-management has been removed from controller, hence it
should no longer be used given is available only in -SNAPSHOT form
- Reupload to retrigger the jenkins

Change-Id: I4f733e5575a9aafea424bab519fb09290a575ae7
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoBug 1458 - Migrate to next MD-SAL dataStore API 32/9532/2
Martin Bobak [Thu, 31 Jul 2014 13:17:18 +0000 (15:17 +0200)]
Bug 1458 - Migrate to next MD-SAL dataStore API

- deprecated ReadWriteTransaction#commit() replaced by submit()

Change-Id: I0191c1765c3b7482106188555eb9e55677538352
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1458 - Migrate to next MD-SAL dataStore API 28/9528/4
Martin Bobak [Thu, 31 Jul 2014 11:58:47 +0000 (13:58 +0200)]
Bug 1458 - Migrate to next MD-SAL dataStore API

- drop-test usage of classes originating from deprecated org.opendaylight.controller.sal.binding.api.data
  and org.opendaylight.controller.sal.core.api.data
  replaced by classes originating from  org.opendaylight.controller.md.sal.binding.api

Change-Id: Id636a4d133484a7524aee24bf40292bb86d6f60c
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1254 - increase unit test coverage 73/9473/3
Martin Bobak [Wed, 30 Jul 2014 09:25:14 +0000 (11:25 +0200)]
Bug 1254 - increase unit test coverage

- Fixed issue in PortTranslatorUtil#translatePortFeatures(PortFeatures)
  and PortTranslatorUtil#translatePortFeatures(PortFeaturesV10). Both
  methods were using PortFeatures constructor with arguments in wrong order.
  Added unit test for if correct properties are used as constructor arguments.

Change-Id: I3b5073338616f6de52e0c8403018cec01a53686d
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG 956 - thread problem 86/9486/3
Timotej Kubas [Tue, 24 Jun 2014 17:48:40 +0000 (19:48 +0200)]
BUG 956 - thread problem
thread problem fixed
added unit tests
OFRpcTaskFactory.createUpdateFlowTask changed - result from flow removing used in further processing
port stats repaired

Change-Id: Idef68139ced6eb5db7a29fb1eb302a105b7a1a4c
Signed-off-by: Timotej Kubas <tkubas@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug 1458 - Migrate to next MD-SAL dataStore API 27/9527/1
Martin Bobak [Thu, 31 Jul 2014 10:36:27 +0000 (12:36 +0200)]
Bug 1458 - Migrate to next MD-SAL dataStore API

- classes originating from deprecated org.opendaylight.controller.sal.binding.api.data
  and org.opendaylight.controller.sal.core.api.data
  replaced by classes originating from  org.opendaylight.controller.md.sal.binding.api

Change-Id: I53d1c1cb3fa56103b97d7333153e9d145f14559d
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoreverting to patch set 7 21/8321/9
Prasanna Huddar [Wed, 30 Jul 2014 11:32:29 +0000 (17:02 +0530)]
reverting to patch set 7

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

9 years agoBug 1254 - Increase unit test coverage 52/9152/2
Martin Bobak [Thu, 17 Jul 2014 21:38:27 +0000 (23:38 +0200)]
Bug 1254 - Increase unit test coverage

Change-Id: I32f02ccb090f8fa7fec88a5b303134953669348d
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG-432 Registration change 89/9389/1
Michal Rehak [Mon, 28 Jul 2014 15:02:18 +0000 (17:02 +0200)]
BUG-432 Registration change

- removed generic parameter

Change-Id: I9a464bcec927db1ba9a10ee81d327a65a0091267
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBUG-1254 test for PortConvertor - tests with all parameters 12/9312/1
Jakub Toth [Fri, 25 Jul 2014 12:01:26 +0000 (08:01 -0400)]
BUG-1254 test for PortConvertor - tests with all parameters

Signed-off-by: Jakub Toth <jatoth@cisco.com>
9 years agoBug 545 - Added exemplary TLS configuration 52/9252/3
Michal Polkorab [Wed, 23 Jul 2014 06:17:46 +0000 (08:17 +0200)]
Bug 545 - Added exemplary TLS configuration

 - uncommenting the code takes effect only after https://git.opendaylight.org/gerrit/#/c/9225/ is merged
   and keys are used inside mininet for tls communication

Change-Id: I4397d094a35a429f8393466b6d69ae700a61cc4a
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoRevert "Bug 545 - Added exemplary TLS configuration" 45/9245/1
Ed Warnicke [Tue, 22 Jul 2014 21:19:49 +0000 (16:19 -0500)]
Revert "Bug 545 - Added exemplary TLS configuration"

This reverts commit 8d5aced73d32bcadc6dbd0a8229db797448fe1dd.

Change-Id: Ia2dffab4f4af5fcea0dba5ecb867682a32a070c6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBug 545 - Added exemplary TLS configuration 21/9021/5
Michal Polkorab [Tue, 15 Jul 2014 13:17:34 +0000 (15:17 +0200)]
Bug 545 - Added exemplary TLS configuration

 - takes effect after https://git.opendaylight.org/gerrit/#/c/9225/ is merged

Change-Id: If5724ea5b63abb6ee874709b06629694f4f5f323
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdded conversion for Tunnel Endpoints to ofplugin 22/7722/6
Brent Salisbury [Thu, 5 Jun 2014 08:39:25 +0000 (04:39 -0400)]
Added conversion for Tunnel Endpoints to ofplugin

Patchset #2:
-Added a few comments to oftestprovider, renumbered
the test functions and rebased.
-Dependencies for this are already merged into
controller and openflowjava.
-Test results after rebase at:
https://gist.github.com/ebb81b8344696a951de6

Patchset #1:
-Per conversations tracked in bug 1133 adding
support for flow based TEPs. As soon as
the openflow implementation is extensible
we will pull them into a seperate bundle.
In the meantime this prevents blocking.
-I broke out a couple of extension specific
type conversions that refernce NXM1Class into
a class named NxmExtensionsConvertor.
-Test and results at:
https://gist.github.com/20d049c8c61a7a03e2c7

Change-Id: I8c0e5fbe8d68eb123cabbe58db49823424d1dfb0
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
9 years agoBUG-1397 Openflowjava corresponding changes for experimenter model update 88/9188/2
Michal Polkorab [Mon, 21 Jul 2014 08:22:30 +0000 (10:22 +0200)]
BUG-1397 Openflowjava corresponding changes for experimenter model update

 - DO NOT MERGE before https://git.opendaylight.org/gerrit/#/c/9155/ is merged

BUG-1307 - unit test NP fix (caused by yangtools fix)

Change-Id: I1b9a1f07821aa265fea4f280914d4fc2f0d975a6
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoFix various null pointer exceptions caused by flows with an empty match 79/8879/3
Rob Adams [Wed, 9 Jul 2014 22:14:16 +0000 (15:14 -0700)]
Fix various null pointer exceptions caused by flows with an empty match
Add unit tests where possible

Change-Id: I893d47dd92daf3fd8d9a2155dc6a6bf32949f7dc
Signed-off-by: Rob Adams <readams@readams.net>
9 years agoMerge "BUG 1310 Simplefix - guarded shake() from late arriving HELLO"
Abhijit Kumbhare [Tue, 15 Jul 2014 22:52:24 +0000 (22:52 +0000)]
Merge "BUG 1310 Simplefix - guarded shake() from late arriving HELLO"

9 years agoBug - 1008 Define checked exceptions 38/8838/2
Martin Bobak [Tue, 8 Jul 2014 15:36:08 +0000 (17:36 +0200)]
Bug - 1008 Define checked exceptions

- IllegalStateException thrown by MessageDispatchServiceImpl#getConnectionAdapter
  is replaced by ConnectionException
- all Future<RpcResult<T>> methods return RpcError wrapped in RpcResult if
  ConenctionException is thrown by MessageDispatchServiceImpl#getConnectionAdapter
  when method is called
- openfloplugin-api bundle added to integration tests

Change-Id: Ib930dfc2ab19e56eea43022b586979c6bc52d034
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug - 1008 Define checked exceptions 37/8837/2
Martin Bobak [Tue, 8 Jul 2014 13:57:17 +0000 (15:57 +0200)]
Bug - 1008 Define checked exceptions

- introduced ConnectionException

Change-Id: I9b5c8594ecc1a4e3134a1643f961970f88a76eda
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG-1332 added cbench distribution 96/8796/4
Michal Rehak [Tue, 8 Jul 2014 12:09:11 +0000 (14:09 +0200)]
BUG-1332 added cbench distribution

- derived from base distribution
- zipped image is produced by default
- included into modules in order to make cbench distribution available
  as result of each automated build

Change-Id: I695c0189a8a6448aa9fa5ee3414fb100fb0fa7a4
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBUG 1310 Simplefix - guarded shake() from late arriving HELLO 00/8900/2
jameshall03885 [Thu, 10 Jul 2014 15:04:30 +0000 (11:04 -0400)]
BUG 1310 Simplefix - guarded shake() from late arriving HELLO

Added two new IT scenarios.  The NoVBM_OF10_TwoHello produces a
duplicate datapathId problem prior to this fix.

Change-Id: Idedac4524acd15d77df73223cd75d67b5b1f4887
Signed-off-by: jameshall03885 <ghall@brocade.com>
9 years agoBug 1008 - Define checked exceptions 91/8791/2
Martin Bobak [Tue, 8 Jul 2014 11:47:25 +0000 (13:47 +0200)]
Bug 1008 - Define checked exceptions

- introduced openflowplugin-api bundle

Change-Id: I6e349c8e58b72a23ead8664f2865108040060d8b
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoFix Eclipse errors. 41/8441/4
Ed Warnicke [Sun, 29 Jun 2014 22:32:35 +0000 (17:32 -0500)]
Fix Eclipse errors.

Change-Id: I9003ba36f54442636c9d93e72e99c91a738b8dd5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoRemoved redundant dependency 79/8779/1
Martin Bobak [Tue, 8 Jul 2014 08:17:14 +0000 (10:17 +0200)]
Removed redundant dependency

Change-Id: Ief98a7304ae875cbf32d6f7ced66b92b576e1692
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoMake configuration of msg-spy in local distro clearer 30/8730/3
Ed Warnicke [Mon, 7 Jul 2014 11:05:43 +0000 (06:05 -0500)]
Make configuration of msg-spy in local distro clearer

This patch:
1)  Gets the initial config from the
openflowplugin-controller-config bundle
2)  Adds a local 43-msg-spy.xml to configure
msg-spy

Change-Id: I2ce87eedb97fc1784aa81c8016983af5deb89959
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBug 1312 - msg-spy config validation fix 28/8728/3
Vaclav Demcak [Thu, 3 Jul 2014 07:21:48 +0000 (09:21 +0200)]
Bug 1312 - msg-spy config validation fix

* fix for commited  BugFix 542 - Plugin internal stats
* fix for forgotten TODO task (initialization method in PluginProvider)

* refactoring for internal statistics
* add internal statistic confSubsystem module
* add MXBean for statistic's report

Change-Id: I1e734063396b2e5344ebd755fde19cea85ac1490
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agofix for BUG 587 84/5784/2
Martin Bobak [Wed, 26 Mar 2014 20:42:40 +0000 (13:42 -0700)]
fix for BUG 587

- reduced tripple registered salFlowListener to one instance
- removed "flow" from message - this listeners catches all error messages

Change-Id: I82f87d71586e5e5de43e7a2a67daa43304a99d17
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 542 - Plugin internal stats 66/8666/2
Vaclav Demcak [Thu, 3 Jul 2014 07:21:48 +0000 (09:21 +0200)]
Bug 542 - Plugin internal stats

* refactoring for internal statistics
* add internal statistic confSubsystem module
* add MXBean for statistic's report

Change-Id: I2574d16bb087538dc0f85963717a0160c5729112
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoBug-1307 - unit test failing (NPE) 67/8667/1
Martin Bobak [Fri, 4 Jul 2014 13:05:23 +0000 (15:05 +0200)]
Bug-1307 - unit test failing (NPE)

Change-Id: I9f1714fc9a7c4e3de0b7e73927dda308ccaef062
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG 1302 Fix NullPointerException in MultipartReplyTranslator 47/8647/1
Rob Adams [Thu, 3 Jul 2014 22:30:14 +0000 (15:30 -0700)]
BUG 1302 Fix NullPointerException in MultipartReplyTranslator

Signed-off-by: Rob Adams <readams@readams.net>
9 years agoAdded a missing nullcheck in stats converter 34/8634/1
Ed Warnicke [Thu, 3 Jul 2014 19:42:59 +0000 (14:42 -0500)]
Added a missing nullcheck in stats converter

There was a missing null check in
FlowStatsResponseConvertor

This pre-existing bug was uncovered when a bug was fixed in the
setCookie() method that caused it to stop inappropriately accepting
nulls.

Change-Id: I1a1bcc8f9de1cc49573b468726418520081159fb
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBUG-1277 Add missing openflowplugin.util dependency to distribution pom 29/8629/3
Rob Adams [Thu, 3 Jul 2014 16:19:38 +0000 (09:19 -0700)]
BUG-1277 Add missing openflowplugin.util dependency to distribution pom

Signed-off-by: Rob Adams <adams@noironetworks.com>
Change-Id: I3e409b36a10c0faf908538b68e78fcab3fa9ad35

9 years agoBUG-1277 Reflection of OFJava's ByteBufUtils move on OFPlugin 27/8627/1
Michal Rehak [Thu, 3 Jul 2014 17:10:31 +0000 (19:10 +0200)]
BUG-1277 Reflection of OFJava's ByteBufUtils move on OFPlugin

- added the introduced bundle as dependency to distribution/base

Change-Id: I6924b5ce86e164846f5df2e7b75ea65d7f07aff2
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBUG-1297 + BUG-1277 Reflection of OFJava's ByteBufUtils move on OFPlugin 08/8608/5
Martin Bobak [Thu, 3 Jul 2014 09:00:09 +0000 (11:00 +0200)]
BUG-1297 + BUG-1277 Reflection of OFJava's ByteBufUtils move on OFPlugin

Merge only after these two are merged :

https://git.opendaylight.org/gerrit/#/c/8552/
https://git.opendaylight.org/gerrit/#/c/8554/
https://git.opendaylight.org/gerrit/#/c/8609/

BUG-1297 flowCookie with null value (unit test blocker)

- added if-branch in order not to create flowCookie if null input

Change-Id: Ib4149f9f41a6b3b2b7b84ec6713d83391db598a9
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoMerge "Bug 1254 - OFP test coverage increase"
michal rehak [Thu, 3 Jul 2014 11:52:42 +0000 (11:52 +0000)]
Merge "Bug 1254 - OFP test coverage increase"

9 years agoBug 1254 - OFP test coverage increase 87/8487/3
Martin Bobak [Mon, 30 Jun 2014 13:52:32 +0000 (15:52 +0200)]
Bug 1254 - OFP test coverage increase

- ByteUtil is final with private constructor instead of being abstract
- ByteUtil#bytesToUnsignedInt expects its paramater to be exactly 4 bytes long
- ByteUtil#bytesToUnsignedShort expects its parameter to be exactly 2 bytes long
- ByteUtil tests added

Change-Id: I7820bb0e0c33070317c08c1f3fd9a65ce99f6f09
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1254 - OFP test coverage increase 27/8527/1
Martin Bobak [Wed, 2 Jul 2014 08:20:12 +0000 (10:20 +0200)]
Bug 1254 - OFP test coverage increase

- PacketInUtil is final with private constructor instead of being abstract
- added unit test for PacketInUtil#getMdSalPacketInReason method

Change-Id: I260c3f92580187de93b4ce7a16512c4a13b9882b
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoCorresponding change for openflowjava - TLS support (https://git.opendaylight.org... 84/8484/2
Michal Polkorab [Tue, 1 Jul 2014 09:45:31 +0000 (11:45 +0200)]
Corresponding change for openflowjava - TLS support (https://git.opendaylight.org/gerrit/#/c/7904)

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 1254 - OFP test coverage increase 52/8452/3
Martin Bobak [Mon, 30 Jun 2014 12:01:49 +0000 (14:01 +0200)]
Bug 1254 - OFP test coverage increase

- FlowCreatorUtil is final with private constructor instead of being
abstract

Change-Id: I063f114279582598770c03e00c3e947c6ee7a4e8
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG-1257 cbench data store test is failing 53/8453/1
Michal Rehak [Mon, 30 Jun 2014 12:10:22 +0000 (14:10 +0200)]
BUG-1257 cbench data store test is failing

- added order value required by instruction
- changed capability in IT (copied from sal-binding-it)

Change-Id: I7adb2ae47e98fb01792229a87bff4718ca88a164
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug-835 - Reserve Ports should be logical ports, part2 22/8422/1
Michal Rehak [Fri, 27 Jun 2014 20:21:07 +0000 (22:21 +0200)]
Bug-835 - Reserve Ports should be logical ports, part2

- spread ofVersion parameter
- improved logical port number usage
- unit tests

Change-Id: I904baefdb62db7d9e49f1eede765bbb389aa7b03
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug-835 - Reserve Ports should be logical ports 18/7618/3
Kamal Rameshan [Thu, 19 Jun 2014 02:42:41 +0000 (19:42 -0700)]
Bug-835 - Reserve Ports should be logical ports

- rebased
- spread ofVersion parameter

Change-Id: I62aa6b441642c8677396522462527d42526775d1
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBUG-709 packetIn and connectionCookie 80/8180/3
Michal Rehak [Fri, 20 Jun 2014 15:12:37 +0000 (17:12 +0200)]
BUG-709 packetIn and connectionCookie

- started sending connectionCookie up to MD-SAL wrapped in packetIn
- started honoring connectionCookie coming down from MD-SAL
  wrapped in TransmitPacketInput
- fixed NPE when auxiliary identifier missing

Change-Id: I1f3d1e4392cc8e3b766c4f90ac251e1692ba37eb
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoMerge "Bug 1187 - of-flow: instruction/.../action/set-field with missing detail in...
michal rehak [Mon, 23 Jun 2014 09:32:57 +0000 (09:32 +0000)]
Merge "Bug 1187 - of-flow: instruction/.../action/set-field with missing detail in operational data store"

9 years agoMerge "Bug 1186 - of-flow: pop-mpls-action different in config and operational data...
michal rehak [Mon, 23 Jun 2014 09:28:20 +0000 (09:28 +0000)]
Merge "Bug 1186 - of-flow: pop-mpls-action different in config and operational data store"

9 years agoBug 1187 - of-flow: instruction/.../action/set-field with missing detail in operation... 15/8215/1
Anilkumar Vishnoi [Sat, 21 Jun 2014 04:39:31 +0000 (10:09 +0530)]
Bug 1187 - of-flow: instruction/.../action/set-field with missing detail in operational data store

Change-Id: Ie69c5d87b6a26fa9a6aef98b6523ed4603daae5c
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
9 years agoBug 1229: POM Restructuring for reliable weekly automated releases 99/8199/2
Vaishali Mithbaokar [Fri, 20 Jun 2014 22:22:07 +0000 (15:22 -0700)]
Bug 1229: POM Restructuring for reliable weekly automated releases

Change-Id: I8561e847251a2ea99b2c7fac63591091de8a63cb
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
9 years agoBug 1186 - of-flow: pop-mpls-action different in config and operational data store 31/8131/1
Anilkumar Vishnoi [Wed, 18 Jun 2014 19:25:46 +0000 (00:55 +0530)]
Bug 1186 - of-flow: pop-mpls-action different in config and operational data store

Change-Id: I9b13cd917200504c24b2892590661a85824899cb
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
9 years agoBUG-1075: ingress back pressure 58/7458/9
Michal Rehak [Tue, 27 May 2014 11:43:42 +0000 (13:43 +0200)]
BUG-1075: ingress back pressure

- added fair competition queue keeper implementation
- added queueProcessor (harvesting and processing messages)
- per-connection-queues register for queueProcessor and are blocked if polling queue is full
- removed netty thread blocking by publish
- added dropping of messages
- added meaningful names to threads
- added harvester, queues zipper, messageSource registration stuff
- changed ticketPool to blocking if poolQueue full
- doubleCheckedLocking for harverster starving
- handshake pool switched to logging implementation
- onHello method is no more synchronized
- for messages {hello, features} timeout = 8s
- optimized synchronized singleton methods
- used ThreadFactoryBuilder
- processed comments

Change-Id: Ic0b4ebc2df4e19793fa1d1d125a0d31dd2f9c6c8
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug 1185 :of-flow: push-mpls-action different in config and operational data store 02/8002/1
Anilkumar Vishnoi [Fri, 13 Jun 2014 20:45:13 +0000 (02:15 +0530)]
Bug 1185 :of-flow: push-mpls-action different in config and operational data store

Change-Id: I2fac5b3eaeced2a1f93f963fc7a180dc164fc589
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
9 years agoKaraf integration with plugin 20/7620/9
Prasanna Huddar [Tue, 3 Jun 2014 06:13:25 +0000 (11:43 +0530)]
Karaf integration with plugin

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

9 years agoBug 1181 : of-flow: Flow match criteria (ipv6-source,ipv6-destination) is different... 57/7957/2
Anilkumar Vishnoi [Thu, 12 Jun 2014 19:06:35 +0000 (00:36 +0530)]
Bug 1181 : of-flow: Flow match criteria (ipv6-source,ipv6-destination) is different in config and operational database

- added unit test

Change-Id: I186d9bdd67a62fa8f98606a8f3ad76d99ef56fec
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>