controller.git
6 years agoAdded WADL generation for Models 32/4032/1
Ed Warnicke [Mon, 6 Jan 2014 12:41:51 +0000 (04:41 -0800)]
Added WADL generation for Models

Change-Id: I7e42fc60250c2bf41d857937b98470c79e88240f
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFix for Bug 271 31/4031/1
Ed Warnicke [Mon, 6 Jan 2014 12:20:20 +0000 (04:20 -0800)]
Fix for Bug 271

Change-Id: I6a7335b467277ce18318bd24a2456ce1bd8c4b32
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoAdd a flow by adding the flow data into the datastore 16/4016/2
Moiz Raja [Fri, 3 Jan 2014 23:47:48 +0000 (15:47 -0800)]
Add a flow by adding the flow data into the datastore

Change-Id: Ie11ee9433bbfe25559f2f3b6cdbf7fece96ba791
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoSet Node on the AddFlowInput and RemoveFlowInput 05/4005/3
Moiz Raja [Fri, 3 Jan 2014 00:58:01 +0000 (16:58 -0800)]
Set Node on the AddFlowInput and RemoveFlowInput

This avoids the NPE reported in bug #259

Change-Id: Ic48123a39d4d2fa0b280ac5540f6a5e1304036ef
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoFixed Topology Adapter to properly add Edge Properties 23/4023/2
Ed Warnicke [Mon, 6 Jan 2014 07:22:53 +0000 (23:22 -0800)]
Fixed Topology Adapter to properly add Edge Properties

Change-Id: I89b6349e220a085d8ba6027f8294f88f7e6df244
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoRemoved dead code in LLDPDiscoveryUtil 14/4014/2
Ed Warnicke [Fri, 3 Jan 2014 18:11:23 +0000 (10:11 -0800)]
Removed dead code in LLDPDiscoveryUtil

Per aboch, lldp.getOptionalTLVList() never returns null
and thus the code checking for it is dead code.

Change-Id: I23a0951313095a09cc7fbeaeb7e254c157a77f8c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed two small FlowAdapter bugs. 09/4009/2
Ed Warnicke [Fri, 3 Jan 2014 09:08:13 +0000 (01:08 -0800)]
Fixed two small FlowAdapter bugs.

1)  Handle NW Addresses correctly
2)  Add Order to Instructions

Change-Id: Ibe5395dd6ea6c150bdb0d1d329228f86284f813b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed implementation of getNodeConnectorProps and getNodeProps 08/4008/2
Ed Warnicke [Fri, 3 Jan 2014 06:32:21 +0000 (22:32 -0800)]
Fixed implementation of getNodeConnectorProps and getNodeProps

Change-Id: If05e04129cf002ead7f07eafba66d07c1d66c4c5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoCheck for null srcNodeId and srcNodeConnectorId 04/4004/2
Ed Warnicke [Fri, 3 Jan 2014 00:50:17 +0000 (16:50 -0800)]
Check for null srcNodeId and srcNodeConnectorId

In response to comment here:

https://git.opendaylight.org/gerrit/#/c/3926/2/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java

Change-Id: I19f17f97a74bb3e9e7a7f1837e3484a3c5d32f53
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed Node Properties in Adapter - with exceptions noted below 94/3994/4
Ed Warnicke [Wed, 1 Jan 2014 02:10:34 +0000 (18:10 -0800)]
Fixed Node Properties in Adapter - with exceptions noted below

Still need to fix Supported Actions -

Supported Actions present a bit of an issue.  In OF 1.0,
they come in with the GetFeatures message on switch connection.
In OF 1.3, they are per table, and come in with the response to
an empty bodied TableFeatures Multipart request.  So far,
no switch has been observed in the wild supporting the
empty bodied TableFeature message. OVS 2.0 doesn't, CPQD doesn't.

The net-net is that supported Actions are effectively unreportable
for OF 1.3 switches.

Change-Id: I6f4beab167fa1502cacc767eaf95099ba996a343
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed adapter handling of Special Node Connectors 82/3982/2
Ed Warnicke [Tue, 31 Dec 2013 02:55:09 +0000 (18:55 -0800)]
Fixed adapter handling of Special Node Connectors

Change-Id: I678c46d9ca748d029d7e3831c6c8acbfed81377c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed Adapter to correctly pass NodeConnector Properties. 81/3981/2
Ed Warnicke [Tue, 31 Dec 2013 00:41:08 +0000 (16:41 -0800)]
Fixed Adapter to correctly pass NodeConnector Properties.

