controller.git
8 years agoMerge "Added validation for protocol field while adding flow"
Giovanni Meo [Thu, 19 Sep 2013 15:21:04 +0000 (15:21 +0000)]
Merge "Added validation for protocol field while adding flow"

8 years agoMerge "UI: Allow admin to reset password for other users"
Giovanni Meo [Thu, 19 Sep 2013 14:19:39 +0000 (14:19 +0000)]
Merge "UI: Allow admin to reset password for other users"

8 years agoMerge "Simple changes to eliminate pmd warnings"
Giovanni Meo [Thu, 19 Sep 2013 08:58:20 +0000 (08:58 +0000)]
Merge "Simple changes to eliminate pmd warnings"

8 years agoMerge "Add strong password check for users"
Giovanni Meo [Thu, 19 Sep 2013 08:24:02 +0000 (08:24 +0000)]
Merge "Add strong password check for users"

8 years agoMerge "Prepare the TopologyManager code for integration testing. Need to have the...
Giovanni Meo [Thu, 19 Sep 2013 08:12:44 +0000 (08:12 +0000)]
Merge "Prepare the TopologyManager code for integration testing. Need to have the code in a structure where topologymanager is the top level directory and has sub directories - api - implementation - integrationtest"

8 years agoAdded validation for protocol field while adding flow 81/1281/1
Diti Bhatia [Thu, 19 Sep 2013 02:06:08 +0000 (19:06 -0700)]
Added validation for protocol field while adding flow

Signed-off-by: Diti Bhatia <dibhatia@cisco.com>
Change-Id: Iac1a49ce0b3fa576ba07ea48b2afe978d6ced661

8 years agoUI: Allow admin to reset password for other users 80/1280/2
Yevgeny Khodorkovsky [Wed, 18 Sep 2013 20:11:00 +0000 (13:11 -0700)]
UI: Allow admin to reset password for other users

- Allow admin to reset password for other users
  without providing current password.
- enforce re-login if changed own password

Change-Id: I4553739315fe7a93328e54cf4d345e79011246bc
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
8 years agoSwitched odl-model-project archetype to use yangtools 0.5.8-SNAPSHOT 76/1276/1
Ed Warnicke [Wed, 18 Sep 2013 19:39:11 +0000 (14:39 -0500)]
Switched odl-model-project archetype to use yangtools 0.5.8-SNAPSHOT

Change-Id: I404759c5863d5e7dde6d7a2a139177bbf1bcf8d7
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoMerge "Remove maven repo2 from poms because no need for 2 maven repos, especially...
Giovanni Meo [Wed, 18 Sep 2013 18:05:52 +0000 (18:05 +0000)]
Merge "Remove maven repo2 from poms because no need for 2 maven repos, especially since only repo1 is the official supported one."

8 years agoMerge "Fix "FileNotFound" error for jacoco.exec and the path to the integration tests."
Giovanni Meo [Wed, 18 Sep 2013 18:04:59 +0000 (18:04 +0000)]
Merge "Fix "FileNotFound" error for jacoco.exec and the path to the integration tests."

8 years agoMerge "Conversion class ToSalConversionsUtils."
Ed Warnicke [Wed, 18 Sep 2013 15:38:28 +0000 (15:38 +0000)]
Merge "Conversion class ToSalConversionsUtils."

8 years agoMerge "Configure jackson to turn off FAIL_ON_UNKNOWN_PROPERTIES. This ensures that...
Madhu Venugopal [Wed, 18 Sep 2013 15:37:38 +0000 (15:37 +0000)]
Merge "Configure jackson to turn off FAIL_ON_UNKNOWN_PROPERTIES. This ensures that Jackson is more lenient when it sees extra attributes in the request payload. Add custom exception mapper for handling jackson json exceptions during deserialization"

8 years agoMerge "Adding Tri-states to the connection manager locality check."
Giovanni Meo [Wed, 18 Sep 2013 15:37:28 +0000 (15:37 +0000)]
Merge "Adding Tri-states to the connection manager locality check."

8 years agoMerge "Added Router code generation and unit tests for runtime code generator"
Ed Warnicke [Wed, 18 Sep 2013 15:36:19 +0000 (15:36 +0000)]
Merge "Added Router code generation and unit tests for runtime code generator"

