controller.git
8 years agoMake FRM to finally distribute the work orders 82/1182/1
Giovanni Meo [Fri, 13 Sep 2013 15:06:08 +0000 (17:06 +0200)]
Make FRM to finally distribute the work orders

- Transformed frm.{workOrder|workStatus} caches to be transactional,
as a stop gap to an issue we have run into.
- The transformation of FRM caches in transactional opens an issue
where if used in a context of a transaction the FRM updates will not
travel in the cluster. We use the frm.{workOrder|workStatus} caches as
a way to synchronize operations hence this communications need to
happens also before the transaction commits. To avoid then this
chicken-and-egg problem we are forcing the distributeWorkOrder
business logic to execute off a different thread just to avoid to be
held by the transaction.
This is a stop gap solution till we caracterize and fix the
non-transactional cache issue seen

Signed-off-by: Giovanni Meo <gmeo@cisco.com>
Change-Id: I8e8dd3f38f037dc62252ea1e271e0972e32019f0

8 years agoFix modal session timeout 74/1174/1
Andrew Kim [Wed, 11 Sep 2013 23:12:47 +0000 (18:12 -0500)]
Fix modal session timeout

Change-Id: Id5a402860ecb597489bab1d3d2b45ce8a7cbd9aa
Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoUI: Reset the scroll-bar to the top of modal 73/1173/1
Yevgeny Khodorkovsky [Thu, 12 Sep 2013 20:08:33 +0000 (13:08 -0700)]
UI: Reset the scroll-bar to the top of modal

- Firefox retains scroll position of a modal window.
  Want to reset it so the user doesn't have to.

Change-Id: I4f80ebbd9938c3e8e957c2bf807d0a44e0362d80
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
8 years agoMerge "Supply from filesystem infinispan configuration"
Madhu Venugopal [Thu, 12 Sep 2013 16:55:08 +0000 (16:55 +0000)]
Merge "Supply from filesystem infinispan configuration"

8 years agoMerge "FRMsync get stuck, miscelaneous fix"
Madhu Venugopal [Thu, 12 Sep 2013 16:52:36 +0000 (16:52 +0000)]
Merge "FRMsync get stuck, miscelaneous fix"

8 years agoSupply from filesystem infinispan configuration 68/1168/1
Giovanni Meo [Thu, 12 Sep 2013 16:25:39 +0000 (18:25 +0200)]
Supply from filesystem infinispan configuration

- In order to speed up the prototyping time, allow to supply an
infinispan configuration from the filesystem along the one embedded in
the clustering.services-implementation. This can be specified by
supplying the property org.infinispan.config.file
- Align to 5.3 the XSD used in the infinispan config file, seems there
are different defaults between 5.1 XSD and 5.3

Change-Id: Ied87ecc56725b89b5c85ff21ae185f5d68988ab1
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoMerge "Refactor SubnetConfig"
Giovanni Meo [Thu, 12 Sep 2013 16:21:42 +0000 (16:21 +0000)]
Merge "Refactor SubnetConfig"

8 years agoRefactor SubnetConfig 60/1160/3
Alessandro Boch [Wed, 11 Sep 2013 23:34:41 +0000 (16:34 -0700)]
Refactor SubnetConfig

- Change Subent Config to represent the switch ports with the NodeConnector notation
- Added validity check on zero subnet configuration
- Change device js to correctly set the value in the ports selects, JQuery changes from Andrew (andrekim@cisco.com)
- While uniform Subnet northbound to other NB modules, removed the node-ports endpoints. Have the subnet as end resource,
  we already have the POST for it.
- Added ISwitchManager.modifySubnet(SubnetConfig s)
- Added SubnetConfigTest.java for junit
- Updated subnet northbound junit

Change-Id: I7777d0dc3b60f6532836a5115d8fc2dd48c18768
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoAdded Configurable parameter for the Connection Manager scheme and Container profile. 67/1167/1
Madhu Venugopal [Thu, 12 Sep 2013 15:38:01 +0000 (08:38 -0700)]
Added Configurable parameter for the Connection Manager scheme and Container profile.

Change-Id: I2b65f80b9d2d0d914ff34cdf18af2e652d04a8b1
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
8 years agoMerge "On container removal FRM does not uninstall flows"
Giovanni Meo [Thu, 12 Sep 2013 14:43:27 +0000 (14:43 +0000)]
Merge "On container removal FRM does not uninstall flows"

8 years agoMerge "Declare a property for commons-lang version in poms and use it."
Giovanni Meo [Thu, 12 Sep 2013 14:41:27 +0000 (14:41 +0000)]
Merge "Declare a property for commons-lang version in poms and use it."

8 years agoMerge "Add helper class for RpcError interface"
Giovanni Meo [Thu, 12 Sep 2013 14:35:17 +0000 (14:35 +0000)]
Merge "Add helper class for RpcError interface"

8 years agoFRMsync get stuck, miscelaneous fix 65/1165/1
Giovanni Meo [Wed, 11 Sep 2013 09:52:06 +0000 (11:52 +0200)]
FRMsync get stuck, miscelaneous fix

- The future FlowEntryDistributionOrderFutureTask was erroneously
thinking and entry was not expected simply because the equality check
was failing.
- Added more extensive logging to catch further bugs in the area.

