controller.git
10 years agoRefactor ClusterManagerTest to use correctly junit 12/2212/3
Alissa Bonas [Mon, 28 Oct 2013 10:26:36 +0000 (12:26 +0200)]
Refactor ClusterManagerTest to use correctly junit

Change-Id: Id3b71d21de5a5330e236aed9c05cc47dd257c566
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoAdded support for the maven enforcer plugin to check java version is 1.7 45/2245/3
Ed Warnicke [Tue, 29 Oct 2013 14:51:19 +0000 (07:51 -0700)]
Added support for the maven enforcer plugin to check java version is 1.7

Change-Id: I8d81927fb19d76f6499057e150c4406a2affe79a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoRemove superfulous class from neutron NB bundle. 18/2218/2
Ryan Moats [Mon, 28 Oct 2013 13:25:24 +0000 (08:25 -0500)]
Remove superfulous class from neutron NB bundle.

Remove superfulous NeutronNBInterfaces class from neutron NB bundle
and refactor other classes to use NeutronCRUDInterfaces methods

Change-Id: I7ecccb220250f0038476aea138cf58801ecb3b24
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
10 years agoStop using deprecated pax Configuration annotation. Move the code to use 76/2276/2
Alissa Bonas [Wed, 30 Oct 2013 14:22:08 +0000 (16:22 +0200)]
Stop using deprecated pax Configuration annotation. Move the code to use
not deprecated annotation.

Change-Id: Ibbf861d52ef3f352b5367e3e140b1b32e496c462
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoMake existCache more efficient in ClusterManager 13/2213/2
Alissa Bonas [Mon, 28 Oct 2013 10:44:28 +0000 (12:44 +0200)]
Make existCache more efficient in ClusterManager

Allocate cacheName only when it's needed, when manager
is null the concatenation of strings is redundant.

Change-Id: I031e923d2d725b3e295ed7be53ceba19a6892e96
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoFixing warnings in the sal sub-project. 76/2176/3
Colin Dixon [Fri, 25 Oct 2013 20:13:26 +0000 (15:13 -0500)]
Fixing warnings in the sal sub-project.

This fixes all of the warnings in this module mostly by (a) adding
full types to raw types when possible, (b) removing unused imports,
and (c) adding @SuppressWarning statements in tests where variables
are intentionally unused.

Change-Id: Iccb54cf3163ecf1c14b0473328438f43d78b32e3
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
10 years agoRefactored unreadable test in JMXGeneratorTest. 70/2270/2
Maros Marsalek [Wed, 30 Oct 2013 09:56:19 +0000 (10:56 +0100)]
Refactored unreadable test in JMXGeneratorTest.

Change-Id: I81768217740e136e8340cbb3024292297272ed02
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoThe class DataPacketServiceAdapter was added 68/2268/2
Jozef Gloncak [Wed, 30 Oct 2013 09:09:43 +0000 (10:09 +0100)]
The class DataPacketServiceAdapter was added

It is mirror for DataPacketAdapter class.

Change-Id: If78160e3f7b6f513cc5f4ab9bfb23c60339897ea
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agoClean all unused and redundant imports in controller. 74/2274/2
Alissa Bonas [Wed, 30 Oct 2013 13:43:08 +0000 (15:43 +0200)]
Clean all unused and redundant imports in controller.
Enable verification of unused and redundant imports via checkstyle.
Rename checkstyle configuration file because it no longer checks only
for tabs.

Change-Id: Id94a92fbc8a79aba01a4177aec3d80a2b3394508
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoRefactor allocateCaches in TopologyManagerImpl 96/2196/2
Alissa Bonas [Sun, 27 Oct 2013 20:03:00 +0000 (22:03 +0200)]
Refactor allocateCaches in TopologyManagerImpl

Extract common code to a separate method and reuse it.

Change-Id: I002d55e6c548ba7514c2792df0b3ec5af784f087
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoAdded BundleContext reference to generated factories for config subsystem 49/2249/2
Maros Marsalek [Tue, 29 Oct 2013 15:11:04 +0000 (16:11 +0100)]
Added BundleContext reference to generated factories for config subsystem

Change-Id: I24f597f462f3f7514e55484729284825768af513
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoFlowStatisticsAdapter was added. 39/2239/6
Jozef Gloncak [Tue, 29 Oct 2013 10:55:05 +0000 (11:55 +0100)]
FlowStatisticsAdapter was added.

It is mirror for InventoryAndReadAdapter.

