controller.git
8 years agoMerge "Connection Manager infrastructure supporting the Clustering Active-Active...
Alessandro Boch [Wed, 31 Jul 2013 00:12:42 +0000 (00:12 +0000)]
Merge "Connection Manager infrastructure supporting the Clustering Active-Active requirement. This commit brings in the following changes : 1. Connection Manager as a functional module that runs above SAL providing common services to various south-bound plugins.    The initial version of Connection Manager takes in Node as the only argument and let the Connection Management Scheme to determine the fate of the connection.    Primary use-case that is addressed here is the HA/Clustering's Active-Active mode with the ability for Nodes to connect to different controller in a cluster."

8 years agoPer container flow statistics filtering to account cFlows 50/750/2
Alessandro Boch [Tue, 30 Jul 2013 22:45:31 +0000 (15:45 -0700)]
Per container flow statistics filtering to account cFlows

ISSUE:
ReadServiceFilter in openflow protocol plugin while trying to derive
to which container a flow statistics object belongs, it does not take into
account the container flows (cFlows).
CHANGES:
- Have ReadServiceFilter maintain a map of container to container flows
- Have flowBelongToContainer() account the cFlows while filtering the Flow objects
- Changed the other container maps to concurrent maps
- Other minor style changes

Change-Id: I2d41fa2111334d57ef3179e907fea0bf268943e7
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoConnection Manager infrastructure supporting the Clustering Active-Active requirement. 48/748/1
Madhu Venugopal [Tue, 30 Jul 2013 18:05:43 +0000 (11:05 -0700)]
Connection Manager infrastructure supporting the Clustering Active-Active requirement.
This commit brings in the following changes :
1. Connection Manager as a functional module that runs above SAL providing common services to various south-bound plugins.
   The initial version of Connection Manager takes in Node as the only argument and let the Connection Management Scheme to determine the fate of the connection.
   Primary use-case that is addressed here is the HA/Clustering's Active-Active mode with the ability for Nodes to connect to different controller in a cluster.

2. SAL Connection service is implemented as a seperate bundle in order to show case the possibility of SAL being extensible and not a monolith piece of infra.

3. The only API that is exposed now is the isLocal functionality which can be used by Apps and Protocol plugins alike to take care of their individual funcationalities.

The corresponding Protocol-plugin changes will be pushed as a different commit.

Change-Id: I0ffad694b1a21ff4ec7e2139bb81a398412b9de0
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
8 years agoFixed a bug that failed specifying the value 0 on VLAN ID field for a match condition... 47/747/1
Hideyuki Tai [Tue, 30 Jul 2013 17:03:10 +0000 (13:03 -0400)]
Fixed a bug that failed specifying the value 0 on VLAN ID field for a match condition, and enabled to match VLAN untagged frames on OpenFlow switches.

- Fixed MatchType class to allow the value 0 on VLAN ID field for VLAN untagged frames.
- Changed FlowConverter class to convert the value 0 on VLAN ID field of SAL Flow into the value 0xffff of OF Flow, and vice-versa.

Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
8 years agoMerge "Added uses to extends list. Groupings in YANG are used through key word uses...
Giovanni Meo [Tue, 30 Jul 2013 15:46:00 +0000 (15:46 +0000)]
Merge "Added uses to extends list. Groupings in YANG are used through key word uses. YANG elements which contains uses "something" are now generated as interface which extends "something"."

8 years agoMerge "Created Yang to Java Builder pattern class generator"
Giovanni Meo [Tue, 30 Jul 2013 15:42:46 +0000 (15:42 +0000)]
Merge "Created Yang to Java Builder pattern class generator"

8 years agoMerge "Fixed bug in resolving of conditional Revision Aware XPath."
Giovanni Meo [Tue, 30 Jul 2013 15:34:21 +0000 (15:34 +0000)]
Merge "Fixed bug in resolving of conditional Revision Aware XPath."

8 years agoMerge "NullPointer Exceptions in HostTracker if ARPHandler is shutdown"
Giovanni Meo [Tue, 30 Jul 2013 15:30:11 +0000 (15:30 +0000)]
Merge "NullPointer Exceptions in HostTracker if ARPHandler is shutdown"

8 years agoMerge "Get/remove inactive hosts"
Giovanni Meo [Tue, 30 Jul 2013 15:27:20 +0000 (15:27 +0000)]
Merge "Get/remove inactive hosts"

8 years agoMerge "Fixed the problem with the Vlan PCP not being passed on to the switch. Also...
Alessandro Boch [Tue, 30 Jul 2013 15:16:22 +0000 (15:16 +0000)]
Merge "Fixed the problem with the Vlan PCP not being passed on to the switch. Also fixed the problem with the Masks not being properly applied when a part of the Vlan TCI like either vlan id or the vlan pcp are being set."

8 years agoMerge "Adding Inactive Static Hosts"
Giovanni Meo [Tue, 30 Jul 2013 15:08:12 +0000 (15:08 +0000)]
Merge "Adding Inactive Static Hosts"