Change-Id: I8c2cb08ecf7bd9ea3623d79eae9a3ec16f023724
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoContainer Management and associated Northbound APIs. 64/1164/3
Madhu Venugopal [Wed, 11 Sep 2013 23:20:26 +0000 (16:20 -0700)]
Container Management and associated Northbound APIs.

Features :
1. Create, Modify and delete containers
2. ContainerFlow management
3. Northbound APIs
4. Application authorization support (contributed by Alessandro Boch)

Change-Id: I080d58c2869720c7e78fcdff673b51b142b1c2c2
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
8 years agoFix NPEs on switch disconnect in cluster mode 53/1153/2
Yevgeny Khodorkovsky [Wed, 11 Sep 2013 03:24:47 +0000 (20:24 -0700)]
Fix NPEs on switch disconnect in cluster mode

- Fixed null pointer exceptions on switch disconnect that was
  connected to 2 or more controllers in "Any controller-One master" scheme
- Added node count to clustered controllers table in UI

Change-Id: I0c322a7a4105955a545b24a9ba1f36743800a802
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
8 years agoMerge "Add page loading semaphore"
Alessandro Boch [Wed, 11 Sep 2013 17:10:14 +0000 (17:10 +0000)]
Merge "Add page loading semaphore"

8 years agoMerge "Bug #65 - Fix inconsistencies in the NB REST APIs"
Alessandro Boch [Wed, 11 Sep 2013 16:58:31 +0000 (16:58 +0000)]
Merge "Bug #65 - Fix inconsistencies in the NB REST APIs"

8 years agoOn container removal FRM does not uninstall flows 59/1159/1
Alessandro Boch [Wed, 11 Sep 2013 16:35:36 +0000 (09:35 -0700)]
On container removal FRM does not uninstall flows

ISSUE:
If a container had container flow specified, when it is removed FRM fails to uninstall
the flows that were installed in that container context

ROOT CAUSE:
On FRM stop(), the uninstallAllFlowEntries() function is called.
uninstallAllFlowEntries() does 2 things:
 1) it stores the original FlowEntry elements for later re-install irrespectively
it is called because FRM is being shutdown (container removal) or because controller
is moving to container mode (and this is the default container context) which is a bug.
 2) It uninstall the flows using the removeEntry(FlowEntry fe, ...) function which recomputes
the hw flows to be removed merging fe with the container flows for this container
returned by IContainer service, which is unefficient anyway.

Problem is that when FRM is being stopped because of container removal, IContainer service does no
longer have the container flows for the given container when queried by FRM.

FIX:
- Have uninstallAllFlowEntries() take a parameter to specify if the back up of the original flow entries is needed.
- Have uninstallAllFlowEntries() use the removeEntryInternal() to directly remove the FlowEntryInstall elements, because
  besides of the inefficinecy of recomputing the container flow merged entries there is really no need for it.
- Updated the java docs

Change-Id: If33d80f9593ee81fa58d84dea05514921e143225
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoAdd page loading semaphore 50/1150/2
Andrew Kim [Tue, 10 Sep 2013 20:43:01 +0000 (15:43 -0500)]
Add page loading semaphore

Change-Id: I625eb9fe50732ce4fad17ffdfc650ba129c9ef5c
Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoMerge "Remove unused class member SAVE."
Alessandro Boch [Wed, 11 Sep 2013 15:47:47 +0000 (15:47 +0000)]
Merge "Remove unused class member SAVE."

8 years agoMerge "Remove public from interface methods. Cleans sonar warnings."
Alessandro Boch [Wed, 11 Sep 2013 15:31:00 +0000 (15:31 +0000)]
Merge "Remove public from interface methods. Cleans sonar warnings."

8 years agoDeclare a property for commons-lang version in poms and use it. 58/1158/1
Alissa Bonas [Wed, 11 Sep 2013 15:03:35 +0000 (18:03 +0300)]
Declare a property for commons-lang version in poms and use it.

Change-Id: I0e5b15931b895f0aaf4aa57d88e33c9885f9238e
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoRemove unused class member SAVE. 57/1157/1
Alissa Bonas [Wed, 11 Sep 2013 13:57:20 +0000 (16:57 +0300)]
Remove unused class member SAVE.

Change-Id: I936914928b92b314bd9aa5e9b0d4454a53cc0722
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoMerge "Fix a ClassNotFoundException raised during demarshalling"
Giovanni Meo [Wed, 11 Sep 2013 08:02:23 +0000 (08:02 +0000)]
Merge "Fix a ClassNotFoundException raised during demarshalling"

8 years agoAdd helper class for RpcError interface 41/1141/3
Michal Rehak [Tue, 10 Sep 2013 03:26:39 +0000 (05:26 +0200)]
Add helper class for RpcError interface

Change-Id: I981d63d0c6ccc899a3f2db5985b16d31c8e2742e
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoMerge "Add curly braces to if/else statements. (sonar)"
Alessandro Boch [Wed, 11 Sep 2013 01:30:59 +0000 (01:30 +0000)]
Merge "Add curly braces to if/else statements. (sonar)"

8 years agoBug #65 - Fix inconsistencies in the NB REST APIs 49/1149/2
Prasanth Pallamreddy [Tue, 10 Sep 2013 18:17:33 +0000 (11:17 -0700)]
Bug #65 - Fix inconsistencies in the NB REST APIs

1) PUT is used to create resources (when resource path is known to client and
the action is idempotent).
2) Use plural resource name when listing contents.
3) Rename service names (flow -> flowprogrammer, host -> hosttracker, subnet ->
subnetservice) as they conflict with resource names.

