controller.git
9 years agoMerge "Bug fix for ForwardingRulesManager: addFlow and addFlowAsync are reversed."
Alessandro Boch [Fri, 3 May 2013 13:59:01 +0000 (13:59 +0000)]
Merge "Bug fix for ForwardingRulesManager: addFlow and addFlowAsync are reversed."

9 years agoBug fix for ForwardingRulesManager: 89/289/1
Kalvin Hom [Fri, 3 May 2013 02:14:17 +0000 (19:14 -0700)]
Bug fix for ForwardingRulesManager:
addFlow and addFlowAsync are
reversed.

https://bugs.opendaylight.org/show_bug.cgi?id=16

Change-Id: If119f64e637401ea022b092af44192bdef3db986
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoFix Device Port Status 88/288/1
Andrew Kim [Fri, 3 May 2013 00:22:09 +0000 (17:22 -0700)]
Fix Device Port Status

Signed-off-by: Andrew Kim <andrekim@cisco.com>
9 years agoedgeUpdate API enhancement and related changes. 84/284/1
Madhavan Kasthurirangan [Thu, 2 May 2013 20:44:52 +0000 (13:44 -0700)]
edgeUpdate API enhancement and related changes.
Signed-off-by: Madhavan Kasthurirangan <mkasthur@cisco.com>
9 years agoMerge "Added generate To File for specified directory."
Giovanni Meo [Thu, 2 May 2013 13:51:38 +0000 (13:51 +0000)]
Merge "Added generate To File for specified directory."

9 years agoMerge "Implemented module dependency sort, that returns modules in order in which...
Giovanni Meo [Thu, 2 May 2013 13:48:11 +0000 (13:48 +0000)]
Merge "Implemented module dependency sort, that returns modules in order in which they should be processed. If module A imports module B, sort returns ordered list [B,A]."

9 years agoAdded generate To File for specified directory. 82/282/1
lsedlak [Thu, 2 May 2013 13:06:12 +0000 (15:06 +0200)]
Added generate To File for specified directory.

Added overloading method generateToFile with File as input parameter and
List of Files as result;
Removed unused import in BaseTypeProvider test and BaseYangTypes;

Changed binding-generator, yang and sal maven pom files to use java 1.7;

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoImplemented module dependency sort, that returns modules in order in which they shoul... 80/280/2
Maros Marsalek [Tue, 30 Apr 2013 13:03:20 +0000 (15:03 +0200)]
Implemented module dependency sort, that returns modules in order in which they should be processed.
If module A imports module B, sort returns ordered list [B,A].

Implemented utility topological sort that is used by module dependency sort.
Implemented tests for both topological sort and module sort.

Removed circular dependencies from test yang files.

Change-Id: Id6230a8448b27f80146dc74bf2a8a948523408d3
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoFixed parsing of unknown nodes for identity statemens. 81/281/1
Martin Vitez [Thu, 2 May 2013 09:23:07 +0000 (11:23 +0200)]
Fixed parsing of unknown nodes for identity statemens.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "Added reserved port descriptions to comments matching them to the OF Spec...
Giovanni Meo [Thu, 2 May 2013 08:43:01 +0000 (08:43 +0000)]
Merge "Added reserved port descriptions to comments matching them to the OF Spec in NodeConnector.java and fixed a couple of comment typos"

9 years agoMerge "pom changes for FRM integration tests; added integrationtest bundle with a...
Giovanni Meo [Thu, 2 May 2013 08:41:46 +0000 (08:41 +0000)]
Merge "pom changes for FRM integration tests; added integrationtest bundle with a small simple test"

9 years agoAdded reserved port descriptions to comments matching them to the OF Spec in NodeConn... 79/279/1
Brent Salisbury [Thu, 2 May 2013 07:57:31 +0000 (03:57 -0400)]
Added reserved port descriptions to comments matching them to the OF Spec in NodeConnector.java and fixed a couple of comment typos

Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
9 years agopom changes for FRM integration 77/277/7
Kalvin Hom [Wed, 1 May 2013 20:24:40 +0000 (13:24 -0700)]
pom changes for FRM integration
tests;
added integrationtest bundle with
a small simple test

Change-Id: I1c0591286cb8cea4dcb1ff72f02d2d3a25ba922d
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years ago- Add flow and port stats polling intervals in config.ini 78/278/1
Jason Ye [Wed, 1 May 2013 22:43:12 +0000 (15:43 -0700)]
- Add flow and port stats polling intervals in config.ini
- Add DESC stats polling interval in CONFIG.ini and thru OSGI cmd
- When the switch port is changed to admin down or the link is changed to down state, the switch sends port_status msg with OFPPR_MODIFY type. The existing logic is to map OFPPR_MODIFY to UpdateType.CHANGED. But we should exam the Config state and Link state fields within the port_status packet. If they are "down", we should fire an UpdateType.REMOVED event instead and remove both edges associated with the port.

Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoMerge "Description: - Made changes in devices.web bundle and sal.core.Config - files...
Giovanni Meo [Wed, 1 May 2013 20:06:39 +0000 (20:06 +0000)]
Merge "Description: - Made changes in devices.web bundle and sal.core.Config - files changed for this: pages.js, Devices.java and Config.java - changes seen in the diff in StatusJsonBean.java are purely sun xml style coding    \ related - Port status is correctly shown as "Up" or "Down".  In case the port status cannot  \ be determined, it will be displayed as "Undefined""