Change-Id: I33d89f3796bbf6d3000cb3cc8429b5893f1400e9
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agoAdded case with Choice-case to instance identifier building 51/2251/2
msunal [Tue, 29 Oct 2013 16:11:49 +0000 (17:11 +0100)]
Added case with Choice-case to instance identifier building

- Choice-case is resolved when instance identifier is builded
- added tests for creating instance identifier from uri

Change-Id: Ic61820d0d73cae43db50e0d1434e20b51ea54aa8
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoClass FlowServiceAdapter was created as mirror class to 16/2216/7
Jozef Gloncak [Mon, 28 Oct 2013 12:50:15 +0000 (13:50 +0100)]
Class FlowServiceAdapter was created as mirror class to
FlowProgrammerAdapter

Change-Id: I195ae47379c939ed78f9e80a75e96f2f855441f4
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agologback-config: added support for FileAppender and TimeBasedRollingPolicy 22/2222/2
Milos Fabian [Mon, 28 Oct 2013 13:47:37 +0000 (14:47 +0100)]
logback-config: added support for FileAppender and TimeBasedRollingPolicy

Change-Id: I7cc8b1a6fca10a988dea42dfd7331fe252caf870
Signed-off-by: Milos Fabian <milfabia@cisco.com>
10 years agoAdded support for list, leaf-list and container in output under rpc node in yang... 14/2214/4
Maros Marsalek [Mon, 28 Oct 2013 10:37:25 +0000 (11:37 +0100)]
Added support for list, leaf-list and container in output under rpc node in yang definition.
Added support for leaf-list in state data definition.

Updated config subsystem as well as netconf mapping.

Change-Id: I4bdfbed352e29d6d3dc569f38c07022383d565c8
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoFixed sanitytest to always use the same java and JAVA_HOME as maven. 53/2253/2
Ed Warnicke [Tue, 29 Oct 2013 16:12:17 +0000 (09:12 -0700)]
Fixed sanitytest to always use the same java and JAVA_HOME as maven.

Change-Id: I51d17678614d5df1ebd6d11394ebca6266749f01
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoAdd vlan to container flow (container flow-spec) 54/2254/2
Alessandro Boch [Tue, 29 Oct 2013 17:30:35 +0000 (10:30 -0700)]
Add vlan to container flow (container flow-spec)

Change-Id: If18530dc407e3fc64329d8aa251b148b30bd5a8e
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoOn container removal, remove startup files from the cluster 31/2231/2
Alessandro Boch [Mon, 28 Oct 2013 20:45:38 +0000 (13:45 -0700)]
On container removal, remove startup files from the cluster

- Currently they are only removed on the local cluster node

Change-Id: I731ca66f41946a623711a434f8580ed16b4f9fc6
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoProvide northbound for controller properties 43/2143/5
Katelyn Kasperowicz [Wed, 23 Oct 2013 22:20:50 +0000 (15:20 -0700)]
Provide northbound for controller properties

Change-Id: Ie68e557287ae72bd6456ad8d63c7d1804429b64d
Signed-off-by: Katelyn Kasperowicz <kkaspero@cisco.com>
10 years agoAdd awt headless flag 58/2258/2
Andrew Kim [Tue, 29 Oct 2013 18:28:06 +0000 (13:28 -0500)]
Add awt headless flag

-Djava.awt.headless to run.sh and run.bat

Change-Id: Idfb122e10a38b050bbf1984918d59a7b026c29be
Signed-off-by: Andrew Kim <andrekim@cisco.com>
10 years agoUse same maven-compiler-plugin version 2.5.1 in all poms. 52/2252/2
Alissa Bonas [Tue, 29 Oct 2013 16:15:37 +0000 (18:15 +0200)]
Use same maven-compiler-plugin version 2.5.1 in all poms.
Also declare it in commons pom in pluginsManagement section.
Bump java version to 1.7 in release pom for maven-compiler-plugin

Change-Id: I8844a65029edf99db9eb97db594ef960fff68ba4
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoAdd updatePolicy=never to repos in poms and missing release/snapshots 48/2248/1
Alissa Bonas [Tue, 29 Oct 2013 15:36:14 +0000 (17:36 +0200)]
Add updatePolicy=never  to repos in poms and missing release/snapshots
properties

Change-Id: Ib195f8beab5455fbd3ee84087b909be2812e9969
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoAdd release/snapshot property to repositories in poms 41/2241/2
Alissa Bonas [Tue, 29 Oct 2013 12:51:24 +0000 (14:51 +0200)]
Add release/snapshot property to repositories in poms

