Jeffrey Pedigo [Mon, 7 Nov 2016 20:53:02 +0000 (13:53 -0700)]
Added support for priority in all classifiers
Bug: 6763
Change-Id: Ifb214d922ca3a43bcf5932afd9431cc9997bb0ad
Signed-off-by: Jeffrey Pedigo <jeff@appliedbroadband.com>
Jeff [Thu, 6 Oct 2016 15:05:06 +0000 (09:05 -0600)]
Updates to support new TrafficProfiles that require a user-specified Direction in the GateSpec
Bug: 6762
Change-Id: I6b953e68c3a8420e5ec16e43135c249d2982df5d
Signed-off-by: Jeff <jeff@appliedbroadband.com>
Mufaddal Makati [Thu, 18 Aug 2016 20:29:23 +0000 (14:29 -0600)]
Fix Bug 6299 and formatting issues
- Fixed bug - https://bugs.opendaylight.org/show_bug.cgi?id=6299
- Fixed tabs and spacing issue
Change-Id: Ifc42607ba8f4019de05284971c9d979c024d28bf
Signed-off-by: Mufaddal Makati <m.makati@cablelabs.com>
Ryan Vail [Tue, 16 Aug 2016 13:53:59 +0000 (13:53 +0000)]
Merge "Bug 6278: Switch to use odlparent's karaf-parent"
Mufaddal Makati [Fri, 5 Aug 2016 23:16:23 +0000 (17:16 -0600)]
Solves the following-
Mutlimedia Transaction Identifier does not change.
On each start of the ODL PacketCable plugin instance, it appears that a
single MM Transaction ID is set and it NEVER changes.
Change-Id: I57789d01165c1e31509924bd6f6b1d7ceb4fcbb6
Signed-off-by: Mufaddal Makati <m.makati@cablelabs.com>
Ryan Goulding [Sun, 7 Aug 2016 21:05:05 +0000 (17:05 -0400)]
Bug 6278: Switch to use odlparent's karaf-parent
Change-Id: Ib7a3404e258da60afd388d3cb5ced56a74dac722
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
Thanh Ha [Mon, 8 Aug 2016 21:50:19 +0000 (17:50 -0400)]
Bump versions by 0.1.0 for next dev cycle
Change-Id: I556f25461448664c3665752bedd4c96994f69007
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Sat, 23 Jul 2016 01:41:44 +0000 (21:41 -0400)]
Add missing license headers
Change-Id: Ifad42ad84b1b0f5539dc3a1fcf460ee7d8f9da47
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Lorand Jakab [Wed, 29 Jun 2016 21:09:28 +0000 (16:09 -0500)]
Upgrade ietf-{inet,yang}-types to 2013-07-15
Change-Id: Iff156debb67f02b252a08823df503ae5c83d8c69
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
Mufaddal Makati [Fri, 3 Jun 2016 15:56:44 +0000 (09:56 -0600)]
- Removed validation for all classifier fields (yang and validation code);
- Added wildcard support for all classifier fields that did not have it (including IP addresses and protocol; basically you can now submit an empty classifier, or one that has only the protocol or just the source IP included);
- Fixed issue with large port ranges;
- Fixed validation unit tests to allow for optional classifer values
Change-Id: Iaa8aba2fdc701546b0819957989bd45a46ba112d
Signed-off-by: Mufaddal Makati <m.makati@cablelabs.com>
Luis Gomez [Mon, 18 Apr 2016 23:20:23 +0000 (16:20 -0700)]
Remove nexusproxy property
Change-Id: I97bf0e8da2a7cbc7d7bebe33452d09ac237921e3
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
Ryan Vail [Mon, 14 Mar 2016 16:16:40 +0000 (10:16 -0600)]
Removed incorrect override of powermock version from pom
Change-Id: I9dce166a403daa32f3ff8fb49aae140caf309629
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>
Thanh Ha [Thu, 21 Jan 2016 20:49:17 +0000 (15:49 -0500)]
Bump yangtools to 1.0.0-SNAPSHOT
Change-Id: I499a763486000dd2f208b395294a1631e220526b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Fri, 15 Jan 2016 06:26:20 +0000 (01:26 -0500)]
Bump versions by 0.1.0 for next dev cycle
Change-Id: Ie6c2ea502466ff2234c562d30350e3e1972c1bd8
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Ryan Vail [Tue, 1 Dec 2015 17:16:16 +0000 (11:16 -0600)]
Added GateInfo to Op Ds and RPCs to support gate update requests
Extended driver with GateState and GateInfo types.
Added GateInfo data to operationa datastore.
Added RPC to request GateState updating.
Updated cmts emulator to respond to gate info requests
Change-Id: I35bccb12636359c3613b4b06958a348037cef93b
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>
Thanh Ha [Wed, 16 Dec 2015 05:03:42 +0000 (00:03 -0500)]
Enable checkstyle plugin and switch to odlparent
- Switches parent to odlparent
- Enables checkstyle plugin
Change-Id: Ie91049bcf9eb65bf8e3106e062bb6ec065a00cc3
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:48:00 +0000 (10:48 -0500)]
Add pcmm/umu/cops to exclude license checker (3rdparty lib)
Change-Id: Iea5950c2e9e84bf67c999252b174bc5e7b24ab48
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:43:58 +0000 (10:43 -0500)]
Add missing license headers to packetcable-driver umu/cops
Change-Id: Ifd44586adf5ef205e2bc1793d12bc98f47f81963
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:42:21 +0000 (10:42 -0500)]
Add missing license headers to packetcable-driver pcmm
Change-Id: I220c6d285d10e03c05b62234e18b7a0ae2d6e1e8
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:40:55 +0000 (10:40 -0500)]
Add missing license headers to packetcable-driver utils
Change-Id: I0ea1ec4bed3d61ba617d97606763075a8f8af8d0
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:38:54 +0000 (10:38 -0500)]
Add missing license headers to packetcable-driver state
Change-Id: Iefc6fb24ed70ff86850f2f87eb5303433fff8e90
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:38:15 +0000 (10:38 -0500)]
Add missing license headers to packetcable-driver scd
Change-Id: Ib6936f66fe98df759f854be8540d352d4391c7aa
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:36:31 +0000 (10:36 -0500)]
Add missing license headers to packetcable-driver rcd
Change-Id: Ica18e55a119db8aae9f9914eb228b5c9ef6d0d4b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:34:49 +0000 (10:34 -0500)]
Add missing license headers to packetcable-driver objects
Change-Id: I7c3e2ceed3b8dafcdc173556ec688cdc6d0ee63e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:33:47 +0000 (10:33 -0500)]
Add missing license headers to packetcable-driver nio
Change-Id: I5e48d64d589e09073eb4d704b925fe95f7e5017b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:33:06 +0000 (10:33 -0500)]
Add missing license headers to packetcable-driver messages
Change-Id: Ib6c8bd89d95dae292364b200f350b16f2ad95087
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:25:37 +0000 (10:25 -0500)]
Add missing license headers to packetcable-driver gates
Change-Id: I694943fd0e25e75698d9bbe8615ffc28dfb7655b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:21:00 +0000 (10:21 -0500)]
Add missing license headers to packetcable-driver concurrent
Change-Id: I164d0844e27149b9738909c5dc85fba95b3fa9c9
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:15:23 +0000 (10:15 -0500)]
Add missing license headers to packetcable-driver base
Change-Id: I28b6dc3e42e79df89acb56f80c5e6b2842138a12
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Wed, 16 Dec 2015 15:13:03 +0000 (10:13 -0500)]
Add missing license headers to packetcable-emulator
Change-Id: I73e1d5d080c30ac8b1179429ede2228ad97dc147
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Ryan Vail [Mon, 14 Dec 2015 22:52:18 +0000 (15:52 -0700)]
fixed usage of optional and fixed bug in ccap validator test
Switched to guava Optional so java 7 compiles as well.
Fixed validation issue in CcapsValidatorTest
Change-Id: I816268503c44166767f8aae6fc4854db963e2ea7
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>
Brian Otte [Mon, 14 Dec 2015 22:09:03 +0000 (22:09 +0000)]
Merge "Minor fixes and adding unit testing for validators"
Ryan Vail [Tue, 8 Dec 2015 17:21:55 +0000 (10:21 -0700)]
Minor fixes and adding unit testing for validators
-Renamed GateSpecValidatator to GateSpecValidator
-Added null checks to a few foreach loops
-Added new JUnit Rule, Params to add Parametrized testing with a developer friendly interface.
-Lots of tests added for validation code
Change-Id: I3ce0b8c0d3698cf2ef364c5b9862bc152af7b586
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>
Brian Otte [Wed, 9 Dec 2015 15:33:18 +0000 (15:33 +0000)]
Merge "Refactored validator implementation"
kkershaw [Mon, 7 Dec 2015 23:40:19 +0000 (16:40 -0700)]
Add LICENSE files for Packetcable project and COPS libraries
Add DCO document for COPS (JCOPS) libraries;
Add missing copyright statements on CableLabs-developed code
at COPS top level.
Change-Id: I403407fcf8a81b53f69bdd83b3efcdaf82bc1cb0
Signed-off-by: kkershaw <k.kershaw@cablelabs.com>
Ryan Vail [Tue, 8 Dec 2015 14:45:19 +0000 (07:45 -0700)]
Refactored validator implementation
AbstractValidator now handles pre/post validate tasks and subclasses implement doValidate() for the validation.
Change-Id: Ia6d5cfe60ea8a37e87e55b478a1d802895822511
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>
Ryan Vail [Thu, 19 Nov 2015 16:21:52 +0000 (09:21 -0700)]
Adding support for multiple classifiers per gate
- updated yang, provider, and driver code to support multiple classifiers per gate
- updated validation code for changes in yang
- update example postman collection for changes
- Fixed bug where classifierID was never being set to anything besides 0
Change-Id: I97cd81de9e1874c53e6383d7082b74c5a4726736
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>
Ryan Vail [Thu, 29 Oct 2015 16:26:47 +0000 (10:26 -0600)]
Added response data to operational datastore, refactored data validation
Update yang file to have response data in operation datastore
Response data for ccap and qos/gate data added.
Validation code refactored into several classes to make maintenance and testing easier (Tests not yet written)
Extended MdsalUtils with read, put methods
Created AbstractDataChangeListener to help with new incoming data
Divided DataChangeListiing into two classes one for packetcable:ccaps and one for packetcable:qos
Added a few new items to the postman collection with operational DS fetches and bad puts for testing
Change-Id: I4054bbbf893476327fc39610a47bfa564024610a
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>
Ryan Vail [Mon, 26 Oct 2015 15:49:43 +0000 (09:49 -0600)]
Updated model yang file to use recommended practices found on wiki, then updated binding aware code.
ODL wiki recommends
- All lists should be in a container
- The name just after the list should be singular since it is the element name not the list name
- The outer container should be plural
Updated yang file to do the recommended things, then updated code to match the updated yang generated bindings.
Change-Id: Idafb6b3205fa5ca5d99acc56c7c2b19b8eb4200f
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>
Ryan Vail [Wed, 14 Oct 2015 01:32:34 +0000 (19:32 -0600)]
Cleaned up Subnet.java and added/extended unit tests.
Subnet.java
- Reordered modifiers to standard java lang spec order
- Improved equals() with checks for null and this
- Improved hashCode() by using all member vars used in equals().
- Added braces to all if/else statements
- Added constructor argument checks to ensure valid objects are created.
- Renamed member variables to clearly identify what they are
- Added javadoc
- Added @Nullable and @Nonnull as appropriate
SubnetTest.java
Fleshed out tests to cover all methods and cover more corner cases
PS2: minor javadoc error fix
Change-Id: I2b8097b096ee707ade064f6e583f72aba244e509
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>
Tony Tkacik [Wed, 2 Sep 2015 14:13:30 +0000 (16:13 +0200)]
Migration to use MD-SAL Project
Change-Id: I41ed57fe7bb78b75881b87409a81ac43695a80d6
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tomas Cere [Fri, 4 Sep 2015 12:20:29 +0000 (14:20 +0200)]
Migrate restconf dependency
Change-Id: I7f53fdd610e1297159e1a82c55483888e21a6c79
Signed-off-by: Tomas Cere <tcere@cisco.com>
Steven Pisarski [Thu, 13 Aug 2015 21:54:50 +0000 (15:54 -0600)]
Moved emulator classes out of driver module.
Change-Id: I0e936e37006930da5e8db1ef244c30bf4f85ad33
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Brian Otte [Mon, 24 Aug 2015 20:31:38 +0000 (20:31 +0000)]
Merge "Removed original Hydrogen demo from repo."
Steven Pisarski [Thu, 13 Aug 2015 22:14:02 +0000 (16:14 -0600)]
Removed original Hydrogen demo from repo.
Change-Id: I65f3f9bf9d3f095eac5d3d207b49c15ece598cca
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 13 Aug 2015 18:52:28 +0000 (12:52 -0600)]
Refactor PCMM aspects of COPS message data objects.
Made immutable, added enumerations & unit tests.
Change-Id: I47f44fe2a863d9d933902bc33bb11046613728ef
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Brian Otte [Wed, 12 Aug 2015 19:20:54 +0000 (19:20 +0000)]
Merge "Remove "response" from yang."
Alexis de Talhouët [Wed, 22 Jul 2015 20:00:14 +0000 (16:00 -0400)]
Remove "response" from yang.
Once pushing an object to the DS/config, if it's config is not correct,
instead of updating the object by setting the "response" field to know the reason,
the object is deleted and the message that was previously shown in
the "response" is logged at the error level.
This patch also reconciliate CCAP on restart.
Change-Id: I92fbe38d4519d21079341b618e244db8e51cc6c5
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Alexis de Talhouët [Wed, 22 Jul 2015 21:33:15 +0000 (17:33 -0400)]
Remove deprecated modules.
Thoses modules were deprecated in Lithium, and now obsolete for Berryllium.
Change-Id: I938f337c06381bce10fc30574aabb569b975a3e2
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Steve Pisarski [Wed, 22 Jul 2015 21:58:11 +0000 (21:58 +0000)]
Merge topic 'clean-up'
* changes:
Relocate config subsystem.
Refactor pom files to reflects right parents.
Steve Pisarski [Wed, 22 Jul 2015 21:51:13 +0000 (21:51 +0000)]
Merge "Explicitly set git-review branch to master"
Alexis de Talhouët [Wed, 22 Jul 2015 18:07:41 +0000 (14:07 -0400)]
Relocate config subsystem.
This patch remove packetcable-policy-config and relocate the config
substystem under packetcable-policy-server/src/main/config
Change-Id: I4a27208d3ddb4bb9a5f8bd63bd01d6ae7eac85e3
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Alexis de Talhouët [Wed, 22 Jul 2015 18:07:41 +0000 (14:07 -0400)]
Refactor pom files to reflects right parents.
Also rename the config file to default-config
Change the broker to be binding-osgi-borker
This patch doesn't fix the following issue: https://gist.github.com/adetalhouet/
9ef2ae2f57533ded5cd5
Change-Id: I8364ec693344c1550225e4f44a77dfd6a68deecb
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Thanh Ha [Wed, 22 Jul 2015 19:23:47 +0000 (15:23 -0400)]
Explicitly set git-review branch to master
Change-Id: I89bd234ad8cd6597b29e767151564147d5c53d79
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Alexis de Talhouët [Tue, 21 Jul 2015 19:44:01 +0000 (15:44 -0400)]
Fix issue on shutdown.
On shutdown, former behaviour was deleting ccap and qos from the operational datastore directly.
But at no point those were initialized. So if no action was perfomed by the user, we could see the attached log.
I think all we need is the close the ListenerRegistration and eveything will be deleted on the operational datastore.
associated logs: https://gist.github.com/
23396b108c1742b9299b
Change-Id: I1816387787deb7e441a55df3dd58c9ccaf892d4e
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Brian Otte [Wed, 24 Jun 2015 20:20:20 +0000 (20:20 +0000)]
Merge "Replaced bitwise operator usage with java lang APIs for robustness. Had found that some of the bitwise operator usages were not always returning the expected result."
botte [Wed, 24 Jun 2015 18:40:31 +0000 (19:40 +0100)]
\rModified JUnit tests to allow IP Address form of 'localhost' to support Windows development.
Change-Id: I9c9ba3937a2608a263a44069888b2d1b2f981d0e
Signed-off-by: botte <b.otte@cablelabs.com>
Steven Pisarski [Wed, 17 Jun 2015 15:41:36 +0000 (09:41 -0600)]
Replaced bitwise operator usage with java lang APIs for robustness. Had found that some of the bitwise operator usages were not always returning the expected result.
Change-Id: I6a0d62da87acd3fa448245a990a739276fc3b7c9
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 16 Jun 2015 20:01:50 +0000 (14:01 -0600)]
Moved CMTS emulator to its own module so it can either be run standalone or be used for unit testing for other modules.
Change-Id: Id090efb3bd3ef674fc927d1820ec0f0330a002b8
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 15 Jun 2015 14:40:19 +0000 (08:40 -0600)]
Moving fix by Tony Tkacik in the stable/lithium branch which caused an error with the integration tests during installation of the packetcable-provider bundles where it would sometimes start before MD-SAL.
Added packatcable models to required capabilities.
Change-Id: I1c6b69caae50b4f665929a82e1bb4acbd807ecec
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 1 Jun 2015 15:01:03 +0000 (09:01 -0600)]
Incrementing versions by 0.1.0 for post-lithium master branch
Change-Id: Ifa263400974b51b7712b97f3566b43ba7799effc
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
mserngawy [Fri, 22 May 2015 14:34:06 +0000 (10:34 -0400)]
Junit Test for PacketCable-policy-server project
Change-Id: I0daee091e3def42123b510d7aa8a3aa07483e11f
Signed-off-by: mserngawy <melserngawy@inocybe.com>
Steven Pisarski [Mon, 18 May 2015 21:59:18 +0000 (15:59 -0600)]
Cleanup tests.
Change-Id: I7869a5d2f3db56ca0633c819383e6d5a5576085e
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 18 May 2015 21:49:00 +0000 (15:49 -0600)]
Added sample mock CMTS configuration.
TODO - Will need to implement some configuration file.
Change-Id: I81a977bb0c4129710b12ca7949be2c9ab690ec90
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 18 May 2015 21:35:39 +0000 (15:35 -0600)]
Added logic for the PacketcableProvider class to manage failed gate requests as well as successful.
This will ensure that the ODL restconf state and the plugin's will remain in sync. Previously, should a failed gate set be made then deleted, ODL/restconf would no longer display the gate info but it was impossible to create a new one with the same ID as the plugin would say it already existed.
Change-Id: I1b0e1b5540225d7b2afda47aaa7c8bf3f46c9508
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 18 May 2015 21:30:31 +0000 (15:30 -0600)]
Fixing the setting of the DSCP_TOSOverwrite value with the DSCPTOS object to write the value to correct element of the data byte array.
The setter that uses the byte value was correct and set index 1 where the other setter was setting the byte value to index 2.
Gate COPS data will need additional unit testing and really should be refactored for normalization and semantics.
Change-Id: I719f186d661b3749ed7d9f9f3bef20a7323d4910
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 18 May 2015 21:29:17 +0000 (15:29 -0600)]
Improved thread error handling.
Change-Id: I5bcde1b086d3abbcbc13740e6979515e17b8781b
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 18 May 2015 21:23:58 +0000 (15:23 -0600)]
Sample restconf calls using Google Postman with 2 different environments.
Change-Id: Ic97cefc3af97230f8523873b4fcc19374f01d667
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 13 May 2015 22:41:12 +0000 (16:41 -0600)]
Expanded CMTS emulator to respond properly to gate add requests.
Futher expansion needed for gate deletes and the addition of some more validations around the tests contained in PCMMServiceTest. Additionally, the mock CMTS should be moved into its own module as well as adding command line configuration options.
Change-Id: Id72e1c14ad015c76ef3e50824f22555a00f8a267
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 11 May 2015 21:34:13 +0000 (15:34 -0600)]
Cleanup of state managers' interfaces (constructor and init).
All state managers now will be constructed with a socket object and removed the socket from the initialization routine for PEP managers and removed the initialization routine completely from the PDP managers. Additionally, moved out the logic to process a gate request placed in earlier into COPSPepReqStateMan while testing the packetcable-policy-server. In lieu of removing the aformentioned logic, I also deactivated the PCMMServiceTest#testAddAndRemoveUpGate() test case which will be reactivated after CmtsPepReqStateMan is checked in with additional PCMMService tests.
Change-Id: I2b4c65efd35957f1d2d25aefa0270f95d1800559
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 11 May 2015 19:08:00 +0000 (13:08 -0600)]
Removed Main.java as it does not do anything and the commented out interfaces have also been removed.
Change-Id: Ia041bd2056008ebc85837fc2f700581c85c035c7
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 11 May 2015 17:54:31 +0000 (11:54 -0600)]
Removal of interfaces used by the packetcable-consumer bundle that has neither been activated nor tested.
The each policy server instance connects to a CMTS but the gate control interfaces do not have any parameters to tell the CMTS which gates to set, delete, or query for the given CMTS. The implementation being removed (PCMMPolicyServer$PSCMTSClient) only supports a single gate per CMTS while multiple gates must be supported.
Change-Id: I094803732cbdd5f92b52e40ca742cfa36008d6f7
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Thomas Kee [Fri, 8 May 2015 23:22:54 +0000 (23:22 +0000)]
Merge changes Ic442b16e,Ibeb2c05b,Ibadb787a,I5fd9b5dd,Ia751f131, ...
* changes:
Fixed exception handling when shutting down a COPS/Ccaps connection.
Had to change the key to a map from a yang generated class to the object's ID. This issue may be due to some unintended changes to the code responsible for generating the data model that seem to surround the generated hashCode() method.
Refactor shared attributes and methods to the PEP agent super COPSPepAgent.
Refactor of PDP Agent code. Moved shared functionality up the the super COPSPdpAgent. Clarified purpose of the class by removing the extension of the Thread class as the agent is responsible for creating the persistent connection via the COPSPdpConnection class not itself. It appears that the class was originally meant handle COPS messages at one point but the run() method or extension of Thread was never removed after adding the connection object.
Complete PDP connection refactor. Fixed error handling in run() and moved the addition of new state managers up to the super.
Moved all identical attributes and methods from COPSPdpConnection & COPSPepConnection to COPSConnection.
Completed COPS PEP request state manager refactor primarily to remove redundant code.
Generalize COPSPepOSConnection as a COPSPepConnection. Removed duplicated logic up to the super.
Fix class javadoc comment.
Moving COPSPepOSDatatProcess down the class hierarcy. This is a necessary step in the PEP connection and state manager refactor.
Completed COPS state manager refactor. Removed duplicated logic from sub-classes.
Extending the PCMMPdpConnection from COPSPdpConnection. Removed identical methods from PCMMPdpConnection that were contained in COPSPdpConnection.
Refactor COPS PDP connection classes. Moved much of the OS connection methods up to the super as it was primarily duplicated code.
Generalize PDP Data Process classes. This step is required to further generalize the other PDP PCMM service classes such as the state managers and connection classes.
Thomas Kee [Fri, 8 May 2015 23:22:45 +0000 (23:22 +0000)]
Merge changes If0630105,I9d2d5e61,I1cea2a32,Icc05b6a7,Ic57eb4f8, ...
* changes:
Moved up some of the methods from the PEP and PDP OSMsgSender to their respective supers.
Created abstract super class for all COPS Message Senders as each contained duplicate members. This refactoring should help with the further refactoring slated for the state managers and data process class hierarchies.
Ensure all *DataProcess classes have been changed from abstract classes to interfaces as each does not contain any methods. Also moving common methods up the class hierarchy to allow for easier refactoring of the COPS connection and state managers.
Created abstract super class for all COPS state managers called COPSStateMan as each contained a lot of identical code and began making the state managers more immutable.
Generalize the COPSPdpException class to a COPSException to make upstream exception handling easier.
Generalize the COPSPepException class to a COPSException to make upstream exception handling easier.
Expanded CMTS emulator to accept at least one type of gate request. Future work will allow for the ability to configure gates for validation. With an emulator that can accept gate requests, I have expanded the PCMMService tests to include setting and removal of a gate request to a single mock CMTS. Additionally, as I had encountered issues unmarshalling COPSDecisionMsg objects containing a gate request, another test has been included here (which may be better suited to be located in COPSDecisionMsgTest but the gate set mock object being used can only be used in this module) that creates and parses a COPSDecisionMsg object used for setting gates.
Added comment to the reasoning behind the hashCode() logic implemented in the COPSHandle class per David M. Karr's review on change #19455.
Removed commented line and replaced with a TODO per David M. Karr's review to change #19457.
Generalize the COPSPepException class to a COPSException to make upstream exception handling easier.
Fixed block responsible for parsing the PCMM gate request's traffic profile from a byte[]. Only commented the BestEffortService line as we will most likely need to support the parsing of other types of ITrafficProfile objects.
Fixed the routine responsible for parsing a gate request decision message.
Fixed hashCode() so it returns the same value after the data in the _data + _padding is taken into account.
Removed the requirement that the COPSData member (aka. _data) cannot be null. Found this issue while building tests for the packetcable-policy-server PCMMService class for connecting to and setting gates for a CCAP.
Improved exception handling, increased immutability, and general houskeeping.
Generalizing COPSPdpException to a COPSException.
Fix to NPE during instantiation after moving the instantiation of the gateIidMap member after the call to the private method getGates().
With previous change to AbstractPCMMServer, instantiation of the CMTS class now requires one to specify the port number that will be opened else the ServerSocket class will assign one automatically.
Now Karaf module capable of starting the new bundles contained in the new feature odl-packetcable-policy-server-all.
New feature bundle for the new feature odl-packetcable-policy-server-all.
New configuration bundle for the new feature odl-packetcable-policy-server-all.
The provider module for the Arris designed APIs.
New model module for use in the new feature to be called odl-packetcable-policy-server-all.
Miscellaneous driver fixes found while migrating and testing the new Arris API submission that will live in a new feature called odl-packetcable-policy-server-all.
Added an optional COPSClientSI object as a member to the COPSDecisionMsg as per specs.
Added new constructor. May need to tighten down interfaces in the future.
Thomas Kee [Fri, 8 May 2015 23:22:30 +0000 (23:22 +0000)]
Merge "Changed tests to leverage a dynamic port for testing COPS message marshalling/unmarshalling. Was previously leveraging the static port number of 7777 which has shown to cause problems on the gerrit Jenkins verify build as it appears it allows tests to be run in parallel."
Steven Pisarski [Thu, 7 May 2015 18:14:17 +0000 (12:14 -0600)]
Fixed exception handling when shutting down a COPS/Ccaps connection.
Change-Id: Ic442b16efc95d60d8d3a0924428aa245c19171a4
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 7 May 2015 16:26:46 +0000 (10:26 -0600)]
Had to change the key to a map from a yang generated class to the object's ID.
This issue may be due to some unintended changes to the code responsible for generating the data model that seem to surround the generated hashCode() method.
Change-Id: Ibeb2c05b6513c8b58a2f193547b537bc9fea898f
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 6 May 2015 19:34:48 +0000 (13:34 -0600)]
Refactor shared attributes and methods to the PEP agent super COPSPepAgent.
Change-Id: Ibadb787afc54549bc46fc2efcab2f5f0eb9c223e
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 6 May 2015 17:58:57 +0000 (11:58 -0600)]
Refactor of PDP Agent code.
Moved shared functionality up the the super COPSPdpAgent. Clarified purpose of the class by removing the extension of the Thread class as the agent is responsible for creating the persistent connection via the COPSPdpConnection class not itself. It appears that the class was originally meant handle COPS messages at one point but the run() method or extension of Thread was never removed after adding the connection object.
Change-Id: I5fd9b5dd914cf902c8726821253491f316e7d93f
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 6 May 2015 17:54:38 +0000 (11:54 -0600)]
Complete PDP connection refactor.
Fixed error handling in run() and moved the addition of new state managers up to the super.
Change-Id: Ia751f131d690cfccbf590d728e0eb2863300ed42
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 5 May 2015 21:31:02 +0000 (15:31 -0600)]
Moved all identical attributes and methods from COPSPdpConnection & COPSPepConnection to COPSConnection.
Change-Id: I0fac43de22f44d5f8cf4028e730c78b4c934fd83
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 5 May 2015 20:40:12 +0000 (14:40 -0600)]
Completed COPS PEP request state manager refactor primarily to remove redundant code.
Change-Id: I07f7f1bcb0c53e47f069919fe4dbd46ec255b296
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 5 May 2015 20:14:49 +0000 (14:14 -0600)]
Generalize COPSPepOSConnection as a COPSPepConnection.
Removed duplicated logic up to the super.
Change-Id: I489ec7f6221101e8bd4f1f08089055ff154beeb5
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 5 May 2015 19:39:02 +0000 (13:39 -0600)]
Fix class javadoc comment.
Change-Id: I8b2c16a02f17a92bd3c9152754b013b36ed796e9
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 5 May 2015 19:27:19 +0000 (13:27 -0600)]
Moving COPSPepOSDatatProcess down the class hierarcy.
This is a necessary step in the PEP connection and state manager refactor.
Change-Id: Ibbc27058cfeec648fc4373e14a79528733a6e203
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 5 May 2015 19:20:08 +0000 (13:20 -0600)]
Completed COPS state manager refactor.
Removed duplicated logic from sub-classes.
Change-Id: I1d2f8e00fa5cf74b477a04f90f85fa04b988e12a
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 4 May 2015 20:48:32 +0000 (14:48 -0600)]
Moved up some of the methods from the PEP and PDP OSMsgSender to their respective supers.
Change-Id: If06301050426b59e854835fcb44d20ca8b654927
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 5 May 2015 18:49:12 +0000 (12:49 -0600)]
Extending the PCMMPdpConnection from COPSPdpConnection.
Removed identical methods from PCMMPdpConnection that were contained in COPSPdpConnection.
Change-Id: Ibf610df25c0469037bf890765a2b6dc2ae438fdd
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 4 May 2015 19:57:34 +0000 (13:57 -0600)]
Created abstract super class for all COPS Message Senders as each contained duplicate members. This refactoring should help with the further refactoring slated for the state managers and data process class hierarchies.
Change-Id: I9d2d5e61e4f8816bf1e4f6faff507fe1a6a09763
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 5 May 2015 18:29:21 +0000 (12:29 -0600)]
Refactor COPS PDP connection classes.
Moved much of the OS connection methods up to the super as it was primarily duplicated code.
Change-Id: I33fd305e74f8ed9ea12a83424800cefc59fdc6a9
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 4 May 2015 19:00:46 +0000 (13:00 -0600)]
Ensure all *DataProcess classes have been changed from abstract classes to interfaces as each does not contain any methods. Also moving common methods up the class hierarchy to allow for easier refactoring of the COPS connection and state managers.
Change-Id: I1cea2a32e3f58a4daca612d0a5f1716f00eab5e9
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Tue, 5 May 2015 17:31:11 +0000 (11:31 -0600)]
Generalize PDP Data Process classes.
This step is required to further generalize the other PDP PCMM service classes such as the state managers and connection classes.
Change-Id: I8858d31d61ec4a271851ef5bba850934ea0b0464
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 4 May 2015 18:15:15 +0000 (12:15 -0600)]
Created abstract super class for all COPS state managers called COPSStateMan as each contained a lot of identical code and began making the state managers more immutable.
Change-Id: Icc05b6a7c25bc4dbfb9b75f5a3325e4763307a99
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 4 May 2015 17:00:15 +0000 (11:00 -0600)]
Generalize the COPSPdpException class to a COPSException to make upstream exception handling easier.
Change-Id: Ic57eb4f88b7f6cfc2aa92152326057916ac9552e
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 4 May 2015 16:19:44 +0000 (10:19 -0600)]
Generalize the COPSPepException class to a COPSException to make upstream exception handling easier.
Change-Id: I1fe57321e8cac7dbdab48e0448e5bc8058073a09
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Fri, 1 May 2015 22:55:12 +0000 (16:55 -0600)]
Expanded CMTS emulator to accept at least one type of gate request. Future work will allow for the ability to configure gates for validation. With an emulator that can accept gate requests, I have expanded the PCMMService tests to include setting and removal of a gate request to a single mock CMTS. Additionally, as I had encountered issues unmarshalling COPSDecisionMsg objects containing a gate request, another test has been included here (which may be better suited to be located in COPSDecisionMsgTest but the gate set mock object being used can only be used in this module) that creates and parses a COPSDecisionMsg object used for setting gates.
Change-Id: I98681f2514b88575a951f1e16a683ac046d32750
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Fri, 1 May 2015 22:17:04 +0000 (16:17 -0600)]
Added comment to the reasoning behind the hashCode() logic implemented in the COPSHandle class per David M. Karr's review on change #19455.
Change-Id: Idab26a59bc344c93040bea988a98e033873193f4
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Fri, 1 May 2015 21:58:37 +0000 (15:58 -0600)]
Removed commented line and replaced with a TODO per David M. Karr's review to change #19457.
Change-Id: I030553c96bafd4d12ae80cc60d50a03f5c158df0
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Fri, 1 May 2015 21:43:31 +0000 (15:43 -0600)]
Generalize the COPSPepException class to a COPSException to make upstream exception handling easier.
Change-Id: Ie1e53751b9e426d0099a22b21d4f6f87c8327e8f
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Fri, 1 May 2015 21:31:17 +0000 (15:31 -0600)]
Fixed block responsible for parsing the PCMM gate request's traffic profile from a byte[]. Only commented the BestEffortService line as we will most likely need to support the parsing of other types of ITrafficProfile objects.
Change-Id: I70a82d431c6a20d06a346ff511122d3e8aabd70c
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>