Refer to released versions drools-apps

Issue-ID: POLICY-2695
Change-Id: I2127501c4ac5472409570a7182209eded5b0f644
Signed-off-by: Jim Hahn <jrh3@att.com>

FIX context URI and https to false.

Change-Id: Iffecc4655d22b507188ea266e82046f2a82751e8
Issue-ID: POLICY-2703
Signed-off-by: uj426b <uj426b@att.com>

modify jmx script to accommodate json changes

Issue-ID: POLICY-2705
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Iea6ea806855f5887e9a6206aa966746d822c3679

fix complete the assertion

add isInstanceOf for assertThatThrownBy.

Issue-ID: POLICY-2616
Change-Id: If49255aec6004870d7d2acfeabe258def872c1fa
Signed-off-by: Taka Cho <takamune.cho@att.com>

Use new Actor names in drools-apps

Modified drools-apps to use XxxActor instead of XxxActorServiceProvider.
This is the second step of the rename.

Issue-ID: POLICY-2684
Change-Id: Iea60e92f914b7719ac765b086650479be9192d98
Signed-off-by: Jim Hahn <jrh3@att.com>

Merge "Updating drools applications dependencies"

Updating drools applications dependencies

Issue-ID: POLICY-2387
Change-Id: I1c3ee615f0a72a9e7cec8ccc573e27a0cbe3f02c
Signed-off-by: RossC <ross.carter@est.tech>

sonar issue - drools apps

- elevate the visibility of readResolve
- test case without assertions

Issue-ID: POLICY-2616
Change-Id: Ifde4b8c5e1281f8625a1203858fbe0467defe353
Signed-off-by: Taka Cho <takamune.cho@att.com>

Fix build breakage in drools-apps due to pair

The Pair changes made in drools-pdp also broke drools-apps builds.
Replaced usage of drools.utils.Pair with apache Pair.

Issue-ID: POLICY-2202
Change-Id: I50aaad47c243637688602ae6cb680a929fe3edd9
Signed-off-by: Jim Hahn <jrh3@att.com>

controlloop m2 sonar fix

- remove some unused statement
- remove unnecessary check

Issue-ID: POLICY-2616
Change-Id: Ieb2c898a3c6ad7210642aef990b43c9a01fc15b3
Signed-off-by: Taka Cho <takamune.cho@att.com>

Fix build error from Pair changes

This is a quick fix to get around a build error in drools-applications
due to "Pair" changes made in policy-common and/or policy-models.

Issue-ID: POLICY-2202
Change-Id: If1cb60947e55d97ef7cfb1d05d69e07c54c71a05
Signed-off-by: Jim Hahn <jrh3@att.com>

m2 sonar fix

- "get" returns a string already
- to avoid sonar issue for duplicated strings
- formating

Issue-ID: POLICY-2616
Change-Id: I1fac65bba5ecb402c784dd585ebcd7992cf31545
Signed-off-by: Taka Cho <takamune.cho@att.com>

Use parent snapshot in drools-apps

Fixed checkstyle issues that were subsequently reported.
Also fixed a few eclipse warnings.
Also fixed some of the sonar issues in the files that were touched:
- use "{}" in logger calls
- camelcase method names
- use "<?>" instead of generics
- add serialization ID

Issue-ID: POLICY-2188
Change-Id: I5c94a2e26dd74a61a0a919e1c3da17ab02a5bc9d
Signed-off-by: Jim Hahn <jrh3@att.com>

Changes for checkstyle 8.32

Issue-ID: POLICY-2188
Change-Id: Ib90222c537c5440e0de52fa0acbaa99bbcc4772a
Signed-off-by: Jim Hahn <jrh3@att.com>

fix sonar for m2/base - 2

- unused import
- Hide Utility Class Constructor : Utility classes
  should not have a public or default constructor

Issue-ID: POLICY-2616
Change-Id: I338a739b6e9fb5f4b47898566362b8a87201dae3
Signed-off-by: Taka Cho <takamune.cho@att.com>

Merge "m2 sonar issues"

m2 sonar issues

- unused import
- logger format
- Extract the assignment out of this expression
- Replace this if-then-else statement
  by a single return statement

Issue-ID: POLICY-2616
Change-Id: I2d04569a7070f79fc8979274bce2b87b4b2f3e24
Signed-off-by: Taka Cho <takamune.cho@att.com>

Merge "fix sonar issue for m2/base"

m2/appclcm sonar issue fix

swap the arguments
use assertNull

