controller.git
10 years agoremoved config-util from pax-exam minimum bundles as this is not a bundle 92/3192/1
Michal Rehak [Thu, 28 Nov 2013 12:05:30 +0000 (13:05 +0100)]
removed config-util from pax-exam minimum bundles as this is not a bundle

Change-Id: I20537487d7067d7b0052769b2e443732fa9847df
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoMerge changes I178e467a,Ia8720c2c
Ed Warnicke [Thu, 28 Nov 2013 10:28:01 +0000 (10:28 +0000)]
Merge changes I178e467a,Ia8720c2c

* changes:
  Mark deprecated methods in DataModification as such
  Remove executable permissions from pom.xml

10 years agoMerge "Removed POST, PUT for /restconf/operational"
Ed Warnicke [Thu, 28 Nov 2013 10:27:19 +0000 (10:27 +0000)]
Merge "Removed POST, PUT for /restconf/operational"

10 years agoRemoved POST, PUT for /restconf/operational 79/3179/1
msunal [Thu, 28 Nov 2013 09:47:36 +0000 (10:47 +0100)]
Removed POST, PUT for /restconf/operational

- regarding to RFC the operations POST and PUT do not have to be allowed for client on /restconf/operational

Change-Id: Ie0e8cb07154e4a1a016090fef9645aa38b790b41
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoMerge "Table features : modified yang model. Patch set 2: Modified match types as...
Ed Warnicke [Thu, 28 Nov 2013 09:45:10 +0000 (09:45 +0000)]
Merge "Table features : modified yang model. Patch set 2: Modified match types as identity for extensibility."

10 years agoMark deprecated methods in DataModification as such 71/3171/1
Robert Varga [Thu, 28 Nov 2013 07:30:23 +0000 (08:30 +0100)]
Mark deprecated methods in DataModification as such

Change-Id: I178e467a3885841175755e3e9ff8f977a4276e85
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoRemove executable permissions from pom.xml 70/3170/1
Robert Varga [Tue, 26 Nov 2013 10:36:02 +0000 (11:36 +0100)]
Remove executable permissions from pom.xml

Change-Id: Ia8720c2c29e4cc1f2ac3c0d69827fe4010c5870a
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoMerge "Fixes - config-registry registered to OSGi, used modules's factory bundle...
Ed Warnicke [Wed, 27 Nov 2013 22:14:08 +0000 (22:14 +0000)]
Merge "Fixes - config-registry registered to OSGi, used modules's factory bundle context for module instance registration."

10 years agoMerge "Fixed GlobalEventExecutorCloseable - override "unsupported opearaion" methods."
Ed Warnicke [Wed, 27 Nov 2013 22:12:43 +0000 (22:12 +0000)]
Merge "Fixed GlobalEventExecutorCloseable - override "unsupported opearaion" methods."

10 years agoMerge "Fixes for MD-FRM"
Kalvin Hom [Wed, 27 Nov 2013 21:48:01 +0000 (21:48 +0000)]
Merge "Fixes for MD-FRM"

10 years agoMerge "Flow Topology Exporter"
Ed Warnicke [Wed, 27 Nov 2013 21:38:12 +0000 (21:38 +0000)]
Merge "Flow Topology Exporter"

10 years agoMerge "Moved Schema Aware logic from DataStore to SchemaAwareDataStore adapter"
Ed Warnicke [Wed, 27 Nov 2013 21:34:49 +0000 (21:34 +0000)]
Merge "Moved Schema Aware logic from DataStore to SchemaAwareDataStore adapter"

10 years agoMerge "Fixed typo in group service. Modified Group and Meter flow Impl"
Ed Warnicke [Wed, 27 Nov 2013 21:26:45 +0000 (21:26 +0000)]
Merge "Fixed typo in group service. Modified Group and Meter flow Impl"

10 years agoMerge "Enabled documentation generator for models."
Ed Warnicke [Wed, 27 Nov 2013 21:16:42 +0000 (21:16 +0000)]
Merge "Enabled documentation generator for models."

10 years agoEnabled documentation generator for models. 08/3108/2
Tony Tkacik [Tue, 26 Nov 2013 18:29:13 +0000 (19:29 +0100)]
Enabled documentation generator for models.

