controller.git
6 years agoMerge "Added functionality to store capability info."
Ed Warnicke [Fri, 10 Jan 2014 17:39:29 +0000 (17:39 +0000)]
Merge "Added functionality to store capability info."

6 years agoMerge "Fixed bug when converting augmentation in Instance Identifier"
Ed Warnicke [Fri, 10 Jan 2014 17:11:43 +0000 (17:11 +0000)]
Merge "Fixed bug when converting augmentation in Instance Identifier"

6 years agoMerge "Add test for generated code checking list of dependencies."
Ed Warnicke [Fri, 10 Jan 2014 17:10:53 +0000 (17:10 +0000)]
Merge "Add test for generated code checking list of dependencies."

6 years agoAdded functionality to store capability info. 38/4138/1
Lukas Sedlak [Fri, 10 Jan 2014 15:30:22 +0000 (16:30 +0100)]
Added functionality to store capability info.

Implemented functionality into sal-netconf-connector to support of storing netconf device capabilities.
Inventory model extended for augmentation of netconf device capability information.

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
Change-Id: I205fb2b1505cf823f436c6a9e7cd47e88b632c0a

6 years agoFixed bug when converting augmentation in Instance Identifier 28/4128/1
Tony Tkacik [Fri, 10 Jan 2014 09:02:10 +0000 (10:02 +0100)]
Fixed bug when converting augmentation in Instance Identifier

QName for augmentation s not present in compile-time generated
classes, but Instance Identifier codec did not explicitly checked
that.

Changed implementation in a way, that now it does not uses
reflection, but runtime generated Augmentation codec to
provide valid QName.

Change-Id: If24e9c6bc67975440239dd20a6ec5025977aab58
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoMerge "Always set interrupted flag when catching InterruptedException."
Ed Warnicke [Thu, 9 Jan 2014 20:24:28 +0000 (20:24 +0000)]
Merge "Always set interrupted flag when catching InterruptedException."

6 years agoMerge "bulk transaction and co-relation support"
Ed Warnicke [Thu, 9 Jan 2014 20:24:05 +0000 (20:24 +0000)]
Merge "bulk transaction and co-relation support"

6 years agoMerge "Minor changes in md-sal tests."
Ed Warnicke [Thu, 9 Jan 2014 20:22:34 +0000 (20:22 +0000)]
Merge "Minor changes in md-sal tests."

6 years agoMerge "MD-SAL Statistics Manager-Fixed issue related to aggregate flow stats Also...
Ed Warnicke [Thu, 9 Jan 2014 20:21:39 +0000 (20:21 +0000)]
Merge "MD-SAL Statistics Manager-Fixed issue related to aggregate flow stats Also fixed minor bug in individual flow statistics augmentation."

6 years agoMerge "Addressing a flow programming issues on controler fail-over scenario in a...
Giovanni Meo [Thu, 9 Jan 2014 19:15:36 +0000 (19:15 +0000)]
Merge "Addressing a flow programming issues on controler fail-over scenario in a Clustered setup."

6 years agobulk transaction and co-relation support 23/4123/1
Prasanna Huddar [Thu, 9 Jan 2014 18:26:31 +0000 (23:56 +0530)]
bulk transaction and co-relation support

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

6 years agoMerge "Fix run.sh to work from any directory."
Giovanni Meo [Thu, 9 Jan 2014 15:07:13 +0000 (15:07 +0000)]
Merge "Fix run.sh to work from any directory."

6 years agoMinor changes in md-sal tests. 16/4116/1
Martin Vitez [Thu, 9 Jan 2014 14:08:48 +0000 (15:08 +0100)]
Minor changes in md-sal tests.

Temporary ignored test, removed @Override annotation.

Change-Id: I4d483770a96bf57973164f82c27f20f7d29a1e1f
Signed-off-by: Martin Vitez <mvitez@cisco.com>
6 years agoMD-SAL Statistics Manager-Fixed issue related to aggregate flow stats 04/4104/2
Anil Vishnoi [Thu, 9 Jan 2014 11:19:43 +0000 (16:49 +0530)]
MD-SAL Statistics Manager-Fixed issue related to aggregate flow stats
Also fixed minor bug in individual flow statistics augmentation.

Change-Id: I787cbb54e70862d26521845988cee5e42651cc24
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
6 years agoAlways set interrupted flag when catching InterruptedException. 11/4111/1
Tomas Olvecky [Thu, 9 Jan 2014 13:08:08 +0000 (14:08 +0100)]
Always set interrupted flag when catching InterruptedException.

Fixed catching InterruptedException in config-subsystem and netconf.
In netconf persister propagate interrupted exception as it indicates
that netconf connection was not established and thus config pushing
does not work.

