controller.git
10 years agoFRM to remove flows on switchport admin down 16/1316/2
Alessandro Boch [Fri, 20 Sep 2013 16:45:22 +0000 (09:45 -0700)]
FRM to remove flows on switchport admin down

- When a swithport is shutdown FRM should uninstall the flows which have that port as input/output
- Similarly when a port is moved to admin up state, FRM should install the interested flows from the config

Change-Id: I890a4fb6541c9a01b0adacba7af9c0b8c2d69878
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoChange the member isValid in class MatchField non-transient so that it can be synced... 23/1323/1
Chi-Vien Ly [Sat, 21 Sep 2013 13:26:54 +0000 (06:26 -0700)]
Change the member isValid in class MatchField non-transient so that it can be synced properly.

Change-Id: I036d43b6328d16136a99004ed53d0eb2b70d12c8
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
10 years agoFRM uses "Start Level Thread" to handle container flow changes during bootup 22/1322/1
Chi-Vien Ly [Sat, 21 Sep 2013 01:47:32 +0000 (18:47 -0700)]
FRM uses "Start Level Thread"  to handle container flow changes during bootup

Modify the current design: when FRM receives the notification, it puts it into its own event queue and returns immediately. The event is eventually handled (in the same way) but through FRM's own thread.

Change-Id: I7d1b3608424f44a0f4129ae08a4c9a836a71e370
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
10 years agoCouple of changes 21/1321/1
Asad Ahmed [Fri, 20 Sep 2013 23:08:41 +0000 (16:08 -0700)]
Couple of changes

1. StaticRoutingImplementation now updates cache after updating nodeconnector for   \
the static route

2. The clone method of MatchField now clones the valid flag and the type

Change-Id: I7e4e274742a4680f1369eecbeff155bbede3283c
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
10 years agoCherry-picked and merged modified JavaDocs for northbound apis to fix JSON/XML repres... 19/1319/1
mrajvaid [Fri, 20 Sep 2013 16:38:05 +0000 (09:38 -0700)]
Cherry-picked and merged modified JavaDocs for northbound apis to fix JSON/XML representation

Change-Id: I322b3b77e55c54b54352eb3999ec0fc7a447b2c6
Signed-off-by: mrajvaid <mrajvaid@cisco.com>
10 years agoMerge "Few debug enhancements to debug hashing issues"
Alessandro Boch [Fri, 20 Sep 2013 17:19:47 +0000 (17:19 +0000)]
Merge "Few debug enhancements to debug hashing issues"

10 years agoMerge "Fix: IPProtocols not parsing correctly"
Alessandro Boch [Fri, 20 Sep 2013 17:10:40 +0000 (17:10 +0000)]
Merge "Fix: IPProtocols not parsing correctly"

10 years agoMerge "Fix multi-host caching in visual topology"
Giovanni Meo [Fri, 20 Sep 2013 14:18:28 +0000 (14:18 +0000)]
Merge "Fix multi-host caching in visual topology"

10 years agoReverting the FRM WorkOrder caches to NON_TRANSACTIONAL 15/1315/1
Madhu Venugopal [Fri, 20 Sep 2013 13:56:18 +0000 (06:56 -0700)]
Reverting the FRM WorkOrder caches to NON_TRANSACTIONAL

After Giovanni's recent hashCode fix, most of the cache issue issues are resolved and it also renders itself to making
FRM WorkOrder back NON_TRANSACTIONAL. Also reverted the need to have a seperate thread to handle this processing.
Now it is back to normal and how it is supposed to be.

Change-Id: I0abbe66ea0ec7203ef306bc73d848112110f6460
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
10 years agoFix: IPProtocols not parsing correctly 04/1304/3
Yevgeny Khodorkovsky [Fri, 20 Sep 2013 04:07:05 +0000 (21:07 -0700)]
Fix: IPProtocols not parsing correctly

- Add IP protocol field validation where appropriate
- Enabled all IP protocols in enum
- Added unit tests

Change-Id: I2ae26ad1c3b56129817f41e0a93d27f5b031b790
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
10 years agoMerge "In Firefox DropDown sub menus will have the first option selected"
Andrew Kim [Fri, 20 Sep 2013 05:46:46 +0000 (05:46 +0000)]
Merge "In Firefox DropDown sub menus will have the first option selected"

10 years agoIn Firefox DropDown sub menus will have the first option selected 06/1306/1
Sapan Shah [Fri, 20 Sep 2013 05:32:16 +0000 (22:32 -0700)]
In Firefox DropDown sub menus will have the first option selected

Change-Id: Ib7ea1fbfc0cbe3c8921116ffc7f79ac7b9d9f654
Signed-off-by: Sapan Shah <sapshah@cisco.com>
10 years agoFix for Refresh Port Details and Flow Details in Troubleshoot makes search hard 05/1305/1
lakshya [Fri, 20 Sep 2013 04:55:05 +0000 (21:55 -0700)]
Fix for Refresh Port Details and Flow Details in Troubleshoot makes search hard
Replace the auto refresh with a refresh button.