Change-Id: I0f22e959ea8f21e6e9edd82be3ec1a4c6739d9dc
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFix to Topology Adapter to properly handle links coming and going 80/3980/2
Ed Warnicke [Fri, 27 Dec 2013 07:26:54 +0000 (23:26 -0800)]
Fix to Topology Adapter to properly handle links coming and going

Change-Id: If43db24a370b89cc93370bcfc5921a721cf38267
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoMerge "Upgrade jackson library to version 2.3.0"
Madhu Venugopal [Sat, 4 Jan 2014 22:11:02 +0000 (22:11 +0000)]
Merge "Upgrade jackson library to version 2.3.0"

6 years agoMerge changes Ib1fb74f6,I532fff58
Alessandro Boch [Fri, 3 Jan 2014 18:06:15 +0000 (18:06 +0000)]
Merge changes Ib1fb74f6,I532fff58

* changes:
  Remove links from topology when port goes down
  Fix for port-state Bug 262.

6 years agoMerge changes Idf3f69db,I4499d7c7,I512af911
Alessandro Boch [Fri, 3 Jan 2014 17:52:35 +0000 (17:52 +0000)]
Merge changes Idf3f69db,I4499d7c7,I512af911

* changes:
  Initial fix to topology-adapter.
  Fixed topology-manager now that we have topology-lldp-discovery
  Added topology-lldp-discovery module

6 years agoMerge "Fixed northbound references to SAL"
Alessandro Boch [Fri, 3 Jan 2014 17:43:03 +0000 (17:43 +0000)]
Merge "Fixed northbound references to SAL"

6 years agoRemove links from topology when port goes down 32/3932/3
Ed Warnicke [Thu, 26 Dec 2013 04:01:45 +0000 (20:01 -0800)]
Remove links from topology when port goes down

Change-Id: Ib1fb74f6257f2048a38e4b5e2801ad85a62dacf2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoInitial fix to topology-adapter. 28/3928/2
Ed Warnicke [Wed, 25 Dec 2013 23:02:24 +0000 (15:02 -0800)]
Initial fix to topology-adapter.

Change-Id: Idf3f69dbcfef80aa485749050aa703e455b3e81f
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFix for port-state Bug 262. 29/3929/2
Ed Warnicke [Thu, 26 Dec 2013 01:47:10 +0000 (17:47 -0800)]
Fix for port-state Bug 262.

Changed from modeling port-state from an enum to a
group of boolean leafs in a container.

Change-Id: I532fff5806fd60823d47bdc255881b2f7ef6a76b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed topology-manager now that we have topology-lldp-discovery 27/3927/2
Ed Warnicke [Wed, 25 Dec 2013 23:00:30 +0000 (15:00 -0800)]
Fixed topology-manager now that we have topology-lldp-discovery

Change-Id: I4499d7c76322c0a4e78e51eed84a0ce1497b62cc
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoAdded topology-lldp-discovery module 26/3926/2
Ed Warnicke [Wed, 25 Dec 2013 22:41:35 +0000 (14:41 -0800)]
Added topology-lldp-discovery module

Change-Id: I512af91128aeeed096b80690c4f1fc181d585457
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoAdding support for the git-review command line tool 63/3963/1
Colin McNamara [Mon, 30 Dec 2013 02:54:25 +0000 (18:54 -0800)]
Adding support for the git-review command line tool

The OpenStack doc workflow (and entire gerrit workflow) has the
option of using a tool called git-review that automates ChangeID:
creation and management,automates rebasing of local commits
as well as simplifies submiting to gerrit and pulling and
pushing reviews.

Usage of the tool is entirely optional, however it does require
a pointer file named .gitreview in the root of the repository
that is referenced.

I am totally new to this project, if you guys don't want to merge
this then no big deal. However I think this will help with dev's
coming over from OpenStack as it will provide a optional workflow
that is closer to the OpenStack workflow.

Necessary to run git review -s to append the change-id into git-hooks

Change-Id: I188d1b67c84b7ac2815b5bf74885100bbe4f7c13
Signed-off-by: Colin McNamara <colin@2cups.com>
6 years agoFixed the API call to operationDataStore from RuntimeDatastore 46/3946/2
Prasanna Huddar [Fri, 27 Dec 2013 18:27:17 +0000 (23:57 +0530)]
Fixed the API call to operationDataStore from RuntimeDatastore

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

6 years agoMD-SAL Statistics-Manager - Minor fix in augmenting flow statistics 13/3913/2
Anil Vishnoi [Tue, 24 Dec 2013 15:26:39 +0000 (20:56 +0530)]
MD-SAL Statistics-Manager - Minor fix in augmenting flow statistics