Change-Id: I7934bddd2b7c6591d1a4557a60df39a6de15dc72
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
6 years agoFix run.sh to work from any directory. 03/4103/1
tomas [Thu, 9 Jan 2014 10:31:20 +0000 (11:31 +0100)]
Fix run.sh to work from any directory.

Add cd command just before executing java process to work around the issue that osgi container does not correctly start
from any folder except where run.sh is located.

Change-Id: I42562cbb88922cefe2347b8e0d293067fbd10d3d
Signed-off-by: tomas <tolvecky@cisco.com>
6 years agoMerge "Remove redundant expression true:false"
Madhu Venugopal [Thu, 9 Jan 2014 08:12:14 +0000 (08:12 +0000)]
Merge "Remove redundant expression true:false"

6 years agoMerge "Declare a urlPrefix for reuse in NorthboundIT."
Madhu Venugopal [Thu, 9 Jan 2014 08:10:31 +0000 (08:10 +0000)]
Merge "Declare a urlPrefix for reuse in NorthboundIT."

6 years agoMerge "Unitests: remove conditions that are always true/false."
Madhu Venugopal [Thu, 9 Jan 2014 08:09:29 +0000 (08:09 +0000)]
Merge "Unitests: remove conditions that are always true/false."

6 years agoMerge "Use InetAddress.getLoopbackAddress in ClusterManagerCommon."
Madhu Venugopal [Thu, 9 Jan 2014 08:07:45 +0000 (08:07 +0000)]
Merge "Use InetAddress.getLoopbackAddress in ClusterManagerCommon."

6 years agoMerge "Use Java 7 new method getLoopbackAddress in ClusterManager"
Madhu Venugopal [Thu, 9 Jan 2014 08:04:17 +0000 (08:04 +0000)]
Merge "Use Java 7 new method getLoopbackAddress in ClusterManager"

6 years agoMerge "private key configurable in config.ini"
Ed Warnicke [Thu, 9 Jan 2014 07:25:47 +0000 (07:25 +0000)]
Merge "private key configurable in config.ini"

6 years agoMerge "Improve error logging in yang-store-impl"
Ed Warnicke [Thu, 9 Jan 2014 07:25:00 +0000 (07:25 +0000)]
Merge "Improve error logging in yang-store-impl"

6 years agoMerge "Update maven-bundle-plugin version in config and netconf."
Ed Warnicke [Thu, 9 Jan 2014 07:24:22 +0000 (07:24 +0000)]
Merge "Update maven-bundle-plugin version in config and netconf."

6 years agoMerge changes If79fa865,Ia6652643
Ed Warnicke [Thu, 9 Jan 2014 07:23:52 +0000 (07:23 +0000)]
Merge changes If79fa865,Ia6652643

* changes:
  Fixed some TODOs in netconf.
  Update service reference persistance according to new ServiceRegistry API in config subsystem.

6 years agoAddressing a flow programming issues on controler fail-over scenario in a Clustered... 75/4075/2
Madhu Venugopal [Wed, 8 Jan 2014 15:02:16 +0000 (07:02 -0800)]
Addressing a flow programming issues on controler fail-over scenario in a Clustered setup.

FRM : Handling the uninstallAllFlowEntries() only on containerDelete cases
Simple Forwarding : Not to fail for false-reasons when Routing fails to get route when src and dst-node are the same

Change-Id: I512ca2f11d8ae31daa373c41ba1fcfe13578a157
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
6 years agoMerge "Fix testing support for OSGi services registration under String name(s)"
Ed Warnicke [Wed, 8 Jan 2014 22:09:02 +0000 (22:09 +0000)]
Merge "Fix testing support for OSGi services registration under String name(s)"

6 years agoMerge changes I994c19ee,I245e9e7a
Ed Warnicke [Wed, 8 Jan 2014 17:52:25 +0000 (17:52 +0000)]
Merge changes I994c19ee,I245e9e7a

* changes:
  sal-rest-connector test refactoring
  More test for improving of code coverage + test refactoring

6 years agoBug 267: Upgraded maven-bundle-plugin to 2.4.0 83/4083/1
Deepthi V V [Wed, 8 Jan 2014 16:34:45 +0000 (22:04 +0530)]
Bug 267: Upgraded maven-bundle-plugin to 2.4.0
While trying to fetch augmentation code, ClassNotFoundException is thrown for certain classes due to missing imports in Manifest.mf of model bundles. These classes were used as type parameters in Augmentation<T>.
maven-bundle-plugin 2.4.0 fixes the issue of missing imports for generics.

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

