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 <>
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
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

Refactored TypeProviderImpl - resolving of leafrefs now through
SchemaContextUtil methods;

Chenged package name in code-generator-demo to

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

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

Signed-off-by: Lukas Sedlak <>
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 <>
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

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

Change-Id: I6a037a746562d856d12ea71d3fb095e902e1c204
Signed-off-by: Lukas Sedlak <>
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 <>
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 <>
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 <>
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 <>
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 <>
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 <>
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 <>
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

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

Change-Id: I3a2901eb41528008e1d2beb6f0f1f1a88392abf3
Signed-off-by: Kalvin Hom <>
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 <>
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 <>
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 <>"

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 <>
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 <>"

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 <>
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 <>
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 <>"

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 <>
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 <>
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."

9 years agoMerge "Removed forgotten references to yang-to-sources test jar in maven-yang-plugin...
Giovanni Meo [Wed, 17 Apr 2013 05:47:16 +0000 (05:47 +0000)]
Merge "Removed forgotten references to yang-to-sources test jar in maven-yang-plugin integration tests. Replaced with reference to maven-yang test jar (new name for yang-to-sources)."

9 years ago- Added OSGI cmd to display TLS configuration 00/200/1
Jason Ye [Tue, 16 Apr 2013 21:29:52 +0000 (14:29 -0700)]
- Added OSGI cmd to display TLS configuration
- Added null pointer checks and more debug msgs
Signed-off-by: Jason Ye <>
9 years agoFixed bug in HostTracker.retrieveCache() 99/199/1
Kalvin Hom [Tue, 16 Apr 2013 22:45:30 +0000 (15:45 -0700)]
Fixed bug in HostTracker.retrieveCache()
where incorrect variable is being checked
for null.

Change-Id: I1559b61fbceec69835d9f16c055172a005789c28
Signed-off-by: Kalvin Hom <>
9 years agoMerge "Fix Logging for Topology Manager"
Jason Ye [Tue, 16 Apr 2013 21:05:50 +0000 (21:05 +0000)]
Merge "Fix Logging for Topology Manager"

9 years agoFix Logging for Topology Manager 97/197/1
Pramila Singh [Tue, 16 Apr 2013 20:54:43 +0000 (13:54 -0700)]
Fix Logging for Topology Manager

Signed-off-by: Pramila Singh <>
9 years agoFix comments in Also, Max Throughput dijkstra modification. 96/196/1
Madhavan Kasthurirangan [Tue, 16 Apr 2013 19:47:07 +0000 (12:47 -0700)]
Fix comments in Also, Max Throughput dijkstra modification.
Signed-off-by: Madhavan Kasthurirangan <>
9 years agoAdded javadoc to maven-yang-plugin. 93/193/1
Maros Marsalek [Mon, 15 Apr 2013 12:12:42 +0000 (14:12 +0200)]
Added javadoc to maven-yang-plugin.

Documentation can be generated using mvn site command.
Useful information about goals and cofiguration is located under
Project Reports / Plugin Documentation in generated docs.

Signed-off-by: Maros Marsalek <>
9 years agoRemoved forgotten references to yang-to-sources test jar in maven-yang-plugin integra... 69/169/1
Maros Marsalek [Mon, 15 Apr 2013 10:23:34 +0000 (12:23 +0200)]
Removed forgotten references to yang-to-sources test jar in maven-yang-plugin integration tests.
Replaced with reference to maven-yang test jar (new name for yang-to-sources).

Signed-off-by: Maros Marsalek <>
9 years agoUpdate the API generation code and code generation sample 39/139/3
Lukas Sedlak [Thu, 11 Apr 2013 21:47:40 +0000 (14:47 -0700)]
Update the API generation code and code generation sample

Fixed bug in generation of package names.

Change-Id: I8314f44ddf08aceb29b0ccccbb81d2c0eaf54d1d
Signed-off-by: Tony Tkacik <>
9 years agoYANG model parser refactoring 26/126/3
Martin Vitez [Mon, 8 Apr 2013 08:31:04 +0000 (10:31 +0200)]
YANG model parser refactoring
-fix YANG types constraints resolving
-added tests
-removed unused test files

