9 years agoFix for versions in odl-model-project archetype. 76/1976/1
Ed Warnicke [Thu, 17 Oct 2013 22:44:12 +0000 (17:44 -0500)]
Fix for versions in odl-model-project archetype.

Change-Id: I33479badd1191efb16540b5f5949dcac0daec3be
Signed-off-by: Ed Warnicke <>
9 years agoRemove the usages of @XmlSeeAlso annotation. 52/1952/3
Prasanth Pallamreddy [Wed, 16 Oct 2013 18:48:56 +0000 (11:48 -0700)]
Remove the usages of @XmlSeeAlso annotation.

- The @XmlSeeAlso annotations are unnecessary now that the bundle
  scanner can detect them automatically.
- minor fix to the bundle scanner to allow annotated classes to be
  loaded from a proper classloader

Change-Id: I4445ddbdb5b2f2f8edce34f0c056e3da61f916d5
Signed-off-by: Prasanth Pallamreddy <>
9 years agoFix warnings in poms - duplicate and incorrect dependencies 32/1932/2
Alissa Bonas [Wed, 16 Oct 2013 14:12:51 +0000 (17:12 +0300)]
Fix warnings in poms - duplicate and incorrect dependencies

Change-Id: Ia8978555a51ae9be02782b8c70d8867fe2052c7a
Signed-off-by: Alissa Bonas <>
9 years agoUpdated implementation of internal RPC Router for Binding-Aware Broker and added... 33/1933/4
Tony Tkacik [Wed, 16 Oct 2013 15:01:47 +0000 (17:01 +0200)]
Updated implementation of internal RPC Router for Binding-Aware Broker and added IT to it

    Updated implementation of runtime code generator to adhere to RpcRouter contract,
    which is used by binding aware broker for introspection and configuration of runtime generated
    instances without need to use Reflection.

    Added end-to-end integration test which tests following scenarios:
      - Registration of 2 Providers of Flow Service, 1 Consumer
        after registration 4 instances of Flow Service are existing:
         MD-SAL Northbound (runtime generated) - returned to the consumer.
         Optimized RpcRouter (runtime generated) - internal to MD-SAL
         2 implementations supplied by Provider.

      - Test verifies that implementations are not leaked to the Consumer

      - Routing of messages (calls):
         1. Provider 1. registers as provider for Node One, Consumer sends message to Node One, Provider 1. is invoked.
         2. Provider 2. registers as provider for Node Rwo, consumer sends message to Node Two, Provider 2. is invoked.
 3. Provider 1. unregisters as provider for Node One, Provider 2. registers as provider  for Node One,
            Consumer sends message to Node One, Provider 2. is invoked.

Change-Id: I101e26c190cd1770aaff1db974f9b0c341506482
Signed-off-by: Tony Tkacik <>
9 years agoAdd code for working sanity test in windows. 93/1893/6
Ryan Moats [Mon, 14 Oct 2013 23:40:37 +0000 (18:40 -0500)]
Add code for working sanity test in windows.

Refactor application windows batch file to avoid delayed
execution issues.  Add windows batch file to run sanity test.
Refactor sanity test class to call windows batch file properly.
Refactor activator class to close System.out stream before exiting
so that ProcessBuilder detects the exit.

Refactor to first check at 10 seconds and then recheck every second
if bundles are still in the STARTING state.

Refactor to inherit IO and add limit of 60 retries.

And fix style errors

Change-Id: Ifa4d78ebfcf0eeaaccf99e56e84a88d33377f0fa
Signed-off-by: Ryan Moats <>
9 years agoMoving the connection manager NB-API from the network configuration APIs to connectio... 24/1924/3
Madhu Venugopal [Wed, 16 Oct 2013 10:08:48 +0000 (03:08 -0700)]
Moving the connection manager NB-API from the network configuration APIs to connectionmanager API.
Also cleaned up these APIs as per the NBAPI conventions.

Change-Id: Ie633374210ce594d0df0b7a86f4fdc553ef64ade
Signed-off-by: Madhu Venugopal <>
9 years agoProvide Container authorization roles to application running in container 40/1940/1
Alessandro Boch [Wed, 16 Oct 2013 18:47:27 +0000 (11:47 -0700)]
Provide Container authorization roles to application running in container

- An application that runs in a container needs to grant access to its
  resources to the container administrative roles

Change-Id: I439bbb9d5f8aa6dfb17fcaf518654ef3d42979f7
Signed-off-by: Alessandro Boch <>
9 years agoFix .gitignore to ignore xtend-gen directories 17/1917/2
Ed Warnicke [Tue, 15 Oct 2013 20:25:13 +0000 (15:25 -0500)]
Fix .gitignore to ignore xtend-gen directories

Change-Id: I6fd66bff7d6c2ff895c92672271d67306fa323b4
Signed-off-by: Ed Warnicke <>
9 years agoProvide edit functionality for Static Flows 16/1916/2
Sapan Shah [Tue, 15 Oct 2013 19:27:25 +0000 (12:27 -0700)]
Provide edit functionality for Static Flows

Change-Id: I345579c8b97addc4a335044a4f34d5fc694c63e5
Signed-off-by: Sapan Shah <>
9 years agoMD-SAL RuntimeDataProvider for Forwarding Rules 82/1882/7
Tony Tkacik [Mon, 14 Oct 2013 16:56:43 +0000 (18:56 +0200)]
MD-SAL RuntimeDataProvider for Forwarding Rules

Change-Id: I0eac10ec50c9f4a4e95a0d9542842078ef8c7422
Signed-off-by: Tony Tkacik <>
9 years agoAdded topology support to SAL Compatibility 05/1905/2
Tony Tkacik [Tue, 15 Oct 2013 14:23:42 +0000 (16:23 +0200)]
Added topology support to SAL Compatibility

Change-Id: I6bdb967313a3a2a78f3734de18ce92da5b8bf9ea
Signed-off-by: Tony Tkacik <>
9 years agoRemoved xTend from private packages. Added OSGI-fied XTend to distribution 01/1901/1
Tony Tkacik [Tue, 15 Oct 2013 10:41:21 +0000 (12:41 +0200)]
Removed xTend from private packages. Added OSGI-fied XTend to distribution

 - Removed XTend library from Private packages in XTend projects
 - In runtime (distribution) XTend packages are provided by
   OSGI-fied XTend bundle org.opendaylight.yangtools.thirdpary:xtend-lib-osgi:2.4.3