9 years agoMerge "Hide production nodes in visual topology"
Giovanni Meo [Wed, 1 May 2013 20:05:21 +0000 (20:05 +0000)]
Merge "Hide production nodes in visual topology"

9 years agoMerge "Javadoc for controller.web Change-Id: Ie687bbb842391bf94f7c23a3c58833cf53a2e438"
Giovanni Meo [Wed, 1 May 2013 20:00:12 +0000 (20:00 +0000)]
Merge "Javadoc for controller.web Change-Id: Ie687bbb842391bf94f7c23a3c58833cf53a2e438"

9 years agoDescription: 76/276/1
dibhatia [Wed, 1 May 2013 19:27:39 +0000 (12:27 -0700)]
Description:
- Made changes in devices.web bundle and sal.core.Config
- files changed for this: pages.js, Devices.java and Config.java
- changes seen in the diff in StatusJsonBean.java are purely sun xml style coding    \
related
- Port status is correctly shown as "Up" or "Down".  In case the port status cannot  \
be determined, it will be displayed as "Undefined"

Change-Id: I15f4281fb0a00c466942d7c4effab6fe4d25a7b9
Signed-off-by: dibhatia <dibhatia@cisco.com>
9 years agoMerge "Update comments for JavaDoc Added comments for the followings interfaces:...
Alessandro Boch [Wed, 1 May 2013 18:01:43 +0000 (18:01 +0000)]
Merge "Update comments for JavaDoc Added comments for the followings interfaces: IForwardingStaticRouting, IRouting. Removed the method saveConfig() from IForwardingStaticRouting since it is not a public method and is only use privately."

9 years agoHide production nodes in visual topology 75/275/1
Andrew Kim [Wed, 1 May 2013 17:17:20 +0000 (10:17 -0700)]
Hide production nodes in visual topology

At least for now, we don't want to display production nodes within the visual topology.

However, if there are production nodes, then the user can still view them using the
northbound interface.

Signed-off-by: Andrew Kim <andrekim@cisco.com>
9 years agoUI Flow configuration fix 74/274/1
Alessandro Boch [Wed, 1 May 2013 16:44:38 +0000 (09:44 -0700)]
UI Flow configuration fix

ISSUE: Flows configured through UI do not honor selected actions

Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years agoUpdate comments for JavaDoc 73/273/1
Chi-Vien Ly [Wed, 1 May 2013 04:43:15 +0000 (21:43 -0700)]
Update comments for JavaDoc
Added comments for the followings interfaces: IForwardingStaticRouting, IRouting.
Removed the method saveConfig() from IForwardingStaticRouting since it is not a public method and is only use privately.

Change-Id: I15e15916287fe05a02e31536e064fb78c827c26a
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
9 years agoJavadoc for controller.web 71/271/1
Pramila Singh [Tue, 30 Apr 2013 20:41:06 +0000 (13:41 -0700)]
Javadoc for controller.web
Change-Id: Ie687bbb842391bf94f7c23a3c58833cf53a2e438

Signed-off-by: Pramila Singh <pramisin@cisco.com>
9 years agochanging directory structure to fix errors 69/269/1
Colin Dixon [Tue, 30 Apr 2013 19:40:42 +0000 (14:40 -0500)]
changing directory structure to fix errors

Change-Id: I6df95b0274b7df5cf4737a02607707c555ffb1df
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
9 years agoExpanded UnknownSchemaNode implementation, refactored java source code generation. 68/268/1
Martin Vitez [Tue, 30 Apr 2013 14:02:15 +0000 (16:02 +0200)]
Expanded UnknownSchemaNode implementation, refactored java source code generation.
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoFixed NPE in maven-yang-plugin 67/267/1
Tony Tkacik [Tue, 30 Apr 2013 13:41:43 +0000 (15:41 +0200)]
Fixed NPE in maven-yang-plugin

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoAdded Maven plugin for generation SAL APIs from YANG 65/265/2
Tony Tkacik [Mon, 29 Apr 2013 20:24:09 +0000 (22:24 +0200)]
Added Maven plugin for generation SAL APIs from YANG

Added sample project.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoAdded generation of Transfer Objects from Type Definitions. 63/263/4
Lukas Sedlak [Mon, 29 Apr 2013 16:29:30 +0000 (18:29 +0200)]
Added generation of Transfer Objects from Type Definitions.