Signed-off-by: Martin Vitez <>
9 years agoRenamed yang-to-sources-plugin to maven-yang-plugin. 34/134/2
Maros Marsalek [Thu, 11 Apr 2013 06:37:23 +0000 (08:37 +0200)]
Renamed yang-to-sources-plugin to maven-yang-plugin.
Updated all references in tests.

Signed-off-by: Maros Marsalek <>
9 years agoMerge "Moving a recently added trim() call in SwitchHandler after Null check."
Alessandro Boch [Sat, 13 Apr 2013 01:44:15 +0000 (01:44 +0000)]
Merge "Moving a recently added trim() call in SwitchHandler after Null check."

9 years agoMoving a recently added trim() call in SwitchHandler after Null check. 47/147/1
Madhu Venugopal [Sat, 13 Apr 2013 01:36:35 +0000 (18:36 -0700)]
Moving a recently added trim() call in SwitchHandler after Null check.

Change-Id: Ib7f5787d612b0cca2b04383e684b6d91401ebb73
Signed-off-by: Madhu Venugopal <>
9 years agoFix issue seen with enunciate plugin when importing in eclipse the 35/135/2
Giovanni Meo [Thu, 11 Apr 2013 17:27:58 +0000 (19:27 +0200)]
Fix issue seen with enunciate plugin when importing in eclipse the
project with m2e

Change-Id: I3607d969ac8235dd3dff965c207c9ff7509f0ad6
Signed-off-by: Giovanni Meo <>
9 years agoMerge "- Add stop() method in IMessageReadWrite for proper clean up when connection...
Alessandro Boch [Fri, 12 Apr 2013 23:25:23 +0000 (23:25 +0000)]
Merge "- Add stop() method in IMessageReadWrite for proper clean up when connection is closed. - Be able to handle whitespace in TLS config lines Signed-off-by: Jason Ye <>"

9 years ago- Add stop() method in IMessageReadWrite for proper clean up when connection is closed. 45/145/1
Jason Ye [Fri, 12 Apr 2013 23:08:25 +0000 (16:08 -0700)]
- Add stop() method in IMessageReadWrite for proper clean up when connection is closed.
- Be able to handle whitespace in TLS config lines
Signed-off-by: Jason Ye <>
9 years agoChanging NB API authentication/authorization to use Tomcat Valve. 36/136/2
Venkatraghavan Sankarasubbu [Fri, 12 Apr 2013 22:54:17 +0000 (15:54 -0700)]
Changing NB API authentication/authorization to use Tomcat Valve.
Affected modules
1. Flow Programmer
2. Host Tracker
3. Static Roting
4. Statistics
5. Subnets
6. Switch Manager
7. Topology
8. Loadbalancer
Change-Id: I94267ed1878c49b9615e956aa816473361ded8f2
Signed-off-by: Venkatraghavan Sankarasubbu <>
9 years agoISSUE: Topology does not show Node description as learned by the OFA 44/144/1
Alessandro Boch [Fri, 12 Apr 2013 20:40:59 +0000 (13:40 -0700)]
ISSUE: Topology does not show Node description as learned by the OFA

Signed-off-by: Alessandro Boch <>
9 years agoFix stale cached links in visual topology 43/143/1
Andrew Kim [Fri, 12 Apr 2013 19:24:05 +0000 (12:24 -0700)]
Fix stale cached links in visual topology

Links weren't properly updated everytime there was a topology state change.

Change-Id: Ia65e02009aa7da65bbedb3d8ed8e72e8de433791
Signed-off-by: Andrew Kim <>
9 years agoFix disappearing nodes 41/141/1
Andrew Kim [Fri, 12 Apr 2013 19:08:02 +0000 (12:08 -0700)]
Fix disappearing nodes

Minor fix in jit.js, this bug was only seen in Webkit-based browsers such as Chrome/Chromium

