controller.git
6 years agoAdded Inventory Reader for SwitchManager 93/2493/1
Tony Tkacik [Thu, 7 Nov 2013 12:46:09 +0000 (13:46 +0100)]
Added Inventory Reader for SwitchManager

  - Inventory Reader is runtime data reader, which delegates
    all state retrievals to the SwitchManager.

Change-Id: If6482b32948a166c45cb110f9ac915ce87a5e668
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoMerge "Ganymed patch fix"
Giovanni Meo [Thu, 7 Nov 2013 11:15:56 +0000 (11:15 +0000)]
Merge "Ganymed patch fix"

6 years agoMerge "Added AsyncEvenBus and EventBus configuration modules implementations. Added...
Ed Warnicke [Thu, 7 Nov 2013 11:14:43 +0000 (11:14 +0000)]
Merge "Added AsyncEvenBus and EventBus configuration modules implementations. Added EventBus and AsyncEventBus closeable wrappers."

6 years agoMerge "Added MD-SAL Topology Reader for reading and accessing AD-SAL topology."
Ed Warnicke [Thu, 7 Nov 2013 11:10:49 +0000 (11:10 +0000)]
Merge "Added MD-SAL Topology Reader for reading and accessing AD-SAL topology."

6 years agoAdded AsyncEvenBus and EventBus configuration modules implementations. Added EventBus... 45/2445/4
Milos Fabian [Wed, 6 Nov 2013 10:23:52 +0000 (11:23 +0100)]
Added AsyncEvenBus and EventBus configuration modules implementations. Added EventBus and AsyncEventBus closeable wrappers.

Change-Id: I21c4f2217fa876770c4ecdfa1c6a36778a00cbf0
Signed-off-by: Milos Fabian <milfabia@cisco.com>
6 years agoAdded MD-SAL Topology Reader for reading and accessing AD-SAL topology. 83/2483/1
Tony Tkacik [Thu, 7 Nov 2013 10:40:48 +0000 (11:40 +0100)]
Added MD-SAL Topology Reader for reading and accessing AD-SAL topology.

Change-Id: I7441c0f148cc891e552bd673c41902ad4f5ecd54
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoSubnet gw can be configured w/o name 69/2469/3
Alessandro Boch [Wed, 6 Nov 2013 22:30:36 +0000 (14:30 -0800)]
Subnet gw can be configured w/o name

Change-Id: I11b58948005e3ecf7068ac5b70926cb3f1fce36d
Signed-off-by: Alessandro Boch <aboch@cisco.com>
6 years agoThreadpool APIs and thread-related configuration service interfaces. 90/2390/3
Milos Fabian [Tue, 5 Nov 2013 13:42:30 +0000 (14:42 +0100)]
Threadpool APIs and thread-related configuration service interfaces.

EventBusServiceInterface - Service representing an event bus. The service acts as message router between event producers and event consumers.
ScheduledThredPoolServiceInterface - An extension of the simple pool of threads able to schedule work to be executed at some point in time.
ThreadFactoryServiceInterface - Service representing a ThreadFactory instance. It is directly useful in Java world,
where various library pieces need to create threads and you may want to inject a customized thread implementation.
ThreadPoolServiceInterface - Representing a simple pool of threads able to execute work.

Change-Id: I4bb9c3fb118f317816ee24c7edaa292f8780ae32
Signed-off-by: Milos Fabian <milfabia@cisco.com>
6 years agoTest of conversion of yang + xml file to json 76/2476/2
Jozef Gloncak [Thu, 7 Nov 2013 08:14:49 +0000 (09:14 +0100)]
Test of conversion of yang + xml file to json

Change-Id: I24447e25ffc245d6557a8aedf9b32302a00ad385
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
6 years agoMake default strategy for edit-config netconf operation MERGE in config-persister... 46/2446/3
Maros Marsalek [Wed, 6 Nov 2013 15:24:32 +0000 (16:24 +0100)]
Make default strategy for edit-config netconf operation MERGE in config-persister-impl

Replace strategy, deletes default modules

Change-Id: Ie6e09dbdeb12aa4201af09852d4a4c6eee4e29a2
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoConvert to SAL Property instances. 57/2357/2
Jozef Gloncak [Mon, 4 Nov 2013 14:04:54 +0000 (15:04 +0100)]
Convert to SAL Property instances.

Converts from FlowCapableNodeConnector to instances of SAL Property class.
Conversion for Bandwidth, Name, MacAddress are included.

