controller.git
8 years agoMerge "increased test coverage"
Ed Warnicke [Wed, 15 Jan 2014 21:13:36 +0000 (21:13 +0000)]
Merge "increased test coverage"

8 years agoMerge "Update to new version of ADSAL components and its dependencies proposed by...
Giovanni Meo [Wed, 15 Jan 2014 20:54:56 +0000 (20:54 +0000)]
Merge "Update to new version of ADSAL components and its dependencies proposed by jenkins-controller-version-changes-8"

8 years agoUpdate to new version of ADSAL components and its dependencies proposed by jenkins... 79/4279/1
Madhu Venugopal [Wed, 15 Jan 2014 20:22:47 +0000 (12:22 -0800)]
Update to new version of ADSAL components and its dependencies proposed by jenkins-controller-version-changes-8

By splitting the effort into 2 phases, it is more managable and easy to test.
After this commit, the ADSAL components and all the NSFs are uptodate with the dependency convergence.

Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Change-Id: Ia8f0a0d2959f8f6ea61babe9c3f826d0950dcaf5

8 years agoMerge "BugFix : Changes to get ping between two hosts to work"
Ed Warnicke [Wed, 15 Jan 2014 19:01:25 +0000 (19:01 +0000)]
Merge "BugFix : Changes to get ping between two hosts to work"

8 years agoFixed deployment of mount points (dynamic instances of MD-SAL) 74/4274/3
Tony Tkacik [Wed, 15 Jan 2014 13:36:35 +0000 (14:36 +0100)]
Fixed deployment of mount points (dynamic instances of MD-SAL)

  - Converted some xtend sources into Java classes
  - Added mount point deployer - service responsible for
    deploying dynamic instances of MD-SAL, which have
    separate context and could be created and retrieved via
    MountService.

Change-Id: I9c0798e2f5f0af647d97b22a2da2f6c46bf9b72d
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoUpdated implementation of Netconf, fixed DOM Mountpoint 66/4266/2
Tony Tkacik [Wed, 15 Jan 2014 13:04:02 +0000 (14:04 +0100)]
Updated implementation of Netconf, fixed DOM Mountpoint

Change-Id: Ia0d4f92a65174e891a8111571ced24182d9f47c6
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoAllow initial config xml files to start with xml header. 73/4273/1
Maros Marsalek [Wed, 15 Jan 2014 15:35:34 +0000 (16:35 +0100)]
Allow initial config xml files to start with xml header.

E.g.

<?xml version="1.0" encoding="UTF-8"?>
<!-- vi: set et smarttab sw=4 tabstop=4: -->

Change-Id: Ie6ce587d3d44b2b357b48616d0a596e332c65c98
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoincreased test coverage 68/4268/2
Martin Bobak [Wed, 15 Jan 2014 13:46:41 +0000 (14:46 +0100)]
increased test coverage

Change-Id: I4f9f387a606a17724d2c835f6243cda14b9f4e0c
Signed-off-by: Martin Bobak <mbobak@cisco.com>
8 years agoMerge "Add shutdown hook."
Ed Warnicke [Wed, 15 Jan 2014 05:08:51 +0000 (05:08 +0000)]
Merge "Add shutdown hook."

8 years agoMerge "Switch initial config files format to xml and add autodetect adapter for confi...
Ed Warnicke [Wed, 15 Jan 2014 03:05:03 +0000 (03:05 +0000)]
Merge "Switch initial config files format to xml and add autodetect adapter for config persister."

8 years agoMerge "Better logging for netconf-ssh."
Ed Warnicke [Wed, 15 Jan 2014 02:50:55 +0000 (02:50 +0000)]
Merge "Better logging for netconf-ssh."

8 years agoMerge "Restconf operation GET, PUT, POST tests refactoring"
Ed Warnicke [Wed, 15 Jan 2014 02:50:25 +0000 (02:50 +0000)]
Merge "Restconf operation GET, PUT, POST tests refactoring"

8 years agoMerge "* fix : yang-generator can't find SIE if its base is another SIE"
Ed Warnicke [Wed, 15 Jan 2014 02:49:19 +0000 (02:49 +0000)]
Merge "* fix : yang-generator can't find SIE if its base is another SIE"

8 years agoBugFix : Changes to get ping between two hosts to work 38/4238/3
Moiz Raja [Tue, 14 Jan 2014 23:07:47 +0000 (15:07 -0800)]
BugFix : Changes to get ping between two hosts to work

1. InventoryUpdates were not getting to ConnectionManager because the InventoryAndReadAdapter was not tracking all listeners
2. DataPacketServiceAdapter was not setup as an IPluginInDataPacketService
3. DataPacketServiceAdapters delegate was not set to the PacketProcessingService
4. Node was not set on the TransmitPacketInput causing an NPE somewhere in the MD-SAL internals (this should probably be better addressed as I have hit this twice already)
5. DataPacketServiceAdapter now handles situation where the NodeConnectors is null