Change-Id: Ied1b2c68ce98d7d6b9385b9c2f3f56cf34ba8fed
Signed-off-by: Andrew Kim <>
9 years ago- If a port is already under OF control and then hw LLDP transmit is enabled on it... 40/140/1
Jason Ye [Thu, 11 Apr 2013 21:53:07 +0000 (14:53 -0700)]
- If a port is already under OF control and then hw LLDP transmit is enabled on it, controller should discard the hw LLDP packet.
- When we change the name of the Production switch, stale entries should be removed.
- Added Backend APIs to add/delete/get user link configs
- Northbound REST APIs to GET/POST/DELETE user link configs
- Endpoint connected as Production Switch to OF port. If the system-name TLV exists in the hw LLDP packet, it should be used for display.
- Some misc osgi debugging commands.

Signed-off-by: Jason Ye <>
9 years agoEnable sal.core.Node to be an XML root element 38/138/1
Yevgeny Khodorkovsky [Thu, 11 Apr 2013 20:55:34 +0000 (13:55 -0700)]
Enable sal.core.Node to be an XML root element

Change-Id: Iec1d94864a33e7e175c5180d84c1f8b5c2ccc641
Signed-off-by: Yevgeny Khodorkovsky <>
9 years agoAuth Principal to work with Remote authorization 37/137/1
Madhu Venugopal [Thu, 11 Apr 2013 19:06:05 +0000 (12:06 -0700)]
Auth Principal to work with Remote authorization
Also added some helpful OSGi console commands for remote auth.

Change-Id: I2c092cb73c7603acc2a2171e1d1fcc5669a9373d
Signed-off-by: Madhu Venugopal <>
9 years agoISSUE: After controller restart, proactive flows are not installed 32/132/2
Alessandro Boch [Wed, 10 Apr 2013 23:30:35 +0000 (16:30 -0700)]
ISSUE: After controller restart, proactive flows are not installed
This is because of an incongruence between Devices.web and SwitchManagerImpl code, where the
former only consider the Node.nodeID string form and the latter expects the full Node string form.
Have Devices.web passing Node.toString() form to front-end

Change-Id: I04443178099f151b37b76d4f8a5e41cee64f5ecb
Signed-off-by: Alessandro Boch <>
9 years agoMerge "fixed method name"
Giovanni Meo [Thu, 11 Apr 2013 17:07:53 +0000 (17:07 +0000)]
Merge "fixed method name"

9 years agoMerge "Call per page clean up if that is defined."
Madhu Venugopal [Thu, 11 Apr 2013 03:59:45 +0000 (03:59 +0000)]
Merge "Call per page clean up if that is defined."

9 years agofixed method name 33/133/1
Youcef Laribi [Thu, 11 Apr 2013 00:05:56 +0000 (17:05 -0700)]
fixed method name

Change-Id: I18ff595c6fe84eed59c2ef138b0e783ba00ba1f0
Signed-off-by: Youcef Laribi <>
9 years agoSimple Load Balancer Application - Recommitting the source codewith the whole source... 30/130/1
Anilkumar Vishnoi [Wed, 10 Apr 2013 22:17:12 +0000 (03:47 +0530)]
Simple Load Balancer Application - Recommitting the source codewith the whole source code of the application in single commit

Signed-off-by: Anilkumar Vishnoi <>
9 years agofixing spelling errors in comments 29/129/1
Colin Dixon [Wed, 10 Apr 2013 15:13:35 +0000 (10:13 -0500)]
fixing spelling errors in comments

Change-Id: Iecac10313c1cb7a88c5de3848b4506f591f88dca
Signed-off-by: Colin Dixon <>
9 years agoCall per page clean up if that is defined. 28/128/1
lakshya [Wed, 10 Apr 2013 17:59:46 +0000 (10:59 -0700)]
Call per page clean up if that is defined.

Signed-off-by: lakshya <>
9 years agoBranding support for the newly added error page. 23/123/1
Madhu Venugopal [Sat, 6 Apr 2013 16:40:44 +0000 (09:40 -0700)]
Branding support for the newly added error page.