8 years agoMerge "MD-SAL model for group feature in OF 1.3."
Ed Warnicke [Wed, 18 Sep 2013 14:52:53 +0000 (14:52 +0000)]
Merge "MD-SAL model for group feature in OF 1.3."

8 years agoConversion class ToSalConversionsUtils. 67/1267/1
Jozef Gloncak [Wed, 18 Sep 2013 14:10:57 +0000 (16:10 +0200)]
Conversion class ToSalConversionsUtils.

YANG -> SAL conversion

Change-Id: If502dabcb00bba0f189ec0d1b4ce714ef55426aa
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoAdding Tri-states to the connection manager locality check. 65/1265/1
Madhu Venugopal [Wed, 18 Sep 2013 13:04:10 +0000 (06:04 -0700)]
Adding Tri-states to the connection manager locality check.

As of now, the connection manager's isLocal() provides a binary true/false for a locality.
But is missing a key state of not-connected. This is now included as part of a new API (getLocalityStatus).
Retaining the isLocal as a deprecated method to be removed later once all the users have migrated.

Change-Id: I0feddf2a86770740f441060bd411f28d1bb15610
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
8 years agoMerge "In o.o.c.switchmanager.SpanConfig, handle node connector string format correctly."
Giovanni Meo [Wed, 18 Sep 2013 10:27:47 +0000 (10:27 +0000)]
Merge "In o.o.c.switchmanager.SpanConfig, handle node connector string format correctly."

8 years agoMerge "Add missing validation on ContainerFlowConfig objects"
Giovanni Meo [Wed, 18 Sep 2013 10:18:22 +0000 (10:18 +0000)]
Merge "Add missing validation on ContainerFlowConfig objects"

8 years agoFix "FileNotFound" error for jacoco.exec and the path to the integration 21/1221/3
Alissa Bonas [Tue, 17 Sep 2013 13:44:35 +0000 (16:44 +0300)]
Fix "FileNotFound" error for jacoco.exec and the path to the integration
tests.

Change-Id: I388dfc01a672f53d939c62953fb5638643f2dca9
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoDeclare jacoco.version in parent pom and reuse it in other pom files. 25/1225/2
Alissa Bonas [Tue, 17 Sep 2013 15:02:03 +0000 (18:02 +0300)]
Declare jacoco.version in parent pom and reuse it in other pom files.

Change-Id: I79a4bd9278c53ff18199a06c40a37f1627e412b8
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoRemove maven repo2 from poms because no need for 2 maven repos, 48/1248/1
Alissa Bonas [Wed, 18 Sep 2013 07:53:31 +0000 (10:53 +0300)]
Remove maven repo2 from poms because no need for 2 maven repos,
especially since only repo1 is the official supported one.

Change-Id: I2121923e375bb3efbb7ddf5f2289a465528a131e
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoAdd strong password check for users 41/1241/2
Alessandro Boch [Wed, 18 Sep 2013 07:13:49 +0000 (00:13 -0700)]
Add strong password check for users

- User password must be at least 8 characters long, contain upper and lower
  case letters, at least one number and one non-alphanumeric character. Max lenght 256.
- Disabled by default, can be enabled through config.ini

Change-Id: I4696801dc60379292a3d6a687795f33971bd85c8
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoAdded Router code generation and unit tests for runtime code generator 27/1227/3
Tony Tkacik [Tue, 17 Sep 2013 15:32:11 +0000 (17:32 +0200)]
Added Router code generation and unit tests for runtime code generator

Added implementation of Router generation
  - SAL implementation of service responsible for routing requests
    to southbound components based on ContextReference field,
    which is conceptually same as NodeType in HARD SAL, but more
    flexible and does allow selecting implementation on different
    fields than only NodeType.

Moved runtime code generation code to separate packages .codegen