6 years agoprivate key configurable in config.ini 72/4072/5
Martin Bobak [Wed, 8 Jan 2014 12:18:11 +0000 (13:18 +0100)]
private key configurable in config.ini

Netconf SSH bridge has private key stored in distribution.
Path to this file is configured in config.ini.

Change-Id: I517586009c883a537c80fde8205d9040b5fe6052
Signed-off-by: Martin Bobak <mbobak@cisco.com>
6 years agoUpdate maven-bundle-plugin version in config and netconf. 70/4070/1
tomas [Wed, 8 Jan 2014 14:11:27 +0000 (15:11 +0100)]
Update maven-bundle-plugin version in config and netconf.

Update from 2.3.7 to 2.4.0

Change-Id: Ie121db016d5532df58da05244d7883520cdf8b11
Signed-off-by: tomas <tolvecky@cisco.com>
6 years agoImprove error logging in yang-store-impl 69/4069/1
tomas [Wed, 8 Jan 2014 14:00:52 +0000 (15:00 +0100)]
Improve error logging in yang-store-impl

Resulting exception should contain getMessage information from each nested exception.

Change-Id: Idcb124a6e15f2be952d6b64028924929011e7156
Signed-off-by: tomas <tolvecky@cisco.com>
6 years agosal-rest-connector test refactoring 61/3861/9
Jozef Gloncak [Fri, 20 Dec 2013 09:34:23 +0000 (10:34 +0100)]
sal-rest-connector test refactoring

Mainly deleting unnecessary methods.

Change-Id: I994c19ee0a9ccc95491e85667fe7ae352f62864f
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
6 years agoMore test for improving of code coverage + test refactoring 44/3844/6
Jozef Gloncak [Tue, 17 Dec 2013 13:36:44 +0000 (14:36 +0100)]
More test for improving of code coverage + test refactoring

Added tests to sal-rest-connector to improve code coverage.
Added test for leafref.
Some methods in TestUtils were refactored.

Change-Id: I245e9e7a55e02c542aab7f835f09081b040afa41
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
6 years agoMerge changes I7e42fc60,I6a7335b4,Ie11ee943,Ic48123a3,I89b6349e,I23a09513,Ibe5395dd...
Alessandro Boch [Tue, 7 Jan 2014 22:50:12 +0000 (22:50 +0000)]
Merge changes I7e42fc60,I6a7335b4,Ie11ee943,Ic48123a3,I89b6349e,I23a09513,Ibe5395dd,If05e0412,I19f17f97,I6f4beab1,I678c46d9

* changes:
  Added WADL generation for Models
  Fix for Bug 271
  Add a flow by adding the flow data into the datastore
  Set Node on the AddFlowInput and RemoveFlowInput
  Fixed Topology Adapter to properly add Edge Properties
  Removed dead code in LLDPDiscoveryUtil
  Fixed two small FlowAdapter bugs.
  Fixed implementation of getNodeConnectorProps and getNodeProps
  Check for null srcNodeId and srcNodeConnectorId
  Fixed Node Properties in Adapter - with exceptions noted below
  Fixed adapter handling of Special Node Connectors

6 years agoMerge "API for accessing the controller version"
Andrew Kim [Tue, 7 Jan 2014 15:48:18 +0000 (15:48 +0000)]
Merge "API for accessing the controller version"

6 years agoBug 267: Fixed augmentation read from configuration store 48/4048/2
Tony Tkacik [Tue, 7 Jan 2014 13:00:32 +0000 (14:00 +0100)]
Bug 267: Fixed augmentation read from configuration store

  - Fixed missing support of direct read of augmentation
    from configuration store.
  - Added regresion unit test, which test storing Node with
    FlowCapableNode augmentation and reading it directly
    via InstanceIdentifier pointing to the augmentation.

Change-Id: I31c1f14d09e8c6f22720d50d25b7c6c457f37c8b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoFix testing support for OSGi services registration under String name(s) 46/4046/2
Maros Marsalek [Tue, 7 Jan 2014 10:19:01 +0000 (11:19 +0100)]
Fix testing support for OSGi services registration under String name(s)

Change-Id: I0cf4c29f5838394cc8ad5a33c5f3926d22f33d42
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoFixed advanced Netconf client functionality. 38/4038/2
Tony Tkacik [Mon, 6 Jan 2014 19:47:49 +0000 (20:47 +0100)]
Fixed advanced Netconf client functionality.

  - Added two-stage model for remote device
     - Schema-unaware - allows only for baseline netconf functionality
     - Schema-aware - allows for deeper get operations
  - Performance fixes for message sending and retrieval
  - Fixed received notification upstreaming by proper reimplementation
    of NetconfClientSessionListener