8 years agoAdded uses to extends list. 94/694/4
Jozef Gloncak [Wed, 24 Jul 2013 11:34:28 +0000 (13:34 +0200)]
Added uses to extends list.
Groupings in YANG are used through key word uses. YANG elements which
contains uses "something" are now generated as interface which extends
"something".

Change-Id: Icc3db4191876e31cf1d27d9ddc71e4b0702a956f
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoFixed the problem with the Vlan PCP not being passed on to the switch. 35/735/1
Asad Ahmed [Mon, 29 Jul 2013 17:44:22 +0000 (10:44 -0700)]
Fixed the problem with the Vlan PCP not being passed on to the switch.
Also fixed the problem with the Masks not being properly applied
when a part of the Vlan TCI like either vlan id or the vlan pcp are being set.

Change-Id: I637a0570ade4e32dde52e555bfdbc1e186da7b1e
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
8 years agoNullPointer Exceptions in HostTracker if ARPHandler is shutdown 14/714/1
Maurice Qureshi [Fri, 26 Jul 2013 22:11:29 +0000 (15:11 -0700)]
NullPointer Exceptions in HostTracker if ARPHandler is shutdown

Check for availability of ARPHandler Services in HostTracker. Aslo enhanced
debug-ability

Signed-off-by: Maurice Qureshi <maquresh@cisco.com>
8 years agoCreated Yang to Java Builder pattern class generator 02/702/3
msunal [Thu, 25 Jul 2013 11:37:39 +0000 (13:37 +0200)]
Created Yang to Java Builder pattern class generator

- added Xtend tool to dependencies
- created builder xtend class template
- created BuilderClassDescriptor class which is used as source of information in template
- integrated generating of Builder pattern classes for interfaces
- updated jUnit test

Maven generates .java file as a translation of .xtend template into src/main/xtend-gen. Therefore /binding-java-api-generator/src/main/xtend-gen was added into .gitignore file.
If you use Xtend plugin for Eclipse, you should check a configuration of Xtend compiler in Eclipse, whether there is choosen xtend-gen as an output direcotory.

Change-Id: I72e733c7d8f2587848b0e0d32368f7f1700a44d0
Signed-off-by: Martin Sunal <msunal@cisco.com>
8 years agoMerge "Out of Memory when static Routes are configured with unresolved next hop Root...
Madhu Venugopal [Thu, 25 Jul 2013 21:48:40 +0000 (21:48 +0000)]
Merge "Out of Memory when static Routes are configured with unresolved next hop Root cause: This problem happens when there are staticRoutes configured but their next hop IP are unresolved (ie. not responding to ARP Request). StaticRouteImpl.java spawns a thread requesting hostTracker to discover the host, this thread is waiting forever due to a bug in the thread (HostTrackerCallable) that handles the discovery which never returns since the host is not responding."

8 years agoFixed bug in resolving of conditional Revision Aware XPath. 03/703/1
lsedlak [Thu, 25 Jul 2013 14:13:09 +0000 (16:13 +0200)]
Fixed bug in resolving of conditional Revision Aware XPath.

Fixed implementation in TypeProviderImpl - if leafref references the leaf through the conditional XPath the method will no more returns null but wrapped Type as java.lang.Object.
Added test into GeneratedTypesTest for conditional XPath.
Fixed controller-network-ne.yang - changed name of flow-tables to flow-tables2 - the build should no more fail.
Fixed wrong transformation of yang namespace to java package in case that yang namespace contains numbers right after the "."
Added check into BindingGeneratorUtil - validateJavaPackage.
Refactored and commented SchemaContextUtil.java

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
8 years agoOut of Memory when static Routes are configured with unresolved next hop 97/697/1
Chi-Vien Ly [Thu, 25 Jul 2013 05:51:03 +0000 (22:51 -0700)]
Out of Memory when static Routes are configured with unresolved next hop
Root cause: This problem happens when there are staticRoutes configured but their
next hop IP are unresolved (ie. not responding to ARP Request).
StaticRouteImpl.java spawns a thread requesting hostTracker to discover the host,
this thread is waiting forever due to a bug in the thread (HostTrackerCallable)
that handles the discovery which never returns since the host is not responding.

Solution:
- Instead of creating threads dynamically, we create a threadpool of 2 and reuse
  the threads.
- Fix the bug in HostTrackerCallable to sleep(2000) and returns.

Change-Id: Ic04d1dbaf17d5cd6672646050d71abb9885695e9
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
8 years agoFix a wrong notification in ComponentActivatorAbstractBase 40/640/1
Giovanni Meo [Wed, 24 Jul 2013 11:04:46 +0000 (13:04 +0200)]
Fix a wrong notification in ComponentActivatorAbstractBase

The ComponentActivatorAbstractBase is currently looking for the
"stopping" method on the component that is stopping, during the
"stopped" phase provided by Apache Dependency Manager, while that
should be raised during the "stopping" phase. Correcting the
mis-alignment.