Change-Id: I0e9ad0dace5b7c07a41200221fa3b313fcf7653f
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoadded notification to group and meter 42/2242/1
Prasanna Huddar [Tue, 29 Oct 2013 12:50:27 +0000 (18:20 +0530)]
added notification to group and meter

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

10 years agoInitial code structure of MDSAL based FRM module. 23/2223/4
Prasanna Huddar [Mon, 28 Oct 2013 14:52:46 +0000 (20:22 +0530)]
Initial code structure of MDSAL based FRM module.
This is base code structure for using MD-SAL from NSF.
This is not integrated with MAIN Pom.xml.
Its still independent bundle.
We need provider in plugin to execute this code.
Also there is addFlowTest() in file FlowConsumerImpl file is used to send hardcoded data to provider in plugin comment out the code if you use rest conf API.

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

10 years agoSolved bugs and added tests in sal-rest-connector 57/2157/3
msunal [Fri, 25 Oct 2013 09:18:30 +0000 (11:18 +0200)]
Solved bugs and added tests in sal-rest-connector

- solved bugs in ControllerContext
- added tests
- formatting

Change-Id: Ia552ec3aa6a8e4949aedfc01f8386dbc6875a73f
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoFix FileNotFound jacoco.exec in sal poms and remove duplicate jacoco 25/2225/3
Alissa Bonas [Mon, 28 Oct 2013 16:41:29 +0000 (18:41 +0200)]
Fix FileNotFound jacoco.exec in sal poms and remove duplicate jacoco
setting from pom.

The parent module should not have the jacoco plugin in plugins section, because it causes all the modules, even those without tests to inherit it.
Removed it from parent pom (kept it only in plugins management section)and added it to relevant poms of modules that have tests.

Change-Id: I4d33da1e490a7260d6f7809496dd67d10a45aca9
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoFixed TopologyIT to use @Inject 99/2199/2
Ed Warnicke [Sun, 27 Oct 2013 23:24:13 +0000 (18:24 -0500)]
Fixed TopologyIT to use @Inject

Change-Id: I88aba402ab1b02fe32dc56aca101b42ae4c2a628
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoUpdated flow capable models and affected code 87/2187/3
Tony Tkacik [Mon, 28 Oct 2013 13:18:11 +0000 (14:18 +0100)]
Updated flow capable models and affected code

Flow Model modified to support instruction.
Match type modified. SAL Compatibility is causing compilation problems.
Table features added. Depends on Flow instructions.

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Change-Id: I9662d877ea5f2bc173e2377177f7e62f55c4904a

10 years agoFix FileNotFound jacoco.exec for ForwardingRulesManager impl. 24/2224/2
Alissa Bonas [Mon, 28 Oct 2013 15:48:50 +0000 (17:48 +0200)]
Fix FileNotFound jacoco.exec for ForwardingRulesManager impl.