Change-Id: Ib80bd49eae28c3f9602ca105503edcd3381bcf22
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoMerge "Support for mount points in Restconf"
Ed Warnicke [Tue, 7 Jan 2014 03:37:25 +0000 (03:37 +0000)]
Merge "Support for mount points in Restconf"

6 years agoMerge "Updated ContainerFlow to take multiple vlans"
Alessandro Boch [Tue, 7 Jan 2014 02:08:29 +0000 (02:08 +0000)]
Merge "Updated ContainerFlow to take multiple vlans"

6 years agoSupport for mount points in Restconf 37/4037/2
Tony Tkacik [Mon, 6 Jan 2014 19:44:26 +0000 (20:44 +0100)]
Support for mount points in Restconf

Added support for mount points in Restconf paths, which allows for
deeper queries inside remote nodes such as Netconf.

Change-Id: I348e494bae138f7d46ca70ab051f36b5b021641d
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoAPI for accessing the controller version 40/4040/1
Sapan Shah [Mon, 6 Jan 2014 23:50:40 +0000 (15:50 -0800)]
API for accessing the controller version

Change-Id: I93fbe875651dd51a7eb4319fd210ab142e3b198f
Signed-off-by: Sapan Shah <sapshah@cisco.com>
6 years agoMerge "Added constructor which allows for custom NetconfClientSessionListener"
Ed Warnicke [Mon, 6 Jan 2014 20:43:50 +0000 (20:43 +0000)]
Merge "Added constructor which allows for custom NetconfClientSessionListener"

6 years agoAdded constructor which allows for custom NetconfClientSessionListener 36/4036/1
Tony Tkacik [Mon, 6 Jan 2014 19:53:59 +0000 (20:53 +0100)]
Added constructor which allows for custom NetconfClientSessionListener

Change-Id: I95c1f59a704c91cb1c06c1765935612fc13bc890
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
6 years agoAdded WADL generation for Models 32/4032/1
Ed Warnicke [Mon, 6 Jan 2014 12:41:51 +0000 (04:41 -0800)]
Added WADL generation for Models

Change-Id: I7e42fc60250c2bf41d857937b98470c79e88240f
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed Adapter to correctly pass NodeConnector Properties. 81/3981/2
Ed Warnicke [Tue, 31 Dec 2013 00:41:08 +0000 (16:41 -0800)]
Fixed Adapter to correctly pass NodeConnector Properties.

Change-Id: I0f22e959ea8f21e6e9edd82be3ec1a4c6739d9dc
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFix for Bug 271 31/4031/1
Ed Warnicke [Mon, 6 Jan 2014 12:20:20 +0000 (04:20 -0800)]
Fix for Bug 271

Change-Id: I6a7335b467277ce18318bd24a2456ce1bd8c4b32
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFix to Topology Adapter to properly handle links coming and going 80/3980/2
Ed Warnicke [Fri, 27 Dec 2013 07:26:54 +0000 (23:26 -0800)]
Fix to Topology Adapter to properly handle links coming and going

Change-Id: If43db24a370b89cc93370bcfc5921a721cf38267
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoAdd a flow by adding the flow data into the datastore 16/4016/2
Moiz Raja [Fri, 3 Jan 2014 23:47:48 +0000 (15:47 -0800)]
Add a flow by adding the flow data into the datastore

Change-Id: Ie11ee9433bbfe25559f2f3b6cdbf7fece96ba791
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoSet Node on the AddFlowInput and RemoveFlowInput 05/4005/3
Moiz Raja [Fri, 3 Jan 2014 00:58:01 +0000 (16:58 -0800)]
Set Node on the AddFlowInput and RemoveFlowInput

This avoids the NPE reported in bug #259

Change-Id: Ic48123a39d4d2fa0b280ac5540f6a5e1304036ef
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoFixed Topology Adapter to properly add Edge Properties 23/4023/2
Ed Warnicke [Mon, 6 Jan 2014 07:22:53 +0000 (23:22 -0800)]
Fixed Topology Adapter to properly add Edge Properties

Change-Id: I89b6349e220a085d8ba6027f8294f88f7e6df244
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoRemoved dead code in LLDPDiscoveryUtil 14/4014/2
Ed Warnicke [Fri, 3 Jan 2014 18:11:23 +0000 (10:11 -0800)]
Removed dead code in LLDPDiscoveryUtil

Per aboch, lldp.getOptionalTLVList() never returns null
and thus the code checking for it is dead code.

Change-Id: I23a0951313095a09cc7fbeaeb7e254c157a77f8c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed two small FlowAdapter bugs. 09/4009/2
Ed Warnicke [Fri, 3 Jan 2014 09:08:13 +0000 (01:08 -0800)]
Fixed two small FlowAdapter bugs.