Change-Id: Ic5c44d0b9d29afbcf37d95537ac67b21d8fc57ac
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
6 years agoMerge "Update SubnetConfig Validation"
Alessandro Boch [Tue, 24 Dec 2013 16:30:22 +0000 (16:30 +0000)]
Merge "Update SubnetConfig Validation"

6 years agoMerge "Add some log messages in case controller failed to add connected node."
Chi-Vien Ly [Tue, 24 Dec 2013 16:22:31 +0000 (16:22 +0000)]
Merge "Add some log messages in case controller failed to add connected node."

6 years agoAdd some log messages in case controller failed to add connected node. 14/3914/2
Jason Ye [Tue, 24 Dec 2013 15:33:48 +0000 (07:33 -0800)]
Add some log messages in case controller failed to add connected node.

Change-Id: Ia3df4dda32cc5e91ba862679712debbd68e11fdb
Signed-off-by: Jason Ye <yisye@cisco.com>
6 years agoUpgrade jackson library to version 2.3.0 05/3905/10
Alissa Bonas [Sat, 21 Dec 2013 18:59:31 +0000 (20:59 +0200)]
Upgrade jackson library to version 2.3.0

This change purpose is to use a newer version of the library,
as well as align it with the jackson version used by ovsdb project repo.

Main change areas:
1.Upgrade the jackson from codehaus.jackson version 1.9.x to
fasterxml.jackson version 2.3.0.
change all usages in pom files
and fix the imports in Java classes.
2.Remove the usage of jersey-json library.

Main resource for upgrade information:
http://wiki.fasterxml.com/JacksonUpgradeFrom19To20

Change-Id: I2caa9f94a81af1e5ad0ead90c60c912396b8a390
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoUpdate SubnetConfig Validation 72/3872/5
Katelyn Kasperowicz [Fri, 20 Dec 2013 15:42:15 +0000 (07:42 -0800)]
Update SubnetConfig Validation

-SubnetConfig now validates that the address does not begin with 0 or 255
-Validates that host address is not set to all zeros or ones
-Caught exception when subnet not set to number

Change-Id: I825e2d54b48b7f74e35cfde8dc7e5967dac11684
Signed-off-by: Katelyn Kasperowicz <kkaspero@cisco.com>
6 years agoMerge "Simplify method isMutualExclusive in Subnet. Remove redundant 'if' statements."
Madhu Venugopal [Mon, 23 Dec 2013 19:24:23 +0000 (19:24 +0000)]
Merge "Simplify method isMutualExclusive in Subnet. Remove redundant 'if' statements."

6 years agoMerge "Refactor Subnet.isSubnetOf - reduce number of 'if' statements. Added unitests."
Madhu Venugopal [Mon, 23 Dec 2013 16:44:43 +0000 (16:44 +0000)]
Merge "Refactor Subnet.isSubnetOf - reduce number of 'if' statements. Added unitests."

6 years agomodified the FRM for group and meter to send ref to plugin for events 06/3906/2
Prasanna Huddar [Mon, 23 Dec 2013 11:53:48 +0000 (17:23 +0530)]
modified the FRM for group and meter to send ref to plugin for events

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

6 years agoThis commit contains following changes 97/3897/1
Anil Vishnoi [Sat, 21 Dec 2013 20:00:40 +0000 (01:30 +0530)]
This commit contains following changes
1) Implemented statistics adaptor (IPluginOutReadService, IPluginInReadService ) interfaces in sal-compatibility layer
2) Minor change in Port-Statistis
3) Fixed FlowStatisticsAdaptor.java - Flow Statistics rpc/notifications were changed and that effected the class

Change-Id: Ie0a2170efa5338389f80cb0a586500297320b387
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
6 years agoAdded notification for Flow add/delete/update. 95/3895/4
Prasanna Huddar [Sun, 22 Dec 2013 15:54:21 +0000 (21:24 +0530)]
Added notification for Flow add/delete/update.
Flow ref added to all Flow notification RPC messages.

Flow ref needed to for NSF to co-relate XID with the operation.

FlowTransaction.xtend modified to put flow reference.

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

6 years agoFixed as per comments by changed leaf name 79/3879/5
Prasanna Huddar [Sat, 21 Dec 2013 15:08:59 +0000 (20:38 +0530)]
Fixed as per comments by changed leaf name

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

6 years agoMerge "Take care of a couple of exceptions in the process of handling an add flow...
Ed Warnicke [Sat, 21 Dec 2013 04:36:53 +0000 (04:36 +0000)]
Merge "Take care of a couple of exceptions in the process of handling an add flow on the Flow Programmer"

6 years agoMerge "Use a String Id for both Node and NodeConnector"
Ed Warnicke [Sat, 21 Dec 2013 04:18:05 +0000 (04:18 +0000)]
Merge "Use a String Id for both Node and NodeConnector"