Change-Id: I49f0a4641bc7f6522006fa0794f6448997d0f9bd
Signed-off-by: Madhu Venugopal <>
9 years agoReplacing Spring Security framework with Apache Tomcat Valve for Web Security (UI... 22/122/1
Venkatraghavan Sankarasubbu [Sat, 6 Apr 2013 14:19:52 +0000 (07:19 -0700)]
Replacing Spring Security framework with Apache Tomcat Valve for Web Security (UI Only).
Northbound will be handled as part of a different commit.
Updated Web UI modules :
1. Root
2. Flows
3. Devices
4. Topology
5. Troublehshooting

Change-Id: I09fa1968a184bf6ae0c6248e8eea3c05a40433d8
Signed-off-by: Venkatraghavan Sankarasubbu <>
9 years agoMerge "Web UI Branding support This fix provides an extensible branding support with...
Andrew Kim [Sat, 6 Apr 2013 01:45:23 +0000 (01:45 +0000)]
Merge "Web UI Branding support This fix provides an extensible branding support with the help of OSGi Fragment. Also included a sample branding fragment which can be used to create custom brands."

9 years agoWeb UI Branding support 21/121/1
Madhu Venugopal [Sat, 6 Apr 2013 01:38:08 +0000 (18:38 -0700)]
Web UI Branding support
This fix provides an extensible branding support with the help of OSGi Fragment.
Also included a sample branding fragment which can be used to create custom brands.

Change-Id: Ifccf87ba6a57bf2d0a6da07b6a1809994d7fdf1f
Signed-off-by: Madhu Venugopal <>
9 years agoMerge "Add TLS support in the Opendaylight Controller: - TLS configuration is specifi...
Alessandro Boch [Sat, 6 Apr 2013 00:50:18 +0000 (00:50 +0000)]
Merge "Add TLS support in the Opendaylight Controller: - TLS configuration is specified in file ./configuration/config.ini. To enable the TLS feature, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files. The Java KeyStore contains controller's private key and certificate. The Java TrustStore contains the trusted certificate entries, including switches' Certification Authority (CA) certificates. Here is the sample configuration,"

9 years agoAdding ability to customize onClick on topology graph. 20/120/1
Author Name [Fri, 5 Apr 2013 22:28:23 +0000 (15:28 -0700)]
Adding ability to customize onClick on topology graph.

Change-Id: Ie4d5abf02e9a704ec66ca5cd40633d09153e98c1
Signed-off-by: lakshya <>
9 years agoAdd TLS support in the Opendaylight Controller: 19/119/1
Jason Ye [Fri, 5 Apr 2013 23:58:47 +0000 (16:58 -0700)]
Add TLS support in the Opendaylight Controller:
- TLS configuration is specified in file ./configuration/config.ini. To enable the TLS feature, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files. The Java KeyStore contains controller's private key and certificate. The Java TrustStore contains the trusted certificate entries, including switches' Certification Authority (CA) certificates. Here is the sample configuration,

controllerKeyStorePassword=xxxxx (this password should match the password used for KeyStore generation)
controllerTrustStorePassword=xxxxx (this password should match the password used for TrustStore generation)

- Added two message read/write services, one for clear text, one for secure communication.

- Added priority queue for message transmission. The system critical messages, such as Hello, Echo Reply etc will be treated as high priority and will be served ahead of other messages, like statistics request, discovery packets etc.

Signed-off-by: Jason Ye <>
9 years agoGerritt #107 introduced a fix that caused Routing Listener registration issue. 15/115/1
Madhu Venugopal [Fri, 5 Apr 2013 21:19:35 +0000 (14:19 -0700)]
Gerritt #107 introduced a fix that caused Routing Listener registration issue.
Fixing it here. Also removed the unused DS xmls.

Change-Id: I2b6105d909bea0691b5568a0791d4920f73cc17e
Signed-off-by: Madhu Venugopal <>
9 years agoFix for bug 7 14/114/1
Anilkumar Vishnoi [Fri, 5 Apr 2013 18:15:30 +0000 (23:45 +0530)]
Fix for bug 7

Change-Id: I62e5725e0712e07fcb2fe8c0425cfca0fa6da865
Signed-off-by: Anilkumar Vishnoi <>
9 years agoMerge "Added skeleton for yang maven plugin."
Giovanni Meo [Fri, 5 Apr 2013 13:19:55 +0000 (13:19 +0000)]
Merge "Added skeleton for yang maven plugin."

9 years agoAdded skeleton for yang maven plugin. 11/111/2
Maros Marsalek [Fri, 5 Apr 2013 12:03:55 +0000 (14:03 +0200)]
Added skeleton for yang maven plugin.

Added implementation of yang-to-sources maven plugin
which is responsible for parsing YANG files and invoking
configured code providers to generate sources from YANG
during maven generate-sources and generate-resources phase.

Added JUNIT tests testing the integration with maven and
following scenarios:

No generators for generate-sources and generate-resources
Unknown generators for generate-sources and generate-resources
Non-existant root folder with yang sources
No yang sources under yang root folder
Correct configuration for both generate-sources and generate-resources

Change-Id: Ib4d2a2c004ba19d3fda79d6a3d6da41050059ce0
Signed-off-by: Maros Marsalek <>
9 years agoAdded support for RPCs to Binding-Aware SAL 13/113/1
Tony Tkacik [Fri, 5 Apr 2013 12:59:46 +0000 (14:59 +0200)]
Added support for RPCs to Binding-Aware SAL

Added support for RPCs to Binding-Aware SAL. The implementations
of the RPCs are mapped to interfaces describing RPC contract.

The registered implementation is registered for all RPCs described
in the interface and only one registered implementation of the
interface could exists at-the time.

It is possible to register implementation of derived interface,
but client must request the derived interface to access its
implementation of rpcs defined in super interface.

Signed-off-by: Tony Tkacik <>
9 years agoAdded support for binding-independent RPCs 12/112/1
Tony Tkacik [Fri, 5 Apr 2013 11:11:04 +0000 (13:11 +0200)]
Added support for binding-independent RPCs

Implemented the support for binding-independent RPCs directly into BrokerImpl,
and removed unused placeholders for functionality.

  - Moved Session Implementations directly into BrokerImpl as private inner
    classes, because they are BrokerImpl specific.
  - Removed unnecessary packages.
  - Extracted RPC utils from sal-broker-impl to sal-common-utils to be reusable
    for other components without introducing dependency on sal-broker-impl.

Signed-off-by: Tony Tkacik <>
9 years agoMerge "ISSUE: Some changes to Authorization"
Andrew Kim [Fri, 5 Apr 2013 03:06:41 +0000 (03:06 +0000)]
Merge "ISSUE: Some changes to Authorization"

9 years agoISSUE: Some changes to Authorization 09/109/2
Alessandro Boch [Fri, 5 Apr 2013 02:43:34 +0000 (19:43 -0700)]
ISSUE: Some changes to Authorization

- Fixed enum string in AppRoleLevel and added fromString() method
- Added couple of methods to IResourceAuthorization
- Have some IResourceAuthorization methods to return Status
- Changed UserManagerImpl.getUserLevel() to check against local configured users as well, instead of against only local authenticated users
- Added a couple of Junits tests

Change-Id: I713fa48afa9791a2ba1a4a837dce678d03e4c171
Signed-off-by: Alessandro Boch <>
9 years agoRenaming OneWeb to DaylightWeb 08/108/2
Colin Dixon [Thu, 4 Apr 2013 22:38:42 +0000 (17:38 -0500)]
Renaming OneWeb to DaylightWeb

Change-Id: Ic8f89bc249aadd81fec3416322122259ef51b89a
Signed-off-by: Colin Dixon <>
9 years agoRemoving references to a prior branded controller 07/107/1
Colin Dixon [Thu, 4 Apr 2013 22:27:28 +0000 (17:27 -0500)]
Removing references to a prior branded controller

Change-Id: Ie5518714964fd1713ae64274228bf7269e32d728
Signed-off-by: Colin Dixon <>
9 years agoISSUE: 06/106/1
Alessandro Boch [Thu, 4 Apr 2013 17:25:14 +0000 (10:25 -0700)]
Controller does not format TOS match field as specified by OF1.0 spec.
- In protocol_plugin when converting SAL Match to OFMatch have TOS bits to be msb and viceversa
- Added utilities functions in NetUtils for deriving unsigned values for primitive
  types byte and short when needed for comparisons and bit shifting operations.
  Made use of them throughout the code.

Change-Id: Ia0505921b46627825c27d18229f1e1b626ce3d7d
Signed-off-by: Alessandro Boch <>
9 years agoRefactored YangModelParserImpl 05/105/1
mvitez [Thu, 4 Apr 2013 13:48:56 +0000 (15:48 +0200)]
Refactored YangModelParserImpl
Renamed Identityref to IdentityrefType
Renamed IdentityType to IdentitySchemaNode and moved from yang-model-util to yang-model-api + refactored as interface
Added tests

Signed-off-by: mvitez <>
9 years agoFixed bug in naming conventions. 04/104/1
lsedlak [Thu, 4 Apr 2013 13:04:19 +0000 (15:04 +0200)]
Fixed bug in naming conventions.
In yang-data-util changed package name from to;
In yang-model-api changed package name from
org.opendaylight.controller.model.api.type to
In yang-model-util changed package name from
org.opendaylight.controller.model.util to

Refactored and updated all imports dependant on projects
yang-model-util, yang-model-api and yang-model-util

Signed-off-by: lsedlak <>
9 years agoFixed bugs in naming conventions of packages. 03/103/3
lsedlak [Thu, 4 Apr 2013 13:04:19 +0000 (15:04 +0200)]
Fixed bugs in naming conventions of packages.

In yang-data-util changed package name from to;
In yang-model-api changed package name from
org.opendaylight.controller.model.api.type to
In yang-model-util changed package name from
org.opendaylight.controller.model.util to

Added junit test for resolving Yang types from multiple Yang modules;
Fixed typo in QName of to uint64 QName;

Refactored and updated all imports dependant on projects
yang-model-util, yang-model-api and yang-model-util

Change-Id: I13779030a9823a821fc06d5b9a90e195da3e0a1a
Signed-off-by: lsedlak <>
9 years agoMerge "Fix for messags at the boot up time This commit proposes following two sets...
Giovanni Meo [Thu, 4 Apr 2013 08:04:08 +0000 (08:04 +0000)]
Merge "Fix for messags at the boot up time This commit proposes following two sets of changes"

9 years agoMerge "Fixed YANG union type resolving in yang model parser."
Giovanni Meo [Thu, 4 Apr 2013 08:02:28 +0000 (08:02 +0000)]
Merge "Fixed YANG union type resolving in yang model parser."

9 years agoMerge "Added Google Guava as dependency. Replaced Map<K,List<V> for SAL listeners."
Giovanni Meo [Thu, 4 Apr 2013 07:57:15 +0000 (07:57 +0000)]
Merge "Added Google Guava as dependency. Replaced Map<K,List<V> for SAL listeners."

9 years agoLogging Related Enhancements. 02/102/1
Madhavan Kasthurirangan [Wed, 3 Apr 2013 21:31:31 +0000 (14:31 -0700)]
Logging Related Enhancements.
Signed-off-by: Madhavan Kasthurirangan <>
9 years agoFix for messags at the boot up time 01/101/1
Maurice Qureshi [Wed, 3 Apr 2013 19:17:02 +0000 (12:17 -0700)]
Fix for messags at the boot up time
This commit proposes following two sets of changes

1. Since the logger level has been changed from "WARN" to "INFO" for most
   of the components, change the logger messages in

2. Change the usage of "+" to "{}" in logger messages for better efficiency

Signed-off-by: Maurice Qureshi <>
9 years agoConsistent URL Scheme for Northbound and Web UI 00/100/1
Madhu Venugopal [Wed, 3 Apr 2013 14:45:30 +0000 (07:45 -0700)]
Consistent URL Scheme for Northbound and Web UI
Changing the URLs that is currently used to be more consistent and an added hierarchy : controller/nb, controller/web

Change-Id: Icd4f2f2ffcdfcd6d0439a8df4d556e3e5b56fb20
Signed-off-by: Madhu Venugopal <>
9 years agoFixed YANG union type resolving in yang model parser. 99/99/1
mvitez [Wed, 3 Apr 2013 13:28:38 +0000 (15:28 +0200)]
Fixed YANG union type resolving in yang model parser.

Signed-off-by: mvitez <>
9 years agoAdded Google Guava as dependency. Replaced Map<K,List<V> for SAL listeners. 98/98/1
Tony Tkacik [Wed, 3 Apr 2013 08:51:04 +0000 (10:51 +0200)]
Added Google Guava as dependency. Replaced Map<K,List<V> for SAL listeners.

Signed-off-by: Tony Tkacik <>
9 years agoMerge "Partial fix for bug 8. Fixing many generics-related warnings and some typos."
Giovanni Meo [Wed, 3 Apr 2013 09:26:01 +0000 (09:26 +0000)]
Merge "Partial fix for bug 8. Fixing many generics-related warnings and some typos."

9 years agoMerge "ISSUE Opendaylight controller to get node description from OF description...
Madhu Venugopal [Tue, 2 Apr 2013 21:51:26 +0000 (21:51 +0000)]
Merge "ISSUE Opendaylight controller to get node description from OF description statistics datapath description field"

9 years agoISSUE 96/96/1
Alessandro Boch [Tue, 2 Apr 2013 21:05:14 +0000 (14:05 -0700)]
Opendaylight controller to get node description from OF description
statistics datapath description field

- Switch Mgr to expose a getNodeDescription() method which returns the
  description configured by user if any, otherwise the one learnt from
  the proto plugin
- Web bunldes to make use of the above api (Currently they are ignoring
  the info learnt by the plugin)
- OFStatisticsManager to implement a IStatistics interface for informing
  listeners that the description statistics info has been refreshed
- Removing current logic where OFStatisticsManager was explicitely
  invoking the description property update on InventoryService through
- Removed logic where InventoryServiceShim queries OFStatisticsManager
  about node description as information is not available at that time
  and IStatisticsListener updates will serve same purpose
- Removing statistics request timeouts from OFStatisticsManager as the
  timeout is compeltely handled by core.internal.StatisticsCollector

Change-Id: I0d2941d3012ca6dc77a386570dbbd8e5c7832a03
Signed-off-by: Alessandro Boch <>
9 years agoPartial fix for bug 8. Fixing many generics-related warnings and some typos. 95/95/1
Colin Dixon [Tue, 2 Apr 2013 20:31:19 +0000 (15:31 -0500)]
Partial fix for bug 8. Fixing many generics-related warnings and some typos.

Change-Id: I8cfe05dacbdc3a6e7875a0661b9e1cdb5a18f67e
Signed-off-by: Colin Dixon <>
9 years agoOpenDaylight uses Jersey framework to support JAX-RS compliant Northbound API. 94/94/2
Madhu Venugopal [Tue, 2 Apr 2013 11:31:43 +0000 (04:31 -0700)]
OpenDaylight uses Jersey framework to support JAX-RS compliant Northbound API.
OSGi makes sure the dependent modules are loaded first and before moving a module
into RESOLVED state. But the module implementation can result in one bundle become
ACTIVE before the other. This can be resolved properly by having these sequentialized
by monitoring the service bringup order.
In this case, com.sun.jersey.spi.container expects the jersey-server and core to be
active too soon causing the exceptions as seen in Bug 5.
But, as per OSGi specification, any bundle can be independently shutdown and restored
and the dependent bundles must be robust in handling this. Fortunately, the jersey
and dependent framework bundles handles this scenario properly and hence this exception
is just informational and has no impact on the running system.

OSGi also provides another mechanism called startlevel, which forces some infrastructure
bundles to be loaded sooner than the actual dependency is resolved. This accelerates the
bundle loading and solves problems like these. But, using this mechanism is discouraged,
because a well-made OSGi bundle need not depend on such bundle load parameters for its
operation. We are anyways adding this fix as a temporary measure to check the status
of the issue in various runtime environments. This fix can be removed after the current
work on Apache Valve integration is in place.

Change-Id: I2980cc1f79e1d50d457de96b19f3032d8e808609
Signed-off-by: Madhu Venugopal <>
9 years agoMerge "ISSUE Currently ForwardingRulesManager installs the proactive mode flows throu...
Jason Ye [Mon, 1 Apr 2013 22:42:08 +0000 (22:42 +0000)]
Merge "ISSUE Currently ForwardingRulesManager installs the proactive mode flows through the static flow configuration path. This allows these controller generated flows to be listed in the flow programmer UI. The drawback of this approach is that now the proactive flows are saved to FRM startup configuration, when user saves the config. So when FRM boots up, it will program the proactive flows on the switch whenever the switch connects to the controller, regardless of the actual switch forwarding mode configured on switch mgr."

9 years agoISSUE 93/93/1
aboch [Mon, 1 Apr 2013 20:36:56 +0000 (13:36 -0700)]
Currently ForwardingRulesManager installs the proactive mode flows through the
static flow configuration path. This allows these controller generated flows to
be listed in the flow programmer UI. The drawback of this approach is that now
the proactive flows are saved to FRM startup configuration, when user saves the
config. So when FRM boots up, it will program the proactive flows on the switch
whenever the switch connects to the controller, regardless of the actual switch
forwarding mode configured on switch mgr.

This is not correct as the notion of proactive forwarding mode associated to a
switch is controlled by switch manager, through sm UI. The trigger to install the
proactive flows should come from switch manager, FRM should not save these internal
generated flows to its startup config, nor program them on its own.

1) On FRM config save, the internal generated static flows will not be added to the
list that will be actually saved.
2) In Switch Mgr, when the switch connects, while reading the respective switch
configuration (if any) the mode is learnt. If it is set to proactive, the mode change
event is being played.
3) When a switch disconnect, FRM has to remove the internal static flow configurations
for that switch.
4) Switch Mgr isSpecial method to correctly report special node conenctor (method should
be provided by NodeConnector class in future).
5) Adding the startup directory to the distribution to allow write/read of startup
configuration files.
6) Have FlowConfig class to expose a method to retrieve the configured forwarding mode,
so that internal coding is hidden to clients.