Extended functionality of Type provider to resolve Type Definitions in schema context as GeneratedTransfeObjects with proper package names and
class names;
Updated generateTypes in BindingGeneratorImpl to generate also Transfer Objects from Type Definitions;
Added BindingGeneratorUtil to replace functionality of CodeGeneratorHelper;
Modified EnumerationBuilderImpl - changed visibility from package protected to public due to need for generation of stand alone enums;
Refactored GeneratorUtil with use of BindingGeneratorUtil methods;

Fixed bug in where SchemaPath was incorectly generated for yang types in yang-model-util project;

Changed YangModelParser API - removed parseYangModel method and changed parseYangModels param from vararg String to List of Files and from vararg InputStream to List of Input Streams;

Modified YangToSourcesMojoj and GenerateSourcesTest in maven-yang-plugin due to change in YangModelParser API;
Modified YangToSourcesPluginTest due to change in YangModelParser API;
Modified Demo in binding-model-demo due to change in YangModelParser API;
Modified GeneratedTypesTest in binding-generator-impl -> changed load of yang files due to change in YangModelParser API;

Added comment generation for interface and class definition in binding-java-api-generator -> GeneratorUtil;

Change-Id: Id1be574e10f7f80d1badfbdec2bcc4a98564fee5
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoResubmitted with source code synchronized. Added integration test for hosttracker... 64/264/3
taochang [Mon, 29 Apr 2013 17:20:23 +0000 (10:20 -0700)]
Resubmitted with source code synchronized.  Added integration test for hosttracker, split switchmanager
into api and implementation bundles.

Change-Id: I04d5d89562316cafa89a5ee46e08eb724733711a
Signed-off-by: taochang <taochang@cisco.com>
9 years ago- Application is no longer blocked when programming hundreds of flows. The Barrier... 66/266/1
Jason Ye [Mon, 29 Apr 2013 21:15:27 +0000 (14:15 -0700)]
- Application is no longer blocked when programming hundreds of flows. The Barrier message is now sent asynchronously.
- Waiting for Barrier reply is still blocked in low level plugin, but it's per switch basis.
Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoFixed SchemaPath resolution for base YANG types. 60/260/2
Martin Vitez [Fri, 26 Apr 2013 09:42:59 +0000 (11:42 +0200)]
Fixed SchemaPath resolution for base YANG types.
Refactored refine statement parsing.

Change-Id: Ic00b86c611f1f56b69d9e09bf197d9ddb79da145
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "Convert various result into Status Signed-off-by: Jason Ye <yisye@cisco.com>"
Alessandro Boch [Fri, 26 Apr 2013 17:26:03 +0000 (17:26 +0000)]
Merge "Convert various result into Status Signed-off-by: Jason Ye <yisye@cisco.com>"

9 years agoConvert various result into Status 62/262/1
Jason Ye [Fri, 26 Apr 2013 17:18:21 +0000 (10:18 -0700)]
Convert various result into Status
Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoMerge "Gen Type and Generated TO builders moved to Util project."
Giovanni Meo [Fri, 26 Apr 2013 15:10:47 +0000 (15:10 +0000)]
Merge "Gen Type and Generated TO builders moved to Util project."

9 years agoMerge "Added support for annotations in generated APIs."
Giovanni Meo [Fri, 26 Apr 2013 14:55:12 +0000 (14:55 +0000)]
Merge "Added support for annotations in generated APIs."

9 years agoMerge "Fixed bugs in parsing enumeration, augment, identity. Refactored SchemaPath...
Giovanni Meo [Fri, 26 Apr 2013 14:27:58 +0000 (14:27 +0000)]
Merge "Fixed bugs in parsing enumeration, augment, identity. Refactored SchemaPath construction for int, uint, decimal64, string and union types."

9 years agoMerge "Yang validation moved to validator package and validation listener refactored...
Giovanni Meo [Fri, 26 Apr 2013 14:19:46 +0000 (14:19 +0000)]
Merge "Yang validation moved to validator package and validation listener refactored. Added validations for yang statements according to RFC-6020 (section 6 and 7). Added new tests for statement validation and utility classes created."

9 years agoMerge "Adding tests for clustering services. Removed first slash for infinispan-confi...
Giovanni Meo [Fri, 26 Apr 2013 13:36:58 +0000 (13:36 +0000)]
Merge "Adding tests for clustering services. Removed first slash for infinispan-config.xml path so tests can run."

9 years agoGen Type and Generated TO builders moved to Util project. 61/261/1
lsedlak [Fri, 26 Apr 2013 11:56:21 +0000 (13:56 +0200)]
Gen Type and Generated TO builders moved to Util project.

GeneratedType and Generated Transfer Object builders moved from
binding-generator-impl project to binding-generator-util project;
Added test cases for testing annotations over methods and properties;

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoMerge "ForwardingRulesManager to expose async flow api"
Jason Ye [Thu, 25 Apr 2013 23:21:52 +0000 (23:21 +0000)]
Merge "ForwardingRulesManager to expose async flow api"