6 years agoTake care of a couple of exceptions in the process of handling an add flow on the... 86/3886/1
Moiz Raja [Sat, 21 Dec 2013 04:13:44 +0000 (20:13 -0800)]
Take care of a couple of exceptions in the process of handling an add flow on the Flow Programmer

There was an UnSupportedOperationException in MDFlowMapping and an NPE in FromSalConversionUtils which I
have taken care of.

Change-Id: I86bc9241e926d5ddbc2e46b1a08668bc5b2eef70
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoUse a String Id for both Node and NodeConnector 84/3884/1
Moiz Raja [Sat, 21 Dec 2013 01:53:14 +0000 (17:53 -0800)]
Use a String Id for both Node and NodeConnector

Previously Node and NodeConnector were using NodeKey and NodeConnectorKey respectively as the Id. This causes problems
when you try to use some of the old north bound APIs as they expect to match a node or nodeconnector based on the string id
that is passed to it by the NB APIs

Change-Id: I697d8284f45c8b2d5f7dff327e045cf999d0c701
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoMerge "Provide an MDSalNodeFactory to construct an MD-SAL node for NB interfaces...
Ed Warnicke [Sat, 21 Dec 2013 00:50:49 +0000 (00:50 +0000)]
Merge "Provide an MDSalNodeFactory to construct an MD-SAL node for NB interfaces like the Forwarding Rules Manager"

6 years agoProvide an MDSalNodeFactory to construct an MD-SAL node for NB interfaces like the... 83/3883/1
Moiz Raja [Fri, 20 Dec 2013 23:47:29 +0000 (15:47 -0800)]
Provide an MDSalNodeFactory to construct an MD-SAL node for NB interfaces like the Forwarding Rules Manager

When you try to get flows using the FR NB API for a given node you have to provide both a node type and node id. Since MD_SAL nodes
have a type MD_SAL which is not one of the standard types you need to provide and register a NodeFactory which can construct a Node
for an MD_SAL Node type.

Change-Id: Idc6631f58e248a1d958227312de07faa1fbc3d6e
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoMerge "On openflow plugin restart, NPE in tx poller"
Jason Ye [Fri, 20 Dec 2013 22:03:47 +0000 (22:03 +0000)]
Merge "On openflow plugin restart, NPE in tx poller"

6 years agoFixed northbound references to SAL 77/3877/2
mrajvaid [Fri, 20 Dec 2013 15:55:11 +0000 (07:55 -0800)]
Fixed northbound references to SAL

Change-Id: I1150ee6b4dda79f1648c8ad66799de8c69d792e2
Signed-off-by: mrajvaid <mrajvaid@cisco.com>
6 years agoMerge "Add testing support for registering OSGi services to AbstractConfigTest"
Ed Warnicke [Fri, 20 Dec 2013 16:45:44 +0000 (16:45 +0000)]
Merge "Add testing support for registering OSGi services to AbstractConfigTest"

6 years agoMerge "Fix HashedWheelTimer exception for short living netconf clients."
Ed Warnicke [Fri, 20 Dec 2013 15:25:18 +0000 (15:25 +0000)]
Merge "Fix HashedWheelTimer exception for short living netconf clients."

6 years agochanged models to include XID in add/update/delete service notification 71/3871/1
Prasanna Huddar [Fri, 20 Dec 2013 14:44:06 +0000 (20:14 +0530)]
changed models to include XID in add/update/delete service notification

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

6 years agoFix HashedWheelTimer exception for short living netconf clients. 64/3864/1
Maros Marsalek [Fri, 20 Dec 2013 10:05:13 +0000 (11:05 +0100)]
Fix HashedWheelTimer exception for short living netconf clients.

An exception occurred in logs for short living netconf clients created by config persister.
These clients were closed before their initial check timer ran out.

Change-Id: Ic2c998d17788c9b92b72800415fd1ee068611f84
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoAdd testing support for registering OSGi services to AbstractConfigTest 52/3852/1
Maros Marsalek [Thu, 19 Dec 2013 15:17:21 +0000 (16:17 +0100)]
Add testing support for registering OSGi services to AbstractConfigTest

Change-Id: I17117683f7cba46708bc392e6b36b6a1e40a2dcc
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoMerge "Fixed bug in discovering JVM loaded case classes during code generation"
Ed Warnicke [Thu, 19 Dec 2013 12:52:42 +0000 (12:52 +0000)]
Merge "Fixed bug in discovering JVM loaded case classes during code generation"