Change-Id: I3c89151071c6e34af1490a79b4f19f6195a878a5
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoConfigure jackson to turn off FAIL_ON_UNKNOWN_PROPERTIES. This ensures that Jackson is 46/1246/1
Prasanth Pallamreddy [Tue, 17 Sep 2013 21:18:02 +0000 (14:18 -0700)]
Configure jackson to turn off FAIL_ON_UNKNOWN_PROPERTIES. This ensures that Jackson is
more lenient when it sees extra attributes in the request payload. Add custom exception
mapper for handling jackson json exceptions during deserialization

Change-Id: Id2da67b4edfc92f1d11e41fd349814c2de05079c
Signed-off-by: Prasanth Pallamreddy <ppallamr@cisco.com>
8 years agoMD-SAL model for group feature in OF 1.3. 45/1245/2
Prasanna Huddar [Wed, 18 Sep 2013 02:40:16 +0000 (19:40 -0700)]
MD-SAL model for group feature in OF 1.3.

Change-Id: I34db6a383b94c43682deefb2dd2b7ca9b04b1d87
Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
8 years agoPrepare the TopologyManager code for integration testing. Need to have the code in... 40/1240/3
Moiz Raja [Tue, 17 Sep 2013 23:45:35 +0000 (16:45 -0700)]
Prepare the TopologyManager code for integration testing. Need to have the code in a structure where topologymanager is the top level directory and has sub directories
- api
- implementation
- integrationtest

Change-Id: I20f1c02e40e6045a2fd82c14bc7a0090c2b529b0
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoIn o.o.c.switchmanager.SpanConfig, handle node connector string format correctly. 42/1242/1
Jason Ye [Wed, 18 Sep 2013 00:53:33 +0000 (17:53 -0700)]
In o.o.c.switchmanager.SpanConfig, handle node connector string format correctly.

Change-Id: Ia4a513e37b69ecf8fb4966b15aa8a4f0f60f753f
Signed-off-by: Jason Ye <yisye@cisco.com>
8 years agoMerge "Fail toggle flow if port is no longer a part of slice"
Alessandro Boch [Tue, 17 Sep 2013 23:38:32 +0000 (23:38 +0000)]
Merge "Fail toggle flow if port is no longer a part of slice"

8 years agoSimple changes to eliminate pmd warnings 39/1239/1
Raghurama Bhat [Tue, 17 Sep 2013 23:18:59 +0000 (16:18 -0700)]
Simple changes to eliminate pmd warnings

Signed-off-by: Raghurama Bhat <ragbhat@cisco.com>
Change-Id: I311f3585e61b520ba85db062a4eab6b1cf386561
Signed-off-by: Raghurama Bhat <ragbhat@cisco.com>
8 years agoMerge "Cookie value is ignored while converting OF Flow statistics to SAL statistics"
Madhu Venugopal [Tue, 17 Sep 2013 23:12:48 +0000 (23:12 +0000)]
Merge "Cookie value is ignored while converting OF Flow statistics to SAL statistics"

8 years agoMerge "Add the following logics: - only send wildcard flowmod delete to the switch...
Madhu Venugopal [Tue, 17 Sep 2013 23:05:14 +0000 (23:05 +0000)]
Merge "Add the following logics: - only send wildcard flowmod delete to the switch  when the controller is the cluster's master - ignore nodeAdd notification when the event is triggered by connection manager as a result of a subsequent controller (standby) joining the cluster."

8 years agoAdd the following logics: 37/1237/1
Chi-Vien Ly [Tue, 17 Sep 2013 22:20:04 +0000 (15:20 -0700)]
Add the following logics:
- only send wildcard flowmod delete to the switch  when the controller is the cluster's master
- ignore nodeAdd notification when the event is triggered by connection manager as a result of a subsequent controller (standby) joining the cluster.

Change-Id: I9450df87af4fc9ec306ee5787c48163587d98140
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
8 years agoAdd missing validation on ContainerFlowConfig objects 36/1236/1
Alessandro Boch [Tue, 17 Sep 2013 20:06:49 +0000 (13:06 -0700)]
Add missing validation on ContainerFlowConfig objects

- Some basic validation is missing when modifying the container flow configs in a container

Change-Id: I4955a5a1ae9ef36a5564570bd5ae38801055c355
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoImplement doesContainerExist(String) so that IT tests can use. 35/1235/1
Shigeru Yasuda [Tue, 17 Sep 2013 20:18:23 +0000 (05:18 +0900)]
Implement doesContainerExist(String) so that IT tests can use.