Because this module has no tests, the jacoco test code coverage plugin
cannot run here (and there's no point anyway) , thus it fails.
Removing it resolves the exception.

Change-Id: I2b3bc65aeca8eae6a08356e7ae62e43e782305e0
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoFix typo in messages in ContainerManager 97/2197/2
Alissa Bonas [Sun, 27 Oct 2013 20:10:58 +0000 (22:10 +0200)]
Fix typo in messages in ContainerManager

Change-Id: Ifd66812dedbe6c3637e585708b57ae61dabb0f46
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoFixed exclusions in checkstyle maven plugin. 20/2220/2
Maros Marsalek [Mon, 28 Oct 2013 14:49:53 +0000 (15:49 +0100)]
Fixed exclusions in checkstyle maven plugin.

Change-Id: Ie554399671bf2eadbc3827c2039c1550dfd07968
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoFix several tests to use correct junit methods 21/2221/2
Alissa Bonas [Mon, 28 Oct 2013 14:58:44 +0000 (16:58 +0200)]
Fix several tests to use correct junit methods

Change-Id: I61c7eca9c448f50140fd206ee4665bd2d58c0b65
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoAdded context-reference statements to the YANG models. 08/2208/2
Tony Tkacik [Mon, 28 Oct 2013 09:42:01 +0000 (10:42 +0100)]
Added context-reference statements to the YANG models.

context-reference statement is used to mark a leaf
in RPCs which serves as identifier of the context
in which RPC is used. The context is then used
as an routing information when selecting between
multiple implementations of same RPCs.

Change-Id: I1e8bf7e98429262967ae63f7a2e0481396048e3e
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoosgi command cleanup in Switch Manager and FRM 17/2117/2
Pramila Singh [Wed, 23 Oct 2013 18:55:02 +0000 (11:55 -0700)]
osgi command cleanup in Switch Manager and FRM

Change-Id: I8317f715aa1507418cfd7fcf690f0390f5165eb2
Signed-off-by: Pramila Singh <pramisin@cisco.com>
10 years agoAdd env vars to set the controller working directory. 74/2174/2
Sam Hague [Fri, 25 Oct 2013 18:00:10 +0000 (14:00 -0400)]
Add env vars to set the controller working directory.

The run.sh makes an assumption that the current working directory is
writeable and owned by the user running the command. These assumptions
don't hold when running the controller as a service such as when it
was installed via an RPM package.

Added two env variables to specify the run directory and the output
directory:

ODL_BASEDIR: working directory
ODL_DATADIR: output directory

By default the run.sh will continue to use the current working directory
and will only use the env vars if they are set.

Change-Id: I85dda38353f632e84409d91ac4dfc4a44c2d457e
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoHave openflow switch report all flow removals 48/2148/3
Alessandro Boch [Thu, 24 Oct 2013 17:23:44 +0000 (10:23 -0700)]
Have openflow switch report all flow removals

- Current Flow Programmer Service code in protocol_plugins.openflow
  instructs the switch to report the flow removal event to the controller
  only for hard or idle timeout flows, during flowmod message creation.
  Nevrekar pointed out in some switches a removal of openflow flows may
  be done by other entities. So in order for the app on top of controller
  to get to know about this flow deletions, we are here enabling the flow
  removal event report from the switch for all controller installed flows.

Change-Id: Iae2f7716b592269fd09c4e2fa4a18ae274367f9d
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoAdded unit test to demonstrate netconf-client 61/2161/1
Maros Marsalek [Fri, 25 Oct 2013 12:48:59 +0000 (14:48 +0200)]
Added unit test to demonstrate netconf-client

Change-Id: Ia159a2ebbd30493611189e3ae932c754d0010627
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoFixed AbstractMockedModule and BaseJMXRegistrator in config-manager 25/2125/5
Maros Marsalek [Thu, 24 Oct 2013 08:37:50 +0000 (10:37 +0200)]
Fixed AbstractMockedModule and BaseJMXRegistrator in config-manager

Change-Id: I75cd8a3beabc65ffaec7159ed794a26bccce0148
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoAdding a simple broadcast handler 00/1700/7
Colin Dixon [Mon, 10 Jun 2013 16:00:18 +0000 (11:00 -0500)]
Adding a simple broadcast handler

1.) An interface IBroadcastHandler for enabling/disabling and controlling
    the mode of operation for a module that provides broadcast handling and
    a function to broadcast a packet.
2.) An implementation of that interface, SimpleBroadcastHandler, that both
    handles broadcast traffic received from the DataPacketService and
    provides a way to braodcast a synthetically-generated packet.

There are four modes only two of which have currently been extensively
tested: DISABLED and BROADCAST_TO_HOSTS.

Change-Id: I6ab6042ad7ec08b819a8840e8518022c7805f4e2
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
10 years agoUpdated implementation of broker (data services, generated code), added Integration... 14/2114/5
Tony Tkacik [Wed, 23 Oct 2013 17:13:35 +0000 (19:13 +0200)]
Updated implementation of broker (data services, generated code), added Integration test.

  - Added Javadoc to Bidning Aware APIs
  - Updated implementation of data services
- Added default data store for integration testing
        - added integration test for data modifications and reads
  - Updated implementation of generated RpcRouters to get rid of reflection in cases
    where invoker does not known RPC name, only payload.

Change-Id: I30b8d8b5b4b35ff1879d0a67c2f8717294841063
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoAdd group modification methods to IResourceAuthorization 53/2153/2
Alessandro Boch [Thu, 24 Oct 2013 02:19:39 +0000 (19:19 -0700)]
Add group modification methods to IResourceAuthorization

- They were already iplemented by Authorization
- Add isApplicationUser() to Authorization

Change-Id: I057738d752aeea52b56993f2c3952a11440f9c96
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoFixing a few warnings 50/2150/1
Colin Dixon [Thu, 24 Oct 2013 18:18:28 +0000 (13:18 -0500)]
Fixing a few warnings

Just a few simple fixes in the SAL to fix warnings.

Change-Id: I411e0202d5590f6a1a37e5c3b7b3b623b20166d3
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
10 years agoPrevent addition/removal for well known container roles 18/2118/3
Alessandro Boch [Wed, 23 Oct 2013 19:26:45 +0000 (12:26 -0700)]
Prevent addition/removal for well known container roles

