Merge "Added missing keys. This allows to reuse DTOs for operational/configuration data."

Added missing keys. This allows to reuse DTOs for operational/configuration data.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

fix BUG 596 (part2)

- reenabled fixed SalPortService interface (providing portUpdate)

Change-Id: I5adbf8e1868abf55f319b1d03d5d44deca88b378
Signed-off-by: Michal Rehak <mirehak@cisco.com>

vlan ID fix
Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>

fix for BUG 609

- extra hello message is being disregarded

Change-Id: Idfe6009c5791d2441c1e5fe5311b75b6927d5f5f
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Reenabled integration tests - part2

- adding dirty sleep to have the controller part up and running

Change-Id: I1f6e9b617d10df162631af34598206b7b5d81bf5
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Reenabled integration tests

- added osgi console and debug support for IT
- pulled dependencies to parent pom (including IT dependencies)
- fixed dependencies (pax, config-manager, commons-codec, junit)
- fixed pax bundles
- tidied up plugin activator + OpenflowPluginProvider
- changing reactor strategy to perClass (speedup testing)
- added AutoCloseable interface to ErrorHandler
- moved errorHandler setup up to MDController
- enabling of SalIntegrationTest
- added check whether the SimpleClient succeeded to connect to controller

- updated versions of sal-api, netconf-connector, config-manager
- added 5s wait on startup - dirty temprary solution untill configSubsysten

- rebased

Change-Id: I21ff052ff6d90ff95f5b8b2a51fb8d736e697034
Signed-off-by: Michal Rehak <mirehak@cisco.com>

fix for BUG 596

- SalPortService wont be supported for now

Change-Id: Ia9f140d969e324630fbe7d64bd03ff8d198bc0c5
Signed-off-by: Michal Rehak <mirehak@cisco.com>

BUG-592: prepare for API change

getPathArguments() was added by mistake with its current return type. It
will be fixed in a follow-up patch, so fall back to getPath(), which does
the same thing, such that it won't break when things change.

Change-Id: Iae3661aa8942e050c0ac638cce0bec6dae9fa290
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>

quickfix - added missing org.osgi.core provided dependency

- sample-consumer
- learning-switch

Change-Id: Ibb4f5fa3abcfa88103097e95a147712ddf06d2ff
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Merge "Added required keys to items in DropTestCommiter."

Added required keys to items in DropTestCommiter.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

Adjust permissions: datafiles should not be executable

Signed-off-by: Robert Varga <robert.varga@pantheon.sk>

Fix a typo

Signed-off-by: Robert Varga <robert.varga@pantheon.sk>

Bug 572 - Removing the duplicate translate method call. Tested on the mininet with linear,2 switch.

Change-Id: I8386b31e68742c844495da96463330fee61cd5b1
Signed-off-by: lmukkama@cisco.com

Refactor and fix another reference bug in PortConvertor

Another place where an out-parameter was used has been fixed. Also refactored some code to make it a little cleaner.

Change-Id: I3ef970cc09007e84d43ff8f5bbce5cde241ab525
Signed-off-by: Moiz Raja <moraja@cisco.com>

Pass the appropriate PortModInput to portMod

In ModelDrivenSwitchImpl we were building an input but the built input was not passed to portMod. This had issues like missing Xid on the PortModInput
which caused NPE's downstream in the open flow java code

Also we were not correctly population ConfigV10, MaskV10 and FeaturesV10 on the PortModInput which caused NPE in the open flow java code when using
open flow 10

This commit fixes both of those problems. After this updatePort actually works.

Change-Id: Ie2548a36b2ba06f1d1ce0ccf833627bc7cbaf785
Signed-off-by: Moiz Raja <moraja@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Fix bug in PortConvertor#maskPortConfigFields

This method was trying to set a passed reference to a different value and expecting to see it set in the caller
This won't work in java because java passes object references also as a value

See http://www.javaworld.com/article/2077424/learn-java/does-java-pass-by-reference-or-pass-by-value.html

Change-Id: I809f0887fb435b5ae2dd2b91304b8c20fa2adb17
Signed-off-by: Moiz Raja <moraja@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Register for SalPortService

This is required so that someone can use the SalPortService as a consumer
- rebased onto merged change

Change-Id: I14069f04420285a783c16926543cf30ec85308b8
Signed-off-by: Moiz Raja <moraja@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>

fix of BUG 512

- FlowEventListener copied implementation has been pulled out, defined in one place for all tests
- transactionUri NPE fix

Change-Id: Iab7223050e7012c4c29f310922008fc54b14b14e
Signed-off-by: Michal Rehak <mirehak@cisco.com>

fix of BUG 480