Current state
An IllegalArgumentException is being thrown from the openflowplugin "Session cookie is invalid" - Need to look at that further

Change-Id: I643ea435d7bda9ee7b3a5d603a381c3cfbaa0cce
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoMerge "Invalid cast results in HTTP 500 error returned by the Neutron REST APIs."
Alessandro Boch [Tue, 14 Jan 2014 23:54:58 +0000 (23:54 +0000)]
Merge "Invalid cast results in HTTP 500 error returned by the Neutron REST APIs."

8 years agoInvalid cast results in HTTP 500 error returned by the Neutron REST APIs. 35/4235/1
Madhu Venugopal [Tue, 14 Jan 2014 18:55:33 +0000 (10:55 -0800)]
Invalid cast results in HTTP 500 error returned by the Neutron REST APIs.

I think this is a copy+paste error where a INeutronSubnetAware is incorrectly casted to INeutronPortAware.

Change-Id: I5009b790edbc60e5b143a520d306d984e14fea37
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
8 years agoRestconf operation GET, PUT, POST tests refactoring 93/4193/4
Jozef Gloncak [Fri, 10 Jan 2014 09:05:24 +0000 (10:05 +0100)]
Restconf operation GET, PUT, POST tests refactoring

Tests for GET, PUT, POST were refactored. For every operation there is one
class with name Rest<OPERATION_NAME>OperationTest.java and special class
RestOperationUtils for common subrutines.

Change-Id: If8c9b76b86d728b3e35a931b12caeed41eb75805
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoBetter logging for netconf-ssh. 12/4212/1
Tomas Olvecky [Tue, 14 Jan 2014 12:42:52 +0000 (13:42 +0100)]
Better logging for netconf-ssh.

Log ServiceReference object in ServiceTrackerCustomizer methods.

Change-Id: Iaba864174de0e634a24c1e7a7eb5f0aeb0565b3e
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoSwitch initial config files format to xml and add autodetect adapter for config persi... 85/3785/4
Maros Marsalek [Mon, 16 Dec 2013 15:29:58 +0000 (16:29 +0100)]
Switch initial config files format to xml and add autodetect adapter for config persister.

Autodetect adapter allows to read initial configuration from xml as well as plaintext files.
The detection of file type is based on file content.

Change-Id: I499f0983bbea60f07e2ea7deb93814aa4f9e59e6
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoMerge "Added flow-node-inventory import to group-statistics.yang"
Giovanni Meo [Tue, 14 Jan 2014 10:54:51 +0000 (10:54 +0000)]
Merge "Added flow-node-inventory import to group-statistics.yang"

8 years agoAdded flow-node-inventory import to group-statistics.yang 04/4204/1
Martin Vitez [Tue, 14 Jan 2014 10:21:33 +0000 (11:21 +0100)]
Added flow-node-inventory import to group-statistics.yang

Change-Id: I0382e8229a448e48de9b382f0d9a64dcd0bc0250
Signed-off-by: Martin Vitez <mvitez@cisco.com>
8 years agoMerge "Modify uncaught exception handler to call System.exit(1)."
Giovanni Meo [Tue, 14 Jan 2014 10:05:34 +0000 (10:05 +0000)]
Merge "Modify uncaught exception handler to call System.exit(1)."

8 years agomissing dependecies reviewed and fixed 95/4195/1
Martin Bobak [Tue, 14 Jan 2014 09:07:23 +0000 (10:07 +0100)]
missing dependecies reviewed and fixed

Change-Id: Iba7275c4ccdc7b9f35392896b393004ccc4245b4
Signed-off-by: Martin Bobak <mbobak@cisco.com>
8 years ago* fix : yang-generator can't find SIE if its base is another SIE 22/3822/7
Martin Bobak [Wed, 18 Dec 2013 13:37:02 +0000 (14:37 +0100)]
* fix : yang-generator can't find SIE if its base is another SIE

JMXGenerator processes modules in dependency sorted order. Known SIE
tracker introduced for use in ServiceInterfaceEntry#create.

Change-Id: I36899dcdc3ea80661c43056dfc63c8f41d7c1f4d
Signed-off-by: Martin Bobak <mbobak@cisco.com>
8 years agoMerge "ArpHandler to ignore ip packet sent to default GW"
Chi-Vien Ly [Mon, 13 Jan 2014 17:09:57 +0000 (17:09 +0000)]
Merge "ArpHandler to ignore ip packet sent to default GW"