Change-Id: I1ff703ce071e2f5c80215b748b4f046760445b21
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoMerge "Fix IPv6 + subnet flow installation"
Chi-Vien Ly [Wed, 24 Jul 2013 03:10:27 +0000 (03:10 +0000)]
Merge "Fix IPv6 + subnet flow installation"

8 years agoMerge "When a node is going down, remove edges in both directions associated with...
Alessandro Boch [Wed, 24 Jul 2013 00:19:33 +0000 (00:19 +0000)]
Merge "When a node is going down, remove edges in both directions associated with the node."

8 years agoMerge "InventoryShim to check node presence, before notifying in container Signed...
Alessandro Boch [Tue, 23 Jul 2013 14:32:04 +0000 (14:32 +0000)]
Merge "InventoryShim to check node presence, before notifying in container Signed-off-by: Pramila Singh <pramisin@cisco.com>"

8 years agoMerge "Projects moved under correct parent."
Giovanni Meo [Tue, 23 Jul 2013 12:32:35 +0000 (12:32 +0000)]
Merge "Projects moved under correct parent."

8 years agoProjects moved under correct parent. 16/616/4
Martin Vitez [Fri, 19 Jul 2013 09:15:10 +0000 (11:15 +0200)]
Projects moved under correct parent.

Moved code-generator/maven-yang -> yang/.
Moved code-generator/maven-yang-plugin -> yang/.
Moved code-generator/maven-yang-plugin-it -> yang/.
Moved code-generator/yang-model-parser-api -> yang/.
Moved code-generator/yang-model-parser-impl -> yang/.

Configured site plugin for project. Fixed some javadocs.
Fixed bug in ParserUtils causing NullPointerException.
Fixed bug in resolving uses statement.
Improved tests.

Change-Id: Ia7567544fbe006f0cf87055c6633c04b5ce2c50e
Signed-off-by: Martin Vitez <mvitez@cisco.com>
8 years agoFix IPv6 + subnet flow installation 25/625/1
Alessandro Boch [Mon, 22 Jul 2013 21:29:03 +0000 (14:29 -0700)]
Fix IPv6 + subnet flow installation

    ISSUE: Flows matching on IPv6 packets are not installed when a mask is specified
    CHANGE:
    - Set the proper field in V6Match for subnets
    - Cleanup V6Match to make use of parent OFMatch fields for IPv4 matches
    - Fix subnet methods in NetUtils
    - Fix MatchType and MatchField to consider the network prefix address when
      checking equality and building hashcode for a Match on NW_SRC and NW_DST

Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoMerge "Fixed bug of IPv4 option handling."
Madhu Venugopal [Mon, 22 Jul 2013 23:53:49 +0000 (23:53 +0000)]
Merge "Fixed bug of IPv4 option handling."

8 years agoWhen a node is going down, remove edges in both directions associated with the node. 23/623/1
Jason Ye [Mon, 22 Jul 2013 22:11:59 +0000 (15:11 -0700)]
When a node is going down, remove edges in both directions associated with the node.

Signed-off-by: Jason Ye <yisye@cisco.com>
8 years agoAdded toester demo yang file. 22/622/2
Tony Tkacik [Mon, 22 Jul 2013 14:22:21 +0000 (16:22 +0200)]
Added toester demo yang file.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "Package names for enclosed Types of TOs were changed to fully qualified. Fully...
Ed Warnicke [Sun, 21 Jul 2013 05:51:17 +0000 (05:51 +0000)]
Merge "Package names for enclosed Types of TOs were changed to fully qualified. Fully qualified package names are added to enclosed Types of transport objects. In previous version there was bug (name of enclosing type was missing in package name)."

8 years agoMerge "Fix for Switchmanager Save Configuration. Signed-off-by: Pramila Singh <pramis...
Alessandro Boch [Fri, 19 Jul 2013 23:15:13 +0000 (23:15 +0000)]
Merge "Fix for Switchmanager Save Configuration. Signed-off-by: Pramila Singh <pramisin@cisco.com>"

8 years agoFixed bug of IPv4 option handling. 21/621/1
Hideyuki Tai [Fri, 19 Jul 2013 22:05:51 +0000 (18:05 -0400)]
Fixed bug of IPv4 option handling.

Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
8 years agoInventoryShim to check node presence, before notifying in container 20/620/1
Pramila Singh [Fri, 19 Jul 2013 20:01:44 +0000 (13:01 -0700)]
InventoryShim to check node presence, before notifying in container
Signed-off-by: Pramila Singh <pramisin@cisco.com>
8 years agoMerge "Make statistic queue size configurable via config.ini"
Jason Ye [Fri, 19 Jul 2013 18:06:51 +0000 (18:06 +0000)]
Merge "Make statistic queue size  configurable via config.ini"

8 years agoMerge "Simpleforwarding cache synch doesn't work"
Madhu Venugopal [Fri, 19 Jul 2013 17:54:30 +0000 (17:54 +0000)]
Merge "Simpleforwarding cache synch doesn't work"