1)  Handle NW Addresses correctly
2)  Add Order to Instructions

Change-Id: Ibe5395dd6ea6c150bdb0d1d329228f86284f813b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed implementation of getNodeConnectorProps and getNodeProps 08/4008/2
Ed Warnicke [Fri, 3 Jan 2014 06:32:21 +0000 (22:32 -0800)]
Fixed implementation of getNodeConnectorProps and getNodeProps

Change-Id: If05e04129cf002ead7f07eafba66d07c1d66c4c5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoCheck for null srcNodeId and srcNodeConnectorId 04/4004/2
Ed Warnicke [Fri, 3 Jan 2014 00:50:17 +0000 (16:50 -0800)]
Check for null srcNodeId and srcNodeConnectorId

In response to comment here:

https://git.opendaylight.org/gerrit/#/c/3926/2/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java

Change-Id: I19f17f97a74bb3e9e7a7f1837e3484a3c5d32f53
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed Node Properties in Adapter - with exceptions noted below 94/3994/4
Ed Warnicke [Wed, 1 Jan 2014 02:10:34 +0000 (18:10 -0800)]
Fixed Node Properties in Adapter - with exceptions noted below

Still need to fix Supported Actions -

Supported Actions present a bit of an issue.  In OF 1.0,
they come in with the GetFeatures message on switch connection.
In OF 1.3, they are per table, and come in with the response to
an empty bodied TableFeatures Multipart request.  So far,
no switch has been observed in the wild supporting the
empty bodied TableFeature message. OVS 2.0 doesn't, CPQD doesn't.

The net-net is that supported Actions are effectively unreportable
for OF 1.3 switches.

Change-Id: I6f4beab167fa1502cacc767eaf95099ba996a343
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed adapter handling of Special Node Connectors 82/3982/2
Ed Warnicke [Tue, 31 Dec 2013 02:55:09 +0000 (18:55 -0800)]
Fixed adapter handling of Special Node Connectors

Change-Id: I678c46d9ca748d029d7e3831c6c8acbfed81377c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoMerge "Upgrade jackson library to version 2.3.0"
Madhu Venugopal [Sat, 4 Jan 2014 22:11:02 +0000 (22:11 +0000)]
Merge "Upgrade jackson library to version 2.3.0"

6 years agoMerge changes Ib1fb74f6,I532fff58
Alessandro Boch [Fri, 3 Jan 2014 18:06:15 +0000 (18:06 +0000)]
Merge changes Ib1fb74f6,I532fff58

* changes:
  Remove links from topology when port goes down
  Fix for port-state Bug 262.

6 years agoMerge changes Idf3f69db,I4499d7c7,I512af911
Alessandro Boch [Fri, 3 Jan 2014 17:52:35 +0000 (17:52 +0000)]
Merge changes Idf3f69db,I4499d7c7,I512af911

* changes:
  Initial fix to topology-adapter.
  Fixed topology-manager now that we have topology-lldp-discovery
  Added topology-lldp-discovery module

6 years agoMerge "Fixed northbound references to SAL"
Alessandro Boch [Fri, 3 Jan 2014 17:43:03 +0000 (17:43 +0000)]
Merge "Fixed northbound references to SAL"

6 years agoUpdated ContainerFlow to take multiple vlans 01/4001/2
Katelyn Kasperowicz [Thu, 2 Jan 2014 18:14:01 +0000 (10:14 -0800)]
Updated ContainerFlow to take multiple vlans

-In ContainerFlowConfig allowed for multiple vlan specified in list/range to be accepted
-getMatches now returns 1/2 match(es) for each vlan specified depending on bidirectional setting

Change-Id: Ib994f32b5540ea9fd4035c95e24c1ced3cbc06d6
Signed-off-by: Katelyn Kasperowicz <kkaspero@cisco.com>
6 years agoRemove links from topology when port goes down 32/3932/3
Ed Warnicke [Thu, 26 Dec 2013 04:01:45 +0000 (20:01 -0800)]
Remove links from topology when port goes down

Change-Id: Ib1fb74f6257f2048a38e4b5e2801ad85a62dacf2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoInitial fix to topology-adapter. 28/3928/2
Ed Warnicke [Wed, 25 Dec 2013 23:02:24 +0000 (15:02 -0800)]
Initial fix to topology-adapter.

Change-Id: Idf3f69dbcfef80aa485749050aa703e455b3e81f
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFix for port-state Bug 262. 29/3929/2
Ed Warnicke [Thu, 26 Dec 2013 01:47:10 +0000 (17:47 -0800)]
Fix for port-state Bug 262.