8 years agoMerge "incorrect dependencies and unnecesary export-package removed from pom.xml"
Giovanni Meo [Mon, 13 Jan 2014 14:45:56 +0000 (14:45 +0000)]
Merge "incorrect dependencies and unnecesary export-package removed from pom.xml"

8 years agoincorrect dependencies and unnecesary export-package removed from pom.xml 82/4182/2
Martin Bobak [Mon, 13 Jan 2014 13:47:53 +0000 (14:47 +0100)]
incorrect dependencies and unnecesary export-package removed from pom.xml

Change-Id: I8be593758f25cf04439ae1ee302e91aa379bf600
Signed-off-by: Martin Bobak <mbobak@cisco.com>
8 years agoMerge "increased test coverage of config-persister"
Ed Warnicke [Mon, 13 Jan 2014 13:47:55 +0000 (13:47 +0000)]
Merge "increased test coverage of config-persister"

8 years agoMerge "OF 1.3: Remove range check for max-length attribute for Output action."
Ed Warnicke [Mon, 13 Jan 2014 13:47:06 +0000 (13:47 +0000)]
Merge "OF 1.3: Remove range check for max-length attribute for Output action."

8 years agoMerge "Added tests for DELETE operation"
Ed Warnicke [Mon, 13 Jan 2014 13:46:17 +0000 (13:46 +0000)]
Merge "Added tests for DELETE operation"

8 years agoMerge "Unify topology versions used in controller"
Ed Warnicke [Mon, 13 Jan 2014 13:45:48 +0000 (13:45 +0000)]
Merge "Unify topology versions used in controller"

8 years agoMerge "Fix a few POM versioning/dependency warnings"
Ed Warnicke [Mon, 13 Jan 2014 13:44:44 +0000 (13:44 +0000)]
Merge "Fix a few POM versioning/dependency warnings"

8 years agoMerge "Updated review comments.Bulk transaction support added trasaction attribute...
Ed Warnicke [Mon, 13 Jan 2014 13:43:38 +0000 (13:43 +0000)]
Merge "Updated review comments.Bulk transaction support added trasaction attribute with RPC inputs"

8 years agoMerge "Model PacketInReason on yang model from openflow-types.yang Signed-off-by...
Ed Warnicke [Mon, 13 Jan 2014 13:40:46 +0000 (13:40 +0000)]
Merge "Model PacketInReason on yang model from openflow-types.yang Signed-off-by: Srikar Rajamani <srikar.rajamani@ericsson.com> Change-Id: I2103ce75ea3506cf9864b22ce18899f37a4f7062"

8 years agoincreased test coverage of config-persister 02/4102/2
Martin Bobak [Wed, 8 Jan 2014 09:54:18 +0000 (10:54 +0100)]
increased test coverage of config-persister

Change-Id: Ib614a90723575ac96b3bd2b3e2e5fe9f16a7653b
Signed-off-by: Martin Bobak <mbobak@cisco.com>
8 years agoModify uncaught exception handler to call System.exit(1). 10/4110/4
Tomas Olvecky [Thu, 9 Jan 2014 12:29:49 +0000 (13:29 +0100)]
Modify uncaught exception handler to call System.exit(1).

This introduces the ability to specify how uncaught exceptions are
handled via setting controller.uncaughtExceptionPolicy property.

There are two policies: IGNORE and ABORT. The former logs which thread
has died and does nothing else. The latter forces a virtual machine
shutdown when a thread dies.

The default policy is IGNORE, as that has been the historic setting. For
Helium release, this should probably get discussed, as uncontrolled
thread death may leave the controller in an inconsistent/invalid state.

Change-Id: Ib7c64b23e1cd3c7c45cfa31401410bba22acd431
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoOF 1.3: Remove range check for max-length attribute for Output action. 75/4175/1
Deepthi V V [Mon, 13 Jan 2014 10:44:37 +0000 (16:14 +0530)]
OF 1.3: Remove range check for max-length attribute for Output action.

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

8 years agoModel PacketInReason on yang model from openflow-types.yang 49/3949/4
Srikar Rajamani [Thu, 9 Jan 2014 10:08:44 +0000 (15:38 +0530)]
Model PacketInReason on yang model from openflow-types.yang
Signed-off-by: Srikar Rajamani <srikar.rajamani@ericsson.com>
Change-Id: I2103ce75ea3506cf9864b22ce18899f37a4f7062

8 years agoAdd shutdown hook. 35/3835/3
Tomas Olvecky [Wed, 18 Dec 2013 17:15:58 +0000 (18:15 +0100)]
Add shutdown hook.

Implement shutdown bundle that stops system bundle on JMX, netconf RPC, or when invoked on
shutdown service taken from OSGi service registry. User must provide a shutdown secret
set during initial module configuration and may provide a reason of shutdown.
Currently this bundle is not instanciated during server startup.