Issue-ID: POLICY-2616
Change-Id: Id5bd0b7acd0914566dfdebdb42fdcaabf9eb3012
Signed-off-by: Taka Cho <takamune.cho@att.com>

fix sonar issue for m2/base

-using {} in logger in stead
-diamond operator (<>) to reduce
 the verbosity of generics code.
-rename this method name to match
 the regular expression '^[a-z][a-zA-Z0-9]*$'

Issue-ID: POLICY-2616
Change-Id: I8e722af52b08382ca53190a33a3a27ad1e7d4830
Signed-off-by: Taka Cho <takamune.cho@att.com>

Merge "change audit and metric formats in feature-controlloop-trans"

change audit and metric formats in feature-controlloop-trans

logging enhancement

Issue-ID: POLICY-2579
Change-Id: Id1e0230d3cd2ac6d921be86f127f3721c65f3e52
Signed-off-by: Joseph Chou <jc2555@att.com>

Remove deprecated actor properties

Now that the actor change has been merged, the deprecated properties
can be removed from drools-apps.  Done.

Issue-ID: POLICY-2632
Change-Id: If4dafc489c32da4dfccd6ebac97e8e7beac2454d
Signed-off-by: Jim Hahn <jrh3@att.com>

Merge "Adjust properties in anticipation of actor changes"

Adjust properties in anticipation of actor changes

Issue-ID: POLICY-2632
Change-Id: I4d20fe6b46432298ba796fe978796d5d74e1eb14
Signed-off-by: Jim Hahn <jrh3@att.com>

Clean up to remove controlloop.simulator.env

Change-Id: Ic336eb24f1f3ecda359f07714e59f075596cc105
Issue-ID: POLICY-2555
Signed-off-by: uj426b <uj426b@att.com>

Merge "Remove deprecated properties for CDS and VFC"

Merge "sonar issue drools applications - 3"

Remove deprecated properties for CDS and VFC

Now that the changes to the Actors have been merged, the former properties
can be removed, too.
Also fixed guard operator/operation name since it changed from "Guard"
to "Decision".

Issue-ID: POLICY-2629
Change-Id: I1c8d4575be598a8cab12b1aa4ad9b1d3e1f12113
Signed-off-by: Jim Hahn <jrh3@att.com>

Merge "Match property changes to CDS and VFC actors"

Merge "sonar issue drools-application - 2"

Merge "reduce sonar issue - drool-applications"

Match property changes to CDS and VFC actors

An "operations" level is being added to the properties for the
CDS and VFC actor.  Added the new properties; the old ones can
be deleted once the change to the actors has been merged.

Issue-ID: POLICY-2629
Change-Id: Ib0bb3f62d6a2d3380aa6ec5a6e8b61ddd0a44c00
Signed-off-by: Jim Hahn <jrh3@att.com>

sonar issue drools applications - 3

get already returns string
redudant return block
unused import
swap expected argument
use equals method instead
useless assignment for payload

Issue-ID: POLICY-2616
Change-Id: Ie4f07085994420b7ea3f39db89f980f6594f01b7
Signed-off-by: Taka Cho <takamune.cho@att.com>

sonar issue drools-application - 2

fixed some sonar issues: removed empty method,
put expected value in the 1st argument

Change-Id: I86747938187abda34e9ab41b735d55fbf920ecd8
Issue-ID: POLICY-2616
Signed-off-by: Taka Cho <takamune.cho@att.com>

Merge "Fix VFC actor properties"

Merge "Changes for feature-controlloop-util actor conf."

reduce sonar issue - drool-applications

In some conditions for assertTrue, sonarcloud
recommends using assertEquals

Assert.assertTrue(a.equals(b));
Assert.assertTrue(a == b);
Assert.assertTrue(a == null);
Assert.assertTrue(a != null);
Assert.assertFalse(a.equals(b));

Compliant Solution

Assert.assertEquals(a, b);
Assert.assertSame(a, b);
Assert.assertNull(a);
Assert.assertNotNull(a);
Assert.assertNotEquals(a, b);

Change-Id: Ic50bf6e961b74abcc698c2cc0347dd0472fefe71
Issue-ID: POLICY-2616
Signed-off-by: Taka Cho <takamune.cho@att.com>

Changes for feature-controlloop-util actor conf.

Change-Id: I5b48d716dcb17082ad376de1e1fe58b2f4ea4130
Issue-ID: POLICY-2555
Signed-off-by: uj426b <uj426b@att.com>

Fix VFC actor properties