Change-Id: If231b7ee722c436d792000646b743028469f6f03
Signed-off-by: lakshya <lakshya@cisco.com>
10 years agoFix multi-host caching in visual topology 03/1303/1
Andrew Kim [Fri, 20 Sep 2013 02:43:10 +0000 (21:43 -0500)]
Fix multi-host caching in visual topology

Change-Id: I68cd3de135d8422b3994387f43bc0df67c612f3f
Signed-off-by: Andrew Kim <andrekim@cisco.com>
10 years agoController User Audit log to track activities 79/1279/3
Sapan Shah [Wed, 18 Sep 2013 21:26:58 +0000 (14:26 -0700)]
Controller User Audit log to track activities

Change-Id: I78760a5bcea3de9fcea4a0edd46eb7ea44765db0
Signed-off-by: Sapan Shah <sapshah@cisco.com>
10 years agoFew debug enhancements to debug hashing issues 97/1297/2
Giovanni Meo [Thu, 19 Sep 2013 15:58:01 +0000 (17:58 +0200)]
Few debug enhancements to debug hashing issues

Change-Id: I4a173c0a423d740ef75249f777aa35e5d2772d9c
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
10 years agoMerge "Provide consistent hash code for enums and use it too"
Madhu Venugopal [Thu, 19 Sep 2013 15:46:14 +0000 (15:46 +0000)]
Merge "Provide consistent hash code for enums and use it too"

10 years agoMerge "Validate user input in FlowSepc Configuration"
Giovanni Meo [Thu, 19 Sep 2013 15:36:49 +0000 (15:36 +0000)]
Merge "Validate user input in FlowSepc Configuration"

10 years agoMerge "Sal Models for meter table. Removed tab space from group models and formatted...
Giovanni Meo [Thu, 19 Sep 2013 15:23:23 +0000 (15:23 +0000)]
Merge "Sal Models for meter table. Removed tab space from group models and formatted the same."

10 years agoMerge "Aligning JSON marshalled output for Properties similar to the XML counterpart."
Giovanni Meo [Thu, 19 Sep 2013 15:22:22 +0000 (15:22 +0000)]
Merge "Aligning JSON marshalled output for Properties similar to the XML counterpart."

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

10 years agoProvide consistent hash code for enums and use it too 92/1292/2
Giovanni Meo [Thu, 19 Sep 2013 09:33:45 +0000 (11:33 +0200)]
Provide consistent hash code for enums and use it too

- Java enums if used as key, works well in a single JVM, but across
JVM the hashcode generated by them is not guaranteed to be the same
and that breaks the calculation of a cluster wide consistent hash
code, needed by the clustering services. The fix is to provide a
consistent hashcode for the Enum and to use it in the dependent data
structures.

Change-Id: Iee80f262253a287e8bc8be4d5371d0bd407f0462
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
10 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"

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

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

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

10 years agoValidate user input in FlowSepc Configuration 78/1278/3
Maurice Qureshi [Wed, 18 Sep 2013 21:15:44 +0000 (14:15 -0700)]
Validate user input in FlowSepc Configuration

Existing flow spec validation was missing range check for IP Protocol and Protocol
source and destination ports. Also, port number were not being checked for invalid
input

Change-Id: I11a5c6b90c4d5193f4e1950df684363e22b0e33a
Signed-off-by: Maurice Qureshi <maquresh@cisco.com>
10 years agoAligning JSON marshalled output for Properties similar to the XML counterpart. 83/1283/1
Madhu Venugopal [Thu, 19 Sep 2013 05:06:45 +0000 (22:06 -0700)]
Aligning JSON marshalled output for Properties similar to the XML counterpart.

After the Jackson migration (https://git.opendaylight.org/gerrit/#/c/1131), the marshalled JSON output
got misaligned from its XML counterpart. This is because of the "special" handling of XmlElementRef by
Jettison.
Please refer to http://pastebin.com/6kCSuddg for various marshalled JSON output for Jettison, Jackson and Moxy.

Having tried & exhausted various mechanisms (using Jackson and Moxy), finally decided to use the Jackson
annotations to take care of this requirement. Changes involves :

1. Modified NodeConnectProperties, EdgProperties and NodeProperties to use @JsonIgnore and @JsonProperty
2. Reverted a few NorthboundIT changes as prior to the gerrit#1131 version to align to the JSON format.
3. Added @XmlAccessorType(XmlAccessType.NONE) in all the Property classes to avoid including unnecessary data.

Change-Id: I574956328fa841b2165e0c10ddec995c70b76e4d
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
10 years agoSal Models for meter table. 82/1282/2
Prasanna Huddar [Thu, 19 Sep 2013 04:27:59 +0000 (21:27 -0700)]
Sal Models for meter table.
Removed tab space from group models and formatted the same.

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

10 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

10 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

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

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

10 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>
10 years agoMerge "Refactor SubnetConfig"
Giovanni Meo [Thu, 12 Sep 2013 16:21:42 +0000 (16:21 +0000)]
Merge "Refactor SubnetConfig"

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