Change-Id: Ib79e678d740ffbcf4c4e5f6c370271af5ca76019
Signed-off-by: Tony Tkacik <>
9 years agoAdded composed Activator for MD-SAL to AD-SAL translation 76/1876/8
Tony Tkacik [Mon, 14 Oct 2013 12:48:59 +0000 (14:48 +0200)]
Added composed Activator for MD-SAL to AD-SAL translation

Activator implements both ComponentBase Activator from AD-SAL
and uses Felix DM to retrieve Binding-Aware Broker which
then treats Activator as BindingAwareConsumer.

Change-Id: I24b414d8b9d0846d12cff55d5a3b54fa6b697c05
Signed-off-by: Tony Tkacik <>
9 years agoExclude yang/md-sal related bundles when building the base distribution package 85/1885/3
Moiz Raja [Mon, 14 Oct 2013 19:38:27 +0000 (12:38 -0700)]
Exclude yang/md-sal related bundles when building the base distribution package

This is done only when the DOINGRELEASE flag is enabled. This is not intended to
be a standard build to be used by ODL but by a specific project outside ODL.
Fixing this for backward support only.

Change-Id: I535072731d4189271b97c90338c16da1a6591b61
Signed-off-by: Moiz Raja <>
9 years agoCandidate fix for "NoSuchAlgorithm SunX509 KeyManager" error. 91/1891/2
Ed Warnicke [Mon, 14 Oct 2013 21:41:48 +0000 (16:41 -0500)]
Candidate fix for "NoSuchAlgorithm SunX509 KeyManager" error.

Used KeyManagerFactory.getDefaultAlgorithm() instead.

Change-Id: Ib1cff94c5f33cb82b004b995802878ed8a75e87c
Signed-off-by: Ed Warnicke <>
9 years agoFix for breakage regarding DataStoreIdentifiers 81/1881/4
Tony Tkacik [Mon, 14 Oct 2013 16:54:03 +0000 (18:54 +0200)]
Fix for breakage regarding DataStoreIdentifiers

Change-Id: I74ec719f5e3be040e6f399a24d2859a0ef89665e
Signed-off-by: Tony Tkacik <>
9 years agoTemporarily disabling config subsystem 83/1883/2
Ed Warnicke [Mon, 14 Oct 2013 18:18:21 +0000 (13:18 -0500)]
Temporarily disabling config subsystem

Change-Id: Ifebd287cd7b79a30123fd8d325c0d90a7bbb3dce
Signed-off-by: Ed Warnicke <>
9 years agoUpdated RESTCONF implementation 75/1875/4
Tony Tkacik [Mon, 14 Oct 2013 12:43:05 +0000 (14:43 +0200)]
Updated RESTCONF implementation

  - Restconf implementation now implements new SAL readign contracts
    in form of <String,CompositeNode> where String is Restconf version
    of instance identifier.

    Translation of Restconf InstanceIdentifier into Binding-Independent
    Restconf Instance-Identifier is done by ControllerContext class
    which implements stateful translation of identifier based on schema

    After translation of instence-identifier most of actions maps
    directly to Binding-Independent APIs.

Change-Id: I248470e282826a3f04f6e99f54aae8fd14ea2eb3
Signed-off-by: Tony Tkacik <>
9 years agoInitial code drop of netconf protocol implementation 76/1776/9
Maros Marsalek [Tue, 8 Oct 2013 16:26:35 +0000 (18:26 +0200)]
Initial code drop of netconf protocol implementation

This implementation is based on infrastructure provided by the framework artifact
and contains server as well as client side code.

Netconf subsystem structure:
Api definition for client and server.

Netconf server implementation. Server handles basic communication
and delegates handling of rpcs to an implementation of netconf-mapping-api.

Api definition for pluggable rpcs handler. Implementations of this api
are plugged dynamically into netconf-impl using OSGi apis.

Implementation of netconf-mapping-api that handles netconf rpcs and delegates
requests to configuration subsystem

Utility classes used by client and server code.

Netconf client implementation.

Integration tests for netconf. These tests verify correct cooperation of netconf server,
config-netconf-connector, config subsystem and netconf client.

Api definition for config persister. Config persister is a component that is responsible
for storing configuration snapshots after every change to the configuration via netconf rpcs.
(Pushed to config-subsystem)

Implementation of config persister that receives notifications from netconf-impl about changes
to the configuration and uses pluggable adapters to store received snapshots.

Implementation of config persister adapter that stores and restores config snapshots from a file.
(Pushed to config-subsystem)

In order to run netconf in OSGi, some configuration issues had to be resolved
in config-subsystem bundles.

Change-Id: I8e0421c924b0714a4d49962c4bb5ca01ef68ac78
Signed-off-by: Maros Marsalek <>
9 years agoFixed Sanity Test to only accept bundles being RESOLVED if they are fragments 64/1864/2
Ed Warnicke [Sun, 13 Oct 2013 22:34:54 +0000 (17:34 -0500)]
Fixed Sanity Test to only accept bundles being RESOLVED if they are fragments

Change-Id: Idfc804a81be493b56ef74fee5e335f656eeba344
Signed-off-by: Ed Warnicke <>
9 years agoAdded routing context information to models. 62/1862/2
Tony Tkacik [Sun, 13 Oct 2013 20:03:57 +0000 (22:03 +0200)]
Added routing context information to models.

Change-Id: I8ed3497bf6a1905333fd042f732814e2e815a2a2
Signed-off-by: Tony Tkacik <>
9 years agoUpdated Flow Capable Models & AD SAL Compatibility mapping 53/1853/3
Tony Tkacik [Sun, 13 Oct 2013 17:20:39 +0000 (19:20 +0200)]
Updated Flow Capable Models & AD SAL Compatibility mapping

  - Updated Inventory notifications of Flow Capable Nodes
  - Updated SAL Compatibility to use XTend for easier readability
    of Model-to-Model Mapping (AD-SAL to MD-SAL)
  - Added Adapter for: AD-SAL Inventory, Read services