Change-Id: I355b2c5f0951fad2795cc39a67a6000954303c80
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
8 years agoRevert "Remove declaring jacoco plugin twice in integrationtests pom.xml files -... 32/1232/1
Giovanni Meo [Tue, 17 Sep 2013 15:58:29 +0000 (15:58 +0000)]
Revert "Remove declaring jacoco plugin twice in integrationtests pom.xml files - because the pluginsManagement section is intended for use by child pom files which do not exist in integration tests case."

This reverts commit a344e6a9d9ac9f513659eb0ec66b34d4c6f82c5d.

Reverting because it's stalling pipeline of commits, will analyze why the verify didn't show any issue while merge does.

Change-Id: Ifd15e8bfabeeb7ad04424c8da8a27fd000bd50ba
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoFail toggle flow if port is no longer a part of slice 30/1230/1
Diti Bhatia [Tue, 17 Sep 2013 15:52:20 +0000 (08:52 -0700)]
Fail toggle flow if port is no longer a part of slice

Change-Id: I637e8da1f16bb21a82e4a53939f6b00bdc84f993
Signed-off-by: Diti Bhatia <dibhatia@cisco.com>
8 years agoCookie value is ignored while converting OF Flow statistics to SAL statistics 28/1228/1
Alessandro Boch [Tue, 17 Sep 2013 15:34:53 +0000 (08:34 -0700)]
Cookie value is ignored while converting OF Flow statistics to SAL statistics

Change-Id: Ia47d4e673fee0e247b49b45ae5ce55bdb387f7fe
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoRemove declaring jacoco plugin twice in integrationtests pom.xml files - 22/1222/1
Alissa Bonas [Tue, 17 Sep 2013 14:10:02 +0000 (17:10 +0300)]
Remove declaring jacoco plugin twice in integrationtests pom.xml files -
because the pluginsManagement section is intended for use by child pom
files which do not exist in integration tests case.

Change-Id: Ida2b06747bf9a74760a8fb1e5efd16b6918df150
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoBuild fix: Fix bundle type for the bundlescanner.implementation sal dependency 17/1217/1
Prasanth Pallamreddy [Tue, 17 Sep 2013 10:45:21 +0000 (03:45 -0700)]
Build fix: Fix bundle type for the bundlescanner.implementation sal dependency

Change-Id: I21d6c3faf119b06dc50d2986ef5e497a3e647a8c
Signed-off-by: Prasanth Pallamreddy <ppallamr@cisco.com>
8 years agoMerge "UI support for multiple host per port"
Giovanni Meo [Tue, 17 Sep 2013 08:29:52 +0000 (08:29 +0000)]
Merge "UI support for multiple host per port"

8 years agoMerge "Add password recovery procedure for default admin user"
Giovanni Meo [Tue, 17 Sep 2013 08:29:17 +0000 (08:29 +0000)]
Merge "Add password recovery procedure for default admin user"

8 years agoMerge "Add missing null check in Container name validation"
Giovanni Meo [Tue, 17 Sep 2013 08:27:37 +0000 (08:27 +0000)]
Merge "Add missing null check in Container name validation"

8 years agoMerge "Address @XmlSeeAlso limitation. Provide the ability to inject the JAXB types...
Giovanni Meo [Tue, 17 Sep 2013 08:00:14 +0000 (08:00 +0000)]
Merge "Address @XmlSeeAlso limitation. Provide the ability to inject the JAXB types without having the need to explicitly define the inherited types with @XmlSeelAlso.  Introduced BundleScanner service which scans bundle classes for annotations dynamically and provides proper artifacts for NB applications to bootstrap. Eliminate the need for NB application extensions."

8 years agoMerge "Reorder public/private modifiers as per JLS. (fixes sonar warnings)"
Giovanni Meo [Tue, 17 Sep 2013 07:53:43 +0000 (07:53 +0000)]
Merge "Reorder public/private modifiers as per JLS. (fixes sonar warnings)"

8 years agoAdd missing null check in Container name validation 11/1211/1
Alessandro Boch [Tue, 17 Sep 2013 00:59:38 +0000 (17:59 -0700)]
Add missing null check in Container name validation

