aboutsummaryrefslogtreecommitdiffstats
path: root/asdc-controller/pom.xml
AgeCommit message (Collapse)AuthorFilesLines
2019-06-27Changed dependency back to 1.3.0Benjamin, Max (mb388a)1-1/+1
sdc-distribution-client changed back to 1.3.0 Change-Id: I53fd206c16bdb9c22976b6b671784841923b5295 Issue-ID: SO-2078 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-06-21Security updates for maven dependenciesSangalang, Felix1-1/+1
Update commons-collections version to 3.2.2. Updated distribution client version to 1.4.0. Update commons-fileupload to version 1.4. Update commons-codec to version 1.12. Change-Id: I4ab794e3aef7300c30088e5197092fd30231c4af Issue-ID: SO-2043 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-06update the SDC tosca version to 1.5.1seshukm1-2/+2
Issue-ID: SO-1834 Change-Id: Iea99bfce2d96611b61f0cba21038d08dd1fa9758 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2019-04-11corrected inlucde filter for formatterBenjamin, Max (mb388a)1-2/+1
all pom.xml files now have two spaces validation is on for pom.xml files Change-Id: I424ea2e4d6a549f468792e5f90a43f3a97e6c954 Issue-ID: SO-1781 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-01replace all fixed wiremock portsBenjamin, Max (mb388a)1-2/+19
trying to get the tests that can be threaded to pass started to remove fixed port references Change-Id: I7bfe067a8f36c908039700646571681321e9a6f5 Issue-ID: SO-1676 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-25PNF ingestion in SO catalogdbeeginux1-262/+267
Support PNF csar ingestion in SO catalogdb Add integation test for TOSCA installer Fix the VNF resource/resource customization insert https://jira.onap.org/browse/SO-1604 subtask so-1607 and SO-1608 are included The catalogdb table contents are attached in the jira Issue-ID: SO-1604 Change-Id: Ie08c4a1219a6cce96ba081b0dd9d3e5fd997da8f Signed-off-by: eeginux <henry.xie@est.tech>
2019-01-24Upgraded tosca parser to version 1.4.8Benjamin, Max (mb388a)1-2/+2
- Upgraded tosca parser to version 1.4.8 and updated imports Change-Id: Ic9549375d3d70598606056691e4e8baabfbd83d1 Issue-ID: SO-1426 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-05Springboot 2.0 upgradeBenjamin, Max (mb388a)1-13/+7
corrected typo in CloudConfiguration class removed files which should not have been merged updated gr api test cases with dynamic cloud owner updated groovy files to allow for dynamic cloud owner values moved VFModularity folder to mso-infrastructure bpmn updated GR API layer to include cloud owner added enum for default cloud owner - fixing junit test cases for using catalogDb client r2 - fixing junit test cases for using catalogDb client - Internal review comments incorporated for merging mocking into BaseTest - Internal review comments incorporated for removing direct repo calls - CLONE - Key Management Hardcoded encryption key | fixing junits - CLONE - Key Management Hardcoded encryption key Updated builder to use String.format Added exception specifically for issues interacting with requestdbadapter Updated exception message and added junit test case removed useless error handling test case from workflow changed method name and added junit coverage to errors added max retry and success status after completed bb Added case to handle when homing is not called during assign vnf. Fixing fortify issues | Implementing review comments - Key Management Hardcoded encryption key - fixing prop files - Key Management Hardcoded encryption key include network ID for completion handler Added exception handling for saving to requestdb - Adding a check on the predicate availability on the repository before firing the query with default conditions. This ensures that the api returns data only when there is an input against which it was able to form some conditions Modify UT to show that the API does not behave - adding negative test case for checkInstanceNameDuplicate added assertion that global count var was reset to 0 updated rollback to reset current sequence count var workflowaction calls rollback is complete before error workflowaction will set failure on successful rollback added check for isrollback to know which complete to call removed file which should not have been added add fabric check before running vf module a la carte Enhance UCPEMigrateService junits and add them to Jenkins build.. Added back removed test case for ManualTasks Added test case for response error Added rainy day test cases for ManualTasks revert the other change and fix the rollback logic instead fixed current sequence and updated rollback code added network cloud heat template parameters to mapper Generate a unique subRequestId for each request to APP-C. reverted conditional logic for determining fabric Fix Bean scanning so it picks up the resttemplate removed unnecessary RestTemplate Bean configurations removed file which should not have been added workflowaction calls rollback is complete before error workflowaction will set failure on successful rollback added check for isrollback to know which complete to call add fabric check before running vf module a la carte added assertion that global count var was reset to 0 updated rollback to reset current sequence count var include network ID for completion handler Revert Application.yaml change accidentally checked in Added exception handling for saving to requestdb Added case to handle when homing is not called during assign vnf. removed useless error handling test case from workflow changed method name and added junit coverage to errors ... add cloud owner variable to camunda in mapping Revert "Pass cloudOwner to subflow DoCreateVfModuleVolumeV2. Added juint test to verify variables are set in the execution. Set default cloudOwner in main module CreateVfModuleVolumeInfraV2" updated cloud configuration pojo to inlcude defaults Revert "Test to verify ServiceInstance object mapping" Test to verify ServiceInstance object mapping Pass cloudOwner to subflow DoCreateVfModuleVolumeV2. Added juint test to verify variables are set in the execution. Set default cloudOwner in main module CreateVfModuleVolumeInfraV2 Pass cloudOwner to subflow DoCreateVfModuleVolumeV2. Set default cloudOwner 'att-aic' if null per old requirements. removed references to att-aic from BBInputSetup Changes done in encryption decryption logic | used DelegateExecutionFake in Tests Changes done in encryption decryption logic | used DelegateExecutionFake in Tests Changes done in encryption decryption logic Changes done in encryption decryption logic | removed Default Auth Constant as per the comments Changes done in encryption decryption logic | Fixed UT Changes done in encryption decryption logic | Added XmlComparator assertion for verifying XML Changes done in encryption decryption logic | Reverted as per the review comment Changes done in encryption decryption logic | Fixed UTs Changes done in encryption decryption logic | Fixed UTs Changes done in encryption decryption logic | modified related encrypted properties in test yaml files Changes done in encryption decryption logic for fortify issue resolution | Fixed UTs Changes done in encryption decryption logic | modified related encrypted properties in yaml files Changes done in encryption decryption logic for fortify issue resolution. Fixed Property fetching issue in required file Added TasksBeansTest using openpojo Removed renamed test file from tasksbeans Updated imports on TasksBeansTest Added openpojo test to replace the individual tests Removed tests that provided no coverage script clean up -Update reference data to support distinct recreate and replace requests with their own sequences Update reference data to support distinct recreate and replace requests with their own sequences- Fix seq number Update reference data to support distinct recreate and replace requests with their own sequences added null check to mdc and interceptors to sdnc cxf validations can now match against multiple BBs reverted changes to BBInputSetup class added support for pre and post validation for BBs initial commit of generic building block validator converted test to no longer be a springboot test Remove cosmetic changes from BPMN files to be consistent. Remove minor changes that are not related to functionality. Rework to implement the functionality as part of Validator Combine the verification methods into one based on the flow's name; change the logging. Add verification of status of other VF Modules in the VNF for the delete/deactivate/unassign. added network-technology validation for CreateNetworkBB Sonar Issue Fix | Changes done in encryption decryption logic | Refactoring Changes done in encryption decryption logic| Used AES/GCM/NoPadding algorithm | fixed sonar issues added network-type and network-technology to mapper Continue the fight to make JUNITS work properly Update ASDC ATT to be springboot 2.0 compliant Continue to fix Unit tests for springboot 2.0 port removed autowired from workflowactionbbtaskstest fixed workflowactiontest and reduced size by 500 lines Update last of UT for mockito upgrade to 2.0 Fix more JUNITS due to mockito 2.0 upgrade Unit Test fixes to use proper mockito not spring Update Base Test to import proper packages for compile Additional Springboot 2.0 changes, for tests Additional springboot 2.0 fixes and upgrades Update Migration to be Flyway 5 Compliant Fix MSOBPMN Infrastructure common tests Fix Groovy Unit Tests in CommonBPMN Project Update MSO common BPMN to Springboot 2.0 Upgrade ASDC controller to SpringBoot 2.0 Port Openstack adapters to springboot 2.0 Fix VFC Adapter to be springboot 2 compatible Port CatalogDB adapter code to springboot 2 Port SDNC Adapter to Springboot 2.0 ... added update scripts to macro data instead of v12 sql added secondarypolicy to rainy day handling table confirm subnet map is not null in adapter response shallow copy subnet before AAI udpate update AAIObjectType to use uriTemplate extract subnet data from adapter response update correct AAIObjectType for subnet query update subnet(s) in AAI on network create completion confirm subnet map is not null in adapter response shallow copy subnet before AAI udpate update AAIObjectType to use uriTemplate extract subnet data from adapter response update correct AAIObjectType for subnet query update subnet(s) in AAI on network create completion fixed test http entity unit test to remove testing appid and transaction id added unit test for querySubsystemHealth method. also added resttemplate mock to implement healthcheck endpoint fixed unit test to use mock instead of actually goes out to health check endpoint added code to extend globalhealthcheck to include pinging other components and consolidate the responses converted test to no longer be a springboot test Remove cosmetic changes from BPMN files to be consistent. Remove minor changes that are not related to functionality. added update scripts to macro data instead of v12 sql Rework to implement the functionality as part of Validator added secondarypolicy to rainy day handling table added network-type and network-technology to mapper Combine the verification methods into one based on the flow's name; change the logging. Add verification of status of other VF Modules in the VNF for the delete/deactivate/unassign. updated how request db is set to failure in workflowA corrected code to match existing unit tests corrected tests after springboot 2 upgrade Added Required UTs in UpdateConfigurationStateTest and also fixed some UTs. added in missing parenthesis on method call added back execution variable for allotted uri addressed comments on pull request refactor AAI Rest calls from groovy files - Changes as per review comments checkin to refactor AAI rest | Fixing AAIResourceClient.update call refactor AAI Rest calls from groovy files - UpdateConfiguration refactor AAI Rest calls from groovy file - DeleteConfiguration refactor AAI Rest calls from groovy file - UpdateConfiguration refactor AAI Rest calls from groovy file - CreateConfiguration & ConfigurationUtils refactor AAI Rest calls from groovy files - Fix getARByID issue checkin to refactor AAI rest | Adding Junits checkin to refactor AAI rest | Adding few more classes checkin to refactor AAI rest of DoCreateVfModuleVolumeV2 checkin to refactor AAI rest | Update junit checkin to refactor AAI rest of DoCreateVfModuleVolumeV2 | Adding junits checkin to refactor AAI rest of DoCreateVfModuleVolumeV2 | Adding junits checkin to refactor AAI rest of DoCreateVfModuleVolumeV2.groovy ... updated in and out mapping to be generalBuildingBlock change source out mapping to generalBuildingBlock Change-Id: I122f1ebe3e15b77da0a55af201d89d47e326bf83 Issue-ID: SO-1098 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-10-19Update version to 1.4.0-SNAPSHOT for DublinRob Daugherty1-1/+1
Henceforth, the master branch will be for Dublin work. Change-Id: I269fd8f227e37afdab9c633f45488c643e5e765e Issue-ID: SO-1151 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-09-20various bugfixes for casablancaBenjamin, Max (mb388a)1-2/+2
fixed unit tests after addition of A&AI edge label added option for edgelabel between vnf inst group added belongs to in connecting a vnf to instance group - Adding test for getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAn dWorkStep method in the catalogdb client correct default RainyDay table search input updated custom resolver to include float and added comment to explain timestamp configuration added a custom resolver and updated snake yaml version Replacing bowman client with restTemplate.exchange | Add Accept and Content-Type to headers Removing the unused imports as well Implementing some review comments for hte tests being ignored Replacing bowman client with restTemplate.exchange |Fixing Junits Replacing bowman client with restTemplate.exchange | Making Data inserts to go specifically in requestDB Replacing bowman client with restTemplate.exchange | Adding Junits Replacing bowman client with restTemplate.exchange | Adding Junits Replacing bowman client with restTemplate.exchange | Adding Junits Replacing bowman client with restTemplate.exchange - Updated tosca parser version to 1.4.3 and upgraded vnfc test case with new csar to pass with latest parser code. added test case for when workflow has not called all flows fixed issue with rollback and retry in workflowaction Reverted homing changes and changes assign vnf to use the homing produced GeneralBuildingBlock. fixed unit test to build the correct format hashmap reverted extraction back to LinkedHashMap marshal sdnc output to an object removed unused variables and imports extract response code/message from embedded map add junits to parse SDNC assign response removed missed org.openecomp.mso imports from bpmn Change-Id: Ib2b6591a744ecb5b08c522494cdf1ad7dae18a08 Issue-ID: SO-1069 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-17Fix Parse VersionSmokowski, Steve (ss835w)1-2/+2
Issue-ID: SO-1063 Change-Id: I6d627915297f9be0a383516df363d3adec8fc083 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-09-10sparate beans and repositoriesBenjamin, Max (mb388a)1-4/+4
Seperate out Beans and repositories for RequestDB Change-Id: I67d6597d580e9828b6bb8faafaea7e09cc6467c0 Issue-ID: SO-999 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-08stability fixesBenjamin, Max (mb388a)1-2/+2
fixed bean error fixed execution variable name do not explicitly set hibernate objects Removed remaing references to tunnel-xconnect fixed virtual link case Change-Id: Ia5a59794e84beadcbf259efb899878cc4465ca57 Issue-ID: SO-997 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-06Update SDC Client DependenciesSmokowski, Steve (ss835w)1-2/+2
Issue-ID: SO-799 Change-Id: Ia403872b2d81e7277f9329d6be08df6e04f7bd27 Change-Id: Ia403872b2d81e7277f9329d6be08df6e04f7bd27 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-07-31Containerization feature of SOBenjamin, Max (mb388a)1-69/+207
Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-04-16Change version of sdc-tosca dependencyArthur Martella1-16/+1
Rolling back version of sdc-tosca library to 1.3.0 to match sdc-distribution-client Removing the exclusion of jtosca and letting sdc-tosca pick the version it wants Change-Id: I5ac8775cce41a92c1964c7a2f24bf0a6b1e3e5df Issue-ID: SO-564 Signed-off-by: Arthur Martella <amartell@research.att.com>
2018-03-27sdc-tosca:1.3.3 depends on a SNAPSHOT artifactRob Daugherty1-0/+15
We have to exclude jtosca:1.3.4-SNAPSHOT and import jtosca:1.3.4. This is really a defect in SDC, but we have to work around it for M4. Change-Id: I4f204da9c5f3f601ae9a832203439bef7554079d Issue-ID: SO-536 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-27Dependency version updates for BeijingRob Daugherty1-33/+5
Update so/libs version to 1.2.1 Update aai-common version to 1.2.1 Update sdc-distribution-client version to 1.3.0 Update sdc-tosca version to 1.3.3 Change-Id: I6c8f1c5476efc4dc866bf765c265736ab70c12c7 Issue-ID: SO-536 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-23Remove forbidden dependencies to fix Jenkins jobArthur Martella1-1/+15
Change-Id: I5cdc138bb64d526d9b1baa8c2238cc9223004426 Issue-ID: SO-529 Signed-off-by: Arthur Martella <amartell@research.att.com>
2018-03-21added custom validators for use with openpojoBenjamin, Max (mb388a)1-6/+0
Change-Id: I7c9fdeb6bccddb1b7ec6bf845351731c3043aafa Issue-ID: SO-510 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-03-20NexusIQ security violation - httpclientRob Daugherty1-1/+0
Violation in: org.apache-httpcomponents : httpclient : 4.4.1, 4.3.1, 4.3.3, 4.5, 4.5.2 Fix: Upgrade httpclient to 4.5.5 and httpcore to 4.4.4 Change-Id: Ie31b853102eb2a4fc7fc16441a2a1c18a2b7fa35 Issue-ID: SO-507 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-19Fix the Jar vulnerability and licensingByung-Woo Jun1-1/+1
Updated Jar versions in pom.xml files Change-Id: I507b9348d7eabba879979a3cfeeefe9d850ecf4a Issue-ID: SO-457 Signed-off-by: byungwoojun<byung-woo.jun@ericsson.com>
2018-03-14AT&T 1712 and 1802 release codeRob Daugherty1-7/+7
This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-09Remove redundant groupId inherited from parentMunir Ahmad1-1/+0
Change-Id: If1df4b792fca2a127e169e393268d63ef31d9ed1 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-02-22Port SO artifacts to ONAP folder structureArthur Martella1-5/+5
Change-Id: Ib7aea4df7e6a31cf5e1e6513b89bed6f878537af Issue-ID: SO-372 Signed-off-by: Arthur Martella <amartell@research.att.com>
2017-12-01Bump minor versionJessica Wagantall1-1/+1
Bump minor version in preparation for Amsterdam branching. Change-Id: Ib72ca9cab2782a4fee15fff8f0653f0c53ad9f71 Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2017-11-16changed artifact versionseshukm1-1/+1
IssueId: SO-346 Change-Id: I4bd910032baa26c2aa154d3860bf4d34ecf7d9dd Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2017-11-02SO docker build issue fix in asdcseshukm1-1/+1
IssueId: SO-286 Change-Id: Ic9cb206c66401808487cf6fdbf1d08f36c6e8a7b Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2017-10-31second commit for the docker build issueseshukm1-2/+2
IssueId: SO-290 Change-Id: Ib097e14c7b06025a213e1cec1c2459fb59919c1a Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2017-10-06UT for the BPMN flowSeshu-Kumar-M1-149/+155
IssueId: SO-191 Change-Id: I167a7e96f4fd3a857a6c3e679dda132fc8a7f720 Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2017-09-081710 Rebase - Second AttemptArthur Martella1-15/+42
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit: 54483fc6606ddb1591a2e9da61bff8712325f924 Wed Sep 6 18:12:56 2017 -0400 Rebasing was done on a branch on top of this commit in so/master in ONAP: 93fbdfbe46104f8859d4754040f979cb7997c157 Thu Sep 7 16:42:59 2017 +0000 Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59 Issue-id: SO-107 Signed-off-by: Arthur Martella <amartell@research.att.com>
2017-08-04Another attempt to fix deploy problemRob Daugherty1-1/+1
The top level pom will contain: <groupId>org.openecomp.so</groupId> <artifactId>so</artifactId> Child modules will contain: <parent> <groupId>org.openecomp.so</groupId> <artifactId>so</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> <artifactId>some-child-artifact</artifactId> Note that the groupId for the direct child module will be the same as the groupId for its parent. Issue: SO-21 Change-Id: I1976819df459d92937c6a4780959c32599dc3e71 Signed-off-by: Rob Daugherty <rd472p@att.com>
2017-08-04Failed to deploy so artifacts in nexus (again)Rob Daugherty1-5/+5
There are Linux Foundation rules (enforced by nexus) that I still don't really understand. I'm convinced this is absolutely true: The groupId of every artifact in a project MUST begin with: org.openecomp.<project> --or-- org.onap.<project> The top-level artifact is no exception. So for example, this is NOT allowed: <groupId>org.openecomp</groupId> <artifactId>so</groupId> Here's what I'm trying now. The top level pom will contain: <groupId>org.openecomp.so</groupId> <artifactId>so-parent</artifactId> Child modules will contain: <parent> <groupId>org.openecomp.so</groupId> <artifactId>so-parent</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> <artifactId>some-child-artifact</artifactId> Note that the groupId for the direct child module will be the same as the groupId for its parent. Issue: SO-21 Change-Id: I0d3cd2eb7a1883e23e3c0878ee7fa3dd4a7d55b2 Signed-off-by: Rob Daugherty <rd472p@att.com>
2017-08-01Failed to deploy so artifacts in nexusRob Daugherty1-6/+6
More problems encountered since mso repos were renamed. We now have found that this declaration in the top-level so pom causes the deploy to fail with a 403 Forbidden error: <groupId>org.openecomp</groupId> <artifactId>so</artifactId> We are changing this to: <groupId>org.openecomp.so</groupId> <artifactId>framework</artifactId> Issue: SO-21 Change-Id: I4e21d689c73c5071bde725127bb81482ce3d91f9 Signed-off-by: Rob Daugherty <rd472p@att.com>
2017-07-19Fix artifact group IDs (org.openecomp.so)Rob Daugherty1-5/+5
Since the repositories were renamed from "mso" to "so" the artifact group IDs in the poms must be updated to match. Issue: SO-39 Change-Id: I617fe738a77d0f6c1d1cc0ac9474fb753f4e234c Signed-off-by: Rob Daugherty <rd472p@att.com>
2017-05-02[MSO-8] Second step of the rebase for MSODeterme, Sebastien (sd378r)1-122/+122
Second rebase containing additional features for MSO + total reworking of the BPMN structure + Notification flow can now be added at the end of some BPMN flows Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-04-11[MSO-8] Update the maven dependencyxg353y1-3/+14
Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes. Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc Signed-off-by: xg353y <xg353y@intl.att.com>
2017-03-13Update to version 1.1.0ChrisC1-3/+3
Change-Id: Id054e7a04ce88450c3cfe108c8259c4d287681c8 Signed-off-by: ChrisC <cc697w@intl.att.com>
2017-03-06Prepare for Release 1.0.0ChrisC1-1/+1
Change-Id: I54ab6edea94e61dd5dbfdb945bda2f51b5d8fc39 Signed-off-by: ChrisC <cc697w@intl.att.com>
2017-01-31Updating dependent artifact version in a few pom.xmlChrisC1-1/+1
Change-Id: I1b8d5e48da3ac4d1257214dab38706302d0acd10 Signed-off-by: ChrisC <cc697w@intl.att.com>
2017-01-31Initial OpenECOMP MSO commitChrisC1-0/+111
Change-Id: Ia6a7574859480717402cc2f22534d9973a78fa6d Signed-off-by: ChrisC <cc697w@intl.att.com>