Change-Id: I564301cdea66a3b843eb469520ba4383b1e92e23
Signed-off-by: Tony Tkacik <>
9 years agoUpdated ext:context-reference to point to right identity. 40/1840/1
Martin Vitez [Fri, 11 Oct 2013 16:52:46 +0000 (18:52 +0200)]
Updated ext:context-reference to point to right identity.

Change-Id: I36d79271ff16e5cfcc3117c563b8ca3cb2237889
Signed-off-by: Martin Vitez <>
9 years agoUpdated integration test for broker 36/1836/1
Tony Tkacik [Fri, 11 Oct 2013 14:54:31 +0000 (16:54 +0200)]
Updated integration test for broker

Change-Id: Ibcf908c651599890e72b8d2e9c0f137e04d99b49
Signed-off-by: Tony Tkacik <>
9 years agoUpdated Flow Services Adapter,started inventory adapter. 13/1813/2
Tony Tkacik [Thu, 10 Oct 2013 18:37:03 +0000 (20:37 +0200)]
Updated Flow Services Adapter,started inventory adapter.

Change-Id: Ie369f20445df872fec16bd4b9cc6318460f21573
Signed-off-by: Tony Tkacik <>
9 years agoUpdated flow capable node models. 98/1798/2
Tony Tkacik [Thu, 10 Oct 2013 11:46:06 +0000 (13:46 +0200)]
Updated flow capable node models.

Change-Id: I8308148e5e081bed135917e4f57b1611906cca74
Signed-off-by: Tony Tkacik <>
9 years agoRevert "Temporarily exclude config from the build until yangtools related issue is... 05/1805/1
Ed Warnicke [Thu, 10 Oct 2013 17:13:23 +0000 (17:13 +0000)]
Revert "Temporarily exclude config from the build until yangtools related issue is resolved."

This reverts commit 42ae0cde14c4cb565d4073d1e8969e69a476ad43.

The yangtools issue is fixed

Change-Id: I9e9ae3bda44780ed6cdf905941e99a24039157f2
Signed-off-by: Ed Warnicke <>
9 years agoTemporarily exclude config from the build until yangtools related issue is resolved. 01/1801/2
Ed Warnicke [Thu, 10 Oct 2013 15:14:00 +0000 (10:14 -0500)]
Temporarily exclude config from the build until yangtools related issue is resolved.

Change-Id: I1c520e33c2a34d096206200c189b0b0963d69b42
Signed-off-by: Ed Warnicke <>
9 years agoAdd felix webconsole and link it off the admin web ui 89/1789/2
Prasanth Pallamreddy [Tue, 1 Oct 2013 23:27:52 +0000 (16:27 -0700)]
Add felix webconsole and link it off the admin web ui

Change-Id: I8b26d95d0f6928f166df01a0e4655b123dd339a9
Signed-off-by: Prasanth Pallamreddy <>
9 years agoMake use of NetUtils.getBroadcastMacAddr() 82/1782/2
Alessandro Boch [Thu, 10 Oct 2013 16:00:49 +0000 (09:00 -0700)]
Make use of NetUtils.getBroadcastMacAddr()

    ISSUE: I suggested to make NetUtils.broadcastMacAddr public, but that was no
           a good idea as we already have the getter and because that is an arra
           therefore vulnerable to modifications.

Change-Id: I098ca828d79ffe1d478c761d8b749ee100dfba5b
Signed-off-by: Alessandro Boch <>
9 years agoReuse NetUtils.BroadcastMACAddr in ArpHandler 92/1792/2
Alissa Bonas [Thu, 10 Oct 2013 08:19:28 +0000 (11:19 +0300)]
Reuse NetUtils.BroadcastMACAddr in ArpHandler

Change-Id: Id3dde60da07cb37e40dba79ed3481af794b4356d
Signed-off-by: Alissa Bonas <>
9 years agoFixed the yangtools related errors from Eclipse on import 88/1788/2
Ed Warnicke [Thu, 10 Oct 2013 02:19:20 +0000 (21:19 -0500)]
Fixed the yangtools related errors from Eclipse on import

Change-Id: I4bdcdc141906839f42428fad16e36d11ca16fd74
Signed-off-by: Ed Warnicke <>
9 years agoMistake in the using backticks instead of quotes when setting JAVA_HOME 84/1784/1
Moiz Raja [Wed, 9 Oct 2013 22:08:56 +0000 (15:08 -0700)]
Mistake in the using backticks instead of quotes when setting JAVA_HOME

Change-Id: Iabe6474c54b01e5b5eabfd2e8e815638ad8190e9
Signed-off-by: Moiz Raja <>
9 years agoReduce the fragility of the Sanity Test by not trying to access anything outside... 83/1783/2
Moiz Raja [Wed, 9 Oct 2013 20:28:39 +0000 (13:28 -0700)]
Reduce the fragility of the Sanity Test by not trying to access anything outside the current project

Change-Id: I4f563ae82becde73ff412aeddc159cf7c7051433
Signed-off-by: Moiz Raja <>
9 years agoSanity test to verify that the bundles that are included as plugins in the controller... 36/1736/6
Moiz Raja [Mon, 7 Oct 2013 23:22:34 +0000 (16:22 -0700)]
Sanity test to verify that the bundles that are included as plugins in the controller load properly

Change-Id: Id472ab9f17f7a604e473177096b8a5045af913d3
Signed-off-by: Moiz Raja <>
9 years agoExtract ARP and Ethernet creation to method and reuse it to avoid code 94/1694/3
Alissa Bonas [Sun, 6 Oct 2013 15:55:28 +0000 (18:55 +0300)]
Extract ARP and Ethernet creation to method and reuse it to avoid code

Change-Id: I7dca913a93ed948c71f54282d03d862471193fee
Signed-off-by: Alissa Bonas <>
9 years agoUpdate to MD-SAL models 79/1779/3
Tony Tkacik [Wed, 9 Oct 2013 16:56:26 +0000 (18:56 +0200)]
Update to MD-SAL models

Fixed bug in MD-SAL activation

Change-Id: I636d4d7c7b696c68572e94456a87edc358af4850
Signed-off-by: Tony Tkacik <>
9 years agoFix for validity check of Action field in FlowConfig 57/1757/2
Pramila Singh [Tue, 8 Oct 2013 22:49:33 +0000 (15:49 -0700)]
Fix for validity check of Action field in FlowConfig