Change-Id: Ie13d7a3a5d1068064e1c8d72ec9a8b6b343077c6
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoAdd password recovery procedure for default admin user 10/1210/1
Alessandro Boch [Mon, 16 Sep 2013 23:20:15 +0000 (16:20 -0700)]
Add password recovery procedure for default admin user

ISSUE:
  Need for a password recovery procedure for the controller default network administartor user (admin)
  which can be performed only by a user which has access to the host machine file system
PROCEDURE:
  1) System admin creates a flag file in startup directory
  2) Restarts User Manager implementation bundle (or the whole controller) through osgi console

  The above two actions will reset the default network administrator password to the factory one, "admin".
  Will log the change to console and remove the flag file.

Change-Id: Iba5cfd908ef311beeb74c6b11df3bbc6b34872cb
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoUI support for multiple host per port 09/1209/1
Andrew Kim [Mon, 16 Sep 2013 23:13:40 +0000 (18:13 -0500)]
UI support for multiple host per port

Change-Id: I57d6800b77045633afdbfa3e878f070ed82d8557
Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoFix for Span Port added to a Switch should show port name or port id. 08/1208/1
lakshya [Mon, 16 Sep 2013 17:52:36 +0000 (10:52 -0700)]
Fix for Span Port added to a Switch should show port name or port id.

Change-Id: I395d0d10b4e983212f12bc1ac1b35e1fd4fa785b
Signed-off-by: lakshya <lakshya@cisco.com>
8 years agoAddress @XmlSeeAlso limitation. Provide the ability to inject the JAXB types 07/1207/1
Prasanth Pallamreddy [Mon, 9 Sep 2013 21:50:33 +0000 (14:50 -0700)]
Address @XmlSeeAlso limitation. Provide the ability to inject the JAXB types
without having the need to explicitly define the inherited types with
@XmlSeelAlso.  Introduced BundleScanner service which scans bundle classes for
annotations dynamically and provides proper artifacts for NB applications to
bootstrap. Eliminate the need for NB application extensions.

Change-Id: I08b6a30a551f63a304732e8fdda9a594d1a6ca93
Signed-off-by: Prasanth Pallamreddy <ppallamr@cisco.com>
8 years agoMerge "one.x.troubleshooting is undefined while updating node name"
Alessandro Boch [Mon, 16 Sep 2013 18:52:24 +0000 (18:52 +0000)]
Merge "one.x.troubleshooting is undefined while updating node name"

8 years agoone.x.troubleshooting is undefined while updating node name 06/1206/1
Sapan Shah [Mon, 16 Sep 2013 17:28:36 +0000 (10:28 -0700)]
one.x.troubleshooting is undefined while updating node name

Change-Id: Ibfac018dd943bfbaa35ca1bb179a240493dea39f
Signed-off-by: Sapan Shah <sapshah@cisco.com>
8 years agoReorder public/private modifiers as per JLS. (fixes sonar warnings) 03/1203/1
Alissa Bonas [Mon, 16 Sep 2013 17:04:44 +0000 (20:04 +0300)]
Reorder public/private modifiers as per JLS. (fixes sonar warnings)

Signed-off-by: Alissa Bonas <abonas@redhat.com>
Change-Id: I9a8d36a812443aa2e33a01bd30ab9e54758e693a
Signed-off-by: Alissa Bonas <abonas@redhat.com>
8 years agoRemove heavy operation in the context of OSGi framework 99/1199/1
Giovanni Meo [Mon, 16 Sep 2013 14:32:35 +0000 (16:32 +0200)]
Remove heavy operation in the context of OSGi framework

The routine modeChangeNotify can be called in the context of the OSGi
framework via the chain:

<snip>
at org.opendaylight.controller.forwardingrulesmanager.internal.ForwardingRulesManager.modeChangeNotify(ForwardingRulesManager.java:2137)
at org.opendaylight.controller.switchmanager.internal.SwitchManager.switchManagerAwareNotify(SwitchManager.java:1797)
at org.opendaylight.controller.switchmanager.internal.SwitchManager.setSwitchManagerAware(SwitchManager.java:1677)
</snip>