Change-Id: I8d05eb3f75d421b6fc4491128cfb2b7c3cc57bc6
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
6 years agoGanymed patch fix 82/2482/1
Robert Gallas [Thu, 7 Nov 2013 10:12:02 +0000 (11:12 +0100)]
Ganymed patch fix

Fixed missing java.net.socket import in ch.ethz.ssh2.Connection.java

Change-Id: Idc748894cd7bf30675e35083da1a35e5ff435b31
Signed-off-by: Robert Gallas <rgallas@cisco.com>
6 years agoAdded Compatibility for Switch Manager and Topology Manager 75/2375/6
Tony Tkacik [Tue, 5 Nov 2013 07:05:13 +0000 (08:05 +0100)]
Added Compatibility for Switch Manager and Topology Manager

  - Created model-topology under controller for easier
    retrieval of topology models (baseline model is ietf draft
    and is present in YANGTools git).
  - Added aggregate topology view
  - Added mapping to inventory

Change-Id: I26d73415bd19478984908d34d77a476a7a842c9f
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoAdd checkstyle rule to prevent empty statements (;) 48/2448/2
Alissa Bonas [Wed, 6 Nov 2013 16:21:19 +0000 (18:21 +0200)]
Add checkstyle rule to prevent empty statements (;)

Change-Id: Id8b34fde64988326cf6cab494019f99d2d61cbc5
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoGanymed library patch 75/2475/2
Robert Gallas [Thu, 7 Nov 2013 07:13:31 +0000 (08:13 +0100)]
Ganymed library patch

SSH client patch of Ganymed library to accept
to accept precreated socket.

Change-Id: Icbccba360e9a86be41cc65a04f1e7aca8c4bffca
Signed-off-by: Robert Gallas <rgallas@cisco.com>
6 years agoGanymed SSH library provisioning 60/2360/5
Robert Gallas [Mon, 4 Nov 2013 14:42:24 +0000 (15:42 +0100)]
Ganymed SSH library provisioning

Creation of Ganymed OSGI wrapper bundle
Updated pom.xml in relevant projects
Enforcing Ganymed version 261

Change-Id: I2615f074aa463e49e18a30ef4824b7d09dc87876
Signed-off-by: Robert Gallas <rgallas@cisco.com>
6 years agoFix {} vs. %s mixup 62/2462/1
Robert Varga [Wed, 6 Nov 2013 21:42:13 +0000 (22:42 +0100)]
Fix {} vs. %s mixup

Change-Id: I8aa3d3600c977d7836d0aea8c0d5af30dfcb2004
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
6 years agoCreate mvn profile for integrationtests 35/2435/5
Alissa Bonas [Wed, 6 Nov 2013 11:49:52 +0000 (13:49 +0200)]
Create mvn profile for integrationtests

Change-Id: I119cb15f184523201cb190f2dfe8b0639995f704
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoUpdated ZeroMQ implementation 27/2227/5
Tony Tkacik [Mon, 28 Oct 2013 18:30:40 +0000 (19:30 +0100)]
Updated ZeroMQ implementation

ZeroMQ implementation listens for rpc service implementations
on one controller node and when new implementation is registered
on controller it announces it via message bus.

The receivers of announcement registers itself as the implementation
of the same service in that node, and delegates actual processing
via message bus to originating controller instance.

This allows for deployment where one controller has a bundle
which provides service A, and other which has bundle which
only consumes service A to cooperate.

Change-Id: If5a2220e05858693db6297a7592893a09021e97d
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoModify HostTracker to be able to interact with multiple host finders 25/2425/4
Jason Ye [Wed, 6 Nov 2013 06:48:01 +0000 (22:48 -0800)]
Modify HostTracker to be able to interact with multiple host finders

Change-Id: If5b8e0cc2c2ae40dd20f4e9622006b9539b605ed
Signed-off-by: Jason Ye <yisye@cisco.com>
6 years agoFixed bug with groupRef and meterRef in group and meter models. 30/2430/2
Tony Tkacik [Wed, 6 Nov 2013 10:16:01 +0000 (11:16 +0100)]
Fixed bug with groupRef and meterRef in group and meter models.

Change-Id: I4f6bf451ea8b7b554c407d4988b45375e71bd7a1
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoAdded listener for rpc registrations. 73/2173/6
Tony Tkacik [Fri, 25 Oct 2013 18:21:47 +0000 (20:21 +0200)]
Added listener for rpc registrations.

Change-Id: I17d4fbcee58b15b2bc34c83f8dce4495f995292d
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoAdded skeletons for ZeroMQ APIs for Binding Aware ZeroMQ Connector 15/2115/6
Tony Tkacik [Wed, 23 Oct 2013 17:54:35 +0000 (19:54 +0200)]
Added skeletons for ZeroMQ APIs for Binding Aware ZeroMQ Connector