Changed from modeling port-state from an enum to a
group of boolean leafs in a container.

Change-Id: I532fff5806fd60823d47bdc255881b2f7ef6a76b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoFixed topology-manager now that we have topology-lldp-discovery 27/3927/2
Ed Warnicke [Wed, 25 Dec 2013 23:00:30 +0000 (15:00 -0800)]
Fixed topology-manager now that we have topology-lldp-discovery

Change-Id: I4499d7c76322c0a4e78e51eed84a0ce1497b62cc
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoAdded topology-lldp-discovery module 26/3926/2
Ed Warnicke [Wed, 25 Dec 2013 22:41:35 +0000 (14:41 -0800)]
Added topology-lldp-discovery module

Change-Id: I512af91128aeeed096b80690c4f1fc181d585457
Signed-off-by: Ed Warnicke <eaw@cisco.com>
6 years agoAdding support for the git-review command line tool 63/3963/1
Colin McNamara [Mon, 30 Dec 2013 02:54:25 +0000 (18:54 -0800)]
Adding support for the git-review command line tool

The OpenStack doc workflow (and entire gerrit workflow) has the
option of using a tool called git-review that automates ChangeID:
creation and management,automates rebasing of local commits
as well as simplifies submiting to gerrit and pulling and
pushing reviews.

Usage of the tool is entirely optional, however it does require
a pointer file named .gitreview in the root of the repository
that is referenced.

I am totally new to this project, if you guys don't want to merge
this then no big deal. However I think this will help with dev's
coming over from OpenStack as it will provide a optional workflow
that is closer to the OpenStack workflow.

Necessary to run git review -s to append the change-id into git-hooks

Change-Id: I188d1b67c84b7ac2815b5bf74885100bbe4f7c13
Signed-off-by: Colin McNamara <colin@2cups.com>
6 years agoFixed the API call to operationDataStore from RuntimeDatastore 46/3946/2
Prasanna Huddar [Fri, 27 Dec 2013 18:27:17 +0000 (23:57 +0530)]
Fixed the API call to operationDataStore from RuntimeDatastore

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

6 years agoRemove redundant expression true:false 23/3923/1
Alissa Bonas [Wed, 25 Dec 2013 15:29:30 +0000 (17:29 +0200)]
Remove redundant expression true:false

The expression that is evaluated already returns boolean,
no need for additional 'true:false' decision, the correct value
is already returned.

Change-Id: I48378e88f30a4d9ebd8b9a56b287fb6d9536ec46
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoDeclare a urlPrefix for reuse in NorthboundIT. 22/3922/1
Alissa Bonas [Wed, 25 Dec 2013 13:45:12 +0000 (15:45 +0200)]
Declare a urlPrefix for reuse in NorthboundIT.

All test cases use the same url prefix, but prior to this patch
it was copy pasted in all test methods.
For easier code maintenance, declared it once in the
class and reused it in all test cases.

Change-Id: I4c6430799c935293c7b9715b5b68e84e4baefd3a
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoUnitests: remove conditions that are always true/false. 20/3920/1
Alissa Bonas [Wed, 25 Dec 2013 13:20:39 +0000 (15:20 +0200)]
Unitests: remove conditions that are always true/false.

Some conditions are unecessary as they are always true
or always false. They test Java and not
the actual logic, hence irrelevant and should be removed.

Change-Id: If9d5b4935db6ea6cc4068460bb00cd753a0e1406
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoUse InetAddress.getLoopbackAddress in ClusterManagerCommon. 18/3918/1
Alissa Bonas [Wed, 25 Dec 2013 12:03:20 +0000 (14:03 +0200)]
Use InetAddress.getLoopbackAddress in ClusterManagerCommon.

Replace hardcoded 127.0.0.1 with a standard Java method call.

Change-Id: I39f7e27691197593d62e719ca6dbe1fb3eaa56ff
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoMD-SAL Statistics-Manager - Minor fix in augmenting flow statistics 13/3913/2
Anil Vishnoi [Tue, 24 Dec 2013 15:26:39 +0000 (20:56 +0530)]
MD-SAL Statistics-Manager - Minor fix in augmenting flow statistics

Change-Id: Ic5c44d0b9d29afbcf37d95537ac67b21d8fc57ac
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
6 years agoUse Java 7 new method getLoopbackAddress in ClusterManager 12/3912/2
Alissa Bonas [Tue, 24 Dec 2013 12:08:29 +0000 (14:08 +0200)]
Use Java 7 new method getLoopbackAddress in ClusterManager