The VFC actor doesn't have the same property structure as the
other actors, which meant that the properties listed in the file
were incorrect.  Fixed them.
Renamed the operation to "Restart" per review comments.

Issue-ID: POLICY-2407
Change-Id: Icb8ccad518d01a5f23253a9835976eae666566f4
Signed-off-by: Jim Hahn <jrh3@att.com>

Merge "Use OperationsHistory from models"

Use actor constants instead of literals

Modified drools-apps to use constants from the actor classes instead
of hard-coded literals.  Only made this change in code that uses the
new actor model, as the old code will be deleted during this release.

Issue-ID: POLICY-1242
Change-Id: Iac718159fd7cf571a48ac620585bf2b8f94c1e5d
Signed-off-by: Jim Hahn <jrh3@att.com>

Use OperationsHistory from models

Deleted Dbao and replaced it with the shared class in policy-models.
Also had to update the queries and the persistence.xml accordingly.
Note: with this change, the "database" project is no longer needed,
so it was deleted.

Issue-ID: POLICY-2581
Change-Id: Idfde68b28b3a27f2ee794fa477d15e0f12717373
Signed-off-by: Jim Hahn <jrh3@att.com>

Use default serialization provider

The default provider has been changed to gson, so the provider property
no longer has to be set.

Issue-ID: POLICY-1527
Change-Id: I9b555ed3c3b735ca9622314e1ca06476416bae6e
Signed-off-by: Jim Hahn <jrh3@att.com>

Generate SDNR notification in drools-apps

Modified drools-apps to generate the SDNR notification using the
SDNR-response provided by the actor in the operation outcome, instead of
using the controlloop-response provided in the operation outcome, as the
latter is deprecated.

Issue-ID: POLICY-2593
Change-Id: I70ee4a4b11345a4295d720250a63f407f51cb0bd
Signed-off-by: Jim Hahn <jrh3@att.com>

Merge "Do additional processing when control loop times out"

Do additional processing when control loop times out

When the overall control loop times out, a notification is sent to
POLICY-CL-MGT, but then the event is discarded.  Modified the code
to update the operation history, if an operation had been started,
and to generate an SDNR notification, if appropriate.
Applied the same logic for when a lock is lost.

Issue-ID: POLICY-2582
Change-Id: I35510ec8a3cfc6b2ca9be5751896f3c0f7d9bd09
Signed-off-by: Jim Hahn <jrh3@att.com>

Use snapshot versions

Issue-ID: POLICY-1526
Change-Id: I999d0aff7c76ad01e4cec65cb44a165a42259ca0
Signed-off-by: Jim Hahn <jrh3@att.com>

Merge "Generate SDNR notification even on timeout"

Bump Drools-Apps to 1.7.0

Change-Id: I1b4b088d276da6aae3b577102470a6d8e3dcdc6a
Issue-ID: POLICY-2514
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>

Bump drools-applications to 1.6.5

Change-Id: I52c0b421e6ca94153b7f37ae67fdcd086f14f3fa
Issue-ID: POLICY-2514
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>

Generate SDNR notification even on timeout

If a request to SDNR times out, the actor class does not generate a
notification for the DCAE_CL_RSP topic.  Rather than modifying the
actor, decided to modify models to handle that case.  Seems like that's
where it belongs anyway, as notifications are more of an application-
level behavior.

Issue-ID: POLICY-2580
Change-Id: Id9426c223b719efce337a604316f19335dae8a94
Signed-off-by: Jim Hahn <jrh3@att.com>

Use "outcome" to indicate pending record

Mariadb is setting the "endtime" to the current time by default,
so rather than indicate a pending record using a null endtime, just
modified the code set "outcome" to "Started" to indicate a pending record.
Also added code to ensure the "outcome" is never null, as that causes
a DB error.
Also addressed a comment from a previous review to log a warning message
if more than one matching record is found in operations history.

Issue-ID: POLICY-2581
Change-Id: I6bf67551cef46808a79cc15afeb0abbfc1b6d945
Signed-off-by: Jim Hahn <jrh3@att.com>

Merge "Insert pending record when operation starts"

Add secondary indices to operationshistory table

Queries to the operationshistory table will degrade substantially
as more records are added to the DB.
The Dbao class should be moved to policy-models, but for now
we'll just update it in both places (i.e., drools-apps and xacml-pdp).

Issue-ID: POLICY-2581
Change-Id: Ic43cefdfd4d353b73d815bd629ef25f3d2b486c6
Signed-off-by: Jim Hahn <jrh3@att.com>

