summaryrefslogtreecommitdiffstats
path: root/packages/base/src
AgeCommit message (Collapse)AuthorFilesLines
2021-03-16Update policy-keystore with newer certificatesjhh1-0/+0
Issue-ID: POLICY-3139 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I4b0cc4e1a1f6de36857f3e6e73b3dc6b1f9d8b87
2020-11-30move all bash to ash shell scriptsTaka Cho5-141/+115
this gerrit would be the first step to not to use any GPL-3.0 and plus license Issue-ID: POLICY-2847 Change-Id: I09a571f14ef8c6983f9051068c2bad5acc173787 Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-09-24update default keystoresjhh1-0/+0
Issue-ID: POLICY-2827 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: If74e7eeb0ab8ff35accbfddb719bd477cd889b06
2020-07-16add exec option to policy usage messagejhh1-1/+1
Issue-ID: POLICY-2673 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I5b3bbc36ea33c30625119a9e624b68c82a91b634
2020-07-14exec pdp-d java process to run in the foregroundjhh1-101/+130
Issue-ID: POLICY-2673 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I0a08a2760e4dc5a61a59c7f0f3096db76d42cc29
2020-06-26override central repo with right repositoryjhh1-3/+24
This is to prevent that other poms setting the repository http://repo2.maven.org, which has been decommissioned. The repo1.maven.org is the one to be used, only with https. Issue-ID: POLICY-2677 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I743014ea553f5df829eb0bd7ada2cb3d1fb842bf
2020-03-17renew policy certs till 03/17/2021jhh1-0/+0
Issue-ID: POLICY-2402 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ib7112b7ebefcb3a4ce743ec654556bd6cbd789e6
2020-03-10policy routing and reorg into policy-domainsjhh3-13/+15
- Native Drools Controller Policy support. - Move domain policies into the policy-domains project. - Route legacy/compliant operational policies to one or all controller supporting the policy's policy type. - Enhancements to scripts to invoke commands external to the container. Issue-ID: POLICY-2388 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Id41f04d10a28d2ea86bdd41334e499c28d0438ae Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-02-16Native policies support in dockerjhh1-1/+1
Depends on https://gerrit.onap.org/r/#/c/policy/docker/+/101758/ for package cleanup. The work is needed to run the PDP-D with no applications, native policies may exercise this set up. This work provides a functional image with a precooked installation. This work will allow fixing and cleaning up of CSITs specific to this repo which maintenance is problematic. Issue-ID: POLICY-2181 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I62a1b9b556bd2f6c0c243062cb864dfed80e2bea
2020-01-29Parameterize mvn repo urls and proxy settingsRashmi Pujar2-59/+23
This allows the users to build the docker images for drools-pdp and drools-application using their own CI pipelines if needed. Issue-ID: POLICY-2330 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Change-Id: I9ea0161b45d504be4e65a21c95e48dee4a78de3a
2019-12-09base changes to support offline pdpdjhh2-130/+110
Issue-ID: POLICY-2191 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I6f8029c1c771905357971331988a9b8408a93f10 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-08-29remove staging profile from settings.xmljhh1-21/+0
Issue-ID: POLICY-1371 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I969b69386f307669d0d5f70e8618f0e56552d133
2019-08-26optionally source .conf filesjhh1-6/+5
.conf files are now optional as environment variables can be used instead without needing a .conf. Issue-ID: POLICY-1371 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I2cec20fe40d3bfd020e40c9925760de022d4ef34
2019-08-22update keystorejhh1-0/+0
Issue-ID: POLICY-1988 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ia823e0439a0749719118a18e296c70cce501b968 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-04-16One year cert with new component namesjhh1-0/+0
Change-Id: I50afac9fc880d4dd5619093f917be8e55ee80fad Issue-ID: POLICY-1580 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-03-16Manually add NSS libraries to images.Jorge Hernandez1-1/+3
Alpine OpenJDK was updated 2 days ago (3/14), this upgrade seems to break java applications that depend on libnss*.so OS libraries, which seem are no longer installed with the jdk. Before: openjdk version "1.8.0_191" OpenJDK Runtime Environment (IcedTea 3.10.0) (Alpine 8.191.12-r0) OpenJDK 64-Bit Server VM (build 25.191-b12, mixed mode ls /usr/lib/libnss* /usr/lib/libnss3.so /usr/lib/libnssckbi.so.41 /usr/lib/libnssdbm3.so.41 /usr/lib/libnss3.so.41 /usr/lib/libnssdbm3.chk /usr/lib/libnssutil3.so /usr/lib/libnssckbi.so /usr/lib/libnssdbm3.so /usr/lib/libnssutil3.so.41 Now: openjdk version "1.8.0_201" OpenJDK Runtime Environment (IcedTea 3.11.0) (Alpine 8.201.08-r0) OpenJDK 64-Bit Server VM (build 25.201-b08, mixed mode) > ls /usr/lib/libnss*" ls: cannot access '/usr/lib/libnss*': No such file or directory Change-Id: I371d1b3426ded294dba16d4217f6c9ce5a5acf04 Issue-ID: POLICY-1604 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
2019-03-07Tweaking scripts to install for pdpd-cl imageJorge Hernandez2-9/+25
Change-Id: I5f7ab5de402a5412938f42ae76e21f112b106b3a Issue-ID: POLICY-1560 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
2019-03-06pdp-d remove volume + install simplificationsJorge Hernandez1-2/+3
volume is unused and hides config dir when inherited from pdp-d-cl. small simplification in pdp-d install Change-Id: I50d343b8d289f2f883bc31a6c650584343d8cd97 Issue-ID: POLICY-1560 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
2019-02-14Decouple nexus reconfiguration from installationJorge Hernandez5-289/+321
This allows for nexus to be reconfigured dynamically. Change-Id: I103707ab7525ddb29663d7785739a34dff538605 Issue-ID: POLICY-1518 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
2019-01-04Add tooling for drools policy developersJorge Hernandez3-23/+47
This commit adds tooling to better support development activities for drools developers. 1. deploy artifacts to nexus or to local file repository on demand. It also allows to test on a single drools instance without the dependency on a nexus repo. 2. make installation configuration files conform to same convention (all upper case). Change-Id: Ia0a2fc25db2ef21b774a9eee4ed51d4b876a1993 Issue-ID: POLICY-1367 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
2018-12-13Update to latest keystore from AAF toolingJorge Hernandez1-0/+0
It is generic with extended expiration, and support for policy-distribution and policy-apex-pdp components. Change-Id: I02157b063159ed6f8fc71f00cf0f890059b20c7b Issue-ID: POLICY-1377 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
2018-10-11Updated the keystore to include pdp wildcard1.3.0Jorge Hernandez1-0/+0
This allows to talk directly to OOM PDP-X pods without going through the service Change-Id: I9acd171f483c28473442afad80361be374bd4901 Issue-ID: POLICY-1198 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
2018-10-09Regenerate policy keystoreJorge Hernandez1-0/+0
The keystore has been regenerated using the latest tooling from AAF. Previous versions seem to add a bogus " fqdn" which makes the the particular policy.api.simpledemo.onap.org entry invalid. The latest version does not append it. This change is done for consistency with policy/engine for which proper format of this entry is necessary to interact with CLAMP. Drools is never accessed with this identity, therefore the changes are complimentary and do not require release of new artifacts. Change-Id: Ibf6c2e7130dda247ac320f334765e04d369d6b20 Issue-ID: POLICY-1193 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-10-02Recreate latest keystoreJorge Hernandez1-0/+0
Some changes have been made since the first set of stores were generated from the cert manager tooling in the windriver test instance used for this purpose. Change-Id: Ic9a0b056fb2c4e8fb23a0c0e0462087b8b7125da Issue-ID: POLICY-1156 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-08-20https certs with aaf+pdpd containers compatibilityJorge Hernandez3-0/+31
Updated license date (jrh3). Change-Id: I1bc244da64f4a1e683f8c6a1be53157474f46ee9 Issue-ID: POLICY-1026 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-04-25cook policy-keystore into drools imageJorge Hernandez1-0/+0
OOM team reported issues with ONAP installation in terms of config map sizes. After discussion with OOM team, one solution is to cook it in the docker image itself. This will solve the size issue on the OOM side. Change-Id: I6848370f119cabdae450a1153a88ebd8c0f6b392 Issue-ID: POLICY-747 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-04-16Add missing licensesPamela Dragosh1-0/+20
Adding missing licenses to files that should not harm compilation, JUnit tests and instantiation. Issue-ID: POLICY-741 Change-Id: I3075e3493676ee28693323f978c0b5b210b20a34 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-03-26l2 management maturity pdp-dJorge Hernandez1-1/+2
configurable log location metric/audit log for transaction metrics conforming to new field definition. support metrics/audits records with custom logback filters so they are not intrusive with developer log testing. Change-Id: I7a4dcc6790b85539e613ad8705e731e7298ce106 Issue-ID: POLICY-533 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-08-24rename scripts and clean up eclipse warningsJorge Hernandez3-1/+1
rename scripts to follow convention that executable scripts should not have file extensions. clean up some warnings in eclipse Issue-ID: POLICY-162 Change-Id: I82be87925c3a8264381795535d33cee04924ae92 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-08-18Expand acces dependencies to ONAP repos.Jorge Hernandez2-82/+211
Make public ONAP drools-applications repos at runtime or during development testing to ensure that no dependencies are missed, nor all of them need to be published in the private nexus repository. This will be benefitial at runtime and also during control loop development as control loops archetypes could be used from anywhere. Change-Id: I787b5afaf5c525f83326e924d6b9bcf85f9a7662 Issue-ID: POLICY-159 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-08-14Support of DB-enabled featuresJorge Hernandez1-0/+11
Isolation and data migration support overall and on a per feature basis. policy@drools:/opt/app/policy$ policy.sh status [drools-pdp-controllers] L []: Policy Management (no pidfile) is NOT running 1 cron jobs installed. [features] name version status ---- ------- ------ eelf 1.1.0 disabled healthcheck 1.1.0 disabled session-persistence 1.1.0 enabled [migration] session-persistence: upgrade out-of-sync: 0 -> 201702 policy@drools:/opt/app/policy$ features enable session-persistence session-persistence: upgrade out-of-sync: 0 -> 201702 name version status ---- ------- ------ eelf 1.1.0 disabled healthcheck 1.1.0 disabled session-persistence 1.1.0 enabled policy@drools:/opt/app/policy$ db-migrator -s session-persistence -o upgrade upgrade: 0 -> 201702 > upgrade 201701-blah.upgrade.sql -------------- create table blah (a varchar(15), b varchar(20)) -------------- > upgrade 201702-blah2.upgrade.sql -------------- create table blah2 (a varchar(15), b varchar(20)) -------------- session-persistence: OK: upgrade (201702) policy@drools:/opt/app/policy$ db-migrator -s ALL -o report +---------------------+---------+ | name | version | +---------------------+---------+ | session-persistence | 201702 | +---------------------+---------+ +--------------------------+-----------+---------+---------------------+ | script | operation | success | atTime | +--------------------------+-----------+---------+---------------------+ | 201701-blah.upgrade.sql | upgrade | 1 | 2017-08-14 16:01:32 | | 201702-blah2.upgrade.sql | upgrade | 1 | 2017-08-14 16:01:32 | +--------------------------+-----------+---------+---------------------+ policy@drools:/opt/app/policy$ features disable session-persistence name version status ---- ------- ------ eelf 1.1.0 disabled healthcheck 1.1.0 disabled session-persistence 1.1.0 disabled policy@drools:/opt/app/policy$ db-migrator -s ALL -o downgrade downgrade: 201702 -> 0 > downgrade 201702-blah2.downgrade.sql -------------- drop table if exists blah2 -------------- > downgrade 201701-blah.downgrade.sql -------------- drop table if exists blah -------------- session-persistence: OK: downgrade (0) policy@drools:/opt/app/policy$ db-migrator -s ALL -o report +---------------------+---------+ | name | version | +---------------------+---------+ | session-persistence | 0 | +---------------------+---------+ +----------------------------+-----------+---------+---------------------+ | script | operation | success | atTime | +----------------------------+-----------+---------+---------------------+ | 201701-blah.upgrade.sql | upgrade | 1 | 2017-08-14 16:01:32 | | 201702-blah2.upgrade.sql | upgrade | 1 | 2017-08-14 16:01:32 | | 201701-blah.downgrade.sql | downgrade | 1 | 2017-08-14 16:13:49 | | 201702-blah2.downgrade.sql | downgrade | 1 | 2017-08-14 16:13:49 | +----------------------------+-----------+---------+---------------------+ session-persistence: OK @ 0 Change-Id: Ie185f5d7a8463cb349ac452d8c2b4b05928b3e56 Issue-ID: POLICY-96 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-07-25[POLICY-66] policy.sh policy-management-controllerJorge Hernandez1-9/+8
Explicit invokation of policy-management-controller in policy.sh since it loops through scripts picks up others it shouldn't when an operation is selected. Benign but not stetic. Change-Id: I140ca6b0501b3368e9eac0b3ddf947b59c74e426 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-07-24[POLICY-66] consolidate script naming + locationJorge Hernandez1-640/+0
consolidate scripting convention by all adopting not .sh for bash scripts. Location is under policy-management/src/main/server-gen/bin/ so they are inherited by lab installations that don't use the packages directory. Change-Id: Ibcbd4bffad38e87cb3b644deb768120b1a6b2cbb Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-07-18[POLICY-66] self-contained features supportJorge Hernandez1-0/+640
installation/enable/disable of self contained package features: Feature 3rd party dependencies, configuration files, and custom installation scripts do not need to be packaged within the policy core base to be used. Change-Id: I35a472e63bd0f9f7aa6cd0c112d41d2b4604a892 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-06-26[POLICY-30] optional loadable eelf featureJorge Hernandez1-44/+0
for backwards compatibility purposes or if desired to use EELF and common-framework (from policy-common) for logging purposes in miscellaneous environments. It supports EELF/Common Framework style logging at the same time than traditional logging. This functionality is an optional loadable module. policy-docker changes need to be made to optionally unpack to make it active (in a different submission). started marking feature projects with feature prefix in project name to give a clear picture to the community which modules are features vs. code base. Change-Id: I5076c462409f03415ce54f0c9b5f50b78abb18f9 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-06-23[POLICY-30] telemetry scriptJorge Hernandez1-0/+44
Change-Id: Iad43bf9c30de174527fb6a29c216dae6e3ea1a17 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-06-05[POLICY-8] cleaned up unused codeJorge Hernandez22-997/+0
Change-Id: Ifebf67db574e1c4eadf9d50ca0f178ab7ddba033 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-05-31[POLICY-6] add missing license informationJorge Hernandez6-2/+104
Change-Id: I984ec36d3022cb498f99aa3b1a23e8729b0624d8 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-04-21Batch submit -- force rebuildRalph Straubs14-2853/+0
[ECOMPD2TD-1126 1707] Delay the start of the election handler by one more update interval to allow updatedDate to be set and recoginized by other nodes. [ECOMPD2TD-1073 1707] Remove pessimistic locks from DB access to prevent DB deadlock [US867397-policy-management-feature-api] Split original FeatureAPI into three service interfaces. These are: - the original FeatureAPI for core - PolicyControllerFeatureAPI (additional interface methods yet to come ..) - PolicyEngineFeatureAPI (additional interface methods yet to come ..) Additional extensions will be done in the future. This is to have equivalent functionality with what it is already there. [US867397-policy-management-feature-api] Split original FeatureAPI into three service interfaces. These are: - the original FeatureAPI for core - PolicyControllerFeatureAPI (additional interface methods yet to come ..) - PolicyEngineFeatureAPI (additional interface methods yet to come ..) Additional extensions will be done in the future. This is to have equivalent functionality with what it is already there. [ECOMPD2TD-1167] Avoid redundant dependencies and remove obsolete sql scripts [ECOMPD2TD-848] Fix copied from ATT droolspdp repo -- add timestamp to metric and audit logs [ECOMPD2TD-1167] update jetty version to 9.3.14 [ECOMPD2TD-1167] pull in policy-core jar as a dependency of policy-management, instead of zip file [ECOMPD2TD-1159] Add property to ignore repository audit errors The property is called 'repository.audit.ignore.errors' -- it resides in 'IntegrityMonitor.properties', and it defaults to 'true'. When true, any errors that occur in the repository audit are logged, but not reported to integrity monitor. [US867397] additional hooks for policy engine, and support operation take over by feature bypassing further feature processing [US867397] additional hooks for policy engine, and support operation take over by feature bypassing further feature processing [US867397] fix reverse return javadoc comment [ECOMPD2TD-1192] Select correct persistent session information This is a modification to 'DroolsPdpsElectionHandler.DesignatedWaiter'. When going active, the list of persistent sessions needs to come from the most recent active DroolsPDP. The most recent active DroolsPDP is tracked in a local variable 'mostRecentPrimary', and the associated list of sessions needs to be extracted just prior to going active. The problem was that the list of sessions was extracted after the current DroolsPDP was set to 'mostRecentPrimary'. [ECOMPD2TD-1073 1707] Remove pessimistic locks from DB access to prevent DB deadlock [US860546] Add workaround for missing logger in message router [US860546] add DME2 properties to PolicyProperties [US860546] add DME2 support, pending unit testing [US860546] updated unit tests for dmaap/DME2 [US860546] removed System.out.println lines from BusConsumer and BusPublisher [US860546] modifications and additions to TopicEndpoint tests [US860546] remove block to append /events to serviceName in BusConsumer, BusPublisher [US860546] removing dmaap unit tests with ATT references [ECOMPD2TD-1167] Audit release repository by default [ECOMPD2TD-000] Cherry-pick versioning fixes from 1707.39.1 release branch [ECOMPD2TD-000] Fix policy-endpoints cambriaClient version [US865296] ECOMP Policy Logging Compliance, remove redundant timestamp from metric and audit log for logging compliance [US865296] ECOMP Policy Logging Compliance, remove TargetVirtualEntity from audit log, provide name to un-used column [US865296] ECOMP Policy Logging Compliance, remove Unused from AuditLogPattern, leave the column blank means un-used. [US000000] Cleanup and performance improvements 1) Changed 'OrderedServiceImpl' to ensure that the same service instance is used in every queue. This gets around the 'ServiceLoader' behavior that generates a new instance for each interface the service implements. 2) In 'PolicySession': add adaptive poll times within Drools sessions. Instead of always polling every 5 seconds, poll frequency increases when rules fire, and decreases when they don't. At present, the poll delay ranges from 100 milliseconds to 5 seconds, but at some point, it would be nice to make this configurable. 3) In 'PolicySession': add tests for 'logger.isDebugEnabled()' in session listener methods -- this results in a significant amount of real-time savings under load. [ECOMPD2TD-1126 1707] Changes to the election handler to deal with situations (race conditions) which can affect the site choice [ECOMPD2TD-1126 1707] Clean up of site afinity logic. Minor changes and a fix of the case where all pdpd are designated or all are hot standby. [ECOMPD2TD-1126 1707] Fixed issue with election handler and got all StandbyStateManagmentTest JUnits working. [ECOMPD2TD-1126 1707] Hopefully final changes to DroolsPdpsElectionHandler and StateManagementTest. Also removed the ResiliencyTestCases since they were redundant. [ECOMPD2TD-1126 1707] Found a minor bug in the computeMostRecentPrimary algorithm which I corrected and added a JUnit to confirm. [ECOMPD2TD-1126 1707] Removed code that was commented out of election handler to improve reability. Added an explanatory note to StandbyStateManagementTest. [US869183] Convert integrity monitor test endpoint to use HttpServletServer [US869183] add swagger-maven-plugin, update swagger annotation for IM test interface [US860371] Modified existing Dmaap and Ueb code to allow for https connectivity. HTTP/HTTPS is configurable via controller.properties file [US860520] Removed extra useHttps() method call from BusConsumer class where the consumer should be using http. Also, restored pom.xml to version at time feature branch was created. [US860520] Removed TopicEndpointTest.java. Added the ability to configure use of self-signed certificates for consumer topics. Functionality cannot be added for publisher at this time. Removed useHttps parameter field from multiple .builder methods to allow for greater ability to build source/sink objects without specifying http vs https connectivity. Other code cleanup and comments [US860520] -Deleted sys.out statements used in testing from BusConsumer/BusPublisher -Moved setProps method outside of if/else stub in BusConsumer -Could not add useHttps or selfSignedCerts to toString methods in BusConsumer -Move setProperty(contenttype, app/json) call outside of if/else branch in BusPublisher -Renamed doesAllowSelfSignedCerts method to is isAllowSelfSignedCerts and moved to BusTopicBase -Moved allowSelfSignedCerts member variable to BusTopicBase class. BusTopicBase is ancestor of SingleThreadedDmapp*/SingleThreadedUeb*/SingleThreadedBus* classes therefore, it will be inherited. -This changed resulted in cascading changes to the subclasses of BusTopicbase -Default is now set to disallow self-signed certs -Added several javadoc param annotations [US869183 1707] Changes to satisfy dependencies and correct pom syntax [ECOMPD2TD-1280] move DroolsPDPIntegrityMonitor.RestManager to its own class [ECOMPD2TD-1278] Resolve duplicate dependency issues (cherry-pick from 1707.40.1) [ECOMPD2TD-1278] revert cambriaClient back to 0.0.1 [ECOMPD2TD-1278] put dmaap version back to 0.2.12 [ECOMPD2TD-1280 1707] Fix Commons-lang3 version and common-modules version Conflicts: policy-endpoints/pom.xml policy-healthcheck/pom.xml policy-persistence/pom.xml pom.xml Change-Id: I803554bc64c55d2e82a3d6ad9120757f287144fb Signed-off-by: Ralph Straubs <rs8887@att.com>
2017-02-14Initial OpenECOMP policy/drools-pdp commitPamela Dragosh43-0/+4289
Change-Id: I0072ccab6f40ed32da39667f9f8523b6d6dad2e2 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>