now given the modeChangeNotify trigger an interaction with the network
element, it's better to keep that off a different thread to avoid to
stuck the OSGi framework for to long.

Change-Id: I41ba96372816cd0a5b2b488bbfc64d10ba2adb4a
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoMerge "User Manager to hash users passwords"
Giovanni Meo [Mon, 16 Sep 2013 07:26:44 +0000 (07:26 +0000)]
Merge "User Manager to hash users passwords"

8 years agoMerge "Log TLS auth failure"
Giovanni Meo [Mon, 16 Sep 2013 07:22:59 +0000 (07:22 +0000)]
Merge "Log TLS auth failure"

8 years agoMerge "improved flow-type model"
Giovanni Meo [Mon, 16 Sep 2013 07:18:40 +0000 (07:18 +0000)]
Merge "improved flow-type model"

8 years agoUser Manager to hash users passwords 89/1189/1
Alessandro Boch [Sun, 15 Sep 2013 02:05:15 +0000 (19:05 -0700)]
User Manager to hash users passwords

- When a UserConfig object is created, hash the user password

Change-Id: I7eb85c7b0119e1a8f913562a83cd409864a9f1c0
Signed-off-by: Alessandro Boch <aboch@cisco.com>
8 years agoLog TLS auth failure 86/1186/1
Jason Ye [Sat, 14 Sep 2013 01:25:56 +0000 (18:25 -0700)]
Log TLS auth failure

Change-Id: Ibacafafa4bafa1423ef0cdcde271fe764be6599c
Signed-off-by: Jason Ye <yisye@cisco.com>
8 years agoFix flows detail 85/1185/1
Andrew Kim [Fri, 13 Sep 2013 22:32:44 +0000 (17:32 -0500)]
Fix flows detail

- Fix flow with same names not correctly updating details table
  - Add extra check to differentiate between flows on different nodes
- Minor refactor in backend to consolidate Gson

Change-Id: Ifffa051d574a0a81af4de9472842ec82194dfb42
Signed-off-by: Andrew Kim <andrekim@cisco.com>
8 years agoFix for Cannot delete static flow in a container via GUI. 84/1184/2
lakshya [Fri, 13 Sep 2013 18:18:53 +0000 (11:18 -0700)]
Fix for Cannot delete static flow in a container via GUI.

Change-Id: I68bd28b775503a9afe2bd41bc1bc64ece9a81e1c
Signed-off-by: lakshya <lakshya@cisco.com>
8 years agoAddressing gerrit 1182 Madhu's comment 83/1183/1
Giovanni Meo [Fri, 13 Sep 2013 15:41:51 +0000 (17:41 +0200)]
Addressing gerrit 1182 Madhu's comment

- Making sure the executor service is available before the loadconfig
gets called, just in case of some race condition

Change-Id: Ib1d84c33536a68806d281d23855a6c0a5be2dd23
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoMerge "Make FRM to finally distribute the work orders"
Alessandro Boch [Fri, 13 Sep 2013 15:26:57 +0000 (15:26 +0000)]
Merge "Make FRM to finally distribute the work orders"

8 years agoMerge "Fix for cache cleanup in protocol plugin on container deletion"
Giovanni Meo [Fri, 13 Sep 2013 15:24:27 +0000 (15:24 +0000)]
Merge "Fix for cache cleanup in protocol plugin on container deletion"

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 agoimproved flow-type model 75/1175/2
Michal Rehak [Fri, 13 Sep 2013 00:11:57 +0000 (02:11 +0200)]
improved flow-type model

added priority, idletime, hardtime, cookies

Change-Id: I8550668d2317222cad10c61d5c3d0e6cec42b2e5
Signed-off-by: Michal Rehak <mirehak@cisco.com>
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 agoFix for cache cleanup in protocol plugin on container deletion 70/1170/1
Pramila Singh [Thu, 12 Sep 2013 18:21:45 +0000 (11:21 -0700)]
Fix for cache cleanup in protocol plugin on container deletion

Change-Id: I5c16211ea12c384726a5a9d3f1cc23d40c1d0d3f
Signed-off-by: Pramila Singh <pramisin@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."