Insert pending record when operation starts

Modified code to insert a pending record when an operation starts.
Also modified it to update the existing record when the operation
completes, rather than adding a new record.
Note: the "outcome" for a "pending" record is left unset (i.e., it
is null).

Issue-ID: POLICY-2581
Change-Id: Ia1a02ed5a16b8af1328a49b22478fd57c4b9aca0
Signed-off-by: Jim Hahn <jrh3@att.com>

release 1.6.4 docker container

Issue-ID: POLICY-2514
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I76daf2eb6ce0526f8295b182b69b59dd23d3b17d
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

release maven artifacts

Issue-ID: POLICY-2514
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I8d16b1c761e60da4906f5fe9a76fc69a65aa0054

Point to released drools-pdp

Issue-ID: POLICY-2514
Change-Id: I3d40c6016b9ce4adc95ed7a4e59719e94f9f5b26
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Merge "add stability test scripts"

add stability test scripts

Issue-ID: POLICY-2456
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I89a325cfc2dedd10936c28176a0e11e5c54f24b4
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

Merge "Add getter for ControlLoopPolicy instance in ControlLoopProcessor"

Point to released artifacts

Issue-ID: POLICY-2514
Change-Id: I10aea2d45c9dae37d7c3c14a82a34da661c3ea60
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Add getter for ControlLoopPolicy instance in ControlLoopProcessor

This is to allow other frameworks, such as M2, to obtain the
ControlLoopPolicy instance after the raw ToscaPolicy has
been adapted.

Issue-ID: POLICY-2574
Change-Id: I003e60991f6e4007bd30f0e9392f6fa8bf21733a
Signed-off-by: dc443y <dc443y@att.com>

Do not encode null fields in SO request

Currently, the default serialization provider for HTTP clients
is jackson, which encodes null fields in requests.  Unfortunately,
SO does not like the null fields.
Fixed this by modifying the SO config parameters to use the GSON
serialization provider.

Issue-ID: POLICY-2568
Change-Id: I6c2e7c985f23e09940d89409c2a84303bfd54b8a
Signed-off-by: Jim Hahn <jrh3@att.com>

Merge "Handle duplicate events in drools-apps"

Handle duplicate events in drools-apps

Modified the frankfurt rules to compare the event objects instead of
comparing the request ID when determining if an event is new.  The
event object's equals() method ignores the request ID when doing the
comparison, thus it will treat an event as a duplicate even if the
request ID is different, which is the behavior we want.

Also removed the @Ignore from the junit that tests for duplicate
events in the hope that this change will fix it.  If the docker build
still breaks, then @Ignore can be added back in.

Issue-ID: POLICY-2557
Change-Id: If2b9fd26473d78a356218b951bfe160f93daeb32
Signed-off-by: Jim Hahn <jrh3@att.com>

Make that SO actor uses http by default

Issue-ID: POLICY-2560
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I6cd3de9238793fef671c9e058c494c179d4cb25c

delete dependency section in junit test op.pom

This is to correct junit failures

Issue-ID: POLICY-2551
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I4522f01a8ed8a66ddcb09549d4281adbcd644ab7

change the @api path in rest transactions api

Issue-ID: POLICY-2530
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: If21e0607edcf75f491be61012779ddfa5d880105
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

Merge "Plain move from test dir to src"

Bump drools-apps to 1.6.4-SNAPSHOT

Issue-ID: POLICY-2510
Change-Id: Ic431fa80f7b389c84b799f8662df81b4f0ea124f
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Plain move from test dir to src

The file was placed there by mistake.

Issue-ID: POLICY-2456
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I37a0bad7963aa9fe2931d68f5779355471cda345
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

Release drools-apps 1.6.3 docker images

Issue-ID: POLICY-2510
Change-Id: I1be48970e10b9b536740e98f3d16961e3abb6584
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Release drools-apps 1.6.3 java

Issue-ID: POLICY-2510
Change-Id: Ie1be4eca3007ab05a613e60235797a5648857fc7
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Bump drools-apps 1.6.3-SNAPSHOT

Before I can re-release, the patch needs to be bumped.

Issue-ID: POLICY-2510
Change-Id: Ib868d0d72cd28f87b5eb7c233f239d219f699954
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Point to released policy/parent

Pointing to an unavailable SNAPSHOT

Issue-ID: POLICY-2510
Change-Id: Ibc9743908cf67b58db25dadfa1d2151dd72ace57
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Release drools-apps 1.6.2 docker image