6 years agoFixed bug in discovering JVM loaded case classes during code generation 46/3846/1
Tony Tkacik [Thu, 19 Dec 2013 11:15:18 +0000 (12:15 +0100)]
Fixed bug in discovering JVM loaded case classes during code generation

  - Added debug logging
       - routing table updates
       - rpc router creation, non-routed service registration
         proxy instantiation.

Change-Id: Iab0ad7451382ab8179cff2febf17c19e96daf464
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoGenerate ADDED events for Node and NodeConnector 43/3843/2
Moiz Raja [Thu, 19 Dec 2013 01:14:38 +0000 (17:14 -0800)]
Generate ADDED events for Node and NodeConnector

Components like switch manager need to see an ADDED event come in for Node and NodeConnector before
they accept changes for those elements. This commit first checks whether a Node/NodeConnector are
already known to the DataBrokerService. If they are not known then it notifies the listeners of an ADDED
event otherwise it notifies it of a CHANGED event

Also implemented node removal. NOTE: NodeConnector removed events do not seem to be coming through.

Change-Id: Idcbe7fdce37c16158614f62b56767bed624bc803
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoMerge "DataPacketAdapter fix"
Ed Warnicke [Wed, 18 Dec 2013 20:16:06 +0000 (20:16 +0000)]
Merge "DataPacketAdapter fix"

6 years agoMerge "Lazily initialize jaxb context in NB application"
Alessandro Boch [Wed, 18 Dec 2013 20:13:50 +0000 (20:13 +0000)]
Merge "Lazily initialize jaxb context in NB application"

6 years agoDataPacketAdapter fix 38/3838/1
Juraj Sebin [Wed, 18 Dec 2013 17:38:29 +0000 (18:38 +0100)]
DataPacketAdapter fix

added incomingNodeConnector for RawPacket from incoming PacketReceived so DataPacketService dont discard it

Change-Id: I7448296ae06b6170edf24289dfd12fc7fd185312
Signed-off-by: Juraj Sebin <jsebin@cisco.com>
6 years agoLazily initialize jaxb context in NB application 08/3808/2
Prasanth Pallamreddy [Wed, 18 Dec 2013 05:26:20 +0000 (21:26 -0800)]
Lazily initialize jaxb context in NB application

Change-Id: Ibac5614aa1b23ff360bcce3ea29091f0a7a78906
Signed-off-by: Prasanth Pallamreddy <ppallamr@cisco.com>
6 years agoFix method isSame in generated Abstract Modules. 31/3831/1
Tomas Olvecky [Wed, 18 Dec 2013 17:16:42 +0000 (18:16 +0100)]
Fix method isSame in generated Abstract Modules.

When dealing with list of dependencies, == cannot be used. Instead,
both lists must be equal, and each dependency must be == to the old one.

Change-Id: I42d489d99ff7addc9d492f4878e7a13be8d9584a
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
6 years agoMerge "Fixed Bug 250 - bits serialization between Binding Broker and DOM broker"
Ed Warnicke [Wed, 18 Dec 2013 16:10:41 +0000 (16:10 +0000)]
Merge "Fixed Bug 250 - bits serialization between Binding Broker and DOM broker"

6 years agoFixed Bug 250 - bits serialization between Binding Broker and DOM broker 20/3820/2
Tony Tkacik [Wed, 18 Dec 2013 13:59:11 +0000 (14:59 +0100)]
Fixed Bug 250 - bits serialization between Binding Broker and DOM broker

  - fixed serialization bug for YANG bits type when crossing brokers
  - Added regression test for bug, based on provided bug report
  - Decreased log level to debug and trace for some code generation
    functionality.

Change-Id: I07982bb7ffefb4350ec4922c02207eb4dc368ab8
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoMD-SAL Statistics Manager - Changed Group/Meter Augmentataion location in operational... 95/3795/4
Anil Vishnoi [Tue, 17 Dec 2013 13:28:30 +0000 (18:58 +0530)]
MD-SAL Statistics Manager - Changed Group/Meter Augmentataion location in operational data tree
Also added check, to only entertain multipart responses associated to the multipart request sent
by statistics-manager.

Change-Id: I51b1f4c9245ca30914293add0ea5fbefb3f1945b
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
6 years agoMerge "Persist service references as separate MBeans."
Ed Warnicke [Wed, 18 Dec 2013 12:12:43 +0000 (12:12 +0000)]
Merge "Persist service references as separate MBeans."

6 years agoMerge "Switched codecs infrastructure to use yang-data-impl codecs"
Ed Warnicke [Wed, 18 Dec 2013 11:20:25 +0000 (11:20 +0000)]
Merge "Switched codecs infrastructure to use yang-data-impl codecs"