9 years agoForwardingRulesManager to expose async flow api 59/259/1
Alessandro Boch [Thu, 25 Apr 2013 23:11:48 +0000 (16:11 -0700)]
ForwardingRulesManager to expose async flow api

Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years agoMerge "Add the Shutdown Handler. It gets executed when OS sends SIGTERM signal to...
Chi-Vien Ly [Thu, 25 Apr 2013 23:06:35 +0000 (23:06 +0000)]
Merge "Add the Shutdown Handler. It gets executed when OS sends SIGTERM signal to JVM"

9 years agoMerge "Logging and Code clean-up for protocol_plugins.core Change-Id: Ia34dd373ba16d7...
Jason Ye [Thu, 25 Apr 2013 22:06:56 +0000 (22:06 +0000)]
Merge "Logging and Code clean-up for protocol_plugins.core Change-Id: Ia34dd373ba16d7a70be0440d7f076e7dab02ffdd"

9 years agoMerge "In the case when sync msg failed, the returned error msg is listened by both...
Alessandro Boch [Thu, 25 Apr 2013 22:06:14 +0000 (22:06 +0000)]
Merge "In the case when sync msg failed, the returned error msg is listened by both sync msg worker thread and FlowProgrammerService. For sync msg error, FlowProgrammerService should skip the error since it'll be handled by sync msg worker thread. Signed-off-by: Jason Ye <yisye@cisco.com>"

9 years agoLogging and Code clean-up for protocol_plugins.core 57/257/1
Pramila Singh [Thu, 25 Apr 2013 21:57:42 +0000 (14:57 -0700)]
Logging and Code clean-up for protocol_plugins.core
Change-Id: Ia34dd373ba16d7a70be0440d7f076e7dab02ffdd

Signed-off-by: Pramila Singh <pramisin@cisco.com>
9 years agoIn the case when sync msg failed, the returned error msg is listened by both sync... 56/256/1
Jason Ye [Thu, 25 Apr 2013 21:50:23 +0000 (14:50 -0700)]
In the case when sync msg failed, the returned error msg is listened by both sync msg worker thread and FlowProgrammerService. For sync msg error, FlowProgrammerService should skip the error since it'll be handled by sync msg worker thread.
Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoMerge "Update JS library"
Alessandro Boch [Thu, 25 Apr 2013 21:25:42 +0000 (21:25 +0000)]
Merge "Update JS library"

9 years agoUpdate JS library 55/255/1
Andrew Kim [Sun, 21 Apr 2013 23:39:24 +0000 (16:39 -0700)]
Update JS library

Signed-off-by: Andrew Kim <andrekim@cisco.com>
9 years agoLogging cleanup for Statistics 53/253/1
Asad Ahmed [Tue, 23 Apr 2013 23:17:32 +0000 (16:17 -0700)]
Logging cleanup for Statistics

Change-Id: I2a3c8823c0775f4021912bd225b543581f9327ee
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
9 years agoAdd the Shutdown Handler. It gets executed when OS sends SIGTERM signal to JVM 52/252/1
Maurice Qureshi [Thu, 25 Apr 2013 17:13:09 +0000 (10:13 -0700)]
Add the Shutdown Handler. It gets executed when OS sends SIGTERM signal to JVM

Signed-off-by: Maurice Qureshi <maquresh@cisco.com>
9 years agoAdded support for annotations in generated APIs. 51/251/1
lsedlak [Thu, 25 Apr 2013 15:39:25 +0000 (17:39 +0200)]
Added support for annotations in generated APIs.

Added AnnotationType and AnnotationTypeBuilder into binding-model-api;
Modified GeneratedTransferObject -> now extending from GeneratedType -
implementation modified accordingly;
Added getAnnotations property into: Enumeration, GeneratedType,
GeneratedTransferObject and MethodSignature interfaces;
Added addAnnotation method into EnumBuilder, GeneratedPropertyBuilder,
GeneratedTOBuilder, GeneratedTypeBuilder, MethodSignatureBuilder;

Added implementation of AnnotationType into all builder implementations
in binding-generator-impl project part;
Added AnnotationTypeTest into binding-generator-impl;
Package name in src/test/java for binding-generator-impl changed to
org.opendaylight.controller.sal.binding.generator.impl to
test package protected classes;

In binding-java-api-generator CompositeKeyGenerator renamed to
ClassCodeGenerator;
Added implementation to write annotations for interface and class *.java
files;
Added support methods for annotations to Generator Util class;

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoFixed bugs in parsing enumeration, augment, identity. 50/250/1
Martin Vitez [Thu, 25 Apr 2013 11:54:16 +0000 (13:54 +0200)]
Fixed bugs in parsing enumeration, augment, identity.
Refactored SchemaPath construction for int, uint, decimal64, string and union types.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoYang validation moved to validator package and validation listener refactored. 49/249/1
Maros Marsalek [Thu, 18 Apr 2013 10:32:54 +0000 (12:32 +0200)]
Yang validation moved to validator package and validation listener refactored.
Added validations for yang statements according to RFC-6020 (section 6 and 7).
Added new tests for statement validation and utility classes created.