Change-Id: I92c91af2c23d9f9d351a16b9d200e02d6ede2f52
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoFix configuration for default modules 34/2434/3
Maros Marsalek [Wed, 6 Nov 2013 11:44:48 +0000 (12:44 +0100)]
Fix configuration for default modules

Automatically add default modules to jmx, even if they do not use dependencyResolverFactory

Change-Id: I4c1129e02ba6243c3209899a3fba05e6b43055cc
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoAdd UM API to modify local user 71/2371/5
Alessandro Boch [Tue, 5 Nov 2013 00:10:12 +0000 (16:10 -0800)]
Add UM API to modify local user

Change-Id: I6494b30a6375294f63b51762f55ad2398aa3ac29
Signed-off-by: Alessandro Boch <aboch@cisco.com>
6 years agoAdded Model-Driven Inventory Provider for Flow-Capable Node. 62/2362/6
Tony Tkacik [Mon, 4 Nov 2013 15:08:51 +0000 (16:08 +0100)]
Added Model-Driven Inventory Provider for Flow-Capable Node.

Change-Id: I3b33837d3898404caebce052ac8b997219aed430
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoFixed dependencies for yang-jmx-generator-plugin 29/2429/2
Maros Marsalek [Wed, 6 Nov 2013 09:24:29 +0000 (10:24 +0100)]
Fixed dependencies for yang-jmx-generator-plugin

Change-Id: Iabe3d1354f59a4bb53b94179234784572d7fa6ae
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoInitial commit for the ClusteredDataStore 10/2410/8
Moiz Raja [Tue, 5 Nov 2013 20:18:43 +0000 (12:18 -0800)]
Initial commit for the ClusteredDataStore

The ClusteredDataStore provides a mechanism for the MD-SAL Broker to share data across a cluster. It can be used by other components/services as well to share data.

The ClusteredDataStore will use the ClusteringServices interface to create a cache and read/write data to it.

This only includes the structure of the project.

Moved clustered data store within md-sal

Change-Id: I37b24c8a91e6dc69815566bc0acd6dde561cbc29
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoCompleted the missing configuration parameters in NetworkConfiguration Northbound... 42/2442/2
Madhu Venugopal [Wed, 6 Nov 2013 13:49:52 +0000 (05:49 -0800)]
Completed the missing configuration parameters in NetworkConfiguration Northbound APIs for addBridge and addPort

Change-Id: Ie92c90f61aa04fa2a18c7f4b68a8daea1819b1f0
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
6 years agoAltering ARPHandler and SimpleBroadcastHandler to forward traffic immediately. 13/2413/3
Colin Dixon [Tue, 5 Nov 2013 02:30:42 +0000 (20:30 -0600)]
Altering ARPHandler and SimpleBroadcastHandler to forward traffic immediately.

This change modifies how ARPHandler handles punted IPv4 packets so that
they are immediately forwarded if the destination is known. This allows
for the first ARP response to come back to the requestor.

Change-Id: I278762c4048cb169bb9513e7237cac562bdc40ca
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
6 years agoAdded an extra validation check so that 09/2409/3
Asad Ahmed [Tue, 5 Nov 2013 19:37:40 +0000 (11:37 -0800)]
Added an extra validation check so that
the gateway mask cannot be 0 or 32

Change-Id: I78a4174c7800fcca7bdd95d03a520db5db01983d
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
6 years agoDisabled yang-jmx-generator-plugin until we can figure out the Nexus issue with it. 17/2417/2
Ed Warnicke [Wed, 6 Nov 2013 00:18:14 +0000 (18:18 -0600)]
Disabled yang-jmx-generator-plugin until we can figure out the Nexus issue with it.

yang-jmx-generator-plugin suddenly, and with no code changes whatsoever, began
having build issues.  It turns out that there is some slippery nexus issue
that is causing difficulties.  Debugging currently, this should unblock
us until a solution can be found.

Change-Id: I842152c1e0d5d1c6922722fc3c2dc41d9e19990f
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoAdd checkstyle rule UpperEll and fix all code accordingly. 35/2335/3
Alissa Bonas [Sun, 3 Nov 2013 13:21:31 +0000 (15:21 +0200)]
Add checkstyle rule UpperEll and fix all code accordingly.

UpperEll rule ensures that numbers of type long
are defined with a capital "L" in the end instead of "l"
for a better readability - per java language specification
recommendation.