- Container roles are self generated when container is created.
  They are equivalent to the Controller network admin and network
  operator roles for the container sub controller. Authorization
  APIs for creating and removing roles are currently only validating
  against the Controller roles, not the sub controller roles.

Change-Id: I0ecf521a89163fedb68450fa3bc2b0d6c077977a
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoReturn singleton empty collection instead of null in Read service code 60/2060/2
Alessandro Boch [Mon, 21 Oct 2013 23:46:15 +0000 (16:46 -0700)]
Return singleton empty collection instead of null in Read service code

Change-Id: I763bdd6178047e3de43158176c29a8bd6f478b25
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoRemoving suppress annotations to fix warnings. 49/2149/2
Colin Dixon [Thu, 24 Oct 2013 17:38:39 +0000 (12:38 -0500)]
Removing suppress annotations to fix warnings.

We no longer need the @SuppressWarnings for "deprecated"

Change-Id: I42fb70ff6bf3a41c05611884bc0554f2d8615da8
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
10 years agoAdding logging configuration for tomcat (JULI) 16/2116/2
mrajvaid [Wed, 23 Oct 2013 18:25:49 +0000 (11:25 -0700)]
Adding logging configuration for tomcat (JULI)

Change-Id: I54c6740e71e59ec566b7809e9fe90d7a26ec1abc
Signed-off-by: mrajvaid <mrajvaid@cisco.com>
10 years agoadded implementation of Identifier and Identifiable from yangtools.concepts 02/2102/4
Martin Bobak [Wed, 23 Oct 2013 13:14:46 +0000 (15:14 +0200)]
added implementation of Identifier and Identifiable from yangtools.concepts

Change-Id: I33a106e3c7b7db8ea74921409b931c3eea06a548
Signed-off-by: Martin Bobak <mbobak@cisco.com>
10 years agoFix typo in TCP and reuse constants in TcpTest 45/2145/2
Alissa Bonas [Thu, 24 Oct 2013 16:10:15 +0000 (19:10 +0300)]
Fix typo in TCP and reuse constants in TcpTest

Change-Id: I2f3ff4ed20e8e191234ab30fda3ba60f1d52bc5f
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoAdding query API in connection-mgr to retrieve node controllers 48/2048/7
Muthukumaran Kothandaraman [Mon, 21 Oct 2013 13:05:40 +0000 (18:35 +0530)]
Adding query API in connection-mgr to retrieve node controllers

Change-Id: Id76d8577cfc08a96f533c62f2072c1abd040105e
Signed-off-by: Muthukumaran Kothandaraman <mkothand@in.ibm.com>
10 years agoNorthbound IT works unreliably 29/2129/3
Giovanni Meo [Thu, 24 Oct 2013 09:23:09 +0000 (11:23 +0200)]
Northbound IT works unreliably

- The root cause of the issue is in the fact the hosttracker
northbound bundles takes long time to reply to a query, why is that is
todo. To avoid this issue however i'm making the timeout for the HTTP
request in the IT to be infinity.

Change-Id: I8b857a24d6ebd03ff27f13c5061106c5202a8c2a
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
10 years agoFix warning by adding version to maven-clean-plugin 40/2140/2
Alissa Bonas [Thu, 24 Oct 2013 13:42:53 +0000 (16:42 +0300)]
Fix warning by adding version to maven-clean-plugin

Change-Id: I21d61fc159142d2d5c36253f69a730adc2e3f021
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoNetconf message related constants moved to one place. 97/2097/4
Milos Fabian [Wed, 23 Oct 2013 09:09:59 +0000 (11:09 +0200)]
Netconf message related constants moved to one place.

Change-Id: Idcbf63f51d152779804aa54432366874088db332
Signed-off-by: Milos Fabian <milfabia@cisco.com>
10 years agoPort Group and Meter Management model added 36/2136/1
Prasanna Huddar [Thu, 24 Oct 2013 11:21:34 +0000 (16:51 +0530)]
Port Group and Meter Management model added

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

10 years agoAdd ModuleFactory#getDefaultModules method to config-api. 95/2095/3
Tomas Olvecky [Mon, 21 Oct 2013 16:00:05 +0000 (18:00 +0200)]
Add ModuleFactory#getDefaultModules method to config-api.