8 years agoMake statistic queue size configurable via config.ini 19/619/1
Chi-Vien Ly [Fri, 19 Jul 2013 17:34:58 +0000 (10:34 -0700)]
Make statistic queue size  configurable via config.ini

Currently the queue size is fixed at 64. For large network support, this can't accommodate large network support. This enhancement is to make this size configurable through config.ini. A new system parameter is created "of.statsQueueSize" and is default to 64 (same as today).

Change-Id: I0f9c02ee3228a51ba3ec8ad2047dfff8ddae50a1
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
8 years agoSimpleforwarding cache synch doesn't work 17/617/1
Giovanni Meo [Fri, 19 Jul 2013 13:36:11 +0000 (15:36 +0200)]
Simpleforwarding cache synch doesn't work

- When Simple forwarding cache syncs the HostNodePair it will cause
exceptions in the clustering services because cannot find HostNodePair
class, this is simply because the Export-Package of SimpleForwarding
bundle was exporting no packages and this was due to the mis-spelling
in the package name.

Change-Id: Iadc6609f0ae9dffc32567c04e034e025dc247584
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoFix for Switchmanager Save Configuration. 14/614/1
Pramila Singh [Thu, 18 Jul 2013 21:10:41 +0000 (14:10 -0700)]
Fix for Switchmanager Save Configuration.
Signed-off-by: Pramila Singh <pramisin@cisco.com>
8 years agoCluster mgr to remove caches when container is destroyed 13/613/1
Alessandro Boch [Thu, 18 Jul 2013 19:47:56 +0000 (12:47 -0700)]
Cluster mgr to remove caches when container is destroyed

DESCRIPTION: When a container is destroyed, cluster manager should clear all the caches
that were allocated in that container.

CHANGE: Have cluster mgr implement IContainerAware and cleanup the caches
on the container destroy notification

Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoMerge "HA - Cache synch for Topology Manager"
Alessandro Boch [Thu, 18 Jul 2013 18:22:44 +0000 (18:22 +0000)]
Merge "HA - Cache synch for Topology Manager"

8 years agoMerge changes I69928220,Ia0704c89
Chi-Vien Ly [Thu, 18 Jul 2013 16:40:27 +0000 (16:40 +0000)]
Merge changes I69928220,Ia0704c89

* changes:
  Change default timeout to 30 sec.
  REST APIs to add/delete ports to/from a subnet.

8 years agoPackage names for enclosed Types of TOs were changed to fully qualified. 12/612/1
Jozef Gloncak [Thu, 18 Jul 2013 12:39:14 +0000 (14:39 +0200)]
Package names for enclosed Types of TOs were changed to fully qualified.
Fully qualified package names are added to enclosed Types of transport
objects. In previous version there was bug (name of enclosing type was
missing in package name).

Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agogroovy node-tree integration 93/593/5
Michal Rehak [Mon, 24 Jun 2013 06:31:00 +0000 (08:31 +0200)]
groovy node-tree integration
logging

fixing groovy tree generating

added params for surefire

lazy node2node map fixing

changed api according to dom usage
added lazy implementation of dom
added unit tests of this dom
changed abstract implementation in yang-data-util according to new api

improved groovy generated tree and testing
removed large testing files
added copyright comments
removed maven-surefire-plugin jConsole argument (plugin fails to start, if property not defined)

Change-Id: I00b9fcbc20ce5d120128940b7b569d7a14628a6e
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoMerge "fix maven warnings regarding missing versions of some plugins"
Giovanni Meo [Thu, 18 Jul 2013 08:02:01 +0000 (08:02 +0000)]
Merge "fix maven warnings regarding missing versions of some plugins"

8 years agoMerge "YANG typedefs generation as class with extends key word In case that YANG...
Giovanni Meo [Thu, 18 Jul 2013 08:00:28 +0000 (08:00 +0000)]
Merge "YANG typedefs generation as class with extends key word In case that YANG typedef isn't specified as base type then corresponding class will be generated with EXTENDS key word and corresponding extended class."

8 years agoMerge "Added more descriptive parsing exceptions."
Giovanni Meo [Thu, 18 Jul 2013 07:59:42 +0000 (07:59 +0000)]
Merge "Added more descriptive parsing exceptions."

8 years agoChange default timeout to 30 sec. 11/611/1
Jason Ye [Thu, 18 Jul 2013 04:55:55 +0000 (21:55 -0700)]
Change default timeout to 30 sec.

Signed-off-by: Jason Ye <yisye@cisco.com>
8 years agoHA - Cache synch for Topology Manager 09/609/4
Yevgeny Khodorkovsky [Wed, 17 Jul 2013 18:12:10 +0000 (11:12 -0700)]
HA - Cache synch for Topology Manager

- Allocate/retrieve cluster cache for topology mgr caches
- Remove destroyCache from bundle shutdown callbacks
  in HostTracker, TopologyMgr and StaticRouting
- Style fixes