Change-Id: I068c32d4aaed0980bee1d93cfeec511e72bad2f1
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoImproved exception handling thrown by client threads in ConcurrentClientsTest 51/2351/3
Maros Marsalek [Mon, 4 Nov 2013 09:14:02 +0000 (10:14 +0100)]
Improved exception handling thrown by client threads in ConcurrentClientsTest

Change-Id: Iabb655c4bf6f03e80c7822cbbc19e79d8f1db30e
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoNetconfClientDispatcher moved to constructor arguments in NetconfClient 79/2379/3
Maros Marsalek [Tue, 5 Nov 2013 09:19:58 +0000 (10:19 +0100)]
NetconfClientDispatcher moved to constructor arguments in NetconfClient
This way NioEventLoopGroup instance can be reused by multiple clients.

Dispatcher created in NetconfCLient's constructor spawned an instance of NioEventLoopGroup (in AbstractDispatcher in bgpcep repo).
Instance of NioEventLoopGroup spawns new threads and with multiple concurrent clients system could get out of resources e.g. Too many open files, Unable to create new native thread.

Change-Id: I7dffed243d62ea0be4786d067a16d4e58ab1530c
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoAdded serializer/deserializer for JSON/XML 63/2363/5
msunal [Tue, 5 Nov 2013 14:45:55 +0000 (15:45 +0100)]
Added serializer/deserializer for JSON/XML

- exceptions are translated to rest call response with state code 400 or 500
- imporoved singleton pattern
- tests
- added providers for serialization/deserialization of JSON/XML
- supported rest methods: readData, invokeRpc

Change-Id: I3a888fc1ad9c0ae2364d050e5c67875f9e075337
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Martin Sunal <msunal@cisco.com>
6 years agoChanging the file names from run.sh/run.bat to runsanity.sh/runsanity.bat to make... 43/2343/2
Madhu Venugopal [Mon, 4 Nov 2013 03:42:18 +0000 (22:42 -0500)]
Changing the file names from run.sh/run.bat to runsanity.sh/runsanity.bat to make it explicit.
A lot of human errors were made due to the identical name to the run.sh under target.

Change-Id: Ic8289d22ba3dd7fec004a9421eac3fbd978fc5fb
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
6 years agoRemoved import related warnings from most of YANG Models 59/2359/5
Tony Tkacik [Mon, 4 Nov 2013 14:27:22 +0000 (15:27 +0100)]
Removed import related warnings from most of YANG Models

  - Added revision-date statement to YANG models,
  - Added reusable grouping to inventory model, used this grouping
    in service models.

Change-Id: I78bfc3f97c5f58d755922839a6dfab07a2968ea0
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoEnabling vlan in flow spec in backend 22/2322/4
Alessandro Boch [Fri, 1 Nov 2013 18:17:05 +0000 (11:17 -0700)]
Enabling vlan in flow spec in backend

Change-Id: Idfc779b7f0b6b583b96566b1b0aeb321feb394d1
Signed-off-by: Alessandro Boch <aboch@cisco.com>
6 years agoAdded reuse support to MD-SAL for config subsystem 55/2355/3
Tony Tkacik [Mon, 4 Nov 2013 12:32:51 +0000 (13:32 +0100)]
Added reuse support to MD-SAL for config subsystem

Change-Id: I8a61b1d689feab71b750781a398756a2cd0d2547
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoFixed typo in node-inventory model. 53/2353/2
Tony Tkacik [Mon, 4 Nov 2013 11:51:14 +0000 (12:51 +0100)]
Fixed typo in node-inventory model.

Change-Id: I0b37e36a86ae4651971d9cc4cc93f90cd5224c2e
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoSwitched to using the single group repo from nexus.opendaylight.org 13/2313/2
Ed Warnicke [Fri, 1 Nov 2013 05:48:25 +0000 (22:48 -0700)]
Switched to using the single group repo from nexus.opendaylight.org

Change-Id: I3b82b11d1017a0d35f4bd78b3f7d524dbbd6085d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoRefactor if/else with dead branch to explain corner case better 39/2339/2
Ryan Moats [Sun, 3 Nov 2013 15:47:24 +0000 (09:47 -0600)]
Refactor if/else with dead branch to explain corner case better

Change allocating address from subnet pool path to split the pool
in the main branch rather than the else and explain what happens
if the pool as a single address with a comment.

Change-Id: I3e910aecc2b251da419fc5d8055c2a9ccd975563
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
6 years agoAdd missing options to run.bat 12/2312/4
Prasanth Pallamreddy [Fri, 1 Nov 2013 05:04:58 +0000 (22:04 -0700)]
Add missing options to run.bat

  - Enhance run.bat to support same options as run.sh