This is only initial validation performed on every yang file without any context
from other yang files.

Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoAdding tests for clustering services. Removed first slash for 48/248/1
Patrick Chu [Thu, 25 Apr 2013 07:02:57 +0000 (00:02 -0700)]
Adding tests for clustering services. Removed first slash for
infinispan-config.xml path so tests can run.

Change-Id: Id1ac6575e0d504a39427c45dfbe44ce1ba321c86

Signed-off-by: Patrick Chu <patrichu@cisco.com>
9 years agoWhen plugin receives error msg from the switch regarding a flow message sent to the... 47/247/1 v0.4.0
Jason Ye [Thu, 25 Apr 2013 01:57:10 +0000 (18:57 -0700)]
When plugin receives error msg from the switch regarding a flow message sent to the switch earlier, it will report the error thru SAL to notify upper FMs/applications. A request id associated with the offending message is also passed along.
Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoRevisit Exception handling in BitBufferHelper and Packet 46/246/1
Alessandro Boch [Thu, 25 Apr 2013 01:09:09 +0000 (18:09 -0700)]
Revisit Exception handling in BitBufferHelper and Packet

- Added BufferException and PacketException
- Revisit exception handling in BitBufferhelper
- Other minor code style changes

Change-Id: I2b97560708fb1adb557852a524e2a8d3da6a5d73
Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years ago- Plugin sends Barrier msg every 100 async msgs (configurable thru config.ini: of... 43/243/1
Jason Ye [Wed, 24 Apr 2013 16:55:27 +0000 (09:55 -0700)]
- Plugin sends Barrier msg every 100 async msgs (configurable thru config.ini: of.barrierMessagePriorCount)
- SAL/plugin provide service to send Barrier message on demand. FM/application should invoke it explictly for sync purpose.
- LLDP interval is set to 5 mins (configurable thru config.ini: of.discoveryInterval)
- LLDP timeout is set to 1 min (configurable thru config.ini: of.discoveryTimeout). Retry 2 times.
- Switch liveness timeout is set to 60.5 sec (configurable thru config.ini: of.switchLivenessTimeout)
- SAL generates Request ID and passes it down to the plugin (IPluginInFlowProgrammerService: addFlowAsync(Node node, Flow flow, long rid), modifyFlowAsync(), deleteFlowAsync())
- STATS_REPLY timeout is configurable now thru config.ini of.messageResponseTimer
- Same priority messages are in FIFO manner
- Fix invalid ChassisID in LLDP packet
- Debugging messages
- Code style formatting
Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoMerge "Implemented YANG identityref type parsing. Refactored augmentation parsing...
Giovanni Meo [Wed, 24 Apr 2013 16:05:22 +0000 (16:05 +0000)]
Merge "Implemented YANG identityref type parsing. Refactored augmentation parsing. Added tests."

9 years agoMerge "Fixed validation bug of YANG import statement"
Giovanni Meo [Wed, 24 Apr 2013 16:02:49 +0000 (16:02 +0000)]
Merge "Fixed validation bug of YANG import statement"

9 years agoMerge "Updated YANG lexer to support unknown statements"
Giovanni Meo [Wed, 24 Apr 2013 16:01:56 +0000 (16:01 +0000)]
Merge "Updated YANG lexer to support unknown statements"

9 years agoImplemented YANG identityref type parsing. 42/242/1
Martin Vitez [Wed, 24 Apr 2013 15:34:56 +0000 (17:34 +0200)]
Implemented YANG identityref type parsing.
Refactored augmentation parsing. Added tests.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoFixed validation bug of YANG import statement 41/241/1
Tony Tkacik [Wed, 24 Apr 2013 14:47:13 +0000 (16:47 +0200)]
Fixed validation bug of YANG import statement

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoUpdated YANG lexer to support unknown statements 40/240/1
Tony Tkacik [Wed, 24 Apr 2013 14:11:51 +0000 (16:11 +0200)]
Updated YANG lexer to support unknown statements

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoImplemented refine statement parsing. 39/239/1
Martin Vitez [Wed, 24 Apr 2013 06:33:45 +0000 (08:33 +0200)]
Implemented refine statement parsing.
Implemented choice statement parsing.
Implemented anyxml statement parsing.
Added EmptyType. Added more tests. Fixed bugs.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "Fixing ForwardingRulesManager code that got lost in a previous merge"
Alessandro Boch [Wed, 24 Apr 2013 00:31:27 +0000 (00:31 +0000)]
Merge "Fixing ForwardingRulesManager code that got lost in a previous merge"

9 years agoFixing ForwardingRulesManager code that 32/232/1
Kalvin Hom [Tue, 23 Apr 2013 23:20:33 +0000 (16:20 -0700)]
Fixing ForwardingRulesManager code that
got lost in a previous merge

Change-Id: I3e3ba4e69e3082b6980a42101d54c3af834a99cb
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoLogging related enhancements. 31/231/1
Madhavan Kasthurirangan [Tue, 23 Apr 2013 20:58:09 +0000 (13:58 -0700)]
Logging related enhancements.
Signed-off-by: Madhavan Kasthurirangan <mkasthur@cisco.com>
9 years agoMerge "fixing warnings"
Giovanni Meo [Tue, 23 Apr 2013 19:11:10 +0000 (19:11 +0000)]
Merge "fixing warnings"

9 years agofixing warnings 29/229/1
Colin Dixon [Thu, 11 Apr 2013 22:26:37 +0000 (15:26 -0700)]
fixing warnings

Change-Id: Iae2f073fb9733d0b1bdedd2aa05815fc25063e9a
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
9 years agoFixed some dependencies for 23/223/2
Kalvin Hom [Mon, 22 Apr 2013 19:02:04 +0000 (12:02 -0700)]
Fixed some dependencies for
StatisticsManager.integrationtest

Change-Id: I8228827c21966ef885fd2cf103326139e8f65858
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoSplit ForwardingRulesManager into 22/222/2
Kalvin Hom [Mon, 22 Apr 2013 18:47:02 +0000 (11:47 -0700)]
Split ForwardingRulesManager into
API and Implementation Bundles

Change-Id: I8137aedbbcefe3ed8f17b032cf81830d39f96e32
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoAdded capability to resolve Enumeration type definitions; 28/228/1
lsedlak [Tue, 23 Apr 2013 13:48:53 +0000 (15:48 +0200)]
Added capability to resolve Enumeration type definitions;

Added ReferencedTypeImpl for resolving of referenced enumeration types;
Modified GeneratedTypeBuilder for setting correct package name for
enumeration types defined as inner enums in Generated Types;
Modified EnumBuilder added extends of Type interface in
binding-model-api;
Added test case for resolving of Leaf Enumeration in GeneratedTypesTest;

Modified BindingGeneratorImpl accordingly:
Added Implementation to resolve Enumeration type,
The Schema Tree traversal methods removed - replaced by
DataNodeIterator,

Refactored TypeProviderImpl - resolving of leafrefs now through
SchemaContextUtil methods;

Chenged package name in code-generator-demo to
org.opendaylight.controller.yang;

Added DataNodeIterator and SchemaContextUtil into yang-model-util

Fixed Raw TypeDefinition in ExtendedType implementation;
Fixed SchemaPath setting in EnumerationType implementation - added two
parametric constructors that contains SchemaPath parameter;
Updated parseTypeBody method in YangModelBuilderUtil in
yang-model-parser-impl - added Enumeration constructor call with schema
path parameter;
Fixed constructor with XPath parameter visbility in Leafref
implementation;

Added extension of AugmentationTarget for ChoiceNode in yang-model-api;

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoFixed organization and contact reference in yang test files. 27/227/1
lsedlak [Tue, 23 Apr 2013 09:46:08 +0000 (11:46 +0200)]
Fixed organization and contact reference in yang test files.

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoFixed implementation of TypeProviderImpl for Leafref resolving. 03/203/3
lsedlak [Wed, 17 Apr 2013 14:21:26 +0000 (16:21 +0200)]
Fixed implementation of TypeProviderImpl for Leafref resolving.

Since the modification of resolving of inner type definitions as
ExtendedTypes there had to be done minor modifications in
javaTypeForSchemaDefinitionType and baseTypeForExtendedType methods.
Also the SchemaPath no longer contains the module name as first element
so the module name is now retrieved directly from SchemaContext
via findModuleByNamespace method;

Added findModuleByName and findModuleByNamespace into SchemaContext in
yang-model-api;

Added implementation of findModuleByName and findModuleByNamespace for
private implementation of SchemaContextImpl in YangModelParserImpl;
Fixed possible resource leak in resolveModuleBuildersFromStreams in
YangModelBuilderImpl - implemented loadStreams and closeStreams methods;

Added implementation of test case for resolving of leafrefs and leafref
types from multiple modules;

Fixed wrong constructor call of Leafref Type Definition in parseTypeBody
method in YangModelBuilderUtil;

Fixed resolving of SchemaPath for Type statement in
YangModelParserListenerImpl;

Change-Id: I6a037a746562d856d12ea71d3fb095e902e1c204
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoFix yet another breakage on m2e import, due to introduction of another 25/225/1
Giovanni Meo [Tue, 23 Apr 2013 10:22:25 +0000 (12:22 +0200)]
Fix yet another breakage on m2e import, due to introduction of another
unknown to m2e maven plugin.

Change-Id: I63a32c632546ff7c86f329a809a515349380f611
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoMerge "FRM logging improvements"
Giovanni Meo [Tue, 23 Apr 2013 07:25:48 +0000 (07:25 +0000)]
Merge "FRM logging improvements"

9 years agoMerge "reformatting packet creation to be more readable"
Giovanni Meo [Mon, 22 Apr 2013 21:02:13 +0000 (21:02 +0000)]
Merge "reformatting packet creation to be more readable"

9 years agoFRM logging improvements 17/217/2
Asad Ahmed [Sat, 20 Apr 2013 03:14:25 +0000 (20:14 -0700)]
FRM logging improvements

Change-Id: I5f5a4878e0c85cd5aa637b16010f82575a9a509a
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
9 years agoreformatting packet creation to be more readable 24/224/1
Colin Dixon [Sat, 20 Apr 2013 20:46:36 +0000 (13:46 -0700)]
reformatting packet creation to be more readable

Change-Id: I1c22139c45b61530faf5a1a5891ff507deda28ff
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
9 years agoFixed bug in generating of package names in BindingGeneratorImpl; 02/202/3
lsedlak [Tue, 16 Apr 2013 12:01:13 +0000 (14:01 +0200)]
Fixed bug in generating of package names in BindingGeneratorImpl;

Added test files into src/test/resources/leafref-test-models for testing
of resolution of leafrefs in yang models;

Change-Id: I910da64133715efda02023781ba829ae4d12ad02
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoFixed UDP traffic load balancing 18/218/2
Anilkumar Vishnoi [Sat, 20 Apr 2013 14:56:26 +0000 (20:26 +0530)]
Fixed UDP traffic load balancing

Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
9 years agoMerge "Mavenified generation of ANTLR YANG parser"
Giovanni Meo [Mon, 22 Apr 2013 19:55:14 +0000 (19:55 +0000)]
Merge "Mavenified generation of ANTLR YANG parser"

9 years agoRedirecting Caught and Uncaught Exceptions to OSGI Console and Log File 15/215/2
Maurice Qureshi [Fri, 19 Apr 2013 19:14:02 +0000 (12:14 -0700)]
Redirecting Caught and Uncaught Exceptions to OSGI Console and Log File

The existing mechanism int the Controller allows the exceptions to be printed only
the console. This applies to both caught and uncaught exception. If the console
buffer is not too large and gets overwritten or gets cleared, there is no way for
the user to know what exceptions occurred. This commit implements a new mechanism
by which both types of exceptions will get printed on the console as well as logged
to the file.

Signed-off-by: Maurice Qureshi <maquresh@cisco.com>
9 years agoAdded Yang validator. 09/209/2
Maros Marsalek [Tue, 16 Apr 2013 15:05:00 +0000 (17:05 +0200)]
Added Yang validator.
Initial implementation committed that validates Module and Submodule statements.
It also validates a few additional yang statements e.g. revision, import.

Rules that must be obeyed are documented in code as javadoc.
Added tests to test implemented rules.

Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoAdded protocol_plugins.stub that implements 46/146/4
Kalvin Hom [Fri, 12 Apr 2013 23:32:32 +0000 (16:32 -0700)]
Added protocol_plugins.stub that implements
IPluginInReadService

Modified statisticsmanager structure so that
api and implementation are separate modules.

Added Integration test for statisticsmanager
Modified pom.xml for sonar integration test
inclusion.  When going to the Statistics
Manager unit test, should also show
integration percentage.  If Sonar's integration
widget is enabled, should also see coverage on
dashboard.

Change-Id: I3a2901eb41528008e1d2beb6f0f1f1a88392abf3
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoMavenified generation of ANTLR YANG parser 19/219/1
Tony Tkacik [Mon, 22 Apr 2013 12:34:55 +0000 (14:34 +0200)]
Mavenified generation of ANTLR YANG parser

Added ANTLR sources for YANG parser and lexer,
Added antlr4-maven-plugin configuration and lifecycle
mappings for the Eclipse.

Removed original sources of YANG parser and lexer.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Refactor frontend JS"
Alessandro Boch [Fri, 19 Apr 2013 02:15:54 +0000 (02:15 +0000)]
Merge "Refactor frontend JS"

9 years agoRefactor frontend JS 13/213/5
Andrew Kim [Tue, 16 Apr 2013 22:35:12 +0000 (15:35 -0700)]
Refactor frontend JS

Refactored one.js into lib.js and open.js. lib.js contains all the common library functions
one.js and other page.js can use. open.js is the core engine that runs the web UI.

Frontend is now extensible by automatically including  lib.js and overriding default JS engine.

Use spaces instead of tabs.

Change-Id: Ia6678a81a23266c6d0e1c1d56c6cec547f792487
Signed-off-by: Andrew Kim <andrekim@cisco.com>
9 years agoMerge "Topology Service related enhancement and Style changes. Signed-off-by: Madhava...
Jason Ye [Fri, 19 Apr 2013 01:07:07 +0000 (01:07 +0000)]
Merge "Topology Service related enhancement and Style changes. Signed-off-by: Madhavan Kasthurirangan <mkasthur@cisco.com>"

9 years agoMerge "- Added the username/password criteria in usermanager - Relaxed the criteria...
Giovanni Meo [Fri, 19 Apr 2013 00:43:06 +0000 (00:43 +0000)]
Merge "- Added the username/password criteria in usermanager - Relaxed the criteria for nodename/gateway name in devices"

9 years agoTopology Service related enhancement and Style changes. 14/214/1
Madhavan Kasthurirangan [Fri, 19 Apr 2013 00:37:22 +0000 (17:37 -0700)]
Topology Service related enhancement and Style changes.
Signed-off-by: Madhavan Kasthurirangan <mkasthur@cisco.com>
9 years agoMerge "Controller to listen to expired flow removal message - Added plugin-to-FM...
Jason Ye [Thu, 18 Apr 2013 23:01:30 +0000 (23:01 +0000)]
Merge "Controller to listen to expired flow removal message - Added plugin-to-FM async notification path for Flow Programmer so that functional modules can receive notification of flow removal sent by switch - On flow programming phase, instruct switch to notify controller about flow removal only if hard or idle timeout is set - Have FRM listen to flow removal message so that it updates the sw view of installed flows and the static flow config installation status accordingly - Changed equals logic in MatchField as a null mask object for net address is equivalent to a /32 (or /128) bitmask - Removed strict dependencies in SAL Activator. SAL services startup should not depend on external services - Enforced the sun_doding_style.xml in newly added or modified files Change-Id: Ifc913ceef87aac0b4694bcd7c47f29d5cb10c6ed Signed-off-by: Alessandro Boch <aboch@cisco.com>"

9 years agoController to listen to expired flow removal message 12/212/2
Alessandro Boch [Thu, 18 Apr 2013 01:48:44 +0000 (18:48 -0700)]
Controller to listen to expired flow removal message
- Added plugin-to-FM async notification path for Flow Programmer so that functional modules can receive notification of flow removal sent by switch
- On flow programming phase, instruct switch to notify controller about flow removal only if hard or idle timeout is set
- Have FRM listen to flow removal message so that it updates the sw view of installed flows and the static flow config installation status accordingly
- Changed equals logic in MatchField as a null mask object for net address is equivalent to a /32 (or /128) bitmask
- Removed strict dependencies in SAL Activator. SAL services startup should not depend on external services
- Enforced the sun_doding_style.xml in newly added or modified files
Change-Id: Ifc913ceef87aac0b4694bcd7c47f29d5cb10c6ed
Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years ago- Added the username/password criteria in usermanager 08/208/2
dibhatia [Thu, 18 Apr 2013 19:55:33 +0000 (12:55 -0700)]
- Added the username/password criteria in usermanager
- Relaxed the criteria for nodename/gateway name in devices

Change-Id: Id476f2d99e7dbaf285df761ff7e756d3d592cce3
Signed-off-by: dibhatia <dibhatia@cisco.com>
9 years agoMerge "Refactored YANG types resolving."
Giovanni Meo [Thu, 18 Apr 2013 05:37:51 +0000 (05:37 +0000)]
Merge "Refactored YANG types resolving."

9 years agoMerge "Improve Vendor Extension Error Handling. Signed-off-by: Madhavan Kasthuriranga...
Jason Ye [Wed, 17 Apr 2013 23:16:56 +0000 (23:16 +0000)]
Merge "Improve Vendor Extension Error Handling. Signed-off-by: Madhavan Kasthurirangan <mkasthur@cisco.com>"

9 years agoImprove Vendor Extension Error Handling. 06/206/1
Madhavan Kasthurirangan [Wed, 17 Apr 2013 19:15:39 +0000 (12:15 -0700)]
Improve Vendor Extension Error Handling.
Signed-off-by: Madhavan Kasthurirangan <mkasthur@cisco.com>
9 years agoRefactored YANG types resolving. 01/201/1
Martin Vitez [Tue, 16 Apr 2013 08:43:34 +0000 (10:43 +0200)]
Refactored YANG types resolving.

Fixed YANG union type parsing. Refactored code after PMD check.
Fixed organization statement in test files.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "Fixed bug in HostTracker.retrieveCache() where incorrect variable is being...
Giovanni Meo [Wed, 17 Apr 2013 06:10:11 +0000 (06:10 +0000)]
Merge "Fixed bug in HostTracker.retrieveCache() where incorrect variable is being checked for null."

9 years agoMerge "Added javadoc to maven-yang-plugin."
Giovanni Meo [Wed, 17 Apr 2013 05:55:47 +0000 (05:55 +0000)]
Merge "Added javadoc to maven-yang-plugin."