Replaces a hardcoded string 127.0.0.1

Change-Id: I321c5bfe1352e1f02664823bb45dbc8d112417b9
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoMerge "Update SubnetConfig Validation"
Alessandro Boch [Tue, 24 Dec 2013 16:30:22 +0000 (16:30 +0000)]
Merge "Update SubnetConfig Validation"

6 years agoMerge "Add some log messages in case controller failed to add connected node."
Chi-Vien Ly [Tue, 24 Dec 2013 16:22:31 +0000 (16:22 +0000)]
Merge "Add some log messages in case controller failed to add connected node."

6 years agoAdd some log messages in case controller failed to add connected node. 14/3914/2
Jason Ye [Tue, 24 Dec 2013 15:33:48 +0000 (07:33 -0800)]
Add some log messages in case controller failed to add connected node.

Change-Id: Ia3df4dda32cc5e91ba862679712debbd68e11fdb
Signed-off-by: Jason Ye <yisye@cisco.com>
6 years agoUpgrade jackson library to version 2.3.0 05/3905/10
Alissa Bonas [Sat, 21 Dec 2013 18:59:31 +0000 (20:59 +0200)]
Upgrade jackson library to version 2.3.0

This change purpose is to use a newer version of the library,
as well as align it with the jackson version used by ovsdb project repo.

Main change areas:
1.Upgrade the jackson from codehaus.jackson version 1.9.x to
fasterxml.jackson version 2.3.0.
change all usages in pom files
and fix the imports in Java classes.
2.Remove the usage of jersey-json library.

Main resource for upgrade information:
http://wiki.fasterxml.com/JacksonUpgradeFrom19To20

Change-Id: I2caa9f94a81af1e5ad0ead90c60c912396b8a390
Signed-off-by: Alissa Bonas <abonas@redhat.com>
6 years agoUpdate SubnetConfig Validation 72/3872/5
Katelyn Kasperowicz [Fri, 20 Dec 2013 15:42:15 +0000 (07:42 -0800)]
Update SubnetConfig Validation

-SubnetConfig now validates that the address does not begin with 0 or 255
-Validates that host address is not set to all zeros or ones
-Caught exception when subnet not set to number

Change-Id: I825e2d54b48b7f74e35cfde8dc7e5967dac11684
Signed-off-by: Katelyn Kasperowicz <kkaspero@cisco.com>
6 years agoMerge "Simplify method isMutualExclusive in Subnet. Remove redundant 'if' statements."
Madhu Venugopal [Mon, 23 Dec 2013 19:24:23 +0000 (19:24 +0000)]
Merge "Simplify method isMutualExclusive in Subnet. Remove redundant 'if' statements."

6 years agoMerge "Refactor Subnet.isSubnetOf - reduce number of 'if' statements. Added unitests."
Madhu Venugopal [Mon, 23 Dec 2013 16:44:43 +0000 (16:44 +0000)]
Merge "Refactor Subnet.isSubnetOf - reduce number of 'if' statements. Added unitests."

6 years agomodified the FRM for group and meter to send ref to plugin for events 06/3906/2
Prasanna Huddar [Mon, 23 Dec 2013 11:53:48 +0000 (17:23 +0530)]
modified the FRM for group and meter to send ref to plugin for events

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

6 years agoThis commit contains following changes 97/3897/1
Anil Vishnoi [Sat, 21 Dec 2013 20:00:40 +0000 (01:30 +0530)]
This commit contains following changes
1) Implemented statistics adaptor (IPluginOutReadService, IPluginInReadService ) interfaces in sal-compatibility layer
2) Minor change in Port-Statistis
3) Fixed FlowStatisticsAdaptor.java - Flow Statistics rpc/notifications were changed and that effected the class

Change-Id: Ie0a2170efa5338389f80cb0a586500297320b387
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
6 years agoAdded notification for Flow add/delete/update. 95/3895/4
Prasanna Huddar [Sun, 22 Dec 2013 15:54:21 +0000 (21:24 +0530)]
Added notification for Flow add/delete/update.
Flow ref added to all Flow notification RPC messages.

Flow ref needed to for NSF to co-relate XID with the operation.

FlowTransaction.xtend modified to put flow reference.

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

6 years agoFixed as per comments by changed leaf name 79/3879/5
Prasanna Huddar [Sat, 21 Dec 2013 15:08:59 +0000 (20:38 +0530)]
Fixed as per comments by changed leaf name

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

6 years agoMerge "Take care of a couple of exceptions in the process of handling an add flow...
Ed Warnicke [Sat, 21 Dec 2013 04:36:53 +0000 (04:36 +0000)]
Merge "Take care of a couple of exceptions in the process of handling an add flow on the Flow Programmer"