Change-Id: I7171ec725b83799ec3686460ab7aa23c7df56c9b
Signed-off-by: Prasanth Pallamreddy <ppallamr@cisco.com>
8 years agoRemove public from interface methods. Cleans sonar warnings. 47/1147/1
Alissa Bonas [Tue, 10 Sep 2013 16:43:03 +0000 (19:43 +0300)]
Remove public from interface methods. Cleans sonar warnings.

Change-Id: I5a64f93cb452522c50f788fd24bd10340f61a4e5
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoAdd curly braces to if/else statements. (sonar) 24/1124/4
Alissa Bonas [Sun, 8 Sep 2013 16:51:05 +0000 (19:51 +0300)]
Add curly braces to if/else statements. (sonar)

Change-Id: I34d30294615e98a2a76f8096f4edb50cabab7f24
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoFix a ClassNotFoundException raised during demarshalling 45/1145/1
Giovanni Meo [Tue, 10 Sep 2013 10:05:56 +0000 (12:05 +0200)]
Fix a ClassNotFoundException raised during demarshalling

Under certain conditions an error like:

Caused by: java.lang.ClassNotFoundException: org.opendaylight.controller.sal.reader.FlowOnNode
at org.eclipse.gemini.web.tomcat.internal.loading.BundleWebappClassLoader.loadClass(BundleWebappClassLoader.java:312) ~[na:na]
at java.lang.ClassLoader.loadClass(ClassLoader.java:356) ~[na:1.7.0_09]
at java.lang.Class.forName0(Native Method) ~[na:1.7.0_09]
at java.lang.Class.forName(Class.java:264) ~[na:1.7.0_09]
at org.jboss.marshalling.AbstractClassResolver.loadClass(AbstractClassResolver.java:135) ~[na:na]
at org.jboss.marshalling.AbstractClassResolver.resolveClass(AbstractClassResolver.java:116) ~[na:na]
at org.jboss.marshalling.river.RiverUnmarshaller.doReadClassDescriptor(RiverUnmarshaller.java:893) ~[na:na]
at org.jboss.marshalling.river.RiverUnmarshaller.doReadNewObject(RiverUnmarshaller.java:1205) ~[na:na]
at org.jboss.marshalling.river.RiverUnmarshaller.doReadObject(RiverUnmarshaller.java:272) ~[na:na]
at org.jboss.marshalling.river.RiverUnmarshaller.doReadObject(RiverUnmarshaller.java:209) ~[na:na]

this is due to the fact that by default the Jboss Marshaller used by
Infinispan uses the Thread Context Class Loader to retrieve the
classloader to be used in the demarshalling function. Equinox provides
a default one
(org.eclipse.core.runtime.internal.adaptor.ContextFinder) as TCCL,
however it heuristically try to find the classloader and in some cases
can fetch the wrong one. Now given that all the classes managed by
clustering services must go via OSGi it make sense to force the usage
of only the bundle class loader and we let OSGi framework to figure
out how to load the class.

Change-Id: I24a9056eda5f6ab7b8cf0ab2e476be56cb61f6c1
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoMerge "Replace exception.printStacktrace with write to log."
Giovanni Meo [Tue, 10 Sep 2013 10:41:20 +0000 (10:41 +0000)]
Merge "Replace exception.printStacktrace with write to log."

8 years agoBug #60 : JSON list responses from the NB-APIs returns native object (instead of... 31/1131/3
Madhu Venugopal [Mon, 9 Sep 2013 12:00:39 +0000 (05:00 -0700)]
Bug #60 : JSON list responses from the NB-APIs returns native object (instead of List) when the API returns a single element.

We use Jersey and JAXB frameworks for the NB-API implementation.
Jersey by default uses Jettison for the JSON marshalling/demarshalling. It seems like there is a bug in Jettison for this case.
And the recommended approach is to use Jackson instead.
Among various approaches to replace Jettison with Jackson (including package scanning, etc..), the only easy approach in an
OSGi environment is to directly refer to the JerseyJaxbJsonProvider class from the Northbound application.
JerseyJaxbJsonProvider has dependancies on jersey-xc which is also pulled in.

The Northbound Integration Test has inbuilt assumption that the NB-APIs use Jettison & hence a whole bunch of such bugs were
hidden and not visible to the tests as well. The correct approach is to use JAXB bindings in the IT so that immaterial of
Jettison or Jackson as the NB Marshalling infra, the IT need not change.
But, that is a bigger change and hence to restrict to the changes being addressed, this changeset just fixed these incorrect
assumptions and continued to use the Jettison library for demarshalling (while the actual Northbound API uses Jackson).

Also note that, such infra changes call for bumping both the NB-API version and the bundle version.
But, given the fact that the API freeze is scheduled later in October and more NB related changes are coming, the version bump
process can be scheduled later to ease the development work.

Change-Id: I47d8309dfbe11c251a30316bca37c7823cb0325a
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
8 years agoMerge "Remove redundant class members, turn others to local variables. (sonar)"
Giovanni Meo [Tue, 10 Sep 2013 09:19:09 +0000 (09:19 +0000)]
Merge "Remove redundant class members, turn others to local variables. (sonar)"