6 years agoMerge "Fixed RESTConf support for identity-ref build-in datatype"
Ed Warnicke [Wed, 18 Dec 2013 11:20:14 +0000 (11:20 +0000)]
Merge "Fixed RESTConf support for identity-ref build-in datatype"

6 years agoMerge "Verification of keys in list"
Ed Warnicke [Wed, 18 Dec 2013 11:19:55 +0000 (11:19 +0000)]
Merge "Verification of keys in list"

6 years agoMerge "Fix list of dependencies mapping for readable/writable jmx wrappers"
Ed Warnicke [Wed, 18 Dec 2013 10:53:47 +0000 (10:53 +0000)]
Merge "Fix list of dependencies mapping for readable/writable jmx wrappers"

6 years agoSwitched codecs infrastructure to use yang-data-impl codecs 49/3749/8
Martin Sunal [Wed, 18 Dec 2013 09:24:12 +0000 (10:24 +0100)]
Switched codecs infrastructure to use yang-data-impl codecs

- Codecs are used for tranlation of JSON/XML values to SimpleNode values and vice versa
- Leafref is encoded as String

Change-Id: Ibe5b4a23d5dad6373a2dcf7d8723a7dff135cf2a
Signed-off-by: Martin Sunal <msunal@cisco.com>
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoFixed RESTConf support for identity-ref build-in datatype 01/3701/3
Tony Tkacik [Tue, 17 Dec 2013 16:26:05 +0000 (17:26 +0100)]
Fixed RESTConf support for identity-ref build-in datatype

- Created implementation of codec for identityref
- Identityref is supported in XML and JSON
- Tests

Change-Id: I813f1f52e990317b6adf30f1d0d8a164c60a4901
Signed-off-by: Martin Sunal <msunal@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoVerification of keys in list 05/3605/3
Tony Tkacik [Tue, 17 Dec 2013 16:26:00 +0000 (17:26 +0100)]
Verification of keys in list

- verification of keys in list against list yang structure

Change-Id: Ieb46eea67a7d3173958184ced10cec1b853bb7fe
Signed-off-by: Martin Sunal <msunal@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoMerge "Netconf SSH user authentication using UserManager"
Giovanni Meo [Tue, 17 Dec 2013 14:53:09 +0000 (14:53 +0000)]
Merge "Netconf SSH user authentication using UserManager"

6 years agoNetconf SSH user authentication using UserManager 77/3677/7
Martin Bobak [Thu, 12 Dec 2013 14:47:01 +0000 (15:47 +0100)]
Netconf SSH user authentication using UserManager

Change-Id: I48112f86cf8f839d5cbfdc62f0b7a6866118ed25
Signed-off-by: Martin Bobak <mbobak@cisco.com>
6 years agoMerge changes I1474351f,I2ddc5ffa
Giovanni Meo [Tue, 17 Dec 2013 13:46:06 +0000 (13:46 +0000)]
Merge changes I1474351f,I2ddc5ffa

* changes:
  FRM to properly handle timed flows in case of switch down/up
  Adding password salting

6 years agoMerge "Use equalsIgnoreCase when comparing subnet name to default subnet. Using equal...
Giovanni Meo [Tue, 17 Dec 2013 13:43:22 +0000 (13:43 +0000)]
Merge "Use equalsIgnoreCase when comparing subnet name to default subnet. Using equals or == is not accurate enough. Also, move declaration of variable to be where it's used, to save its allocation before an 'if' validation that's not related to it."

6 years agoUse equalsIgnoreCase when comparing subnet name to default subnet. 61/3761/2
Alissa Bonas [Mon, 16 Dec 2013 17:19:08 +0000 (19:19 +0200)]
Use equalsIgnoreCase when comparing subnet name to default subnet.
Using equals or == is not accurate enough.
Also, move declaration of variable to be where it's used,
to save its allocation before an 'if' validation that's not related to
it.

Change-Id: Icc5480055b8455b11b1c6674b1856ece6d97de91
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoAdded Missing DELETE to allowed CORS methods. 07/3807/1
Thomas Bachman [Tue, 17 Dec 2013 02:09:44 +0000 (18:09 -0800)]
Added Missing DELETE to allowed CORS methods.

Change-Id: I4415666588fec3bb7f7c11b4850817ad006a8353
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>
6 years agoMerge "Changed zeromq-routingtable module to remoterpc-routingtable based on coderevi...
Giovanni Meo [Tue, 17 Dec 2013 18:24:32 +0000 (18:24 +0000)]
Merge "Changed zeromq-routingtable module to remoterpc-routingtable based on codereview comments"

6 years agoFix date initialization in NetconfOperationServiceImplTest. 99/3799/2
Tomas Olvecky [Tue, 17 Dec 2013 17:44:46 +0000 (18:44 +0100)]
Fix date initialization in NetconfOperationServiceImplTest.

