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>
Steven Pisarski [Fri, 1 May 2015 21:29:21 +0000 (15:29 -0600)]
Fixed the routine responsible for parsing a gate request decision message.
Change-Id: I8efa03e6300ea25117388869ad74b3bf9bcdf097
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Fri, 1 May 2015 21:08:28 +0000 (15:08 -0600)]
Fixed hashCode() so it returns the same value after the data in the _data + _padding is taken into account.
Change-Id: Iadde6326c660deba6dbe05a1cda55f2c5b0219de
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Fri, 1 May 2015 20:56:06 +0000 (14:56 -0600)]
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.
Change-Id: I02e5c8d9562b2ecfbcb30c9ffcc7ac649262a1db
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 30 Apr 2015 16:10:44 +0000 (10:10 -0600)]
Improved exception handling, increased immutability, and general houskeeping.
Change-Id: I7243c358ed878b12afca657a2c0ebb0840aa97be
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 30 Apr 2015 15:42:17 +0000 (09:42 -0600)]
Generalizing COPSPdpException to a COPSException.
Change-Id: I26043dd475f12a5fe02a7b04b97e04ab747e1063
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 30 Apr 2015 15:10:55 +0000 (09:10 -0600)]
Fix to NPE during instantiation after moving the instantiation of the gateIidMap member after the call to the private method getGates().
Change-Id: I6bade15d28f16f4c79e83e5161abf547088fb908
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 21:10:18 +0000 (15:10 -0600)]
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.
Change-Id: Iabc32d486952475f18b5b3025b809003f48c5c8f
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 20:55:40 +0000 (14:55 -0600)]
Now Karaf module capable of starting the new bundles contained in the new feature odl-packetcable-policy-server-all.
Change-Id: Ib88791973fbfd38cbb72ea9521d642872afd4318
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 20:34:30 +0000 (14:34 -0600)]
New feature bundle for the new feature odl-packetcable-policy-server-all.
Change-Id: Ib84294970a8b955b5f06e6edc521397286d1e431
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 20:20:32 +0000 (14:20 -0600)]
New configuration bundle for the new feature odl-packetcable-policy-server-all.
Change-Id: I8cee33d563cdda7dcb2deb7f1773ea06a777221b
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 20:07:19 +0000 (14:07 -0600)]
The provider module for the Arris designed APIs.
Change-Id: I14b087d72c4ff180007cda2c9fd9992cf54e9906
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 18:26:29 +0000 (12:26 -0600)]
New model module for use in the new feature to be called odl-packetcable-policy-server-all.
Change-Id: I7e1b3ee8d937165c3e3af0d735555180b23cdd1f
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 18:16:50 +0000 (12:16 -0600)]
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.
Change-Id: I9c56c26faf8b59e5f9e48027e8a3b351d25ebb03
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 17:24:24 +0000 (11:24 -0600)]
Added an optional COPSClientSI object as a member to the COPSDecisionMsg as per specs.
Change-Id: If648ca341ca889fd6c6f0d9382ea180b0c239351
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 17:09:14 +0000 (11:09 -0600)]
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.
Change-Id: Ie52ac87d9efa776e3a1ee1afb57fc44cc6259354
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 16:04:50 +0000 (10:04 -0600)]
Added new constructor. May need to tighten down interfaces in the future.
Change-Id: I56bbcc65514f9eb2f7ff9aad804780449968e4fb
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Thomas Kee [Fri, 8 May 2015 18:32:33 +0000 (18:32 +0000)]
Merge "Ensure padding data cannot be written when empty."
Thomas Kee [Fri, 8 May 2015 18:30:20 +0000 (18:30 +0000)]
Merge "Copyright"
Thomas Kee [Fri, 8 May 2015 18:30:17 +0000 (18:30 +0000)]
Merge "Copyright"
Thomas Kee [Fri, 8 May 2015 18:24:32 +0000 (18:24 +0000)]
Merge "Added logging to help debug COPS message handling."
Thomas Kee [Fri, 8 May 2015 16:56:20 +0000 (16:56 +0000)]
Merge "Created a client-type enumeration as part of the original COPS refactor and have changed it back to an short value due to a misinterpretation of the COPS specifications. Additionally changed the enumeration held by the COPSDecision to not leverage the ordinal value as a mapping between the COPS payload which comes in as two bytes."
Thomas Kee [Fri, 8 May 2015 16:34:32 +0000 (16:34 +0000)]
Merge "Completed COPS Message refactoring. Was planning on one additional patch starting with the COPSHeader; however, the dependencies of COPSHeader were everywhere the COPSMsg objects were being instantiated and determined it would be easier merging this as the final patch versus splitting these changes up. Please see Bugzilla report #2943 for more details. In addition to the restructuring of the COPSMsg classes for immutability, semantics by adding in enumerations, and testability, this patch is also fixing some of the code warnings and removing MS-DOS CR characters."
Thomas Kee [Fri, 8 May 2015 16:32:53 +0000 (16:32 +0000)]
Merge "The second patch of an estimated 4 to complete the COPS message refactoring as described in Bugzilla report #2943. This patch completes the refactoring for all of the objects that can be contained within a COPS message. Although this changelist is quite large, it was not possible to subdivide it any further as it was necessary to refactor each of the classes being extended by COPSObjectBase. Most of the changes made at the service level are to the COPS object construction; however, a few fixes have also been made to address some of the compiler warnings. This patch also should have taken out all of the DOS CR characters in any of the source being altered at this time."
Mohamed El-Serngawy [Fri, 8 May 2015 16:21:05 +0000 (12:21 -0400)]
Copyright
Change-Id: I1bbc51de1d10174217c5eee2f2aa33be094fa40d
Signed-off-by: Mohamed El-Serngawy <melserngawy@inocybe.com>
Mohamed El-Serngawy [Fri, 8 May 2015 16:07:30 +0000 (12:07 -0400)]
Copyright
Change-Id: I20c69788aee8eef25ffe2064cd2a4cb95c1fa500
Signed-off-by: Mohamed El-Serngawy <melserngawy@inocybe.com>
Steven Pisarski [Wed, 29 Apr 2015 15:44:26 +0000 (09:44 -0600)]
Ensure padding data cannot be written when empty.
Change-Id: Ic816da28fff33587d6ba847c29159127a2515f86
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Wed, 29 Apr 2015 15:41:23 +0000 (09:41 -0600)]
Added logging to help debug COPS message handling.
Change-Id: I47c67821e55666f9a67928efdc45e31b25b9d5c2
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Fri, 24 Apr 2015 16:21:22 +0000 (10:21 -0600)]
Created a client-type enumeration as part of the original COPS refactor and have changed it back to an short value due to a misinterpretation of the COPS specifications. Additionally changed the enumeration held by the COPSDecision to not leverage the ordinal value as a mapping between the COPS payload which comes in as two bytes.
Change-Id: I2c86fd4fc134afa12de1fee12a52279f1a9fdf31
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Tony Tkacik [Tue, 21 Apr 2015 09:05:54 +0000 (11:05 +0200)]
Do not override Karaf version
Change-Id: Iaa682dfba488ab6da66afe7aaa48fea271b9cc9e
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Steven Pisarski [Mon, 20 Apr 2015 21:24:51 +0000 (15:24 -0600)]
Completed COPS Message refactoring. Was planning on one additional patch starting with the COPSHeader; however, the dependencies of COPSHeader were everywhere the COPSMsg objects were being instantiated and determined it would be easier merging this as the final patch versus splitting these changes up. Please see Bugzilla report #2943 for more details. In addition to the restructuring of the COPSMsg classes for immutability, semantics by adding in enumerations, and testability, this patch is also fixing some of the code warnings and removing MS-DOS CR characters.
Change-Id: Ica1e55209728fab5c71d0bffb52eb4ca0401e4dc
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Mon, 20 Apr 2015 15:08:16 +0000 (09:08 -0600)]
The second patch of an estimated 4 to complete the COPS message refactoring as described in Bugzilla report #2943. This patch completes the refactoring for all of the objects that can be contained within a COPS message. Although this changelist is quite large, it was not possible to subdivide it any further as it was necessary to refactor each of the classes being extended by COPSObjectBase. Most of the changes made at the service level are to the COPS object construction; however, a few fixes have also been made to address some of the compiler warnings. This patch also should have taken out all of the DOS CR characters in any of the source being altered at this time.
Change-Id: I299f2360dac8455b2f4e87d9e8e751ae7c843f3b
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Thomas Kee [Sat, 18 Apr 2015 00:06:07 +0000 (00:06 +0000)]
Merge changes I0d4117b1,Ib233ea80,I307b4ddd,I03338c43,Id8641e04, ...
* changes:
Removed DOS CR characters as per Alixis de Talhouet's code review to patch #18478.
Removed COPSDebug.java and all remaining references.
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Thomas Kee [Sat, 18 Apr 2015 00:05:31 +0000 (00:05 +0000)]
Merge "Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings."
Thomas Kee [Sat, 18 Apr 2015 00:01:36 +0000 (00:01 +0000)]
Merge changes I80861f13,I2d6675bd
* changes:
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger.
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger.
Thomas Kee [Sat, 18 Apr 2015 00:00:45 +0000 (00:00 +0000)]
Merge changes I99dfd3ce,Ib55b1ca2,I584ed58f,I0020da7e,If9376252
* changes:
Removed existing \t (tab) characters per code review to change 18467 from Alexis de Talhouet.
Removed existing \r characters per code review to change 18469 from Alexis de Talhouet.
Replaced System.err.println() call with a logger.
Replaced System.out.println() calls with a logger.
Replaced System.out.println() calls with a logger and removed several compiler warnings.
Thomas Kee [Fri, 17 Apr 2015 23:57:58 +0000 (23:57 +0000)]
Merge changes Id19fc95a,I83a73ed1
* changes:
Replaced System.out.println() with a logger.
Replaced System.out.println() calls with a logger.
Thomas Kee [Fri, 17 Apr 2015 23:31:47 +0000 (23:31 +0000)]
Merge "Replaced System.out.println() calls with a logger and fixed a few compiler warnings."
Thomas Kee [Fri, 17 Apr 2015 23:30:42 +0000 (23:30 +0000)]
Merge "Oops! Change to logger class."
Thomas Kee [Fri, 17 Apr 2015 23:30:16 +0000 (23:30 +0000)]
Merge "Replaced System.out.println() calls with a logger."
Thomas Kee [Fri, 17 Apr 2015 23:29:39 +0000 (23:29 +0000)]
Merge "Removal of calls to COPSDebug.err() and replaced with calls to the logger."
Thomas Kee [Fri, 17 Apr 2015 23:28:05 +0000 (23:28 +0000)]
Merge "Replaced System.out.println() and COPSDebug.error() calls with logging. Also added error logs for all exceptions being caught."
Thomas Kee [Fri, 17 Apr 2015 23:26:41 +0000 (23:26 +0000)]
Merge "Start of the COPS message refactoring to make all of these classes more semantic, immutable and testable. More unit tests will be added as each COPS message/object has been refactored."
Steven Pisarski [Thu, 16 Apr 2015 22:02:25 +0000 (16:02 -0600)]
Removed DOS CR characters as per Alixis de Talhouet's code review to patch #18478.
Change-Id: I0d4117b1b1bde9305c9fdbddef8b20c4f2ddd936
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 21:53:00 +0000 (15:53 -0600)]
Removed COPSDebug.java and all remaining references.
Change-Id: Ib233ea8028755359e6e233bd70ef3646d0198836
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 21:38:44 +0000 (15:38 -0600)]
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Change-Id: I307b4ddd5b1a1d12a9baf7465caf5a10214ecb98
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 21:28:55 +0000 (15:28 -0600)]
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Change-Id: I03338c4348f0e9649cdedf9868839e7d37494b37
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 21:19:12 +0000 (15:19 -0600)]
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Change-Id: Id8641e045e47ee84db9a0421a5ff97bfe7843763
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 21:09:15 +0000 (15:09 -0600)]
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Change-Id: If1709dc853ddf210775319cde1e78d6f397ebb34
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 20:57:28 +0000 (14:57 -0600)]
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Change-Id: I0e870ba11017fc8270ac056814fe7046fc6db04a
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 20:14:20 +0000 (14:14 -0600)]
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger as well as fixing several compiler warnings.
Change-Id: I5d000525c81c4be2075e2579058e6ae4f887076d
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 20:02:55 +0000 (14:02 -0600)]
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger.
Change-Id: I80861f13e32a05861efd01ad187d6cde20080582
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 19:53:26 +0000 (13:53 -0600)]
Replaced use of logger abstraction COPSDebug.java to having this class log directly to it's own logger.
Change-Id: I2d6675bd9e425e449050e73c3c00000b149a1787
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 19:33:20 +0000 (13:33 -0600)]
Removed existing \t (tab) characters per code review to change 18467 from Alexis de Talhouet.
Change-Id: I99dfd3ce172e8a514e326ce32743e8e7e55d21e2
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 19:18:45 +0000 (13:18 -0600)]
Removed existing \r characters per code review to change 18469 from Alexis de Talhouet.
Change-Id: Ib55b1ca297afe510b2dce4ab27355de53538397a
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 18:34:00 +0000 (12:34 -0600)]
Replaced System.err.println() call with a logger.
Change-Id: I584ed58f9cdbd1693767be77eb71e6f5039c445d
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 18:29:09 +0000 (12:29 -0600)]
Replaced System.out.println() calls with a logger.
Change-Id: I0020da7ef7294ed121df3ead1486e6dd4ab70f9e
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 18:22:34 +0000 (12:22 -0600)]
Replaced System.out.println() calls with a logger and removed several compiler warnings.
Change-Id: If93762527c6dd52f3260be0bea488edf2c3163c7
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 18:14:28 +0000 (12:14 -0600)]
Replaced System.out.println() with a logger.
Change-Id: Id19fc95a3b0ffb5c3f17728d6e13f85fe42515a8
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 18:11:12 +0000 (12:11 -0600)]
Replaced System.out.println() calls with a logger.
Change-Id: I83a73ed1133785214d03df798cff43693e653c7c
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 17:48:32 +0000 (11:48 -0600)]
Replaced System.out.println() calls with a logger and fixed a few compiler warnings.
Change-Id: I50e6ca5d130aebb83554420cc5fcda00ee10312e
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 17:35:14 +0000 (11:35 -0600)]
Oops! Change to logger class.
Change-Id: I1e658c81e71e3832c179b331987d9cabe9de0db4
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 17:25:36 +0000 (11:25 -0600)]
Replaced System.out.println() calls with a logger.
Change-Id: I889920613d858f84cecadcf8206a02913c58921e
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 17:20:07 +0000 (11:20 -0600)]
Removal of calls to COPSDebug.err() and replaced with calls to the logger.
Change-Id: I0acf0aeb3d4e73c057ea0ca52f2c821a2eea64d7
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 16:44:49 +0000 (10:44 -0600)]
Replaced System.out.println() and COPSDebug.error() calls with logging. Also added error logs for all exceptions being caught.
Change-Id: Ic768dca152943ddc07b21eb8682f5639480c3ed9
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Steven Pisarski [Thu, 16 Apr 2015 16:29:46 +0000 (10:29 -0600)]
Start of the COPS message refactoring to make all of these classes more semantic, immutable and testable. More unit tests will be added as each COPS message/object has been refactored.
Change-Id: Ic21c14cf850b01fc48c9806cf1dc24a222994a69
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>
Tony Tkacik [Thu, 16 Apr 2015 13:17:09 +0000 (15:17 +0200)]
Updated references to latest karaf versions.
karaf.version is inherited from odlparent.
Change-Id: I78b69529785fad70ffc35a5e1aff72968c347a68
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tony Tkacik [Fri, 10 Apr 2015 07:27:13 +0000 (09:27 +0200)]
Removed references to features-flow
Change-Id: Iefcf60bf3dd06976c97c7d90874d24d42a9fe6d7
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Thomas Kee [Thu, 2 Apr 2015 17:56:51 +0000 (17:56 +0000)]
Merge "Add <relativePath/> to ensure Maven pulls artifact from Nexus"
Thomas Kee [Thu, 2 Apr 2015 16:58:40 +0000 (16:58 +0000)]
Merge "Migrate to odlparent-provided features-test"
Thomas Kee [Thu, 2 Apr 2015 16:29:21 +0000 (16:29 +0000)]
Merge "changed revision of flow-capable transaction"