8 years agoMerge "Remove java.lang redundant imports. Taken from sonar."
Giovanni Meo [Tue, 10 Sep 2013 09:15:51 +0000 (09:15 +0000)]
Merge "Remove java.lang redundant imports. Taken from sonar."

8 years agoMerge "Added NOTICE file"
Ed Warnicke [Tue, 10 Sep 2013 05:09:14 +0000 (05:09 +0000)]
Merge "Added NOTICE file"

8 years agoUpdated models, modeling existing SAL and its functionality 39/1139/2
Tony Tkacik [Mon, 9 Sep 2013 23:18:28 +0000 (16:18 -0700)]
Updated models, modeling existing SAL and its functionality

model-flow-base
  - match-types.yang - Match types categorized by protocol / layer
  - flow-types.yang - Base flow types / actions
model-flow-service
  - flow-service.yang - Model of Flow Programming service
model-flow-statistics
  - flow-statistics.yang - Flow Statistics service
model-inventory
  - model-inventory.yang - Device inventory

Change-Id: I14e9fe3c7a85e49131e102cf4c840bb1bdb0afbc
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "Display Confirmation dialog before removing network configuration"
Andrew Kim [Mon, 9 Sep 2013 23:36:39 +0000 (23:36 +0000)]
Merge "Display Confirmation dialog before removing network configuration"

8 years agoMerge "Fix for exceptions seen in FlowProgrammer NB, when get/put is done for invalid...
Alessandro Boch [Mon, 9 Sep 2013 23:30:59 +0000 (23:30 +0000)]
Merge "Fix for exceptions seen in FlowProgrammer NB, when get/put is done for invalid flow"

8 years agoMerge "Add snapshots/releases setting to all maven repos."
Giovanni Meo [Mon, 9 Sep 2013 20:11:46 +0000 (20:11 +0000)]
Merge "Add snapshots/releases setting to all maven repos."

8 years agoReplace exception.printStacktrace with write to log. 34/1134/1
Alissa Bonas [Mon, 9 Sep 2013 14:16:38 +0000 (17:16 +0300)]
Replace exception.printStacktrace with write to log.

Change-Id: I09768746f1789748c2f2f9efe8fae35e33610304
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoMerge "- DiscoveryService yields to avoid hogging the cpu - SwitchManager getNodes...
Giovanni Meo [Mon, 9 Sep 2013 13:50:12 +0000 (13:50 +0000)]
Merge "- DiscoveryService yields to avoid hogging the cpu - SwitchManager getNodes() not to return null"

8 years agoFix cluster menu 18/1118/2
Andrew Kim [Fri, 6 Sep 2013 22:21:27 +0000 (17:21 -0500)]
Fix cluster menu

Change-Id: I78b11efc4928b1be0d3d3f0b865483b59b8fb839
Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoRemove redundant class members, turn others to local variables. (sonar) 23/1123/1
Alissa Bonas [Sun, 8 Sep 2013 16:09:21 +0000 (19:09 +0300)]
Remove redundant class members, turn others to local variables. (sonar)

Change-Id: I90c1c9cea67bd62900876ee373c86a33eb80765d
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoRemove java.lang redundant imports. Taken from sonar. 22/1122/1
Alissa Bonas [Sun, 8 Sep 2013 15:43:25 +0000 (18:43 +0300)]
Remove java.lang redundant imports. Taken from sonar.

Change-Id: I5606e49f27c15539728a00cda7cde6fe48cb45a0
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoAdd snapshots/releases setting to all maven repos. 79/1079/3
Alissa Bonas [Tue, 3 Sep 2013 08:03:24 +0000 (11:03 +0300)]
Add snapshots/releases setting to all maven repos.

Change-Id: I8122947d2c6dfa3828502b1629f4bf6811b77ecc
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoDisplay Confirmation dialog before removing network configuration 19/1119/1
Sapan Shah [Sat, 7 Sep 2013 02:03:50 +0000 (19:03 -0700)]
Display Confirmation dialog before removing network configuration

Change-Id: I0d85018f3946ea700fe24bbd617dff5e09879088
Signed-off-by: Sapan Shah <sapshah@cisco.com>
8 years agoFix for exceptions seen in FlowProgrammer NB, when get/put is done for invalid flow 17/1117/1
Pramila Singh [Fri, 6 Sep 2013 21:33:05 +0000 (14:33 -0700)]
Fix for exceptions seen in FlowProgrammer NB, when get/put is done for invalid flow

Change-Id: I6a247072bab9a21c82d7247a852c0d19766bcf13
Signed-off-by: Pramila Singh <pramisin@cisco.com>
8 years ago- DiscoveryService yields to avoid hogging the cpu 16/1116/1
Jason Ye [Fri, 6 Sep 2013 20:15:34 +0000 (13:15 -0700)]
- DiscoveryService yields to avoid hogging the cpu
- SwitchManager getNodes() not to return null

Change-Id: I7fc6bcc3953108745505c6c3ed8060618f500fe3
Signed-off-by: Jason Ye <yisye@cisco.com>
8 years agoAdd Cluster Menu 08/1108/3
Andrew Kim [Thu, 5 Sep 2013 20:15:18 +0000 (15:15 -0500)]
Add Cluster Menu

Change-Id: Ie795953393493a41dd05a0a8a7de03ddb5278729
Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoAdded NOTICE file 42/1142/1
Ed Warnicke [Fri, 6 Sep 2013 15:30:11 +0000 (10:30 -0500)]
Added NOTICE file