- lowered priority of flow-54 added programmatically via osgi cmd
- cleaning bound to OFLibrary upon bundle stop

Change-Id: Ibe24e730b032621a97f6dd36af8c29d4607a27ea
Signed-off-by: Michal Rehak <mirehak@cisco.com>

fix of BUG 434

- added AutoCloseable interface to MDController, MessageCountCommandProvider, SalRegistrationManager, SessionManager
- added init/start and close/destroy logging
- added closing/destroying upon bundle stop

Change-Id: I5fe94bbcfa37225790b68d2e1ef01ffb1f6ab675
Signed-off-by: Michal Rehak <mirehak@cisco.com>

fix of BUG 512

- sanitized NPE if no data in error message present
- added error type support for OF-1.0 error messages
- removed commented code in ActionConvertor

Change-Id: I915ad8f2645d9e641b53a5a237906a3a44aade2b
Signed-off-by: Michal Rehak <mirehak@cisco.com>

fixed the recconect issue "Timeout waiting for task"
Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>

fix of BUG 482

packetIn translation is split into OF-1.0 and OF-1.3
- OF-1.0 does not provide table and match, ingress port is directly assigned to message
- OF-1.3 provides tableId, match, ingress port is extracted from match

Change-Id: I083359041de038eca971b5453c152cad3a8fb51b
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Adding FlowRef,MeterRef and GroupRef for the Error message

Signed-off-by: P Govinda Rajulu <p.govinda.rajulu@ericsson.com>
Change-Id: Ief43d18b2e45dac2bf8f38c226407247d1e3fb4b

fix BUG 391

added version and address based mapping of adderess reading and injecting
(ovs and cpqd do require appropriate eth-type in match in order for instructions to work)

Change-Id: I3422095f508923663736c23756390588d519fe87
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Pass additional fields to applications from plugin

blocked IT tests
rebase

Signed-off-by: Srikar Rajamani <srikar.rajamani@ericsson.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Change-Id: Ibffe135690b5340b9d7744b3e871c6c071aa44c5

Minor refactoring due to change in the library model
CORRESPONDING LIBRARY CHANGE: https://git.opendaylight.org/gerrit/#/c/5112

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
Change-Id: Ic08bbc22cf93c574f3ca029619e1b3b9d217c69e

Added cookie into flows created during learning

- cookie is unique per switch

Change-Id: I7aacc889a35c2bd4a785e96ba562d8fe3f6194ff
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Clear actions instruction does not support actions.

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

Merge "-refactored utility code to separate modules and classes -upgraded stress test to include cleanup after test -added test for operation data store"

Plugin changes:handling List<actions> to PacketOut
-Done Plugin Changes to handle List<Action> added to PacketOut Controller Yang
-Added TestCase for configuring actions through PacketOut Message from Controller
- Dependent on Controller Code review : https://git.opendaylight.org/gerrit/#/c/5071/

Signed-off-by: Gaurav Bhagwani <gaurav.bhagwani@ericsson.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Change-Id: Ie3d1d3ac432af464b9d0096cc732896ae3036dae

Pick the updated jars from the controller,Library

Signed-off-by: Gaurav Bhagwani <gaurav.bhagwani@ericsson.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Change-Id: I36bfb5afa910ae7caa8eaefabb4285e6d3cb5d60

Adding multipart learning switch

- improved logging
- wrapped simple implementation
- tidying up names
- fixed stop
- limited to IPv4 traffic
- fixed expire times (=0) for flow forwarding packets to controller
- Introduced InstanceIdentifier utility class.
- Separated utility functions to thematic classes.

Change-Id: I20bfb99797294767fbb0e290089cb2c701876ff4
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

initial: learning switch example

example code for learning switch / hub
added as module into parent pom
added into distribution/base pom
handler + listener divided to atomic methods
initial flow written + sent to switch
bridge flows written to switch
storing covered mac-paths

Change-Id: I016055ed0920fb08c1923fa337c3e5b8880aba56
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

Test XMLs for flow-instructions, set-field, apply-actions

Signed-off-by: mcsl <mcsl@cisco.com>

-refactored utility code to separate modules and classes
-upgraded stress test to include cleanup after test
-added test for operation data store

Change-Id: Ifc7329cefb02a544025d2c547ad2806b6f875c0d
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

OF1.3 action unit testing XML's using REST
Signed-off-by: Praveen Darshanam <praveen_recker@sify.com>

Adding actions testing XML files in test-scripts/xml
Signed-off-by: Krishnan <krishnan.k.iyer@gmail.com>