Change-Id: I352f5cb4cfab8fd06b15be708cf07ae1ef64c9bf
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
8 years agoMerge "Fix for maintaining properties for non-default container. Signed-off-by:...
Alessandro Boch [Thu, 18 Jul 2013 01:50:50 +0000 (01:50 +0000)]
Merge "Fix for maintaining  properties for non-default container. Signed-off-by: Pramila Singh <pramisin@cisco.com>"

8 years agoREST APIs to add/delete ports to/from a subnet. 10/610/1
Jason Ye [Thu, 18 Jul 2013 01:32:14 +0000 (18:32 -0700)]
REST APIs to add/delete ports to/from a subnet.

Signed-off-by: Jason Ye <yisye@cisco.com>
8 years agoMerge "Fix for bug 28 https://bugs.opendaylight.org/show_bug.cgi?id=28 Updated surefi...
Alessandro Boch [Thu, 18 Jul 2013 01:04:32 +0000 (01:04 +0000)]
Merge "Fix for bug 28 https://bugs.opendaylight.org/show_bug.cgi?id=28 Updated surefire and failsafe plugin configurations to set heap to 1gb and permgen to 256mb.  These settings allow the Northbound integration tests to pass in both unit test and integration modes."

8 years agoMerge "Changes in DiscoveryService to cope with recently introduced HA active-active...
Alessandro Boch [Wed, 17 Jul 2013 21:04:51 +0000 (21:04 +0000)]
Merge "Changes in DiscoveryService to cope with recently introduced HA active-active model: - Fixed logic in addEdge() when discovery pkt is received. - Added retry mechanism for newly added ports. - Added some user configurable parameters in config.ini."

8 years agoChanges in DiscoveryService to cope with recently introduced HA active-active model: 08/608/1
Jason Ye [Wed, 17 Jul 2013 15:12:03 +0000 (08:12 -0700)]
Changes in DiscoveryService to cope with recently introduced HA active-active model:
- Fixed logic in addEdge() when discovery pkt is received.
- Added retry mechanism for newly added ports.
- Added some user configurable parameters in config.ini.

Signed-off-by: Jason Ye <yisye@cisco.com>
8 years agoFix null pointer exception in FRM 07/607/1
Alessandro Boch [Wed, 17 Jul 2013 01:55:46 +0000 (18:55 -0700)]
Fix null pointer exception in FRM

Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoGet/remove inactive hosts 06/606/1
Kalvin Hom [Tue, 16 Jul 2013 21:53:33 +0000 (14:53 -0700)]
Get/remove inactive hosts

Added logic for removing inactive hosts
when removing static hosts, and for
retrieving list of inactive hosts.

Change-Id: I2f08f35eec36a99dee21979c5a64d62d01647602
Signed-off-by: Kalvin Hom <kahom@cisco.com>
8 years agoFix for bug 28 05/605/1
Prasanth Pallamreddy [Tue, 16 Jul 2013 21:16:48 +0000 (14:16 -0700)]
Fix for bug 28
https://bugs.opendaylight.org/show_bug.cgi?id=28
Updated surefire and failsafe plugin configurations to set heap to 1gb and
permgen to 256mb.  These settings allow the Northbound integration tests to
pass in both unit test and integration modes.

Change-Id: I06f5254458db65c06b84076d6f3022cdcd983cf6
Signed-off-by: Prasanth Pallamreddy <ppallamr@cisco.com>
8 years agoFix for maintaining properties for non-default container. 04/604/1
Pramila Singh [Tue, 16 Jul 2013 21:11:08 +0000 (14:11 -0700)]
Fix for maintaining  properties for non-default container.
Signed-off-by: Pramila Singh <pramisin@cisco.com>
8 years agoAdding Inactive Static Hosts 03/603/1
Kalvin Hom [Tue, 16 Jul 2013 18:35:57 +0000 (11:35 -0700)]
Adding Inactive Static Hosts

saving inactive static hosts in map for when node
isn't up. When node goes up, device gets added.

Change-Id: I3d77da8b0939d6f3206a84fab01a809c8ca1ce09

Signed-off-by: Kalvin Hom <kahom@cisco.com>
8 years agoYANG typedefs generation as class with extends key word 96/596/4
Jozef Gloncak [Thu, 11 Jul 2013 08:49:23 +0000 (10:49 +0200)]
YANG typedefs generation as class with extends key word
In case that YANG typedef isn't specified as base type then corresponding
class will be generated with EXTENDS key word and corresponding extended
class.

Change-Id: I36143f485b8e68f471e2a3021ceb7ddc4ad9df2f
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoAdded more descriptive parsing exceptions. 00/600/1
Martin Vitez [Tue, 16 Jul 2013 08:48:18 +0000 (10:48 +0200)]
Added more descriptive parsing exceptions.

Added module name to all builders to help create detailed exception messages. Added new abstract class AbstracBuilder as base implementation of Builder interface.
Added more tests.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
8 years agofix maven warnings regarding missing versions of some plugins 99/599/1
Michal Rehak [Tue, 16 Jul 2013 07:57:47 +0000 (09:57 +0200)]
fix maven warnings regarding missing versions of some plugins