Change-Id: I0b3e8406c392084c9ed4183bdce7b736de551c34
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoMerge "Enhancement to switchmanager CLI commands to display all the properties of...
Giovanni Meo [Fri, 6 Sep 2013 12:31:00 +0000 (12:31 +0000)]
Merge "Enhancement to switchmanager CLI commands to display all the properties of node and nodeconnector"

8 years agoMerge "Bugfix: Exception when adding static host"
Giovanni Meo [Fri, 6 Sep 2013 12:26:58 +0000 (12:26 +0000)]
Merge "Bugfix: Exception when adding  static host"

8 years agoMerge "Add sorting to js select.create()"
Giovanni Meo [Fri, 6 Sep 2013 12:25:25 +0000 (12:25 +0000)]
Merge "Add sorting to js select.create()"

8 years agoEnhancement to switchmanager CLI commands to display all the properties of node and... 09/1109/1
Pramila Singh [Fri, 6 Sep 2013 05:55:38 +0000 (22:55 -0700)]
Enhancement to switchmanager CLI commands to display all the properties of node and nodeconnector

Change-Id: I87ee445168e64cc74a7538593503cb43f4e1f50a
Signed-off-by: Pramila Singh <pramisin@cisco.com>
8 years agoRemove version hard coding in integration tests 03/1103/1
Giovanni Meo [Thu, 5 Sep 2013 09:53:26 +0000 (11:53 +0200)]
Remove version hard coding in integration tests

- Version hardcoding on integration tests will cause problems when
releasing artifacts, hence removing it and relaying solely on the
version number present in the pom file.
- Enabled verify phase in integration tests else developer build will
happily succed even if there are integration test failures, which will
be only discovered during the controller-verify phase.

Change-Id: I52a0e16d1228ef09c87fa8aa7dc1f21dc0663fae
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoBugfix: Exception when adding static host 02/1102/4
Yevgeny Khodorkovsky [Thu, 5 Sep 2013 01:33:11 +0000 (18:33 -0700)]
Bugfix: Exception when adding  static host

- Fix NumberFormatException when adding static host
  through REST API with no vlan configured.
- Add IT to verify this
- Clean up Host Tracker REST API

Change-Id: Iefc672a0a978640ca47903f20962f150298ba11c
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
8 years agoMerge "SwitchManager NB - Added URL info in response on successful creation of Node...
Madhu Venugopal [Thu, 5 Sep 2013 03:56:15 +0000 (03:56 +0000)]
Merge "SwitchManager NB - Added URL info in response on successful creation of Node property and NodeConnector Property"

8 years agoAdd sorting to js select.create() 01/1101/1
Alessandro Boch [Wed, 4 Sep 2013 22:58:26 +0000 (15:58 -0700)]
Add sorting to js select.create()

- Add optional parameter to the select constructor to get the options array sorted

Change-Id: Icb7d529ccbd4d343310f3c8397f59bc083f2cb52
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoSwitchManager NB - Added URL info in response on successful creation of Node property... 94/1094/1
Diti Bhatia [Wed, 4 Sep 2013 20:01:50 +0000 (13:01 -0700)]
SwitchManager NB - Added URL info in response on successful creation of Node property and NodeConnector Property

Change-Id: Iae62b1208a6b6be0f00da71e402aa2f3b8ea9843
Signed-off-by: Diti Bhatia <dibhatia@cisco.com>
8 years agoCorrect modal ID 91/1091/1
Andrew Kim [Wed, 4 Sep 2013 17:22:52 +0000 (12:22 -0500)]
Correct modal ID

Change-Id: I43af7e054b1ccad1fe3db003c649170cd8cb9ecc
Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoMerge "Checksum errors seen on some setup while downloading guava"
Madhu Venugopal [Wed, 4 Sep 2013 12:45:00 +0000 (12:45 +0000)]
Merge "Checksum errors seen on some setup while downloading guava"

8 years agoMerge "fixing spelling errors"
Ed Warnicke [Wed, 4 Sep 2013 12:42:28 +0000 (12:42 +0000)]
Merge "fixing spelling errors"

8 years agoMerge "Cleaning up code, comments, and documentation for SimpleForwarding"
Ed Warnicke [Wed, 4 Sep 2013 12:38:43 +0000 (12:38 +0000)]
Merge "Cleaning up code, comments, and documentation for SimpleForwarding"

8 years agoUpdated SAL Flow Models 59/1059/2
Tony Tkacik [Fri, 30 Aug 2013 01:25:08 +0000 (18:25 -0700)]
Updated SAL Flow Models

Change-Id: I2770e9b412b641aa93eb206e52b677f79d2038c7
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoChecksum errors seen on some setup while downloading guava 42/1042/3
Giovanni Meo [Thu, 29 Aug 2013 15:00:55 +0000 (17:00 +0200)]
Checksum errors seen on some setup while downloading guava

- Due to some issues with the mirroring of {repo1|repo2}.maven.org of
some artifact, forcing all the repo1/repo2 artifacts to be downloaded
directly and not via ODP nexus proxy. This has been adviced also by
sonatype support folks, now they have a content delivery network in
place and can handle the load.

Change-Id: Iff7e604d35f0a4a877e1316990be2bf6bf1ea1f6
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoMerge "Updated toaster sample to match new Binding specification of YANG Tools."
Giovanni Meo [Wed, 4 Sep 2013 11:51:38 +0000 (11:51 +0000)]
Merge "Updated toaster sample to match new Binding specification of YANG Tools."