REST Actions testing
Signed-off-by: Krishnan Iyer <krishnan.k.iyer@gmail.com>
Change-Id: I3b9cad70460a00b51801c246fffcd99ac415f811

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release openflowplugin-parent-0.0.2

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release master-tagforprepareonly-openflowplugin-bulk-release-prepare-only-8

updated to release versions
 - yangtools-0.6.1
 - controller
 - openflowjava-0.4

Change-Id: Ia17f6c5e35781ba3ebd34009114a62be0de6c77b
Signed-off-by: Michal Rehak <mirehak@cisco.com>

updated yangtools to 0.6.1-SNAPSHOT

Change-Id: I95a8ef5226e0c95eda7cf5d7f0a3c10505b99dbc
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Fix for bug 290/291

Change-Id: I6cb31435031868757ac2dc8dce42abc9b8120f94
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>

Test scripts modified for Meter and Group

Signed-off-by: etusgoy <goyaltushar7@gmail.com>

Turned down logging in ErrorTranslator from ERROR to DEBUG

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

fix for BUG 365
 - by adding and removing all context of datastore were touched
 - now we use only the config context and by remove we do not clean flow itself

Change-Id: Id7131c5073cfe1a6f89d24afc02158f849f4318b
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Minor fix in Ip address decoding from flow stats.
If user specify 32 as a mask, as per specs switch ignores it. And when you fetch the flow stats switch, it returns
null as a mask value. I added a check for it and now I am explicitly adding 32 as a mask if ip mask value in flow
statistics is null"
Added code to send group/meter statistics request only to openflow 1.3+ switches.

Change-Id: I10b23f058f42d60338d51319c0f5545501e22838
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>

Fix for Bug 269

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

Minor fix in instruction building -Explicitely setting instruction key

Change-Id: I9409b7c847655425743fe111a5572f25fef6bc98
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>

fix for BUG 346, BUG 347

- added more descriptive exception text
- fixed NPE for tableId for flows added by dropTest
- removed binary dump of payload hooked to errorMessage (appearing in log)

Change-Id: I49dc4aeb3b7b8444b2cc198c08e7ea393cd2febe
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Mapping OF1.0 Actions to OF1.3 SetField Action
- Fix for Bug - 268
- Actions: StripVlan, SetNwTos were not mapped to any oxm-field of setFieldAction of OF1.3
-Actions: SetTpSrc, SetTpDst : Not able to differentiate to tcp/udp ports in OF1.3, as 1.0 do not differentiate for the ports being tcp or udp
Signed-off-by: Gaurav Bhagwani <gaurav.bhagwani@ericsson.com>

Fix for bug #357- Set log levels on all log statements to appropriate level

Change-Id: I53390b29e42c66082c239da4cc80422aeaccb2f1
Signed-off-by: goyal <sheena.goyal@tcs.com>

added stress test script

Change-Id: I951d776dece9757c2d52a42f166b9df4fd3587ae
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

Merge "updated version of switch restart test"

Fixed minor issue in decoding instruction from flow statistics response

Change-Id: I6db047b8a04afcff90ba859c63420e9471502d05
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>

Openflow plugin code changes due to match yang model change: https://git.opendaylight.org/gerrit/#/c/4635/1

Change-Id: I193be03b8aea075939bada818ba4983de2a5a365
Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>

stress test related improvement

- propagate close upon bundle stop
- enriched logging upon echo timeout disconnect
- increased echo timeout from 5 to 15 sec
- fix memory leak in OpenflowpluginTestCommandProvider.FlowEventListener

Change-Id: I13c9bd319438f883271bd3ddc71e5952f45a351f
Signed-off-by: Michal Rehak <mirehak@cisco.com>

updated version of switch restart test

Change-Id: Ieb957079d7f9a15f5847e026d2da5d270a393e90
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

added new script for testing switch restart
added new test xml files

Change-Id: Iece37149cbf7561c486ea38cb0c22c94bf47b106
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

added new validation for ipv6 addresses
refactored validation for ipv6 addresses

Change-Id: I53dcc76821744fcc2fa958627b2aa888801acb8e
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

Tests: fix ip mask

Change-Id: I3be6d7d3b63f400ddda1804b956ee4657c344561
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>

added dropAllPackets provider bypassing datastore

required for cbench load tests:
  time consuming operations (datastore + transaction) are bypassed
  and flow is added by calling flow service rpc (directly routed back to plugin)
  so flow created this way is not visible though rest

Change-Id: I40608e6321517494f8eef2dd8d2637bb503b010b
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Adding testcase for Output Port
-f82 is the test-case for outputport, written for port=1
Signed-off-by: Gaurav Bhagwani <gaurav.bhagwani@ericsson.com>