Use SimpleDateFormat instead of Date(0) as the later fixes the date to UTC rendering local date to
1969-12-31 for timezones > 0

Change-Id: I455610603e66b9748df8e5b035761ca22617c4eb
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
6 years agoPersist service references as separate MBeans. 46/3746/3
Tomas Olvecky [Mon, 16 Dec 2013 10:39:41 +0000 (11:39 +0100)]
Persist service references as separate MBeans.

Create dummy MBean - ServiceReferenceMXBean - that contains link to implementation of the service as an attribute.
Add support for resolving of SR to dependency resolver. Each time user saves SR, create MBean and
add the interface QName together with user defined reference name to ObjectName of the newly created SR MBean.

Change-Id: I71ddb762e00d9be8b426fb979ff5ade046d46050
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
6 years agoFix list of dependencies mapping for readable/writable jmx wrappers 48/3748/2
Maros Marsalek [Mon, 16 Dec 2013 11:15:11 +0000 (12:15 +0100)]
Fix list of dependencies mapping for readable/writable jmx wrappers

Attributes for list of dependencies can be accessed from (testing) code

Change-Id: I966912210a74bef40a7e6a74d506dbc72a41f34c
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoOn openflow plugin restart, NPE in tx poller 78/3778/1
Alessandro Boch [Tue, 17 Dec 2013 01:15:00 +0000 (17:15 -0800)]
On openflow plugin restart, NPE in tx poller

- In TopologyServiceShim tx poller thread task does not
  check is IOFStatisticsManager provider is available.
  Protocol plugin restart is a way to consistently
  expose the issue.

Change-Id: I9033eb5dd03c1465f465a4e2ef254db760ca0651
Signed-off-by: Alessandro Boch <aboch@cisco.com>
6 years agoFRM to properly handle timed flows in case of switch down/up 77/3777/1
Alessandro Boch [Tue, 17 Dec 2013 00:29:22 +0000 (16:29 -0800)]
FRM to properly handle timed flows in case of switch down/up

- When node reconnects to controller, plugin will send remove all flow message.
  FRM will receive flow removed message and should toggle the installInHw flag
  only for the timed static flows, not all of them. At the end a timed flow with
  original configured timeout (idle or hard) is no longer valid later on.
- Fix bug in flow ui

Change-Id: I1474351fa750029246b89d11bdefb41e9bd6eefd
Signed-off-by: Alessandro Boch <aboch@cisco.com>
6 years agoChanged zeromq-routingtable module to remoterpc-routingtable based on codereview... 55/3655/4
Basheeruddin Ahmed [Mon, 16 Dec 2013 23:58:38 +0000 (15:58 -0800)]
Changed zeromq-routingtable module to remoterpc-routingtable based on codereview comments

Change-Id: Idbdeca125c81c382a4ec0eec479c614b5ecf891a
Signed-off-by: Basheeruddin Ahmed <syedbahm@cisco.com>
6 years agoMerge "Added tests for reading: - operational data - configuration data"
Ed Warnicke [Mon, 16 Dec 2013 23:03:48 +0000 (23:03 +0000)]
Merge "Added tests for reading: - operational data - configuration data"

6 years agoMD-SAL Statistics Manager: Added support for queue statistics collection 65/3765/1
Anil Vishnoi [Mon, 16 Dec 2013 10:51:51 +0000 (16:21 +0530)]
MD-SAL Statistics Manager: Added support for queue statistics collection

Change-Id: I173d7722a8d1684e069c34733fdca0613c1d6530
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
6 years agoMerge "Improve iteration over subnets map by using entrySet instead of keyset. It...
Alessandro Boch [Mon, 16 Dec 2013 20:07:09 +0000 (20:07 +0000)]
Merge "Improve iteration over subnets map by using entrySet instead of keyset. It is more efficient to iterate  on the entrySet because it avoids the Map.get(key) lookup."

6 years agoMerge "Simplify hasNodeConnector method in Subnet class. Reduce 'if' conditions for...
Alessandro Boch [Mon, 16 Dec 2013 20:06:14 +0000 (20:06 +0000)]
Merge "Simplify hasNodeConnector method in Subnet class. Reduce 'if' conditions for improved readability."

6 years agoAdding password salting 23/3723/4
Alessandro Boch [Fri, 13 Dec 2013 20:58:54 +0000 (12:58 -0800)]
Adding password salting

- When A UserConfig object is created, generate its 64 bit long salt
  and use it to salt the clear text password before hashing.