Change-Id: I4ca652265fc676c9f387c7caa49bca499abd4400
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoAdded tests for DELETE operation 66/4166/2
Ladislav Borak [Mon, 13 Jan 2014 09:34:39 +0000 (10:34 +0100)]
Added tests for DELETE operation

Change-Id: Iba7874231d8662a5626a262228dd1baafead897f
Signed-off-by: Ladislav Borak <lborak@cisco.com>
8 years agoUpdated review comments.Bulk transaction support added trasaction attribute with... 52/4152/4
Prasanna Huddar [Sun, 12 Jan 2014 16:01:23 +0000 (21:31 +0530)]
Updated review comments.Bulk transaction support added trasaction attribute with RPC inputs

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

8 years agoUnify topology versions used in controller 47/4147/1
Robert Varga [Sat, 11 Jan 2014 09:44:22 +0000 (10:44 +0100)]
Unify topology versions used in controller

This change is required to prevent a split-package from occuring in the
SP editions, as MD-SAL pulls in an old topology artifact, contents of
which are also provided by an updated version.

Change-Id: Ibad93403363900a60abf96eae57df0febc52d44f
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoFix a few POM versioning/dependency warnings 79/4079/4
Robert Varga [Wed, 8 Jan 2014 15:29:04 +0000 (16:29 +0100)]
Fix a few POM versioning/dependency warnings

Change-Id: I8c0fbfcb6a2c5b1d032a6ec26ff9176cca7f6834
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoSwitch from using a Long as FlowId to a Uri 58/4058/7
Moiz Raja [Tue, 7 Jan 2014 21:48:00 +0000 (13:48 -0800)]
Switch from using a Long as FlowId to a Uri

Couple of things you may want to pay attention to,

a. FlowProgrammerAdapter maintains a mapping between a Flow and it's id in a map in infinispan
b. Look at internalAddFlowAsync. If it finds that a flow is in the flow to id mapping cache. It will remove the flow and add it back in. This is what makes the switch add back a flow when it a switch comes back alive.
c. The sync vs async behavior should now be properly done

Change-Id: Id156ebbc7b6e643e4a5960aa735d0812bf5cbe48
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoMerge changes I85b49247,Icca28a4a
Ed Warnicke [Fri, 10 Jan 2014 17:40:32 +0000 (17:40 +0000)]
Merge changes I85b49247,Icca28a4a

* changes:
  Added DELETE operation
  Changed POST operation

8 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."

8 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"

8 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."

8 years agoAdded DELETE operation 39/4139/1
Martin Sunal [Fri, 10 Jan 2014 15:51:42 +0000 (16:51 +0100)]
Added DELETE operation

- fix of bug 266
- corrected @Produces and @Consumes annotations in RestconfService and RestconfServiceLegacy

Change-Id: I85b49247f0ff1cfecb3ab999d6cc4f56311947e4
Signed-off-by: Martin Sunal <msunal@cisco.com>
8 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

8 years agoChanged POST operation 81/4081/8
Martin Sunal [Fri, 10 Jan 2014 12:11:24 +0000 (13:11 +0100)]
Changed POST operation

POST operation for creating resource was changed according to RFC
http://tools.ietf.org/html/draft-bierman-netconf-restconf-02#section-3.4
- test fix
- ResponseException tests

Change-Id: Icca28a4a57499be5f29a1b618a432dd61dde2816
Signed-off-by: Martin Sunal <msunal@cisco.com>
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Signed-off-by: Ladislav Borak <lborak@cisco.com>
8 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>
8 years agoArpHandler to ignore ip packet sent to default GW 25/4125/1
Alessandro Boch [Fri, 10 Jan 2014 04:22:52 +0000 (20:22 -0800)]
ArpHandler to ignore ip packet sent to default GW

- If the host pings the default gw, when ArpHandler receives the
  ICMP packet it does not realize it is sent to the controller,
  and it triggers the discovery for an host with that IP through arp request
- This patch is for ArpHandler to detect the if IP packet is sent
  to the controller and stop the processing if that is the case.
  We may consider to have ArpHandler reply if packet is ICMP echo req.

Change-Id: I87e14916564bc0039718882d087c431df7554317
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 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."

8 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"

8 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."

8 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."

8 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."

8 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

8 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."

8 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>
8 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>
8 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>
8 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>
8 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"

8 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."

8 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."

8 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."

8 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"

8 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"

8 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"

8 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."

8 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.

8 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>
8 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)"

8 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

8 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

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

8 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"

8 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>
8 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>
8 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>
8 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"

8 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"

8 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>
8 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>
8 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"

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