Add method to populate pre-existing state. Modify code generator to generate
a blank implementation. Calling of the method is done by config-manager
every time new ModuleFactory is discovered in OSGi service registry, each time in a separate transaction.
Implement default module functionality in config-manager.
Add DependencyResolverFactory for default modules to be able to lookup dependencies.
Implement new service tracker tracking ModuleFactory instances in order to commit blank transactions
every time ModuleFactory service appears or disappears.
Clean up pom versions: merge config.yangstore.version into config.version.

Change-Id: I47229c9e403b817b24740c8f77ad43abcc720094
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agomoved maven property nexusproxy 12/2112/2
Michal Rehak [Wed, 23 Oct 2013 16:08:14 +0000 (18:08 +0200)]
moved maven property nexusproxy

now nexusproxy resides in pom where it is used
in commons.parent it was renamed to nexusdeploy to avoid misusage

Change-Id: I4485820797a0be6e91bae30b517950dc5bcef46b
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoAdded method for getting non-cached flow statistics 20/2120/1
Asad Ahmed [Wed, 23 Oct 2013 23:57:41 +0000 (16:57 -0700)]
Added method for getting non-cached flow statistics

Change-Id: I55f5846e35caca50dd638113fe77882b7213d221
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
10 years agoAdded per node flow query 19/2119/1
Asad Ahmed [Wed, 23 Oct 2013 20:59:54 +0000 (13:59 -0700)]
Added per node flow query

Change-Id: Iab10ad1a38b69786ff2f3b36b070bcca40cc8ee5
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
10 years agoAdding resources for a testing 00/2100/2
msunal [Wed, 23 Oct 2013 11:26:40 +0000 (13:26 +0200)]
Adding resources for a testing

- added xml, yang, json resources for a testing
- created JsonMapper class - there will be conversion to json based on yang schema

Change-Id: I71b13018f9e9e1ed20279f79a0a6e07a0ecef89a
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoImplement consistency barrier in yang-store-impl. 13/2113/1
Tomas Olvecky [Wed, 23 Oct 2013 16:27:26 +0000 (18:27 +0200)]
Implement consistency barrier in yang-store-impl.

Fix possible exceptions occurring on startup that are caused by OSGi container
notifying about added bundles in wrong order.

Change-Id: I3dae0447a775b6fd03c9d02ac0471bad82e0f2fb
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoAdd change notification functionality to yang-store. 79/2079/3
Tomas Olvecky [Tue, 22 Oct 2013 12:11:09 +0000 (14:11 +0200)]
Add change notification functionality to yang-store.

Add ability to listen for change notifications to yang-store. Listeners get notified when
new yang files are found in bundles and also when bundle with yang files is stopped.

Change-Id: I7c665a57ba7face18bf128d6a7db17c1a23526ce
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoFix for $[netconf.version} issues. 90/2090/1
Ed Warnicke [Wed, 23 Oct 2013 03:03:55 +0000 (22:03 -0500)]
Fix for $[netconf.version} issues.

Change-Id: I39bc581dbb09f5f145fd5d9b08c6872b58f29184
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoFixed bug when SAL Proxy service was not returned to the consumer 80/2080/3
Tony Tkacik [Tue, 22 Oct 2013 15:53:14 +0000 (17:53 +0200)]
Fixed bug when SAL Proxy service was not returned to the consumer

Change-Id: I5ba2e330c86925e8e893734a7f5b64ca1eb4c1e4
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoFixed two minor issues : 89/2089/2
Anil Vishnoi [Tue, 22 Oct 2013 21:56:43 +0000 (03:26 +0530)]
Fixed two minor issues :
    1) Throw error is VIP is not attached to any pool
    2) If source and destination machines are connected to same switch node, routing service returns null as a path between same node. Fixed this scenario by adding a check.

Change-Id: I8399bf40af2e1c90501240249802f8d89cc480e7
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoAdded model-flow-management to distribution. 82/2082/2
Ed Warnicke [Tue, 22 Oct 2013 16:32:59 +0000 (11:32 -0500)]
Added model-flow-management to distribution.

Change-Id: I58ae5581ae2db62638057d1a045fcf6f3725c034
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMake the sanity test countup limit a constant and set it to 120 19/2019/3
Ed Warnicke [Sat, 19 Oct 2013 19:04:50 +0000 (14:04 -0500)]
Make the sanity test countup limit a constant and set it to 120

Also add some additional output indicating how long we've been
tryign to start.

Change-Id: I02778bdbee6b9778249cae318debff360ca89a7a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoAdded sonar converage for mdsal. 76/2076/2
Ed Warnicke [Tue, 22 Oct 2013 14:31:32 +0000 (09:31 -0500)]
Added sonar converage for mdsal.