Generated docs can be found in
opendaylight/md-sal/models/*/target/site/restconf/*.html

Change-Id: Ia85b61548d33a4b74248cbf6e72cec9e229e4a7b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoFixes - config-registry registered to OSGi, used modules's factory bundle context... 64/3064/5
Milos Fabian [Mon, 25 Nov 2013 12:52:19 +0000 (13:52 +0100)]
Fixes - config-registry registered to OSGi, used modules's factory bundle context for module instance registration.

Change-Id: Iaae34d47c7a8515ea68f2d8d3629edd0b073152e
Signed-off-by: Milos Fabian <milfabia@cisco.com>
10 years agoFixed typo in group service. Modified Group and Meter flow Impl 49/3149/1
Prasanna Huddar [Wed, 27 Nov 2013 18:55:05 +0000 (00:25 +0530)]
Fixed typo in group service. Modified Group and Meter flow Impl

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

10 years agoMoved Schema Aware logic from DataStore to SchemaAwareDataStore adapter 33/3133/2
Tony Tkacik [Wed, 27 Nov 2013 14:45:51 +0000 (15:45 +0100)]
Moved Schema Aware logic from DataStore to SchemaAwareDataStore adapter

    All YANG schema logic necessary for proper function of DataStore
    for all components was moved to separate component which
    provides this functionality unified from one place for multiple
    datastores.

Change-Id: I840f752b03e22047e8a7f3d2b7dbe3026fb087c9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoMerge changes I6ff6c55c,I92b7e285
Ed Warnicke [Wed, 27 Nov 2013 17:08:36 +0000 (17:08 +0000)]
Merge changes I6ff6c55c,I92b7e285

* changes:
  Bug 165 and changed operations
  Json with prefix for augmented elements

10 years agoBug 165 and changed operations 34/3134/1
msunal [Wed, 27 Nov 2013 15:15:58 +0000 (16:15 +0100)]
Bug 165 and changed operations

Main changes according to corresponding RFC draft 01 and 02:
- corrected media types (used application/yang.data and application/vnd.yang.data)
- PUT operation was changed to POST
- POST operation was changed to PUT

There was also added media types due to Bug 165 :
- application/json
- application/xml
- text/xml

Change-Id: I6ff6c55c272cef0b63d5795d5b9842db83f1b627
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoFixed GlobalEventExecutorCloseable - override "unsupported opearaion" methods. 28/3128/2
Milos Fabian [Wed, 27 Nov 2013 13:51:55 +0000 (14:51 +0100)]
Fixed GlobalEventExecutorCloseable - override "unsupported opearaion" methods.

Change-Id: Ic0c65cc596bdf6ba1bbbada576052f11805a202e
Signed-off-by: Milos Fabian <milfabia@cisco.com>
10 years agoMerge "Switched SAL Netconf Connector to config subsystem"
Ed Warnicke [Wed, 27 Nov 2013 12:11:54 +0000 (12:11 +0000)]
Merge "Switched SAL Netconf Connector to config subsystem"

10 years agoMerge "Fixed bug with multiple DataReaders participating in one read operation"
Ed Warnicke [Wed, 27 Nov 2013 12:11:24 +0000 (12:11 +0000)]
Merge "Fixed bug with multiple DataReaders participating in one read operation"

10 years agoFixes for MD-FRM 16/3116/12
Ed Warnicke [Wed, 27 Nov 2013 02:30:52 +0000 (18:30 -0800)]
Fixes for MD-FRM

Patch 1:  Fix MD-FRM to listen to the correct portion of the data tree.
Currently we listen to /flows/flow/ for which we would need to specify a
key to indicate which flow in the tree we wanted to listen to.  Changing to
listen to /flows/ and thus hear commits involving all flows.

Patch 2:  Unpack Entry... we need the value of the entry which is a DataObject.
Otherwise, the cast fails.

Patch 3: NodeFlow is only used as an input to rpcs towards the
openflowplugin, it does not get filed in the data tree.  Flow gets
filed in the data tree.  Addtionally, commits can come in with multiple
objects, so if we get a commit with other things, we either need to ignore
them or handle them... but blindly casting them will not work.

Patch 4: Change to cope with moving from NodeFlow to Flow.  Fortunately,
NodeFlow is just Flow plus a NodeRef plus a TableRef, so it pretty much just
worked (at least at the typing level... not to running yet).

Patch 5: Fixed an NPE by providing a Collections.<RpcError>emptySet() for
RpcErrors instead of null.

Patch 6: Fixed a failure due to attempt to check with the old AD-SAL
infra for the Node.  This will not work correctly.  Added TODO for
validation of the node.  Also cleaned up substantially handling of
error conditions while I was in the neighborhood.

Patch 7: Something in the current use of ClusteringServices for
validation is breaking things.  At first it looked like
we were just trying to allocate caches before we initialized
out clustering services variable, and thus failing... but at
the end of the day there is more wrong here than make sense
to debug at this time... so commented out.

Patch 8: Get the modifications from the transaction and
deal with the create, updated, removed.  Also handled the
cast to Flow.  Put a small null check around handling of
instructions in FRMUtil.

Patch 9: Something in the current use of ClusteringServices
is breaking things. Commenting out in order to get things working.

Patch 10: Correctly sorted out the creates from the removes
from the *true* updates.  Note, both creates and updates appear
as updates... so you have to do a little setwise subtraction.
Also note, the Collections you get back are immutable, so
you have to do that subtraction with care.

Victory!  As of Patch 10 I can confirm using
https://git.opendaylight.org/gerrit/#/c/3118/

That flows being added, removed, or updated are being
correctly wired to an RPC that is registered for them.

Change-Id: Iee020938d201f3df0629b2df13a85ad023c808ac
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMD-SAL Statistics Manager - Did temporary fix for avoiding CSIT test failure. 20/3120/1
Anil Vishnoi [Wed, 27 Nov 2013 11:30:51 +0000 (17:00 +0530)]
MD-SAL Statistics Manager - Did temporary fix for avoiding CSIT test failure.
This code has dependency on openflowplugin code that is not yet merged.
http://git.opendaylight.org/gerrit/3037

Change-Id: Ia54a911d12f7a484a3475d93dc1b344478121006
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoSwitched SAL Netconf Connector to config subsystem 54/2854/8
Tony Tkacik [Tue, 19 Nov 2013 07:33:02 +0000 (08:33 +0100)]
Switched SAL Netconf Connector to config subsystem

    Switched Programmatic APIs to configuration APIs
    for mounting Netconf southbound devices as a providers
    inside MD-SAL.

    Netconf Southbound Device is not exposed as top-level
    provider, but rather as an mountpoint with explicit
    namespace defined by it's location in overal data tree.

Change-Id: I916e5cde75d15c5d1bcbe6aae9f448833ddaad2b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoFixed bug with multiple DataReaders participating in one read operation 07/3107/2
Tony Tkacik [Tue, 26 Nov 2013 18:01:08 +0000 (19:01 +0100)]
Fixed bug with multiple DataReaders participating in one read operation

Change-Id: I562c070acb0b16b1ffe41abb014c22319e1b5f2a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoJson with prefix for augmented elements 05/3105/2
Jozef Gloncak [Tue, 26 Nov 2013 15:32:47 +0000 (16:32 +0100)]
Json with prefix for augmented elements

Json elements which are created via augmentation are written with
prefix which is equal to module name from where augmentation was defined.

Change-Id: I92b7e2854cea3abf052f9fadc2783d29f1e82391
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agoTable features : modified yang model. 97/3097/2
Deepthi V V [Tue, 26 Nov 2013 12:51:26 +0000 (18:21 +0530)]
Table features : modified yang model.
Patch set 2: Modified match types as identity for extensibility.

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Change-Id: I12f9f99ccc40162951889acc5515940e56e9f211

10 years agoMD-SAL Statistics Manager - Minor bug fixing 14/3114/1
Anil Vishnoi [Tue, 26 Nov 2013 21:39:13 +0000 (03:09 +0530)]
MD-SAL Statistics Manager - Minor bug fixing

Change-Id: I038195b03ac9f5abea9d23f793f69c2f307629c1
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoAdded MD-SAL statistics-manager to dependendy in pom.xml 12/3112/1
Anil Vishnoi [Tue, 26 Nov 2013 19:28:17 +0000 (00:58 +0530)]
Added MD-SAL statistics-manager to dependendy in pom.xml

Change-Id: I5bfed655b9db48161f862488a29ba363ef515d1d
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoMerge "Fixed quote issue in flow-types.yang and table-types.yang"
Giovanni Meo [Tue, 26 Nov 2013 19:54:36 +0000 (19:54 +0000)]
Merge "Fixed quote issue in flow-types.yang and table-types.yang"

10 years agoFixed quote issue in flow-types.yang and table-types.yang 09/3109/1
Ed Warnicke [Tue, 26 Nov 2013 19:11:02 +0000 (11:11 -0800)]
Fixed quote issue in flow-types.yang and table-types.yang

This should resolve the errors on startup:

2013-11-26 07:49:17.846 PST [Start Level Event Dispatcher] ERROR o.o.y.y.p.util.ParserListenerUtils - Syntax error in module opendaylight-table-types at line 7: missing '"'.
2013-11-26 07:49:17.856 PST [Start Level Event Dispatcher] ERROR o.o.y.y.p.util.ParserListenerUtils - Syntax error in module opendaylight-flow-types at line 7: missing '"'

Change-Id: I93511100e323c920bc65576576d082d535516717
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMerge "Added transaction parameter in Port RPC"
Ed Warnicke [Tue, 26 Nov 2013 17:46:09 +0000 (17:46 +0000)]
Merge "Added transaction parameter in Port RPC"

10 years agoMerge "Fix bug 153: change the key container-config to ContainerConfig in the contain...
Giovanni Meo [Tue, 26 Nov 2013 15:55:15 +0000 (15:55 +0000)]
Merge "Fix bug 153: change the key container-config to ContainerConfig in the container manager module"

10 years agoMerge changes I0f752636,Idd154499,Ic35fa3e8
Ed Warnicke [Tue, 26 Nov 2013 14:35:34 +0000 (14:35 +0000)]
Merge changes I0f752636,Idd154499,Ic35fa3e8

* changes:
  Updated xml generated by get netconf operation to conform to yang schema in config-api
  Add logback as a default config module.
  Fix logging of yang parsing problems in yang-parser-impl

10 years agoMerge "Queue yang model"
Ed Warnicke [Tue, 26 Nov 2013 14:30:22 +0000 (14:30 +0000)]
Merge "Queue yang model"

10 years agoMerge "Better exception message in persister. Split information about missing capabil...
Ed Warnicke [Tue, 26 Nov 2013 14:23:32 +0000 (14:23 +0000)]
Merge "Better exception message in persister. Split information about missing capabilities into log message, and exception that only contains missing capabilities."

10 years agoMerge "Fixed default configuration to not reference unused capabilities"
Ed Warnicke [Tue, 26 Nov 2013 14:06:32 +0000 (14:06 +0000)]
Merge "Fixed default configuration to not reference unused capabilities"

10 years agoMerge "Update context-instance xpath format according to latest changes in config...
Ed Warnicke [Tue, 26 Nov 2013 14:06:16 +0000 (14:06 +0000)]
Merge "Update context-instance xpath format according to latest changes in config-api yang."

10 years agoMerge "Null data from XML"
Ed Warnicke [Tue, 26 Nov 2013 14:04:46 +0000 (14:04 +0000)]
Merge "Null data from XML"

10 years agoMerge changes I50218f21,I6bc2631b
Ed Warnicke [Tue, 26 Nov 2013 14:03:22 +0000 (14:03 +0000)]
Merge changes I50218f21,I6bc2631b

* changes:
  Serialization to Json improvement
  Union type processing added to JsonMapper

10 years agoMerge "Bug 164"
Ed Warnicke [Tue, 26 Nov 2013 14:02:25 +0000 (14:02 +0000)]
Merge "Bug 164"

10 years agoFixed default configuration to not reference unused capabilities 99/3099/1
Tony Tkacik [Tue, 26 Nov 2013 13:46:09 +0000 (14:46 +0100)]
Fixed default configuration to not reference unused capabilities

Change-Id: I72a072d4b0d6540df44f67bcc3e339b93d83dca6
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoBetter exception message in persister. 98/3098/1
Tomas Olvecky [Tue, 26 Nov 2013 13:39:46 +0000 (14:39 +0100)]
Better exception message in persister.
Split information about missing capabilities into log message, and exception that only contains missing capabilities.

Change-Id: I5673542d14b3b8cd3ea4bcb6e0166566e9a105b8
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoAdded transaction parameter in Port RPC 95/3095/1
HemaTG [Tue, 26 Nov 2013 11:48:41 +0000 (17:18 +0530)]
Added transaction parameter in Port RPC

Signed-off-by: HemaTG <hema.gopalkrishnan@ericsson.com>
Change-Id: Ia3e36463955690d338436c15c6ff9410b4e4c94a

10 years agoSerialization to Json improvement 94/3094/1
msunal [Tue, 26 Nov 2013 11:41:10 +0000 (12:41 +0100)]
Serialization to Json improvement

- During serialization of List and LeafList is not get parent from composite node
but he is added as a parameter

Change-Id: I50218f2132eb571c3faf103f7914e2f49f735bf6
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoMerge "HostTracker hosts DB key scheme implementation"
Giovanni Meo [Tue, 26 Nov 2013 11:37:38 +0000 (11:37 +0000)]
Merge "HostTracker hosts DB key scheme implementation"

10 years agoUpdated xml generated by get netconf operation to conform to yang schema in config-api 89/3089/3
Maros Marsalek [Tue, 26 Nov 2013 09:15:54 +0000 (10:15 +0100)]
Updated xml generated by get netconf operation to conform to yang schema in config-api

Change-Id: I0f7526369840eb83fdd83aba2459365ccbd9fd16
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoFlow Topology Exporter 93/2593/3
Tony Tkacik [Sun, 10 Nov 2013 22:42:10 +0000 (23:42 +0100)]
Flow Topology Exporter

Change-Id: I1c12a0b89d2229fc8f8c269f738292ba228210cf
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoFixed two-phase commit bug when change originated in DOM Broker 66/3066/2
Tony Tkacik [Mon, 25 Nov 2013 15:58:53 +0000 (16:58 +0100)]
Fixed two-phase commit bug when change originated in DOM Broker

  - DataServiceConnector is now tracking all opened transaction
    in order to prevent creating loop if transaction was
    already forwarded from other broker (DataServiceConnector
    is not publishing it back).
  - Added logging to TwoPhase Commit and Transaction
    forwarding
  - Fixed some warnings regarding wildcards in generics.

Change-Id: I6e3169f20ac84222ed0837735c3ddd95115db38a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoAdded configuration options to MD-SAL 53/2853/13
Tony Tkacik [Tue, 19 Nov 2013 07:27:07 +0000 (08:27 +0100)]
Added configuration options to MD-SAL

   Added default configuration to distribution
   which wires MD-SAL components together.

   Support for configuring wiring of following services:
     - Binding Aware Broker
        - Binding Aware Notification Service
        - Binding Aware Data Broker Service
        - Mapping service
     - Binding Independent Broker
     - Data Store

   Default configuration wires BA Broker, BA Notification service
   BA Data Broker and BI Broker together.

   BA Broker requires now BI Broker to be loaded in order to
   provide datastore functionality right from the beginning.

   Updated integration tests, added new test cases for BA to BI
   integration

Change-Id: I7776bb9b2ed75bd5589757633c17f2466b86a04c
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoMerge changes I4ba7cf7d,Ia3e319ee
Ed Warnicke [Mon, 25 Nov 2013 17:48:58 +0000 (17:48 +0000)]
Merge changes I4ba7cf7d,Ia3e319ee

* changes:
  Allow multiple services provided from same namespace parsed from netconf message
  Fix no response from netconf server if no operation is available to handle message.

10 years agoUpdate context-instance xpath format according to latest changes in config-api yang. 56/3056/7
Maros Marsalek [Mon, 25 Nov 2013 10:25:34 +0000 (11:25 +0100)]
Update context-instance xpath format according to latest changes in config-api yang.

Change-Id: I7b432ecf4703617899e5e945e900a54ec479d342
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoQueue yang model 60/3060/1
usha [Mon, 25 Nov 2013 12:19:23 +0000 (17:49 +0530)]
Queue yang model

Signed-off-by: usha <usha.m.s@ericsson.com>
Change-Id: If80f902ced0b053b197263462cce57c753c78608

10 years agoBug 164 59/3059/2
msunal [Mon, 25 Nov 2013 12:14:57 +0000 (13:14 +0100)]
Bug 164

- if URI has bad format then error status 400 is returned
- corrected xtend conventions: triple equals for null

Change-Id: Idfa58e21942506b7483ca6ecf19aedfd1c1de827
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoHostTracker hosts DB key scheme implementation 17/2817/9
Deepak [Mon, 18 Nov 2013 10:19:47 +0000 (15:49 +0530)]
HostTracker hosts DB key scheme implementation

Requirements :-

i) IP only scheme for hosttracker hosts db key is by default supported.
ii) IP + MAC scheme for hosttracker hosts db key addition.
iii) Only one scheme at a time will be active. The configuration is
controller by the setting hosttracker.keyscheme in config.ini. By default
it has a value of zero which indicates IP only scheme.
The value 1 can be set for choosing IP+MAC scheme.

Changes done :-

i) Marker interface named IHostId is used for the implementation.
ii) IPHostId and IPMacHostId are the classes which implement the marker
interface.
iii) All the hostttracker apis have been aligned to the new key using the
marker interface IHostId as the key.
iv) Version of the hosttracker and it's dependent bundles like
arphandler,loadbalancer,static routing etc.. have been bumped up.
v) HostIdFactory has been provided to create the keys based on the scheme
the user is using.

Tests done :-

i) pingall has worked.
ii) NB APIs of hosttracker.

Made distribution changes which were needed and other pom changes as well.
Integration test for hosttracker has been fixed with the right version.
Other module integration test failures and review comments have been taken
care off.
Host DB Key classes have been serialized.

Change-Id: I328a1b6d3702d5268832f0e3ea6ee47122f20205
Signed-off-by: Deepak <dudapudi@in.ibm.com>
10 years agoNull data from XML 53/3053/1
Jozef Gloncak [Mon, 25 Nov 2013 09:42:58 +0000 (10:42 +0100)]
Null data from XML

In case of reading data from XMl to Composite node following rule was
added:
- XML with opening and closing tag without data is mapped to single node
  with empty string
  (e. g. <foo></foo> -> single node with empty string)
- XML with only closing tag is mapped to single node with null value (e.
  g. <foo /> -> single node with null value)

Change-Id: I17ba4387949dd3cfe943999829dbcc63a29fbac8
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agoUnion type processing added to JsonMapper 92/2992/5
Jozef Gloncak [Fri, 22 Nov 2013 09:00:19 +0000 (10:00 +0100)]
Union type processing added to JsonMapper

if data type according to schema is union then data from single node are validated as follows:
- if simple node value is null -> [null] is written to JSON
- if simple node value is number and union yang contains one of number types ->
  number is written to JSON
- if simple node value si true or false and union yang contains BooleanType ->
  true or false is written to JSON
- other cases are written to JSON as string (inside "")

Change-Id: I6bc2631bc9b018e9497464fac4efbc5abc726882
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agoMerge "Add prefixes to type attribute in generated xml from netconf Add support for...
Ed Warnicke [Mon, 25 Nov 2013 09:42:51 +0000 (09:42 +0000)]
Merge "Add prefixes to type attribute in generated xml from netconf Add support for parsing prefixed type attributes from incomming xml to netconf"

10 years agoMerge changes Ia09a1107,I2c30f3b6
Ed Warnicke [Mon, 25 Nov 2013 09:42:21 +0000 (09:42 +0000)]
Merge changes Ia09a1107,I2c30f3b6

* changes:
  Change type of service-ref grouping to service-type-ref from leafref.
  Fix config-netconf-connector needed for interacting with yuma's yangcli.

10 years agoMerge "Fixed YangStore exception thrown at startup"
Ed Warnicke [Mon, 25 Nov 2013 09:40:50 +0000 (09:40 +0000)]
Merge "Fixed YangStore exception thrown at startup"

10 years agoMerge "TableFeatures Update,correcting InstanceIdentifier"
Ed Warnicke [Mon, 25 Nov 2013 08:46:51 +0000 (08:46 +0000)]
Merge "TableFeatures Update,correcting InstanceIdentifier"

10 years agoMD-SAL Statistics Manager- types and capabilities in group-features model is bitmap... 33/3033/1
Anil Vishnoi [Sat, 23 Nov 2013 15:09:07 +0000 (20:39 +0530)]
MD-SAL Statistics Manager- types and capabilities in group-features model is bitmap, so changed to bitmap from enum

Change-Id: I71cdc43f2919a8950052aa7334a135c79fb5b748
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoMerge "Fix NPE in FlowProgrammerService in openflow plugin"
Andrew Kim [Sat, 23 Nov 2013 01:44:16 +0000 (01:44 +0000)]
Merge "Fix NPE in FlowProgrammerService in openflow plugin"

10 years agoMerge "Adding another constructor to ContainerFlowConfig to take dlVlan. Being an...
Alessandro Boch [Fri, 22 Nov 2013 23:31:32 +0000 (23:31 +0000)]
Merge "Adding another constructor to ContainerFlowConfig to take dlVlan. Being an immutable object, there is no other way to set the Vlan (other than via NB Serialization)"

10 years agoAdding another constructor to ContainerFlowConfig to take dlVlan. 21/3021/1
Madhu Venugopal [Fri, 22 Nov 2013 21:24:15 +0000 (13:24 -0800)]
Adding another constructor to ContainerFlowConfig to take dlVlan.
Being an immutable object, there is no other way to set the Vlan (other than via NB Serialization)

Change-Id: Ie26c5b9770275095152484f90f61722418db6991
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
10 years agoAdd logback as a default config module. 01/3001/2
Tomas Olvecky [Fri, 22 Nov 2013 13:40:17 +0000 (14:40 +0100)]
Add logback as a default config module.

Change-Id: Idd15449925dc20cfc731d97ee8cef5c42a5a4d80
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoFix logging of yang parsing problems in yang-parser-impl 08/3008/2
Tomas Olvecky [Fri, 22 Nov 2013 14:47:17 +0000 (15:47 +0100)]
Fix logging of yang parsing problems in yang-parser-impl

Change-Id: Ic35fa3e85c0bb12b0b342e570e2c440161be3923
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoAllow multiple services provided from same namespace parsed from netconf message 02/3002/1
Maros Marsalek [Fri, 22 Nov 2013 13:42:38 +0000 (14:42 +0100)]
Allow multiple services provided from same namespace parsed from netconf message

Change-Id: I4ba7cf7d3e728be447066abc3a3c9f871faba954
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoMerge "1. Fixed not sending of events to the node that created the routing table...
Giovanni Meo [Fri, 22 Nov 2013 13:26:18 +0000 (13:26 +0000)]
Merge "1. Fixed not sending of events to the node that created the routing table entry 2. Deprecated listener pattern and introduced the WB pattern based on code review 3. Included some documentation and logging package 4. Modified/Added unit test case"

10 years agoFix no response from netconf server if no operation is available to handle message. 00/3000/1
Maros Marsalek [Fri, 22 Nov 2013 13:08:30 +0000 (14:08 +0100)]
Fix no response from netconf server if no operation is available to handle message.

Change-Id: Ia3e319ee6b9d224a92def7652ed50f4ae7021b4a
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoTableFeatures Update,correcting InstanceIdentifier 99/2999/1
Gaurav Bhagwani [Fri, 22 Nov 2013 12:39:43 +0000 (18:09 +0530)]
TableFeatures Update,correcting InstanceIdentifier

Signed-off-by: Gaurav Bhagwani <gaurav.bhagwani@ericsson.com>
Change-Id: I3722482a52a8b26cd48474838d21bf3ecc22a580

10 years agoMerge "MD-SAL Statistics Manager -Added group-id to group-statistics API"
Ed Warnicke [Fri, 22 Nov 2013 11:59:14 +0000 (11:59 +0000)]
Merge "MD-SAL Statistics Manager -Added group-id to group-statistics API"

10 years agoAdd prefixes to type attribute in generated xml from netconf 89/2989/4
Maros Marsalek [Thu, 21 Nov 2013 16:50:31 +0000 (17:50 +0100)]
Add prefixes to type attribute in generated xml from netconf
Add support for parsing prefixed type attributes from incomming xml to netconf

Prefixed type attribute conforms to config api defined in yang

Change-Id: I4516ddb97d3fcfaab50f3402edb4a6e1bd6505cf
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years ago1. Fixed not sending of events to the node that created the routing table entry 73/2973/2
Basheeruddin Ahmed [Fri, 22 Nov 2013 03:32:17 +0000 (19:32 -0800)]
1. Fixed not sending of events to the node that created the routing table entry
2. Deprecated listener pattern and introduced the WB pattern based on code review
3. Included some documentation and logging package
4. Modified/Added unit test case

Change-Id: I1273b4c3a87180bae90419e3bdf55dca640cd899
Signed-off-by: Basheeruddin Ahmed <syedbahm@cisco.com>
10 years agoMD-SAL Statistics Manager -Added group-id to group-statistics API 67/2967/1
Anil Vishnoi [Thu, 21 Nov 2013 20:23:39 +0000 (01:53 +0530)]
MD-SAL Statistics Manager -Added group-id to group-statistics API

Change-Id: I42c09be836922c403a3dc874eea740cc707958a7
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoChange type of service-ref grouping to service-type-ref from leafref. 59/2959/2
Tomas Olvecky [Thu, 21 Nov 2013 16:07:26 +0000 (17:07 +0100)]
Change type of service-ref grouping to service-type-ref from leafref.

Also fix bug in config-netconf-connector where edit strategy was in global scope.

Change-Id: Ia09a11078c87ffa4c6fa8de34f0b69b438b6c50e
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoFix config-netconf-connector needed for interacting with yuma's yangcli. 41/2941/2
Tomas Olvecky [Thu, 21 Nov 2013 12:29:09 +0000 (13:29 +0100)]
Fix config-netconf-connector needed for interacting with yuma's yangcli.

Mitigate issue when yuma is sending services/service/type with a prefix that is not referenced anywhere - it will be ignored.
When issuing edit-config with merge strategy, populate services as they appear in get-config.

Change-Id: I2c30f3b626fc25cfd3b46225d5f1c24109d655b7
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoMerge "Fixed NPE in MD-FRM."
Giovanni Meo [Thu, 21 Nov 2013 12:15:09 +0000 (12:15 +0000)]
Merge "Fixed NPE in MD-FRM."

10 years agoFixed YangStore exception thrown at startup 39/2939/1
Maros Marsalek [Thu, 21 Nov 2013 08:15:17 +0000 (09:15 +0100)]
Fixed YangStore exception thrown at startup

Fixed a bug in yang store service that caused cache to be updated at illegal state

Change-Id: I567bb245af6577a53a52d003a14b74c9edc5850d
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoFixed NPE in MD-FRM. 36/2936/1
Ed Warnicke [Thu, 21 Nov 2013 11:45:27 +0000 (03:45 -0800)]
Fixed NPE in MD-FRM.

There was an uninitialized ConcurrentMap.  Initialized it.

Change-Id: I1bc5c4959806c020b630b4a5da3e3a9c311850f5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMerge "Added flags for flow removed event"
Ed Warnicke [Thu, 21 Nov 2013 09:30:59 +0000 (09:30 +0000)]
Merge "Added flags for flow removed event"

10 years agoMerge "Ganymed ChannelManager hack for subsystem command, functionality for subsystem...
Ed Warnicke [Wed, 20 Nov 2013 23:54:14 +0000 (23:54 +0000)]
Merge "Ganymed ChannelManager hack for subsystem command, functionality for subsystem added - tabulators replaced"

10 years agoResponse for PUT and POST operations 21/2921/1
msunal [Wed, 20 Nov 2013 16:49:08 +0000 (17:49 +0100)]
Response for PUT and POST operations

- added response as is written in http://tools.ietf.org/html/draft-bierman-netconf-restconf-02#page-37
- tests

Change-Id: Ice0a698f08b7512ea7ee29c1a534bff068e3b6bd
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoFix NPE in FlowProgrammerService in openflow plugin 20/2920/1
Alessandro Boch [Wed, 20 Nov 2013 16:23:50 +0000 (08:23 -0800)]
Fix NPE in FlowProgrammerService in openflow plugin

- In default container have installed flows matching on input port.
  When creating the first container, default container flows are removed.
  On switch notification about flow removal, a NPE is hit in FlowProgrammerService
  because of the assumption the newly created container already has ports assigned.

Change-Id: I645684f9bc47ea26d1fe9f45383343354fb3df6a
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoMerge "tests for empty leaf, namespace changing, multi simple node"
Ed Warnicke [Wed, 20 Nov 2013 16:07:25 +0000 (16:07 +0000)]
Merge "tests for empty leaf, namespace changing, multi simple node"

10 years agoMerge "Added config SI for io.netty.util.Timer and config module wrapper for HashedWh...
Ed Warnicke [Wed, 20 Nov 2013 16:06:34 +0000 (16:06 +0000)]
Merge "Added config SI for io.netty.util.Timer and config module wrapper for HashedWheelTimer, moved netty's config SIs into netty-config-api. Added and fixed dependencies to distribution pom.xml."

10 years agoMerge "Dispose HashedWheelTimer instances properly in netconf client and server"
Ed Warnicke [Wed, 20 Nov 2013 16:05:11 +0000 (16:05 +0000)]
Merge "Dispose HashedWheelTimer instances properly in netconf client and server"

10 years agoDispose HashedWheelTimer instances properly in netconf client and server 98/2898/2
Maros Marsalek [Wed, 20 Nov 2013 09:46:49 +0000 (10:46 +0100)]
Dispose HashedWheelTimer instances properly in netconf client and server

Prevents resource leak exception from netty

Change-Id: I1c12806382ee5d5edf394c2ad5f81c5b0f282fdd
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agotests for empty leaf, namespace changing, multi simple node 09/2909/2
Jozef Gloncak [Wed, 20 Nov 2013 12:26:53 +0000 (13:26 +0100)]
tests for empty leaf, namespace changing, multi simple node

following tests were added
- N elements in leaf list are red as N simple node instances
- Json [null] value is translated to simple node with null value
- for composite node for which were updated namespaces of its childs
  can't be namespaces changed again

Change-Id: Ibfb28b1b6fdaff49a7cf38531b058f8b0a79c524
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agoAdded flags for flow removed event 08/2808/4
Deepthi V V [Mon, 18 Nov 2013 06:04:34 +0000 (11:34 +0530)]
Added flags for flow removed event

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Change-Id: I4765c5620f6a49fb55a993b80e1132fe73e15326

10 years agoFix bug 153: change the key container-config to ContainerConfig in the container... 08/2908/1
Baohua Yang [Wed, 20 Nov 2013 13:06:30 +0000 (21:06 +0800)]
Fix bug 153: change the key container-config to ContainerConfig in the container manager module

Change-Id: Iaa9e7cf3d67363197b09440d52b887df8fd28f51
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
10 years agoDo not re-register config instances to OSGi service registry if old instance is reused. 03/2903/1
Tomas Olvecky [Wed, 20 Nov 2013 12:06:58 +0000 (13:06 +0100)]
Do not re-register config instances to OSGi service registry if old instance is reused.

Keep old OSGi service registration when reusing old instance. Also move @Deprecated flag in ModuleInternalTransactionalInfo where it belongs.

Change-Id: I1e6f75f9ac225dd6149e24adb3713e2b2ed8dc50
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoAdded config SI for io.netty.util.Timer and config module wrapper for HashedWheelTime... 90/2890/2
Milos Fabian [Tue, 19 Nov 2013 15:14:03 +0000 (16:14 +0100)]
Added config SI for io.netty.util.Timer and config module wrapper for HashedWheelTimer, moved netty's config SIs into netty-config-api.
Added and fixed dependencies to distribution pom.xml.

Change-Id: Iea5fc62c44b92ebb45348f8115c7b3aae8f85cb9
Signed-off-by: Milos Fabian <milfabia@cisco.com>
10 years agoAdd threadpool bundles to distribution. 95/2895/1
Tomas Olvecky [Mon, 18 Nov 2013 17:45:53 +0000 (18:45 +0100)]
Add threadpool bundles to distribution.

Change-Id: I51c8a312e8ff895201778e4e6ddbdde893bc7e4b
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoMerge "Add blacklist capability to yang-store-impl."
Ed Warnicke [Wed, 20 Nov 2013 09:50:37 +0000 (09:50 +0000)]
Merge "Add blacklist capability to yang-store-impl."

10 years agoBind raw TCP netconf server to all network interfaces. 43/2843/2
Tomas Olvecky [Mon, 18 Nov 2013 18:14:47 +0000 (19:14 +0100)]
Bind raw TCP netconf server to all network interfaces.

Change-Id: I178300b9284f55f674beea6fc6528aa24e68a78c
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoAdd blacklist capability to yang-store-impl. 80/2880/2
Tomas Olvecky [Tue, 19 Nov 2013 17:13:07 +0000 (18:13 +0100)]
Add blacklist capability to yang-store-impl.

Add blacklist to overcome yuma problems when parsing buggy yang files in md-sal.

Change-Id: Iaf222ac627317a48619beadaebb2a16073edac9d
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoGanymed ChannelManager hack for subsystem command, functionality for subsystem added 69/2869/3
Martin Bobak [Tue, 19 Nov 2013 14:25:31 +0000 (15:25 +0100)]
Ganymed ChannelManager hack for subsystem command, functionality for subsystem added
- tabulators replaced

Change-Id: I3c8f38c2417c716ef89d6c31dba87c8e72bf61a9
Signed-off-by: Martin Bobak <mbobak@cisco.com>