8 years agoMerge "Fix "unary operator expected" err in run.sh line47"
Giovanni Meo [Wed, 4 Sep 2013 11:42:36 +0000 (11:42 +0000)]
Merge "Fix "unary operator expected" err in run.sh line47"

8 years agoUpdated toaster sample to match new Binding specification of YANG Tools. 86/1086/3
Tony Tkacik [Wed, 4 Sep 2013 00:42:26 +0000 (17:42 -0700)]
Updated toaster sample to match new Binding specification of YANG Tools.

Change-Id: I95a7373868993d766b467a1e53252caeb24fdc15
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoController network interface enhancements: 82/1082/1
Chi-Vien Ly [Tue, 3 Sep 2013 17:07:13 +0000 (10:07 -0700)]
Controller network interface enhancements:
- Provide a configuration parameter "of.address = " in config.ini which allows a specific IP address to be specified.
  If a valid IP address is specified, the controller will ONLY accept connections from switches with destination address
  matching the specified configured address. If an address it NOT specified (which is the default case) or is syntactically
  incorrect, the controller will use "any" (wildcard) address. The default case is what currently been implemented.
- If the IP address is specified, the controller will determine the networking interface (eg, eth0) on which the
  IP address is configured. If the interface is NOT up and is changed status between up and down, a log will be generated
  to alert the network operation to take corrective actions. If the address is not specified (or is specified with an invalid
  address syntax), the controller will use any interfaces and will NOT monitor the status of these interfaces.

Change-Id: Ie2a92ad99d35367a1d89dca390e7af54321bfe7c
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
8 years agoFix "unary operator expected" err in run.sh line47 81/1081/1
Alissa Bonas [Tue, 3 Sep 2013 14:42:10 +0000 (17:42 +0300)]
Fix "unary operator expected" err in run.sh line47

Change-Id: I62b5d52686b8dfd52e479df87d07675d7bd673fd
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoCleaning up code, comments, and documentation for SimpleForwarding 69/1069/1
Colin Dixon [Thu, 11 Apr 2013 17:09:56 +0000 (10:09 -0700)]
Cleaning up code, comments, and documentation for SimpleForwarding

Change-Id: I12a3ba528c2a6c7b62a5a30ccca75d249b96f0a2
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
8 years agofixing spelling errors 70/1070/1
Colin Dixon [Thu, 6 Jun 2013 16:56:21 +0000 (09:56 -0700)]
fixing spelling errors

Change-Id: I51283f2c31941f389e670bf76801113bdc8b0437
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
8 years agoMerge "toaster-it: add missing version for maven-paxexam-plugin"
Madhu Venugopal [Sat, 31 Aug 2013 13:12:27 +0000 (13:12 +0000)]
Merge "toaster-it: add missing version for maven-paxexam-plugin"

8 years agoMerge "yang-prototype: add missing version for maven-site-plugin"
Madhu Venugopal [Sat, 31 Aug 2013 13:08:01 +0000 (13:08 +0000)]
Merge "yang-prototype: add missing version for maven-site-plugin"

8 years agoFix IP/MASK intersection in Match 68/1068/1
Alessandro Boch [Sat, 31 Aug 2013 00:31:28 +0000 (17:31 -0700)]
Fix IP/MASK intersection in Match

- Match.getIntersection() picks the wrong IP/MASK
- Updated Junit to assert on expected behavior

Change-Id: Iae49984ece6be28855f5835803cb3d6b7c94fa50
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoMerge "Few additional fixes to enable Client script access to Northbound."
Alessandro Boch [Fri, 30 Aug 2013 23:20:46 +0000 (23:20 +0000)]
Merge "Few additional fixes to enable Client script access to Northbound."

8 years agoFew additional fixes to enable Client script access to Northbound. 66/1066/1
Madhu Venugopal [Fri, 30 Aug 2013 21:55:01 +0000 (14:55 -0700)]
Few additional fixes to enable Client script access to Northbound.

After Tomcat 7, httpOnly is true by default. This causes the httponly flag set on the Cookie.
This prevents the Scripts to access the cookie. setting it to false by default.
Due to the recent fix on disabling authentication for OPTIONS, if a script uses OPTIONS for an
NB-API, the username is null causing null pointer exception. Hence adding null pointer safety
checks on all the northbound APIs.

Change-Id: I726fd058b629c04695bf07d9fd52f6483d193b79
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
8 years agoFixed .gitignore around bin/ directories 65/1065/1
Ed Warnicke [Fri, 30 Aug 2013 20:50:27 +0000 (13:50 -0700)]
Fixed .gitignore around bin/ directories

Change-Id: I4b23e76cefdeff2c12e7c770119d73af19f3770a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoFix to remove @ from id and type parameter of node and nodeconnector in Northbound... 36/1036/3
Pramila Singh [Fri, 30 Aug 2013 17:47:04 +0000 (10:47 -0700)]
Fix to remove @ from id and type parameter of node and nodeconnector in Northbound javadocs

Change-Id: I343fc32d34ffb9940961e3319a260345db45d05b
Signed-off-by: Pramila Singh <pramisin@cisco.com>
8 years agotoaster-it: add missing version for maven-paxexam-plugin 62/1062/1
Chris Wright [Fri, 30 Aug 2013 07:01:23 +0000 (00:01 -0700)]
toaster-it: add missing version for maven-paxexam-plugin