Signed-off-by: aboch <>
Change-Id: Id628042b7d656d95ace87a1e72c13f2950e6795c
Signed-off-by: aboch <>
9 years agoAdding additional JUnit tests for SwitchManager 92/92/1
Kalvin Hom [Sat, 30 Mar 2013 00:46:50 +0000 (17:46 -0700)]
Adding additional JUnit tests for SwitchManager

Change-Id: I9235a653d1740faf3a143b7fea48d80c91584124
Signed-off-by: Kalvin Hom <>
9 years agoMerge "Refactoring SubnetConfig: -Use NetUtils IP validation methods instead of own...
Alessandro Boch [Fri, 29 Mar 2013 20:53:19 +0000 (20:53 +0000)]
Merge "Refactoring SubnetConfig: -Use NetUtils IP validation methods instead of own regex and duplicate method -Remove unused method getFieldsNames()"

9 years agoRefactoring SubnetConfig: 91/91/1
Kalvin Hom [Fri, 29 Mar 2013 20:40:31 +0000 (13:40 -0700)]
Refactoring SubnetConfig:
-Use NetUtils IP validation methods
instead of own regex and duplicate method
-Remove unused method getFieldsNames()

Change-Id: I6efc16a0fad39c622411e93cf5a3e4d377678de7
Signed-off-by: Kalvin Hom <>
9 years agoMerge "Ability to configure some system parameters on the controller"
Giovanni Meo [Fri, 29 Mar 2013 07:52:55 +0000 (07:52 +0000)]
Merge "Ability to configure some system parameters on the controller"