Change-Id: I9ec131df550a5242227c049ec813c022829d1b4d
Signed-off-by: Pramila Singh <>
9 years agoUpdate to MD-SAL APIs 68/1768/3
Tony Tkacik [Wed, 9 Oct 2013 10:51:17 +0000 (12:51 +0200)]
Update to MD-SAL APIs

Introduced new Common APIs from which Binding-Aware and Binding-Independent
APIs are derived, this allows to maintain similar contract between
sal-binding-api and sal-dom-api which provides different access to MD SAL.

 - Fixed typos in YANG models
 - Bumped version of YANG Maven Plugin to 0.5.9-SNAPSHOT which now enforces
   valid YANG models
 - Removed OFPort.yang - Part of that model should be part of flow-node-inventory.yang
 - Removed spaces and tabs from various files
 - Updated implementations to adhere to new API definitions.

Change-Id: I5661a76398e8c8d82250de532aef6e5d268123e8
Signed-off-by: Tony Tkacik <>
9 years agoDeclare switchmanager in dependencyManagement in commons, declare its 92/1692/4
Alissa Bonas [Sun, 6 Oct 2013 13:36:36 +0000 (16:36 +0300)]
Declare switchmanager in dependencyManagement in commons, declare its
version once, so it's inherited by child poms.

Change-Id: I48208159bd2058cc27386a89350fe1bd4cbb67f3
Signed-off-by: Alissa Bonas <>
9 years agoMake BroadcastMacAddr public in NetUtils 67/1767/2
Alissa Bonas [Wed, 9 Oct 2013 10:43:39 +0000 (13:43 +0300)]
Make BroadcastMacAddr public in NetUtils

Change-Id: I701289b39e7dd05322f67276d198d95e992d8455
Signed-off-by: Alissa Bonas <>
9 years agoFix typo "swtch" to "switch" 02/1602/3
Alissa Bonas [Wed, 2 Oct 2013 13:40:18 +0000 (16:40 +0300)]
Fix typo "swtch" to "switch"

Change-Id: Ia3633309a861fb019225398aa4907cbf4b77936e
Signed-off-by: Alissa Bonas <>
9 years agoRemoving config subsystem as it does not load in the controller. 58/1758/2
Ed Warnicke [Wed, 9 Oct 2013 00:06:29 +0000 (19:06 -0500)]
Removing config subsystem as it does not load in the controller.

Some notes on this:
1)  Config appears to be missing some yangtools.binding-generator-*
    dependencies that are needed in
2)  Attempts to add those dependency fail because they need to
    be higher versions ( 0.6.0-SNAPSHOT and 0.5.9-SNAPSHOT)
    than the current setting for
    <yangtools.version> for the controller.
3)  Attempts to move the controller to use those higher versions
    causes other failures on load.

Config subsystem will be restored to the distribution as soon as it
works with the yangtools version being used in the controller.

Change-Id: Ic5e5c074531bee84494a42517d9de83b93793711
Signed-off-by: Ed Warnicke <>
9 years agoFixed most comments from 56/1756/2
Ed Warnicke [Tue, 8 Oct 2013 22:34:55 +0000 (17:34 -0500)]
Fixed most comments from

Change-Id: I174a3662b13a3a6f2f07954c2d0c742e98cc5ff2
Signed-off-by: Ed Warnicke <>
9 years agoReworked pom files 21/1721/10
Tony Tkacik [Mon, 7 Oct 2013 13:21:28 +0000 (15:21 +0200)]
Reworked pom files

Each pom (artifact) declares it's dependencies (internal and external)
No dependencies declared at parent POM level, only dependency Management.

Also moved the <modules> from distribution/opendaylight to the root pom.xml
distribution/opendaylight now builds entirely from dependencies