updates in test scripts
-tests scripts are running in sequence
-new validation method
-structure of xml is validated before test

Change-Id: I6931f6449370f65df9a081e3089f9f8d0c0e20e8
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

FlowStats for a particular flow using RPC service

Signed-off-by: etusgoy <goyaltushar7@gmail.com>

Group and Meter desc statistics testing

Signed-off-by: etusgoy <goyaltushar7@gmail.com>
Change-Id: I06e0fe1af27ba32e1a2bee2a5beab525b0fe73d2

Merge "copyright header added"

copyright header added

Change-Id: I1169e1761a5505a6a79e58893837753602d26e92
Signed-off-by: Michal Rehak <mirehak@cisco.com>

dependdency convergence

downgrading slf4j-log4j to 1.7.2

Change-Id: I70f5f22e05b6ba8131f2223d97e7ed60596cc3b7
Signed-off-by: Michal Rehak <mirehak@cisco.com>

PortConvertor changed due to changes in yang model as per https://git.opendaylight.org/gerrit/#/c/4433

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

Fixed build failures for yang module changes

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

Merge "Added some debug logging to check on processing timing"

Merge "Fixed a typo in pom.xml s/includeArtifacIds/includeArtifactIds/"

Fixed bug : 288
https://bugs.opendaylight.org/show_bug.cgi?id=288

Change-Id: I54350ec1bef5f8b3cad95271dcd2bd9140e8827b
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>

Added some debug logging to check on processing timing

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

Removed 100 item limit in queue

The 100 item limit in queue was causing us to drop messages with

Queue full

because pulling stats etc results in more than 100 messages suddenly,
and no matter how fast we take from the queue, its never fast enough.

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

Fixed a typo in pom.xml s/includeArtifacIds/includeArtifactIds/

Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>

Updating LLDP Match TestCase

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

dividing handshake tests to controller fist and switch first scenarios

added exception catching after tests
added posthandshake stuff to tests
added negotiation moved to pure handshake testing

Change-Id: Ic9bbc095f36ec605295af0ffdeddc1902ece3e9d
Signed-off-by: Michal Rehak <mirehak@cisco.com>

Do not add a null ActionsList to the List of ActionsList.

Change-Id: Id474991018db99b3416d5db8767ad152dec1695c
Signed-off-by: Moiz Raja <moraja@cisco.com>

test fix
delete flow after test

Change-Id: Ia6920b25a8c22fdf843e18d6cee01cfbf3691cfb
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

Topology Notifications, seprating PortNotification

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

Added dumpMsgCount osgi command

+ fixed BigInteger constructors to prevent readig byte[] input as negative number
+ added some copyrights

Change-Id: Ie65ae84845ebbfbf77f6164e1521121471e38ab6
Signed-off-by: Michal Rehak <mirehak@cisco.com>

fixes in test scripts:
-removed comparators, files in ofctl directory are used instead
-refactored code

Change-Id: Idd3a67e52a62d6c6279cb425a8e4ea8d124cfd5d
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

Group and Meter Stats Testing

Signed-off-by: etusgoy <goyaltushar7@gmail.com>

Table Features Max Entries Fix

Signed-off-by: HemaTG <hema.gopalkrishnan@ericsson.com>

Merge "Fixed Bug : 287 https://bugs.opendaylight.org/show_bug.cgi?id=287"

Revert "Pass additional fields from OF lib to apps"
https://git.opendaylight.org/gerrit/#/c/4245/

Revert "Added null check for reason"
https://git.opendaylight.org/gerrit/#/c/4244/

These commits completely break packetIn, and thus topology.
Please revert until they can be fixed, as its also holding
up work on the adapters around arp etc.

This reverts commit c9d12e93d94189aca02073079db55e92abfed6e4.

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

Fixed Bug : 287
https://bugs.opendaylight.org/show_bug.cgi?id=287

Change-Id: Ie7bf61069843901155d81221f993d4c1e29659c6
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>

Merge "added copyright"

Group Test-cases

Signed-off-by: etusgoy <goyaltushar7@gmail.com>
Change-Id: I8dc6c00fc4b1c96903b68db32b1e9babcd8459cb

added copyright

Change-Id: I6438cce953489c0a86b0db907ca17b2fd2b33b7c
Signed-off-by: Michal Rehak <mirehak@cisco.com>

fixes in test scripts

-fixed connection to controller - added port argument
-updated and stored xmls are compared based on thier values, instead of strings
-deleted duplicated method masked_value_hex_comparator

Change-Id: I411eafe605bd65204806c28fbf3981ba50530483
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

Merge "Fixed for bug #301 and added test for queue stats"

Merge "Table Features Requests Fix and TestCases"