Change-Id: Iebf580b59a5a03ff104adcc88cf6b9c162acb854
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoBump version of netconf-subsystem to 0.2.2-SNAPSHOT. 83/2083/1
Tomas Olvecky [Tue, 22 Oct 2013 18:13:10 +0000 (20:13 +0200)]
Bump version of netconf-subsystem to 0.2.2-SNAPSHOT.

Also clean up poms in netconf subsystem.

Change-Id: I419700edbdf4051ea4fed6cbffc1a558635a5548
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoUpgrade netty version to 4.0.10. This release solves a resource leak bug 37/2037/2
Alissa Bonas [Mon, 21 Oct 2013 08:26:46 +0000 (11:26 +0300)]
Upgrade netty version to 4.0.10. This release solves a resource leak bug
in HashedWheelTimer.

Change-Id: Ic8ecbaf1753e4eaad926b083c22e779f252af315
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoSAL binding it test comments. 64/2064/2
Jozef Gloncak [Tue, 22 Oct 2013 06:21:40 +0000 (08:21 +0200)]
SAL binding it test comments.

Change-Id: Ibaec95527eeb29369a60c585e5b7eaeeacec4fb2
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agoProper unregistration of provider's session 68/2068/2
msunal [Tue, 22 Oct 2013 07:43:28 +0000 (09:43 +0200)]
Proper unregistration of provider's session
- if provider's session is closed, all RPCs from broker are removed

Change-Id: Ie59c19868b340588c2b7114830493986d1be3b6b
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agobump netty to version 4.0.10.Final 67/2067/2
Martin Bobak [Mon, 21 Oct 2013 14:18:41 +0000 (16:18 +0200)]
bump netty to version 4.0.10.Final

Change-Id: Ia3cd0b6a0443d252971cfd0beb59bd5ccc800116
Signed-off-by: Martin Bobak <mbobak@cisco.com>
10 years agoRelax conflict check in FRM 77/1977/5
Alessandro Boch [Thu, 17 Oct 2013 23:25:20 +0000 (16:25 -0700)]
Relax conflict check in FRM

- FRM to allow redundant flow entry installation requests

Change-Id: Ibd58562141369aea2595b63510aed1236b05190f
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoDeclare commons-io version 47/2047/2
Alissa Bonas [Mon, 21 Oct 2013 12:47:36 +0000 (15:47 +0300)]
Declare commons-io version

Change-Id: I5493d8144199af7127b7fe5c8b94d2c4c59ef1ab
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoAdded cookie to data packet model 56/2056/2
Tony Tkacik [Mon, 21 Oct 2013 17:07:50 +0000 (19:07 +0200)]
Added cookie to data packet model

Change-Id: If4a160536a7e7058741efd7ba795f82f545fccbf
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoAdded bin/ to the directories that checkstyle skips. 53/2053/2
Ed Warnicke [Mon, 21 Oct 2013 15:03:18 +0000 (10:03 -0500)]
Added bin/ to the directories that checkstyle skips.

Change-Id: I5d16f56791357c0ac85a589e5d6f183a63d6aa70
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoAdded back the config subsystem. 33/2033/2
Ed Warnicke [Mon, 21 Oct 2013 00:28:26 +0000 (19:28 -0500)]
Added back the config subsystem.

Also added a maven plugin to the list of plugins Eclipse
should ignore as it doesn't know how to deal with them.

Change-Id: I963ff4f1e627f8a774c24160623e866502c1eeed
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoRemove deprecated methods from config-api. 51/2051/2
Tomas Olvecky [Mon, 21 Oct 2013 14:43:59 +0000 (16:43 +0200)]
Remove deprecated methods from config-api.

Remove methods that were supporting users before code generation was in place.

Change-Id: I6bb2106c98d7f4a1c0bcaa23bb7c565e93243fe2
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoMove 2 jacoco/sonar settings to commons pom for reuse. 57/1957/3
Alissa Bonas [Thu, 17 Oct 2013 09:36:32 +0000 (12:36 +0300)]
Move 2 jacoco/sonar settings to commons pom for reuse.

Change-Id: Ib32169e0dd4a8100f7f0258292955534fcd58a56
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoAdded TestHelper with new PaxExam options, which could be reused by other ITs. 43/2043/1
Tony Tkacik [Mon, 21 Oct 2013 11:24:33 +0000 (13:24 +0200)]
Added TestHelper with new PaxExam options, which could be reused by other ITs.