This fixes the following warning:

[WARNING] Some problems were encountered while building the effective model for org.opendaylight.controller.samples:sample-toaster-it:jar:1.0-SNAPSHOT
[WARNING] 'build.plugins.plugin.version' for org.ops4j.pax.exam:maven-paxexam-plugin is missing. @ line 23, column 12

Change-Id: I2c46e72940e9ee016a3e6ebb36a39fb7442d90e7
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
8 years agoyang-prototype: add missing version for maven-site-plugin 61/1061/1
Chris Wright [Fri, 30 Aug 2013 06:44:43 +0000 (23:44 -0700)]
yang-prototype: add missing version for maven-site-plugin

This fixes the following warnings:

[WARNING] Some problems were encountered while building the effective model for org.opendaylight.controller:concepts-lang:jar:0.5-SNAPSHOT
[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-site-plugin is missing. @ org.opendaylight.controller:yang-prototype:0.5-SNAPSHOT, /home/chrisw/git/opendaylight/controller/opendaylight/sal/yang-prototype/pom.xml, line 227, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective model for org.opendaylight.controller:yang-prototype:pom:0.5-SNAPSHOT
[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-site-plugin is missing. @ line 227, column 21

Change-Id: Ie36afa672081e3fa5445e539d9279ce14a6fdec0
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
8 years agoMerge "When ports are added to a container, construct its topology immediately based...
Alessandro Boch [Fri, 30 Aug 2013 14:59:43 +0000 (14:59 +0000)]
Merge "When ports are added to a container, construct its topology immediately based on the existing global topology."

8 years agoMerge "Gracefully stop HT threads when the bundle is being stopped (cache terminated...
Jason Ye [Fri, 30 Aug 2013 14:53:01 +0000 (14:53 +0000)]
Merge "Gracefully stop HT threads when the bundle is being stopped (cache terminated exception)"

8 years agoMerge "Fix undefined event, add check prior to delete"
Andrew Kim [Fri, 30 Aug 2013 01:30:32 +0000 (01:30 +0000)]
Merge "Fix undefined event, add check prior to delete"

8 years agoMerge "FRM event sync developement"
Madhu Venugopal [Fri, 30 Aug 2013 01:18:31 +0000 (01:18 +0000)]
Merge "FRM event sync developement"

8 years agoGracefully stop HT threads when the bundle is being stopped (cache terminated exception) 55/1055/1
Alessandro Boch [Thu, 29 Aug 2013 23:58:31 +0000 (16:58 -0700)]
Gracefully stop HT threads when the bundle is being stopped (cache terminated exception)

ISSUE:
When HT bundle is being stopped because container is being destroyed,
infinispan cache terminated exceptions are thrown because HT treads
during their last run are accessing terminated HT caches.
CHANGE:
- Have a stopping flag which gets set when dep mgr calls the HT stopping() method,
so that pending threads and timer tasks can be stopped before Cluster Mgr
terminates the HT caches.
- Fix other static analysis issues in HT code

Change-Id: I3eedb81f9db31c8419502d2eba02aa421616f06a
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoFix undefined event, add check prior to delete 54/1054/1
Andrew Kim [Thu, 29 Aug 2013 23:37:03 +0000 (18:37 -0500)]
Fix undefined event, add check prior to delete

Also changed remove button colors to btn-danger

Change-Id: If1166199b3713132c2c00db4e25d5bc06f26e07a
Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoWhen ports are added to a container, construct its topology immediately based on... 52/1052/1
Jason Ye [Thu, 29 Aug 2013 23:27:24 +0000 (16:27 -0700)]
When ports are added to a container, construct its topology immediately based on the existing global topology.

Change-Id: I6f78a6e03001f52af3eb7cd024fd95dec917dad3
Signed-off-by: Jason Ye <yisye@cisco.com>
8 years agoFix for the Nodes Learnt dashlet error when there are no ports in the topology. 51/1051/2
lakshya [Thu, 29 Aug 2013 23:10:34 +0000 (16:10 -0700)]
Fix for the Nodes Learnt dashlet error when there are no ports in the topology.
This fixes the issue of the dashlet not loading by introducing a null check.

Change-Id: I2c00166409706e95024a913d7e2d85d4f8d4fc3e
Signed-off-by: lakshya <lakshya@cisco.com>
8 years agoFRM event sync developement 35/1035/2
Giovanni Meo [Thu, 22 Aug 2013 21:00:35 +0000 (23:00 +0200)]
FRM event sync developement

- Created necessary logic for distributing entry programming among the
FRM instances in the cluster.
- Made serializable Status so it can be distributed.
- Hooked FRM with connection manager, such that the FRM programming
can be distributed if the node is not local
- In case of non-local node someone picks it and process it, then the
status is returned back to caller.
- At the moment the whole logic to timeout entries that don't get an
answer is missing, will come along.
- HostTracker ages out the ARP entries in clustered environment
because when refreshed the timeout was not being refreshed
clusterwide, probably need a better way to deal with the timing out
-Added license in files missing it.
- Fixed integration test failing, now in fact we can no longer use
fake values else the connection manager will not report them as
attached to local controller and will stuck the test case

Signed-off-by: Giovanni Meo <gmeo@cisco.com>
Change-Id: I74b7535371f61759e89883c66ba9b22596d7dddc

8 years agoNorthbound api cleanup for Subnets 37/1037/1
Diti Bhatia [Thu, 29 Aug 2013 06:34:45 +0000 (23:34 -0700)]
Northbound api cleanup for Subnets

Change-Id: I55f9bfdad8d35a19e2c19a10933d57714b69da88
Signed-off-by: Diti Bhatia <dibhatia@cisco.com>
8 years agoChange 'Nodes Learnt' to 'Nodes Learned' 34/1034/1
Andrew Kim [Wed, 28 Aug 2013 17:06:35 +0000 (12:06 -0500)]
Change 'Nodes Learnt' to 'Nodes Learned'

Change-Id: If3b6099d4f730a8237b471ab4b83db2419745775
Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoMerge "Added archetypes to releasepom"
Giovanni Meo [Wed, 28 Aug 2013 15:26:37 +0000 (15:26 +0000)]
Merge "Added archetypes to releasepom"

8 years agoHostTracker REST APIs compliance of new guidelines 09/1009/6
Asad Ahmed [Tue, 27 Aug 2013 18:19:40 +0000 (11:19 -0700)]
HostTracker REST APIs compliance of new guidelines

Change-Id: I8d33f9970bc4585120316f4cc96f8f32669df4ed
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
8 years agoAdded archetypes to releasepom 33/1033/1
Ed Warnicke [Wed, 28 Aug 2013 14:59:11 +0000 (07:59 -0700)]
Added archetypes to releasepom

Change-Id: Id6cbfba6d3d798fe90ed227c54cc9472b4d57068
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoMerge "Prepare for mvn release:prepare release:perform operation"
Ed Warnicke [Wed, 28 Aug 2013 14:48:33 +0000 (14:48 +0000)]
Merge "Prepare for mvn release:prepare release:perform operation"

8 years agoPrepare for mvn release:prepare release:perform operation 78/978/4
Giovanni Meo [Fri, 23 Aug 2013 08:56:51 +0000 (10:56 +0200)]
Prepare for mvn release:prepare release:perform operation

- Make sure every bundle include a proper scm section
- Provided a pom to be used for release operations in the root
directory, this is due to some implicit assumptions
maven-release-manager does when performing a release. The
maven-release-manager in fact calculate a tag name starting from the
developerConnection and removing from the URL layers based on how
deep the release pom is versus the assumed root. This is hardcoded in:
http://svn.apache.org/viewvc/maven/release/tags/maven-release-2.3.2/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java?view=markup
Line 182 (this logic is not really specific to 2.3.2 version, but
pretty much in every version).
The tag calculation is fine if applied to SCM live SVN but not to GIT
hence this limitation of having to place the root pom in the root
itself.
- Removed uneeded distributions like sdk and parent, because are
combined in the main distribution.
- Corrected some wrong dependencies in clustering
- Added parent poms to distribution so to simplify the deploy of the
artifacts.
- Disable signing of openflowJ during release, it hangs
- Forcing maven-release-plugin to version 2.3.2, latest today (2.4.1)
has some issues.
- Updated README.OPENDAYLIGHT with process for releasing artifacts
- pom file in the root directory is merely a pointer to the main
distribution, this doesn't change any of the current workflow and
enable release support
- Create a profile triggered when the -DDOBUILDRELEASE is set which
exclude modules that are still depending on snapshots not under
controller project

Signed-off-by: Giovanni Meo <gmeo@cisco.com>
Change-Id: I7d18fd7a5efd5809d3fc77d4e0ddc302296d9d98

8 years agoAdded distribution management to archetypes/ root pom 32/1032/1
Ed Warnicke [Wed, 28 Aug 2013 14:17:09 +0000 (07:17 -0700)]
Added distribution management to archetypes/ root pom

Change-Id: I1424cd3d94a4709e8ece65dbe0aeca3ab730b329
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoMerge "Added an archetype odl-model-project"
Giovanni Meo [Wed, 28 Aug 2013 10:24:02 +0000 (10:24 +0000)]
Merge "Added an archetype odl-model-project"

8 years agoAdded CorsFilter to enable secure cross site scripting 31/1031/1
Madhu Venugopal [Wed, 28 Aug 2013 05:26:13 +0000 (22:26 -0700)]
Added CorsFilter to enable secure cross site scripting

This is in addition to Ed's original Cors Filter changes. Default Cors Config
doesnt seem to work in certain scenarios. Added some custom configurations
and also added it per-bundle (started with Flow & i will add it to other bundles
once this is verified).

Also, by default AngularJS like frameworks uses HTTP OPTIONS method to check for
server options and that doesnt carry authentication headers. Hence in order for
the cors to work properly, we have to ignore authentication for OPTIONS method
alone. This is taken care in the web.xml configuration for all the northbound
bundle.

See: http://tomcat.apache.org/tomcat-7.0-doc/config/filter.html#CORS_Filter
And: http://en.wikipedia.org/wiki/Cross-origin_resource_sharing
This is done to allow a web page using javascript to be able to make calls
to our REST APIs even though it does not originate in our domain.

Added CorsFilter bundle in Third Party to bring in the class as a Fragment
on the org.apache.catalina bundle.

Added CorsFilter to the web/root web.xml file so it will be used for
all WebApps.

Fixed the northbound integration tests

Change-Id: I29435c5820613982ef691e03a1d446bc7f958537
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>