Change-Id: I2ddc5ffa061cdef59d01caa6d98cb6eb4b7be014
Signed-off-by: Alessandro Boch <aboch@cisco.com>
6 years agoMerge "Add consistency check of visible yang modules to netconf."
Ed Warnicke [Mon, 16 Dec 2013 15:54:13 +0000 (15:54 +0000)]
Merge "Add consistency check of visible yang modules to netconf."

6 years agoMerge "Fixed netconf monitoring."
Ed Warnicke [Mon, 16 Dec 2013 15:52:41 +0000 (15:52 +0000)]
Merge "Fixed netconf monitoring."

6 years agoSimplify method isMutualExclusive in Subnet. 59/3759/1
Alissa Bonas [Mon, 16 Dec 2013 15:28:06 +0000 (17:28 +0200)]
Simplify method isMutualExclusive in Subnet.
Remove redundant 'if' statements.

Change-Id: I4ba0b5da22095e5d294eea008119dc49159795af
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoMerge "Fixed bug in cross-broker RPC routing"
Ed Warnicke [Mon, 16 Dec 2013 15:23:04 +0000 (15:23 +0000)]
Merge "Fixed bug in cross-broker RPC routing"

6 years agoSimplify hasNodeConnector method in Subnet class. 58/3758/1
Alissa Bonas [Mon, 16 Dec 2013 15:15:21 +0000 (17:15 +0200)]
Simplify hasNodeConnector method in Subnet class.
Reduce 'if' conditions for improved readability.

Change-Id: I8ade7bd8546ddc3396c24e8cc3ba6e13abaaa07c
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoAdded tests for reading: 54/3754/1
Ladislav Borak [Mon, 16 Dec 2013 14:39:10 +0000 (15:39 +0100)]
Added tests for reading:
- operational data
- configuration data

Change-Id: I8d771ac061d0d7cc5c4187133e2bf0a3ddb87252
Signed-off-by: Ladislav Borak <lborak@cisco.com>
6 years agoImprove iteration over subnets map by using entrySet instead of keyset. 55/3755/1
Alissa Bonas [Mon, 16 Dec 2013 14:41:28 +0000 (16:41 +0200)]
Improve iteration over subnets map by using entrySet instead of keyset.
It is more efficient to iterate  on the entrySet because
it avoids the Map.get(key) lookup.

Change-Id: I8ec04ebfe5b22b67a488b81987f0d1f8bd1e107d
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoRefactor Subnet.isSubnetOf - reduce number of 'if' statements. 52/3752/2
Alissa Bonas [Mon, 16 Dec 2013 14:06:20 +0000 (16:06 +0200)]
Refactor Subnet.isSubnetOf - reduce number of 'if' statements.
Added unitests.

Change-Id: Ife074b9afdf029ca02e02af35d53c4a2869681f6
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoMD-SAL Statistics Manger - Added support for fetching port statistics 31/3731/1
Anil Vishnoi [Sat, 14 Dec 2013 11:18:43 +0000 (16:48 +0530)]
MD-SAL Statistics Manger - Added support for fetching port statistics

Change-Id: Ic987b3ea3c920ae9899877c316708b53d132555f
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
6 years agoMerge "Adding Enum for Output -Port Values"
Ed Warnicke [Sat, 14 Dec 2013 15:23:33 +0000 (15:23 +0000)]
Merge "Adding Enum for Output -Port Values"

6 years agoMerge "Revert "Reverting until appropriate Gerrit for Openflowplugin can be provided.""
Ed Warnicke [Sat, 14 Dec 2013 14:43:52 +0000 (14:43 +0000)]
Merge "Revert "Reverting until appropriate Gerrit for Openflowplugin can be provided.""

6 years agoAdding Enum for Output -Port Values 14/3714/3
Gaurav Bhagwani [Fri, 13 Dec 2013 17:22:24 +0000 (22:52 +0530)]
Adding Enum for Output -Port Values

Signed-off-by: Gaurav Bhagwani <gaurav.bhagwani@ericsson.com>
Change-Id: Ic77422b4ce0b1f047df25ce820001707e90813d8
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoMD-SAL Statistics Manager - Adding support for individual flow stats 08/3708/2
Anil Vishnoi [Tue, 10 Dec 2013 18:36:31 +0000 (00:06 +0530)]
MD-SAL Statistics Manager - Adding support for individual flow stats
and aggregate flow statistics.

Change-Id: I0aaa4a70dd8083ed7d6b39d06fe1b040510efbc2
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
6 years agoMerge "Added support for union yang types to netconf."
Ed Warnicke [Sat, 14 Dec 2013 01:25:34 +0000 (01:25 +0000)]
Merge "Added support for union yang types to netconf."

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.