Change-Id: I16518e6a9fa8fd1f330b5f01a1f3a72d70e8e442
Signed-off-by: Prasanth Pallamreddy <ppallamr@cisco.com>
6 years agoBug 73: Thread safety in FRM 06/2306/2
Alessandro Boch [Thu, 31 Oct 2013 19:46:15 +0000 (12:46 -0700)]
Bug 73: Thread safety in FRM

- Have nodeFlows and groupFlows non cluster caches
- Update the two above indirectly on every installedSwView cache update (local or remote)
- Have the update be performed by the FRM event thread only so that all the updates are streamlined

Change-Id: Ie5fa6ebee9433058d4028cff51ed1369ebd7b2a2
Signed-off-by: Alessandro Boch <aboch@cisco.com>
6 years agoCannot delete static flow through northbound 10/2310/2
Alessandro Boch [Fri, 1 Nov 2013 00:06:43 +0000 (17:06 -0700)]
Cannot delete static flow through northbound

- Removed wrong annotation in flowprogrammer.northbound

Change-Id: I81ad631a95c36567f29fb8cc8a2760783b0b437e
Signed-off-by: Alessandro Boch <aboch@cisco.com>
6 years agoAdded field getters to class ICMP 58/2358/2
Noam Mor [Mon, 4 Nov 2013 14:22:33 +0000 (16:22 +0200)]
Added field getters to class ICMP

Change-Id: I436082be38ae00a1825b2cf83a607786f69cfb72
Signed-off-by: Noam Mor <noam.mor@contextream.com>
6 years agoFix star import and enable checkstyle rule to prevent it. 07/2307/2
Alissa Bonas [Thu, 31 Oct 2013 15:58:16 +0000 (17:58 +0200)]
Fix star import and enable checkstyle rule to prevent it.

Change-Id: I62a1b8e3e85c2575939c3710524a98c91227648d
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoMake topomanager members protected instead of package protected 98/2198/4
Alissa Bonas [Sun, 27 Oct 2013 19:24:13 +0000 (21:24 +0200)]
Make topomanager members protected instead of package protected

Change-Id: I258c5d4df8314091abc8e76f1dc4918358c2f2c3
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoHandle conflicting types in BundleScanner 80/2280/4
Prasanth Pallamreddy [Wed, 30 Oct 2013 19:34:03 +0000 (12:34 -0700)]
Handle conflicting types in BundleScanner

  - Change precedence order for JAXB types
  - Add a validation check to report conflicting types
  - Add exclude capability to explicitly exclude types

Change-Id: I734be4ea72100d59ddc02d26072abad2dc5b0e9e
Signed-off-by: Prasanth Pallamreddy <ppallamr@cisco.com>
6 years agoEdit Static Flow from NB APIs 65/2265/6
Sapan Shah [Wed, 30 Oct 2013 00:22:59 +0000 (17:22 -0700)]
Edit Static Flow from NB APIs

Change-Id: I837a288755b7800abd8ccd76a35895eed82a4643
Signed-off-by: Sapan Shah <sapshah@cisco.com>
6 years agoMiscelanous fix for Eclipse users 84/2284/2
Giovanni Meo [Thu, 31 Oct 2013 11:34:29 +0000 (12:34 +0100)]
Miscelanous fix for Eclipse users

- Make sure the jacoco-maven-plugin is not contemplated by m2e in md-sal.
- Make sure the assembly target runs from the release pom project as
opposed to the distribution as it was done before.
- Silent warning from the module
org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort they
don't seem at all warning rather simple advices

Change-Id: I379274caff84c29c1f815c14b1d8530ac689957d
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
6 years agoBase integration of Binding Aware Broker with Config Subsystem 73/2273/5
Tony Tkacik [Wed, 30 Oct 2013 12:32:29 +0000 (13:32 +0100)]
Base integration of Binding Aware Broker with Config Subsystem

Binding Aware Broker is now initialized via config subsystem
as default module, not bundle activator, this allows for
configurable modules declare BindingAwareBroker and MD-SAL as
one of their dependencies.

MD-SAL is still also available via OSGI registry and provided
Activators.

Change-Id: I81315312b921fcc2317d93e5dcf001174d02b644
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoEnable enunciate to produce Neutron Service NB API documentation. 01/2301/2
Ryan Moats [Thu, 31 Oct 2013 15:40:34 +0000 (10:40 -0500)]
Enable enunciate to produce Neutron Service NB API documentation.

POM lacked full enunciate config to produce documentation

Change-Id: I70bad9d9839f6f33a98e5203fc7a4029e2127e7c
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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

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

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

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.