I have intentionally left some things in here I think are wrong,
because the goal of this commit is to reproduce the existing build
(which it does, I've checked).  Subsequent commits will clean up other things.

Change-Id: I358bdac1c0f6a59b37a418a811a30235967fdfdc
Signed-off-by: Tony Tkacik <>
9 years agoFix NPE in OF plugin Topology Service shim 30/1730/2
Yevgeny Khodorkovsky [Mon, 7 Oct 2013 17:25:56 +0000 (10:25 -0700)]
Fix NPE in OF plugin Topology Service shim

This fixes a NPE that occurs in cluster mode with multiple containers

Change-Id: Ic852cb41f6f65ef5812f9d3f1729434533ce0f5a
Signed-off-by: Yevgeny Khodorkovsky <>
9 years agoRename constants, add new constants for better code reuse. 97/1697/2
Alissa Bonas [Sun, 6 Oct 2013 20:21:43 +0000 (23:21 +0300)]
Rename constants, add new constants for better code reuse.

Change-Id: Ia2ae82c1c52974490d68997890c165004fd6920b
Signed-off-by: Alissa Bonas <>
9 years agoAdd missing test methods to IRouterAware and clean up unused imports. 31/1731/1
Ryan Moats [Mon, 7 Oct 2013 18:20:06 +0000 (13:20 -0500)]
Add missing test methods to IRouterAware and clean up unused imports.

Realized that initial Neutron IRouterAware was missing test methods
for interface attach and detach operation.  In addition, removed
unused imports from other classes.

Change-Id: I8547ad7e7437d7215151f843744b56b2e0d93197
Signed-off-by: Ryan Moats <>
9 years agoRevert "Integrate the Distribution Sanity Test with the build" 26/1726/2
Giovanni Meo [Mon, 7 Oct 2013 15:18:21 +0000 (15:18 +0000)]
Revert "Integrate the Distribution Sanity Test with the build"
It failed merge the patch is not behaving well.
This reverts commit d78e985bc4ed590407c8c7800ba796d5ea55aa6c.

Change-Id: Id2d3a6215f7373165217ad92dfda7a4e9b07d7d8
Signed-off-by: Giovanni Meo <>
9 years agoRemoved yangtools packages from bundles export, cleaned up import packages. 49/1649/3
Milos Fabian [Thu, 3 Oct 2013 15:41:02 +0000 (17:41 +0200)]
Removed yangtools packages from bundles export, cleaned up import packages.

Change-Id: I7587222aa1774064f9b002bef277cbad1f058608
Signed-off-by: Milos Fabian <>
9 years agoInital code drop of logback-config. 79/1679/2
Tomas Olvecky [Fri, 4 Oct 2013 14:29:41 +0000 (16:29 +0200)]
Inital code drop of logback-config.

This module bridges logback configuration over config-subsystem, allowing to reconfigure logback via JMX.

Change-Id: I52644b628d384d8ca015885cc9f016f4429238d4
Signed-off-by: Tomas Olvecky <>
9 years agoIntegrate the Distribution Sanity Test with the build 61/1661/5
Moiz Raja [Fri, 4 Oct 2013 02:24:14 +0000 (19:24 -0700)]
Integrate the Distribution Sanity Test with the build

Added the sanity test to the build. The sanity test plugin is built but not added to the distribution.
In the package phase the test is executed and if the test fails (that is finds modules that are not
active or resolved) then the build fails

Change-Id: Iac8831811e6bf004dc0219043d1b8e23ffbfd33e
Signed-off-by: Moiz Raja <>
9 years agoUpdated bundle instructions. 18/1718/2
Tony Tkacik [Mon, 7 Oct 2013 12:19:58 +0000 (14:19 +0200)]
Updated bundle instructions.

Change-Id: Id33f04cbab2cad79710c617ad1c342dd6cc2daf9
Signed-off-by: Tony Tkacik <>
9 years agoUpdate to the SAL Data APIs. Added Flow Configuration model 14/1714/2
Tony Tkacik [Mon, 7 Oct 2013 11:12:02 +0000 (13:12 +0200)]
Update to the SAL Data APIs. Added Flow Configuration model

Change-Id: I17a10b5651f63ab9bc1d2a2ed64bf6ca8493b418
Signed-off-by: Tony Tkacik <>
9 years agoAdded xtend as private package. 09/1709/2
Tony Tkacik [Mon, 7 Oct 2013 08:03:42 +0000 (10:03 +0200)]
Added xtend as private package.

Change-Id: Ida3cb56116e7a525d776d576eaea486de5dfb3b3
Signed-off-by: Tony Tkacik <>
9 years agoPer container save configuration is not synced in the cluster 87/1687/1
Alessandro Boch [Sun, 6 Oct 2013 05:12:04 +0000 (22:12 -0700)]
Per container save configuration is not synced in the cluster

ISSUE: When container administrator saves the configuration on GUI,
       the configurations for the containers on which he has write permission
       are onlyu saved on the local controller.
CHANGE: Have ContainerConfigurationService manage its own event sync cache
        for this specific case. ContainerConfigurationService.saveConfigurations()
        gets invoked only when container adminidtrator trigger the save.For the
        save config triggered by system or network administrator, things work as
        today, it is handled by ConfigurationService which syncs the config event
        to the other ConfigurationServices in the cluster.

Change-Id: I961558579292fd10b0d8ee601aa64f3a3843b0ed
Signed-off-by: Alessandro Boch <>
9 years agoAdd tooltips for nodes in topology in UI 22/1622/2
Alissa Bonas [Wed, 2 Oct 2013 13:12:02 +0000 (16:12 +0300)]
Add tooltips for nodes in topology in UI

Change-Id: I12ec43b79e2df5c305b6a63c9e5434998db646d1
Signed-off-by: Alissa Bonas <>
9 years agoFix save config for Container Administrator 84/1684/1
Alessandro Boch [Sat, 5 Oct 2013 03:35:53 +0000 (20:35 -0700)]
Fix save config for Container Administrator

- Needed code was missing

Change-Id: Ibe4cbf18db0db96cc7f5b0a717b92ece3066b9c4
Signed-off-by: Alessandro Boch <>
9 years agoFix incorrect trace log in FRM 42/1642/3
Alessandro Boch [Thu, 3 Oct 2013 12:17:13 +0000 (05:17 -0700)]
Fix incorrect trace log in FRM

ISSUE: Log reports failure on opposite action, makes it hard to debug
CHANGE: Also lowering severity from warn to trace for some flow programming logs

Change-Id: If8f59137ccd2539b7d46019d0095b2cb2336fb57
Signed-off-by: Alessandro Boch <>
9 years agoIncorrect heading of a table column in the TroubleShooting GUI 60/1660/2
Maurice Qureshi [Thu, 3 Oct 2013 21:54:05 +0000 (14:54 -0700)]
Incorrect heading of a table column in the TroubleShooting GUI
The TroubleShooting Page on ODL Controller has a table "Existing Nodes". This table
has three columns. The middle column has switches. Current heading of this column is
"Static Route", instead of "Node ID".

Change-Id: I0f90d1156255591b00856e027e50bf447aa21733
Signed-off-by: Maurice Qureshi <>
9 years agoAllow Topology DB to keep track of production switches 56/1656/4
Alessandro Boch [Thu, 3 Oct 2013 19:09:42 +0000 (12:09 -0700)]
Allow Topology DB to keep track of production switches

ISSUE: Discovery service is able to discover any non SDN enable
switch directly conencted to the controlled SDN switches which
advertise itself through LLDP. It is a nice feature to be able
to see on the topology to which non-SDN switches the controlled
network nodes are conencted to.
Change in breaks this feature.

CHANGE: Limit the validation check introduced in the above commit
to the edge head end point only.

Change-Id: I081f4320a73eea9bf2a39ca80717771d9c7adfb3
Signed-off-by: Alessandro Boch <>
9 years agoAdd HTTP Client library and refactor Northbound IntegrationTest 08/1608/4
Ryan Moats [Wed, 2 Oct 2013 15:11:17 +0000 (10:11 -0500)]
Add HTTP Client library and refactor Northbound IntegrationTest

Create a new commons.httpclient library for bundles that need
to function as an HTTP client.  Refactor the existing NB
IntegrationTest code to use this new library.

Ammended - library is now a profile of apache httpclient classes
to ensure things like timeouts are set on default and resources
are correctly released when finished.

Change-Id: I76f513b77700213752f4183e917fe239a9c324ff
Signed-off-by: Ryan Moats <>
9 years agoBundleScanner needs to be registered as a bundle listener to track bundles being... 52/1652/2
Prasanth Pallamreddy [Thu, 3 Oct 2013 16:49:49 +0000 (09:49 -0700)]
BundleScanner needs to be registered as a bundle listener to track bundles being added dynamically.

Change-Id: I40af7fb2da4aabe9ae2605d0187d97384be5a3f4
Signed-off-by: Prasanth Pallamreddy <>
9 years agoAdding xtend-gen directories to .gitignore 19/1619/2
Colin Dixon [Wed, 2 Oct 2013 20:28:43 +0000 (15:28 -0500)]
Adding xtend-gen directories to .gitignore

New generated files are showing up in git. This fixes that.

Change-Id: I069c5fc4eb86d4c3eb34631002336dacbd49beef
Signed-off-by: Colin Dixon <>
9 years agoRemove commented out code to fix sonar warnings 71/1571/2
Alissa Bonas [Tue, 1 Oct 2013 10:57:18 +0000 (13:57 +0300)]
Remove commented out code to fix sonar warnings

Change-Id: I541069ede01e456824e8e10eb196a34e477bdbd8
Signed-off-by: Alissa Bonas <>
9 years agoFixed archetype to use the 0.5.8 yangtools 48/1648/2
Ed Warnicke [Thu, 3 Oct 2013 15:27:06 +0000 (10:27 -0500)]
Fixed archetype to use the 0.5.8 yangtools

Change-Id: I02beabeefcb68069cdec8acb475459742496c463
Signed-off-by: Ed Warnicke <>
9 years agoTopology Manager to skip redundant edge updates 23/1623/1
Alessandro Boch [Wed, 2 Oct 2013 21:22:38 +0000 (14:22 -0700)]
Topology Manager to skip redundant edge updates

ISSUE: In a cluster of controllers when one controller is brought down, when the switches
that were actively controlled by this node switch-over to another node in the cluster, on the
new node Connection Manager let openflow plugin Controller know the cluster view has changed.
OF plugin Controller then replay the switch added event for all the local tcp conencted
switches to InventoryShim. InventoryShim checks with CM service if the switches are now
to be considered local to this controller, they are, so it updates inventory service listeners
inside OF plugin (these are cluster unaware classes which need to know the switch is there now,
like data packet serv, discovery, of stats mgr, ...). These moduels inside the plugin during their
processing because this (to them) newly added switches generate notifications toward SAL in their
respective service. Listeners above SAL are cluster aware, they are already aware of those switches,
their properties and edges and so on, they should discard these updates. But in most of the cases
they don't, they accept these redundant updates upfront. As a consequence they generate unnecessary
updates toward their service listeners, causing unnecessary chains of events and recomputations.

CHANGE: This change is to fix the above issue in the topology service, in topology manager bundle.

Change-Id: I04d1fa81758238dfb9ada9940abc3d07ed1fc9cb
Signed-off-by: Alessandro Boch <>
9 years agoSimple Sanity Test to validate that all the bundles in a distribution are active... 14/1614/3
Moiz Raja [Wed, 2 Oct 2013 17:43:54 +0000 (10:43 -0700)]
Simple Sanity Test to validate that all the bundles in a distribution are active and resolved

The idea behind the Sanity Test is to ultimately fail a build when the test fails. The test would
launch but with a slightly modified config.ini where the sanitytest bundle would be injected
as a framework bundle.

The test waits for 30 seconds for the container to finish loading all the bundles. It then gets all the
bundles from the BundleContext and checks if they are ACTIVE or RESOLVED. If they are neither it prints
out the name of the bundle and it's state and returns an error code.

Change-Id: Ia6905318f1cf63e852791ba107193094a83fddf1
Signed-off-by: Moiz Raja <>
9 years agoRevert "Newcomers that register with TopologyManager should get all the existing... 18/1618/2
Giovanni Meo [Wed, 2 Oct 2013 19:33:49 +0000 (19:33 +0000)]
Revert "Newcomers that register with TopologyManager should get all the existing edges"

This reverts commit 72fae1984afe741a93435269545f0346671cf305.

Reverting because it has some cascaded effects.

Change-Id: Iba8490a80ee2343d4875b1a2c5e17da7713099ee
Signed-off-by: Giovanni Meo <>
9 years agoChanged groupId for FCAPS to org.opendaylight.controller 05/1605/2
Tony Tkacik [Wed, 2 Oct 2013 15:00:30 +0000 (17:00 +0200)]
Changed groupId for FCAPS to org.opendaylight.controller

Change-Id: I65b82f7322e21cd9007f650a0d38c982923784a9
Signed-off-by: Tony Tkacik <>
9 years agoAdd curly braces to for and if statements. 72/1572/2
Alissa Bonas [Tue, 1 Oct 2013 11:35:12 +0000 (14:35 +0300)]
Add curly braces to for and if statements.

Change-Id: I1a681f0de1fe3f2b442d71612b4f15171df48ea2
Signed-off-by: Alissa Bonas <>
9 years agoInitial code drop of yang model driven configuration system 62/1462/5
Tomas Olvecky [Fri, 27 Sep 2013 13:38:10 +0000 (15:38 +0200)]
Initial code drop of yang model driven configuration system

Configuration system employs two phase commit to validate and push configuration changes to a running system. It allows changing simple attributes, complex transfer objects, and also provides dependency injection between configured modules.
Module config-api contains base yang model config.yang, defining language extensions and other elements required by all configuration models. Other than that it contains both apis implemented by config-manager and spis to be implemeted by configuration providers. Since the configuration system is internally driven by JMX, package org.opendaylight.controller.config.api.jmx contains all M(X)Bean interfaces exposed by config-manager.
Module config-manager is implementation of config-api.
Module config-util contains clients (both JMX and jolokia, which is http based bridge to JMX) of configuration system.
Module yang-jmx-generator parses yang models and creates java representation of configuration models and service interfaces.
Module yang-jmx-generator-plugin is connector to yangtools yang-maven-plugin that generates skeletons of java files needed by configuration providers.
Module yang-test contains example yang file, from which code is being generated.
Module yang-jmx-generator-it tests yang-test.
Module yang-store-api contains api for a registry of all yang models parsed by yang-jmx-generator.
Module yang-store-impl uses OSGi extender pattern to read META-INF/yang/*.yang from all bundles and provides snapshot view of currently available configuration models.

Change-Id: Icf3201f9754e4ca28ebce3411d2a667dcd7e75c8
Signed-off-by: Tomas Olvecky <>
9 years agoFixed incorrect manifests for newly added MD-SAL components 95/1595/2
Tony Tkacik [Wed, 2 Oct 2013 09:57:35 +0000 (11:57 +0200)]
Fixed incorrect manifests for newly added MD-SAL components

Change-Id: I03e38cab3301f7ad801c91b777e08c114c28f917
Signed-off-by: Tony Tkacik <>
9 years agoAdded Binding-Aware APIs for Mount YANG extension 85/1585/2
Tony Tkacik [Tue, 1 Oct 2013 17:34:46 +0000 (19:34 +0200)]
Added Binding-Aware APIs for Mount YANG extension

Change-Id: If9e68625b38962e0f5432d605cb2e0300b217472
Signed-off-by: Tony Tkacik <>
9 years agoNewcomers that register with TopologyManager should get all the existing edges 79/1579/1
Giovanni Meo [Tue, 1 Oct 2013 15:39:11 +0000 (17:39 +0200)]
Newcomers that register with TopologyManager should get all the existing edges

- When an application wants to get topology updates by topology
manager, it may come after the topology manager has started to push
them around, in that case the app should retrieve the exisiting
topology. Some applications may not do that so topology manager can
still take care of this lazy one by pushing a snapshot of the existing
edges as soon as the listener is registered.

Change-Id: I919350b2ddfddfaa9186e09bd5167d7d810e3bcd
Signed-off-by: Giovanni Meo <>
9 years agoAdded flow capable node and augmentations to inventory 16/1516/3
Tony Tkacik [Mon, 30 Sep 2013 16:44:49 +0000 (18:44 +0200)]
Added flow capable node and augmentations to inventory

Change-Id: Iea8b826880fb56d6d52ea3b0ac18e630be05138b
Signed-off-by: Tony Tkacik <>
9 years agoAdd first integration test for the TopologyManager bundle 21/1521/4
Moiz Raja [Mon, 30 Sep 2013 21:25:14 +0000 (14:25 -0700)]
Add first integration test for the TopologyManager bundle

Change-Id: I9a5230f0f72ba51a88bb36141773b4d00885a774
Signed-off-by: Moiz Raja <>
9 years agoUpdated SAL Binding APIs 12/1512/3
Tony Tkacik [Mon, 30 Sep 2013 13:33:31 +0000 (15:33 +0200)]
Updated SAL Binding APIs

  Data Services
    - Added DataModification contract which is used to track
      reads and writes regarding configuration change.

    - Updated Transaction APIs to use nwe DataModification object
    - Deprecated old APIs for Data Modification which supported
      only one unsubmitted transaction per consumer / provider

  Rpc Services
    - Added Registration for Routed Rpcs
    - Added Registration for Mounted Rpcs

  Util classes
    - Updated implementation of AbstractBindingAwareConsumer
    - Updated implementation of AbstractBindingAwareProvider

Change-Id: I0adb98ae6faf6d214484e4b276d6c3df930ca4e9
Signed-off-by: Tony Tkacik <>
9 years agoMigrated dom.BrokerImpl to xtend code. 27/1427/6
Tony Tkacik [Wed, 25 Sep 2013 17:02:02 +0000 (19:02 +0200)]
Migrated dom.BrokerImpl to xtend code.

Change-Id: Ibf2a63c2d26be8dfa2f10f5467040dc753418362
Signed-off-by: Tony Tkacik <>
9 years agoAdded opendaylight-l2-types to the common parent 75/1575/1
Tony Tkacik [Tue, 1 Oct 2013 12:40:58 +0000 (14:40 +0200)]
Added opendaylight-l2-types to the common parent

Opendaylight-l2-types is dependency required by Flow Service models

Fixed version of ietf-inet-types, ietf-yang-types, opendaylight-types
to the release version.

Change-Id: I950c7f858187d113ef49fb8ff66e03282f04ab3b
Signed-off-by: Tony Tkacik <>
9 years agoFix installInHw handling in FlowConfig 68/1568/1
Alessandro Boch [Tue, 1 Oct 2013 02:25:08 +0000 (19:25 -0700)]
Fix installInHw handling in FlowConfig

Change-Id: I1a78614e04c0d2b1c345c7d4538003aa790ea8ec
Signed-off-by: Alessandro Boch <>
9 years agoFix build failure in usermanager.implementation 20/1520/3
Alessandro Boch [Mon, 30 Sep 2013 18:57:18 +0000 (11:57 -0700)]
Fix build failure in usermanager.implementation

Current usermanager.implementation junit code assumes test functions are run in order.
There is a add function and then a remove function to add/remove an object from a map.
In some machines consistently the remove function is invoked by junit first.
This leads to a failure/succes/failure/success... pattern for usermanager.implementation

Change-Id: Ie5041c6980f9dad0aeb1f11a27c0c3e9bab9dbcf
Signed-off-by: Alessandro Boch <>
9 years agoContainer Manager to expose inContainerMode() 17/1517/2
Alessandro Boch [Mon, 30 Sep 2013 17:33:37 +0000 (10:33 -0700)]
Container Manager to expose inContainerMode()

- So that IContainerLocalListener can poll the information when starting in default container

Change-Id: I3d8ceec9adef58915379eda3d3adc752175ea74c
Signed-off-by: Alessandro Boch <>
9 years agoRemove unused local variable in DataPacketService. 85/1485/3
Alissa Bonas [Sun, 29 Sep 2013 13:57:03 +0000 (16:57 +0300)]
Remove unused local variable in DataPacketService.

Change-Id: I24104b358142061724bcf09b451bad821680028a
Signed-off-by: Alissa Bonas <>
9 years agoMiscelanous fixes after the release of the artifacts 14/1514/2
Giovanni Meo [Mon, 30 Sep 2013 15:14:12 +0000 (17:14 +0200)]
Miscelanous fixes after the release of the artifacts

1) Made sure that the target directory from where the controller runs
doesn't include the version else after every release we need to change
the launchers and all the jenkins jobs
2) Change config.ini to pick the new snapshot
3) Change the launchers to use the new target directory containing the
4) Avoid to build the third-party given they are mostly unchanged
since a while, that will save build time.

Change-Id: Ic1eb2dc9b84ad270c2cdadbb5af3ced8b8f4258b
Signed-off-by: Giovanni Meo <>
9 years agoAvoid javadoc breakages to break the whole build 15/1515/1
Giovanni Meo [Mon, 30 Sep 2013 15:47:58 +0000 (17:47 +0200)]
Avoid javadoc breakages to break the whole build

- Currently simple javadoc failures, like because there are no public
classes will break the whole build, that  should not be the case.

Change-Id: I44fd6b5a7870354f3f024872bd94288750d77776
Signed-off-by: Giovanni Meo <>
9 years agoChanged TopologyManager to ignore edges that contain invalid node connectors. 02/1502/2
Hideyuki Tai [Mon, 30 Sep 2013 18:26:29 +0000 (14:26 -0400)]
Changed TopologyManager to ignore edges that contain invalid node connectors.

- Changed TopologyManager to add only edges whose tail and head node connectors exist.
- Added a method to ISwitchManager to check whether a node connector exists.
- Added tests for the above changes.

Change-Id: Ib17ce94afea9ba16379ce454f48d5d8b1a1970b2
Signed-off-by: Hideyuki Tai <>
9 years agoAdded sal-connector-* skeletons (REST connector, MB, Netconf). 26/1426/5
Tony Tkacik [Wed, 25 Sep 2013 16:52:19 +0000 (18:52 +0200)]
Added sal-connector-* skeletons (REST connector, MB, Netconf).

FIxed version of YANG Tools to 0.5.8 release

Change-Id: Id20c9cd8798948f79c655b4d7f8ecad0d1dd392c
Signed-off-by: Tony Tkacik <>
9 years agoRemove unused private method and unused imports. 95/1395/4
Alissa Bonas [Tue, 24 Sep 2013 12:02:33 +0000 (15:02 +0300)]
Remove unused private method and unused imports.

Change-Id: Icc46cacdb0b929df5dbbf460248a43483f4747d6
Signed-off-by: Alissa Bonas <>
9 years agoRemove unecessary instantiation of Integer 84/1484/3
Alissa Bonas [Sun, 29 Sep 2013 13:52:15 +0000 (16:52 +0300)]
Remove unecessary instantiation of Integer

Change-Id: I057e2df2cc6bf59c8a73ecabee9235c6615f0287
Signed-off-by: Alissa Bonas <>
9 years agoAdd curly braces in for loops in DeviceManagerImpl 82/1482/2
Alissa Bonas [Sun, 29 Sep 2013 13:37:49 +0000 (16:37 +0300)]
Add curly braces in for loops in DeviceManagerImpl

Change-Id: I9802573f086a1715687590c6478e486fee06c09f
Signed-off-by: Alissa Bonas <>
9 years agoAdd curly braces to if statements in StaticRouteConfig 83/1483/2
Alissa Bonas [Sun, 29 Sep 2013 13:44:10 +0000 (16:44 +0300)]
Add curly braces to if statements in StaticRouteConfig

Change-Id: I85ddb4b0e0a2a3b604b4eb6c5c526990127b2f4e
Signed-off-by: Alissa Bonas <>
9 years agoStop concatination inside append of StringBuffer 86/1486/2
Alissa Bonas [Sun, 29 Sep 2013 14:08:12 +0000 (17:08 +0300)]
Stop concatination inside append of StringBuffer

Change-Id: Ic62d273a6b401fb06e0299e36dcd0b428304a799
Signed-off-by: Alissa Bonas <>
9 years agoDeclare junit version and use junit dependencyManagement section. 81/1481/3
Alissa Bonas [Sun, 29 Sep 2013 11:52:50 +0000 (14:52 +0300)]
Declare junit version and use junit dependencyManagement section.

Change-Id: Ic290c0055ea0b3385d92a493ddc42decc0a4b12f
Signed-off-by: Alissa Bonas <>
9 years agoFrom SAL conversion test. 52/1452/3
Jozef Gloncak [Fri, 27 Sep 2013 09:35:36 +0000 (11:35 +0200)]
From SAL conversion test.

The test was added.

Change-Id: Ic1931aef40418b1b48849be4c6f6518548d9f8cf
Signed-off-by: Jozef Gloncak <>
9 years agoFix Authorization class to be compatible with using clustered cache 91/1491/3
Yevgeny Khodorkovsky [Mon, 30 Sep 2013 02:07:46 +0000 (19:07 -0700)]
Fix Authorization class to be compatible with using clustered cache

Change-Id: I25b5a588648afcb79c56a26545ecb785afd0d3a3
Signed-off-by: Yevgeny Khodorkovsky <>
9 years agoPort and statistics models updated. 69/1469/3
Prasanna Huddar [Fri, 27 Sep 2013 17:12:23 +0000 (22:42 +0530)]
Port and statistics models updated.
Will add port service types later

Signed-off-by: Prasanna Huddar <>
Change-Id: I590fc1b1f2d1f6d2524c3754448d1dc1c4e671c0

9 years agoRevert "Changed TopologyManager to ignore edges that contain invalid node connectors." 99/1499/2
Giovanni Meo [Mon, 30 Sep 2013 08:21:20 +0000 (10:21 +0200)]
Revert "Changed TopologyManager to ignore edges that contain invalid node connectors."

This reverts commit d12862677a44f5bf66f8319a8f0e871c35797326.

Signed-off-by: Giovanni Meo <>
Change-Id: Iaeca384ce8a2ef7c7d59263209d00214e2fa15b4

9 years agoMerge "Changed TopologyManager to ignore edges that contain invalid node connectors."
Giovanni Meo [Mon, 30 Sep 2013 07:32:17 +0000 (07:32 +0000)]
Merge "Changed TopologyManager to ignore edges that contain invalid node connectors."

9 years agoCall the flow programmer synchronously but in a different 90/1490/1
Asad Ahmed [Sun, 29 Sep 2013 19:29:03 +0000 (12:29 -0700)]
Call the flow programmer synchronously but in a different
thread so that the FRM event handler thread does not get blocked

Change-Id: Ide1e166a15f9619cd9e273feaa8d32a390b5cfb0
Signed-off-by: Asad Ahmed <>