6 years agoMerge "Use a String Id for both Node and NodeConnector"
Ed Warnicke [Sat, 21 Dec 2013 04:18:05 +0000 (04:18 +0000)]
Merge "Use a String Id for both Node and NodeConnector"

6 years agoTake care of a couple of exceptions in the process of handling an add flow on the... 86/3886/1
Moiz Raja [Sat, 21 Dec 2013 04:13:44 +0000 (20:13 -0800)]
Take care of a couple of exceptions in the process of handling an add flow on the Flow Programmer

There was an UnSupportedOperationException in MDFlowMapping and an NPE in FromSalConversionUtils which I
have taken care of.

Change-Id: I86bc9241e926d5ddbc2e46b1a08668bc5b2eef70
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoUse a String Id for both Node and NodeConnector 84/3884/1
Moiz Raja [Sat, 21 Dec 2013 01:53:14 +0000 (17:53 -0800)]
Use a String Id for both Node and NodeConnector

Previously Node and NodeConnector were using NodeKey and NodeConnectorKey respectively as the Id. This causes problems
when you try to use some of the old north bound APIs as they expect to match a node or nodeconnector based on the string id
that is passed to it by the NB APIs

Change-Id: I697d8284f45c8b2d5f7dff327e045cf999d0c701
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoMerge "Provide an MDSalNodeFactory to construct an MD-SAL node for NB interfaces...
Ed Warnicke [Sat, 21 Dec 2013 00:50:49 +0000 (00:50 +0000)]
Merge "Provide an MDSalNodeFactory to construct an MD-SAL node for NB interfaces like the Forwarding Rules Manager"

6 years agoProvide an MDSalNodeFactory to construct an MD-SAL node for NB interfaces like the... 83/3883/1
Moiz Raja [Fri, 20 Dec 2013 23:47:29 +0000 (15:47 -0800)]
Provide an MDSalNodeFactory to construct an MD-SAL node for NB interfaces like the Forwarding Rules Manager

When you try to get flows using the FR NB API for a given node you have to provide both a node type and node id. Since MD_SAL nodes
have a type MD_SAL which is not one of the standard types you need to provide and register a NodeFactory which can construct a Node
for an MD_SAL Node type.

Change-Id: Idc6631f58e248a1d958227312de07faa1fbc3d6e
Signed-off-by: Moiz Raja <moraja@cisco.com>
6 years agoMerge "On openflow plugin restart, NPE in tx poller"
Jason Ye [Fri, 20 Dec 2013 22:03:47 +0000 (22:03 +0000)]
Merge "On openflow plugin restart, NPE in tx poller"

6 years agoFixed northbound references to SAL 77/3877/2
mrajvaid [Fri, 20 Dec 2013 15:55:11 +0000 (07:55 -0800)]
Fixed northbound references to SAL

Change-Id: I1150ee6b4dda79f1648c8ad66799de8c69d792e2
Signed-off-by: mrajvaid <mrajvaid@cisco.com>
6 years agoMerge "Add testing support for registering OSGi services to AbstractConfigTest"
Ed Warnicke [Fri, 20 Dec 2013 16:45:44 +0000 (16:45 +0000)]
Merge "Add testing support for registering OSGi services to AbstractConfigTest"

6 years agoMerge "Fix HashedWheelTimer exception for short living netconf clients."
Ed Warnicke [Fri, 20 Dec 2013 15:25:18 +0000 (15:25 +0000)]
Merge "Fix HashedWheelTimer exception for short living netconf clients."

6 years agochanged models to include XID in add/update/delete service notification 71/3871/1
Prasanna Huddar [Fri, 20 Dec 2013 14:44:06 +0000 (20:14 +0530)]
changed models to include XID in add/update/delete service notification

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

6 years agoFix HashedWheelTimer exception for short living netconf clients. 64/3864/1
Maros Marsalek [Fri, 20 Dec 2013 10:05:13 +0000 (11:05 +0100)]
Fix HashedWheelTimer exception for short living netconf clients.

An exception occurred in logs for short living netconf clients created by config persister.
These clients were closed before their initial check timer ran out.

Change-Id: Ic2c998d17788c9b92b72800415fd1ee068611f84
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
6 years agoAdd testing support for registering OSGi services to AbstractConfigTest 52/3852/1
Maros Marsalek [Thu, 19 Dec 2013 15:17:21 +0000 (16:17 +0100)]
Add testing support for registering OSGi services to AbstractConfigTest

Change-Id: I17117683f7cba46708bc392e6b36b6a1e40a2dcc
Signed-off-by: Maros Marsalek <mmarsale@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.