Change-Id: I8ee9e5e9f56c77fe6fa177ecb2675752e437ef48
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoAdded container and flow name details as in AD-SAL 09/2009/2
Prasanna Huddar [Fri, 18 Oct 2013 11:25:36 +0000 (16:55 +0530)]
Added container and flow name details as in AD-SAL

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

10 years agoReworked Netconf framing mechanism, added chunked framing mechanism. 97/1897/4
Milos Fabian [Tue, 15 Oct 2013 07:35:43 +0000 (09:35 +0200)]
Reworked Netconf framing mechanism, added chunked framing mechanism.

Chunked framing mechanism http://tools.ietf.org/html/rfc6242#section-4.2

Change-Id: I00c44560836a8df66c33f6c90fa460984c4581fa
Signed-off-by: Milos Fabian <milfabia@cisco.com>
10 years agoMake netconf client throw checked Interrupted exception instead of unchecked 02/2002/2
Maros Marsalek [Fri, 18 Oct 2013 08:18:37 +0000 (10:18 +0200)]
Make netconf client throw checked Interrupted exception instead of unchecked

Change-Id: Id49cc22fc463c754aca98fb03e53afe38b6c9ac4
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoRefactored implementation of Notification Invoker 29/2029/3
Tony Tkacik [Sun, 20 Oct 2013 16:57:33 +0000 (18:57 +0200)]
Refactored implementation of Notification Invoker

sal-binding-broker:
  Refactored implementation of listener invoker to be avoid reflection
  when invoking notification callbacks to avoid reflection.

sal-binding-it:
  Added integration test which tests basic notification scenarios
  such as publishing and receiving notifications using generated
  interfaces.

Change-Id: I7afcf25e6f29608d76143058f2eb6aec12a7ccd2
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoDeclare netty.version and reuse it in commons pom. 26/2026/1
Alissa Bonas [Sun, 20 Oct 2013 11:45:49 +0000 (14:45 +0300)]
Declare netty.version and reuse it in commons pom.

Change-Id: Idf1dc5a7ac172583dd2171fa73c13367a0af5637
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoUpdated BindingAware Activators to prevent premature initialization 55/1955/3
Tony Tkacik [Thu, 17 Oct 2013 08:26:47 +0000 (10:26 +0200)]
Updated BindingAware Activators to prevent premature initialization

Fixes a bug when BindingAwareActivators loaded in wrong order and
tried to retrieve MD-SAL broker before broker bundle was started.

Change-Id: I87f807974b8581a14b387928a52c2ee2fd83208c
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoIntegrating Jolokia REST Bridge for JMX 92/1992/4
Madhu Venugopal [Fri, 18 Oct 2013 07:01:07 +0000 (00:01 -0700)]
Integrating Jolokia REST Bridge for JMX

Jolokia provides remote JMX functionality with JSON messages over REST API.
This change just integrates the Jolokia Servlet with the controller's Web Container.

Change-Id: I5dd12513d29903dbe10aeec9fc34080e5d25730b
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
10 years agoSlight fix to actually handle exception in Sanitytest. 72/1972/2
Ed Warnicke [Thu, 17 Oct 2013 15:16:40 +0000 (10:16 -0500)]
Slight fix to actually handle exception in Sanitytest.

Actually handle Thread.sleep InteruptException

Change-Id: I43ed0d976da336cfd71071e1d4196a24b031e01b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoModified the setting of JAVA_HOME for linux to be more generic. 10/2010/2
Sam Hague [Fri, 18 Oct 2013 13:09:51 +0000 (09:09 -0400)]
Modified the setting of JAVA_HOME for linux to be more generic.

The new code sets the value with the assumption that the user has java
somewhere in their path and that it is set to the JAVA version they
want to use. JAVA_HOME is then set based on that location.

Change-Id: Ie77f0c34f1c1d342ed0a8d0660631db7e5623137
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoBasic Northbound APIs for User Management 48/1948/3
mrajvaid [Thu, 17 Oct 2013 00:37:32 +0000 (17:37 -0700)]
Basic Northbound APIs for User Management

Change-Id: Ie0d36b9faf92fd0663fe17179d66e5f471f79e38
Signed-off-by: mrajvaid <mrajvaid@cisco.com>
10 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 <eaw@cisco.com>
10 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 <ppallamr@cisco.com>
10 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 <abonas@redhat.com>
10 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

sal-binding-broker:
    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.

sal-binding-it:
    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 <ttkacik@cisco.com>
10 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 <rmoats@us.ibm.com>
10 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 <mavenugo@gmail.com>
10 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 <aboch@cisco.com>
10 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 <eaw@cisco.com>
10 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 <sapshah@cisco.com>