Change-Id: I16a80358435b51d6be2c883a10bf893ea73e20ff
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoMerge "adding function to modify existing subnets"
Alessandro Boch [Sat, 13 Jul 2013 17:03:51 +0000 (17:03 +0000)]
Merge "adding function to modify existing subnets"

8 years agoadding function to modify existing subnets 72/572/5
Colin Dixon [Fri, 12 Jul 2013 15:23:52 +0000 (10:23 -0500)]
adding function to modify existing subnets

Change-Id: I2b5b3abda4dd4fbf4a872ea7c866d68821ce9bff
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
8 years agoBug fix: flow statistics are not notified if empty 94/594/1
Yevgeny Khodorkovsky [Fri, 12 Jul 2013 01:19:51 +0000 (18:19 -0700)]
Bug fix: flow statistics are not notified if empty

Change-Id: Id685f6205bd75e666972e30a86584a0b4a1498ec
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
8 years agoMerge "Moved parsing of unknown nodes from implementation to abstract classes."
Alessandro Boch [Fri, 12 Jul 2013 00:09:45 +0000 (00:09 +0000)]
Merge "Moved parsing of unknown nodes from implementation to abstract classes."

8 years agoFixed a bug to block the creation of a static host on an ISL port, removed the code... 69/569/4
Diti Bhatia [Fri, 5 Jul 2013 22:13:03 +0000 (15:13 -0700)]
Fixed a bug to block the creation of a static host on an ISL port, removed the code to block more than one host per port

Change-Id: I600f6d51395b072b3d2bdb90d4fb10ad905fc6c7
Signed-off-by: Diti Bhatia <dibhatia@cisco.com>
8 years ago- In SwitchHandler.java, Transmit Thread waits if the priority queue is empty. 90/590/2
Jason Ye [Wed, 10 Jul 2013 22:55:00 +0000 (15:55 -0700)]
- In SwitchHandler.java, Transmit Thread waits if the priority queue is empty.
- Change DiscoveryService timer from 1 sec to 2 sec per tick leading to less CPU utilization. Added enum class for some time intervals.
- MacAddress property was defined as a byte array. XML can not serialize byte array properly. Change it to String.
- SwitchManager osgi cmd "pns" now displays sorted list of nodes.

Signed-off-by: Jason Ye <yisye@cisco.com>
8 years agoMerge "Fix null value put in FRM incativeFlows hash map"
Jason Ye [Thu, 11 Jul 2013 17:49:52 +0000 (17:49 +0000)]
Merge "Fix null value put in FRM incativeFlows hash map"

8 years agoMerge "- Adding hashCode() and equals() method for v6Match - Fixing mac settings...
Alessandro Boch [Thu, 11 Jul 2013 14:40:53 +0000 (14:40 +0000)]
Merge "- Adding hashCode() and equals() method for v6Match - Fixing mac settings in copy constructor"

8 years agoMoved parsing of unknown nodes from implementation to abstract classes. 92/592/1
Martin Vitez [Thu, 11 Jul 2013 12:05:33 +0000 (14:05 +0200)]
Moved parsing of unknown nodes from implementation to abstract classes.

Added more javadocs. Removed unnecessary ConfigNode interface.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
8 years agoBumped version of yang-prototype to 0.5.4-SNAPSHOT. 83/583/3
Martin Vitez [Wed, 10 Jul 2013 12:01:19 +0000 (14:01 +0200)]
Bumped version of yang-prototype to 0.5.4-SNAPSHOT.

Change-Id: Idacefac91a2d86606debf8a75f6cab2cf1303b98
Signed-off-by: Martin Vitez <mvitez@cisco.com>
8 years agoUpdated PoC APIs of Model-driven SAL 81/581/2
Tony Tkacik [Tue, 9 Jul 2013 15:25:36 +0000 (17:25 +0200)]
Updated PoC APIs of Model-driven SAL

  - Bumped version of YANG tools
  - Added Concepts Lang package with reusable tranformator functionality

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoAdded YANG extensions module 80/580/2
Tony Tkacik [Tue, 9 Jul 2013 15:22:53 +0000 (17:22 +0200)]
Added YANG extensions module

  - Added YANG extensions module which defines
    - Context-aware RPCs
    - Named Augmentations

Change-Id: I7b6cb7f579c519dfa726f966df466ad6c9e6aee1
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoFix null value put in FRM incativeFlows hash map 89/589/2
Alessandro Boch [Thu, 11 Jul 2013 00:23:53 +0000 (17:23 -0700)]
Fix null value put in FRM incativeFlows hash map

- Also renamed ForwardingRulesManagerImpl class to ForwardingRulesManager as already in internal directory
- Minor changes in FlowProgrammerService

Change-Id: I38b46f4ce29b5d6f4dfc0f38db3d3cef960b26ac
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years ago- Adding hashCode() and equals() method for v6Match 88/588/1
Diti Bhatia [Wed, 10 Jul 2013 23:47:46 +0000 (16:47 -0700)]
- Adding hashCode() and equals() method for v6Match
- Fixing mac settings in copy constructor