Issue-ID: POLICY-2510
Change-Id: I10b78ee3a07f13cdbcf9e7216c927d4b66fdf14f
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Release droosl-apps 1.6.2 java

Issue-ID: POLICY-2510
Change-Id: I69552a7989d1af08d4345c2b901a9ba4acd28514
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Point to released artifacts

Issue-ID: POLICY-2510
Change-Id: Ie1c77339f42d990dcd608b8afad7153b04fa24f9
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

transaction tracking improvements with telemetry

Issue-ID: POLICY-2456
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I75b7e8e787d567cf120d7ae7d65d1bff12e8e24e
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

Add properties needed by A&AI PNF Operation

Added properties needed by A&AI PNF Operation.

Issue-ID: POLICY-2505
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I58966faf9eb9900123a085bf8093050440c15170

Change CDS operation name to generic "any"

Issue-ID: POLICY-2504
Change-Id: I4dec3dfd62fa230ad8f0de66c0d1b71e5393bcbd
Signed-off-by: Jim Hahn <jrh3@att.com>

Fix CDS actor properties

CDS actor properties in drools-apps did not match the properties
in the actor, itself.  Fixed them (as best I could be inspection).

Issue-ID: POLICY-2501
Change-Id: Ibb4ac5ee59762bd740342c1d54fc472a9fca8968
Signed-off-by: Jim Hahn <jrh3@att.com>

bump to 1.6.2-SNAPSHOT

Issue-ID: POLICY-2378
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I8feb308f90755a078d0b35e0d8742e385916c225

release 1.6.1 docker image

Issue-ID: POLICY-2378
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ic1bbfa4faea580a1fca7fd7104f5c062d19a3e25

Release 1.6.1 artifacts

Issue-ID: POLICY-2378
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I6cb53e24996486e98535cdeb99ac0e610d696723
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

Point to released common/models/drools

Issue-ID: POLICY-2378
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I65f59ca624865d6738ff32657e27ad05a35f3eb8

Point to common/models fix

Fix in naming policy and common yaml string fix

Issue-ID: POLICY-2486
Change-Id: I311ec07f58c5dd6fe17d8b5e9368e3b78b73e894
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Added vpci and vsonh tests

Added test cases for vpci and vsonh usecases

Issue-ID: POLICY-2162
Change-Id: Ia69b16e74b82b92366b5065eeccab8d35f647742
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
Signed-off-by: Jim Hahn <jrh3@att.com>
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>

Add SDNR notifications to frankfurt rules

Issue-ID: POLICY-2468
Change-Id: Ibf4d3e5f62fa3106028dcf85050c270b8eab0a89
Signed-off-by: Jim Hahn <jrh3@att.com>

Point to parent SNAPSHOT

Issue-ID: POLICY-2378
Change-Id: I1cb44b953e82e73dc35e5568b2df5ef31484a4fd
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Merge "disable but not removed usecases"

remove drools-pdp parent from junit test

parent was wrong an was running into build
problems.

Issue-ID: POLICY-2459
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I502c85934d8d7f88321805f540448c6d280d856b

disable but not removed usecases

integration testing to be focused on the new frankfurt controller

Issue-ID: POLICY-2465
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I2a15c300bba4647ef613c49a4985f22c5936d00e

Synchronize methods for rules

Added "synchronized" to a few more methods in the event manager class,
just to be safe, as they view/modify data that may be viewed/modified
by other threads.

Issue-ID: POLICY-2385
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Ia8404fd3fd53b0de95f939dfff2088867e0f3b24

Update path properties for new actors

Some of the new actors were modified to get their path prefixes
from the property files.  In addition, the models code was modified
to allow an empty "path", so that is now used, where appropriate.

Issue-ID: POLICY-2441
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I4573c5e2a506fb67be9bd040ce047612007fd969
Signed-off-by: Jim Hahn <jrh3@att.com>

Point to latest snapshots

Issue-ID: POLICY-2378
Change-Id: Idcc8a7117c7ff898558e7efce6b51c8ebb4ad7be
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

Fix userName property for http clients

The http client property files had "username", but the correct
property name is "userName".  Fixed.
Also updated the models version to the latest snapshot to pick
up the fix to the APPC actor.

Issue-ID: POLICY-2441
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I4d64efcb5b639526beb145ee0231c6d650098d0f

Expand env variables in frankfurt properties

Issue-ID: POLICY-2434
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I1109a053e46dc8201ff9676da0c9ff93d8b631d5
Signed-off-by: Jim Hahn <jrh3@att.com>