Signed-off-by: Diti Bhatia <dibhatia@cisco.com>
8 years agoMerge "Add operational port status"
Alessandro Boch [Wed, 10 Jul 2013 22:42:37 +0000 (22:42 +0000)]
Merge "Add operational port status"

8 years agoBug fixes and styling 86/586/1
Yevgeny Khodorkovsky [Wed, 10 Jul 2013 22:04:10 +0000 (15:04 -0700)]
Bug fixes and styling

- Fix using skiplistset on a non-comparable
- Add missing help in SAL Read Service
- Remove incorrect throws clause

Change-Id: I4c3c192124e03f84d3ba5ac97e2c69ca7defdd03
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
8 years agoAdd operational port status 85/585/1
Andrew Kim [Tue, 9 Jul 2013 17:42:44 +0000 (12:42 -0500)]
Add operational port status

Port status that is operationally down will be colored yellow

Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoMove stats caching to FM StatisticsManager 75/575/7
Yevgeny Khodorkovsky [Mon, 8 Jul 2013 23:36:57 +0000 (16:36 -0700)]
Move stats caching to FM StatisticsManager

This commit is towards HA functionality and includes:
- Cache flow, port, table and description statistics in a cluster
  allocated cache in functional module Statistics Manager
- Add necessary interfaces to allow plugin stats updates
  to propagate up to Stats Manager FM:
  * IOFStatisticsListener - notifies plugin internal components
  * IReadFilterInternalListener - notifies plugin internal
    components (demuxed to containers).
  * IPluginOutReadService - SAL hook for plugins to publish reader
    notifications.
  * IReadServiceListener - SAL service, publishes reader notifications
- Change statistics manager implementation to return cluster
  cached stats instead of calling reader service (Reader service is
  still available).
- Style fixes
- Bug fix: getOFFlowStatistics(switch,match) should consider priority.

Change-Id: I7c7a32102ea43bd4e05444527ad73d2610958603
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
8 years agoFixed bug in RPC and Generics mapping 82/582/2
Tony Tkacik [Wed, 10 Jul 2013 12:05:17 +0000 (14:05 +0200)]
Fixed bug in RPC and Generics mapping

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "Maping of union leaf a bits leaf YANG type to JAVA inner classes."
Alessandro Boch [Wed, 10 Jul 2013 17:04:36 +0000 (17:04 +0000)]
Merge "Maping of union leaf a bits leaf YANG type to JAVA inner classes."

8 years agoMaping of union leaf a bits leaf YANG type to JAVA inner classes. 46/546/9
Jozef Gloncak [Tue, 2 Jul 2013 13:38:07 +0000 (15:38 +0200)]
Maping of union leaf a bits leaf YANG type to JAVA inner classes.

Implements following mapping:
- YANG union leaf:
-- leaf name -> name of inner class
-- leaf types -> attributes of inner class
- YANG bits leaf:
-- leaf name -> name of inner class
-- leaf concrete bits - attributes of inner class

Bug fix:
- generation of constant list of regular expression also if no pattern in
  string YANG type is specified

Change-Id: I7c52eef34de610877c3dc0c24d44bb89015c953b
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoMinor code refactoring and improvements. 79/579/2
Martin Vitez [Tue, 9 Jul 2013 15:10:20 +0000 (17:10 +0200)]
Minor code refactoring and improvements.

Change-Id: Ifdc5b45e610037ef14eed6c97885deb1075aa884
Signed-off-by: Martin Vitez <mvitez@cisco.com>
8 years agoProactive static flows have to be allowed in container mode 74/574/4
Alessandro Boch [Mon, 8 Jul 2013 21:06:15 +0000 (14:06 -0700)]
Proactive static flows have to be allowed in container mode

ISSUE: Once container are created, setting the forwarding mode to proactive for newly
       joined switches does not result in having the punt flows installed
CHANGE: - Have filtering check in install/uninstall/modify function allow internal
          generated flows when in container mode
        - Also removing uneeded dependecy on IfIptoHost in forwardingrulesmanager
        - Also fix some dependencies in sal activator regarding FlowProgrammer service

Change-Id: Id8a69abb2f3fa948195700a50c30fb368264adf9
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoMerge "Added default output directory to CodeGeneratorImpl in maven-sal-api-gen-plugi...
Alessandro Boch [Wed, 10 Jul 2013 00:12:25 +0000 (00:12 +0000)]
Merge "Added default output directory to CodeGeneratorImpl in maven-sal-api-gen-plugin. Removed default output directory from yang-maven-plugin."

8 years agoHA cache sync for switch manager 76/576/3
Pramila Singh [Mon, 8 Jul 2013 23:48:04 +0000 (16:48 -0700)]
HA cache sync for switch manager

Change-Id: I00ab53d62f2c7622311ee07fd934c9ce8c000064
Signed-off-by: Pramila Singh <pramisin@cisco.com>
8 years agoMerge "Fix for the "without any protocolPluginType provided" error"
Chi-Vien Ly [Tue, 9 Jul 2013 17:49:19 +0000 (17:49 +0000)]
Merge "Fix for the "without any protocolPluginType provided" error"

8 years agoMerge "Fixed bug in maven-yang-plugin."
Alessandro Boch [Tue, 9 Jul 2013 14:55:03 +0000 (14:55 +0000)]
Merge "Fixed bug in maven-yang-plugin."

8 years agoMerge "Added more tests for yang parser. Updated current tests."
Alessandro Boch [Tue, 9 Jul 2013 14:53:42 +0000 (14:53 +0000)]
Merge "Added more tests for yang parser. Updated current tests."

8 years agoMerge "first implementation of yang-data-api"
Alessandro Boch [Tue, 9 Jul 2013 14:53:17 +0000 (14:53 +0000)]
Merge "first implementation of yang-data-api"

8 years agoAdded default output directory to CodeGeneratorImpl in maven-sal-api-gen-plugin. 78/578/1
Martin Vitez [Tue, 9 Jul 2013 11:23:28 +0000 (13:23 +0200)]
Added default output directory to CodeGeneratorImpl in maven-sal-api-gen-plugin.
Removed default output directory from yang-maven-plugin.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
8 years agoFix for the "without any protocolPluginType provided" error 77/577/2
Alessandro Boch [Tue, 9 Jul 2013 02:07:45 +0000 (19:07 -0700)]
Fix for the "without any protocolPluginType provided" error

CHANGE: Add a global constant for the "protocolPluginType" key to prevent the key mispell issue again

Change-Id: Icb76cf8775881d41c1792e0c5ce59925276b7e8e
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoMerge "Ensuring that SET_DL_* action with openflowj only uses OFP_ETH_ALEN bytes...
Alessandro Boch [Mon, 8 Jul 2013 14:53:10 +0000 (14:53 +0000)]
Merge "Ensuring that SET_DL_* action with openflowj only uses OFP_ETH_ALEN bytes, just in case SAL passes more than that."

8 years agoFixed bug in maven-yang-plugin. 73/573/1
Maros Marsalek [Mon, 8 Jul 2013 10:41:32 +0000 (12:41 +0200)]
Fixed bug in maven-yang-plugin.

Yang files in dependencies were not located properly on windows os.

Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agofirst implementation of yang-data-api 30/530/2
Michal Rehak [Thu, 27 Jun 2013 14:01:29 +0000 (16:01 +0200)]
first implementation of yang-data-api

created maven project
added basic implementations of api
added unit tests
changed api according to implementation

Change-Id: I888371d5a7afc46c843f882bee9bfcaa19d5ccbc
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoMerge "adding isBroadcast and isMulticast functions to Ethernet"
Alessandro Boch [Fri, 5 Jul 2013 23:37:21 +0000 (23:37 +0000)]
Merge "adding isBroadcast and isMulticast functions to Ethernet"

8 years agoadding isBroadcast and isMulticast functions to Ethernet 71/571/2
Colin Dixon [Fri, 5 Jul 2013 22:50:23 +0000 (17:50 -0500)]
adding isBroadcast and isMulticast functions to Ethernet

Change-Id: I8777ed281261d062b57cbeae00317c955c4b6385
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
8 years agoMerge "Fixing the style checker to ignore the target directories to fix Bug 29"
Alessandro Boch [Fri, 5 Jul 2013 22:49:07 +0000 (22:49 +0000)]
Merge "Fixing the style checker to ignore the target directories to fix Bug 29"

8 years agoFixing the style checker to ignore the target directories to fix Bug 29 70/570/1
Colin Dixon [Fri, 5 Jul 2013 22:35:30 +0000 (17:35 -0500)]
Fixing the style checker to ignore the target directories to fix Bug 29

Change-Id: I83220b06a13c74b0ea18a278ae1ae5fb72aa6e00
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
8 years agoConfiguration Save event sync mechanism using Clustering services. 68/568/1
Madhu Venugopal [Fri, 5 Jul 2013 06:17:37 +0000 (23:17 -0700)]
Configuration Save event sync mechanism using Clustering services.
Every Controller in the cluster will receive a Config save event and the save is performed locally on each of the Controllers.
This is the first step towards the centralized configuration service.

Change-Id: Icbff65117ccb237a4c31091d392b27de43d8ae1d
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
8 years agoAdded more tests for yang parser. Updated current tests. 66/566/1
Martin Vitez [Thu, 4 Jul 2013 11:50:25 +0000 (13:50 +0200)]
Added more tests for yang parser. Updated current tests.

Improved parsing of deviation statement. Added getDataChildByName method to DataNodeContainerBuilder.
Fixed resolving of pattern constraint.
Renamed YangModelBuilderUtil -> ParserListenerUtils.
Renamed some test files.

Signed-off-by: Martin Vitez <mvitez@cisco.com>