aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/so-bpmn-infrastructure-flows/pom.xml
AgeCommit message (Collapse)AuthorFilesLines
2024-07-08Upgrade SO to Java_17Sreeja Gattagouni1-0/+16
-Removal of aff and logging-filter-base dependencies. -CI build java17 branch-jdk17 version:https://gerrit.onap.org/r/c/ci-management/+/138252 Issue-ID: SO-4125 Change-ID: I58f07f888a814b999f92f8d89909b0666d0b9699 Signed-off-by: Sreeja Gattagouni <SG00744975@techmahindra.com>
2023-06-12Bump version to 1.13.0-SNAPSHOTLukasz Rajewski1-1/+1
Issue-ID: SO-4084 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I6d63f41967b1e43e54f2431b1c6afccee4354b97
2023-03-28Bump version to 1.12.1-SNAPSHOTLukasz Rajewski1-1/+1
Issue-ID: SO-4084 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: Ib302b5a2cb0dd206a0309e9fcae047b508169146
2021-06-24Updating pom version to 1.9.0-SNAPSHOTwaqas.ikram1-1/+1
Change-Id: Idb3e497148225d4158390b944f74e82ff9f771c8 Issue-ID: SO-3688 Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
2021-04-22Update CDS and grpc dependenciesJozsef Csongvai1-1/+1
Issue-ID: SO-3628 Change-Id: Ia1c5c3d2d38d83609410c94068cd0d4533d9ad40 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2021-03-15update swagger to v3 open api versionBOSLET, CORY1-1/+0
Upgraded all projects and services to use the new v3 swagger, discontinued use of old swagger. Updated unit test to account for swagger change and removed apis Issue-ID: SO-3587 Signed-off-by: AT&T Open Source <g22940@att.com> Change-Id: Iddcfe92f8ab240691f92ce2bf23e1ab2ad159780
2021-03-09version upgrades plus cleanupBOSLET, CORY1-21/+7
Removed over 125 dependencies and added to dependency management Added in a few dependencies and removed some Change the swagger version to so pom Removed version property reference in the pom Added in missing dependency for bpmn blocks Added in missing dependecy for common bpmn Updated the camunda-bpm-assert to use a version that is compatible with assertj-core 3.11. The camunda-bpm-assert namespace group also changed. This fixes the no method found error. Updated unit test to account for class name change Updated the unit test to account for lib change Fixed unit test for software upgrade stuff Exclude older versions of javassist to fix null pointer caused by incompatible javassist version with hibernate and bowman Added in missing dependency for task test Added missing dependency and fixed formatting Remove files that got added back in by merge conflict Use the new namespace for the swagger annotations Need to exclude swagger annoatations from the old namespace Updated to fix compilation error due to use of legacy swagger and cxf swagger Use the swagger v3 plugin for gen resources Use the openapi v3 swagger in all bpmn packages Fix null pointer to create the OpenApiFeature in cxf Issue-ID: SO-3578 Signed-off-by: AT&T Open Source <g22940@att.com> Change-Id: I7093376b2d8271e9c5b911b901133e01b957da84
2021-02-17Merge "update camunda and spring to latest versions"Steve Smokowski1-53/+5
2021-02-16update camunda and spring to latest versionsBenjamin, Max (mb388a)1-53/+5
Updated camunda to 7.14 and updated spring boot camunda to 3.4 Started to clean up duplicate maven dependencies Issue-ID: SO-3521 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Ic65b04772b91dd989e41d6b6b93872978bc4e4e2
2021-02-15update the version for the H releaseseshukm1-1/+1
Issue-ID: SO-2765 Signed-off-by: seshukm <seshu.kumar.m@huawei.com> Change-Id: I563295123f7f8de7164495a7db3bc58872863098
2020-10-08Exclude problematic dependency from cxfBenjamin, Max (mb388a)1-3/+0
jboss rmi dependency excluded from all cxf dependencies Done at the root pom to prevent from happening again Issue-ID: SO-3292 Change-Id: I022b8ecf58d76d090b16079324df2047fecc1a61 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
2020-08-06bump the master to 1.7.1seshukm1-1/+1
Issue-ID: SO-2940 Signed-off-by: seshukm <seshu.kumar.m@huawei.com> Change-Id: I888677f7d32ff35619be0f5bb2b677f56215f2e0
2020-06-18Prepare for java 11Benjamin, Max1-5/+0
final changes for java11 groovy compatibility removed unnecessary dependencies and cleaned up poms added missing jaxws-api dependency to pom.xml java8 profile is now active by default in parent pom update beans to have RemoteResource annotation always use the compiler plugin from parent pom Update external task timeout to longer value to hold lock update remote resource annotation to match catalog db client add remote resource annotation to bean for bowman completely remove bowman from requests db client Issue-ID: SO-2059 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: If6f0df36e8077ccd703abce9f64290daed63955b
2020-05-20Began adding pluging to lifecycle mappingBoslet, Cory1-0/+24
Began adding pluging to lifecycle mapping metadata to get rid of eclipse workspace pom errors/markers Issue-ID: SO-2948 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I78946c59e6aaf440e014ed06e9ff476bac5c2613
2020-02-26bump the versions for all the SO to 1.6.0seshukm1-1/+1
Issue-ID: SO-2519 Signed-off-by: seshukm <seshu.kumar.m@huawei.com> Change-Id: Id0993b244b0978375ff8476e4bf8ef79e1bb9e68
2019-04-11corrected inlucde filter for formatterBenjamin, Max (mb388a)1-306/+307
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-04PNF WF post instantiation configurationeeginux1-1/+47
Add PNF ipv4/v6 address for config Deploy Add Integration test for CreateVcpeResCustService_simplified.bpmn Modify the PnfEventReadyDmaapClient to avoid one more running thread Refactor the so-bpmn-infrastructure-flows test resources Modify the CreateVcpeResCustService_simplified.bpmn Add ConfigurePnfResource.bpmn Add Delegates Issue-ID: SO-1506 Change-Id: Iffb69d1441ef0b485ee8cd3fb5da5f1a35279a95 Signed-off-by: eeginux <henry.xie@est.tech>
2019-04-01replace all fixed wiremock portsBenjamin, Max (mb388a)1-0/+3
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>
2018-11-05Catchup commits for DublinBenjamin, Max (mb388a)1-8/+3
added property for retry timer multiplier for testing Infra APIH table, fixed test assertNull condition. Infra APIH table, added tests for request-url = null. Infra APIH should write request_url to infra_active_requests. Return SelfLink URL on ServiceInstantiation SyncResponse. Added JUNITS. Added helper method to get AAI ResourceUri to faciliate unit test. Fixed code to correctly extract related generic vnf or vce id. updated unit test coverage for update network Handle REST NotFoundException for serviceInstance nodes query. Process should continue for new order request and throw exception only for SUPP request. Added disconnect functionality to the gw vnf test tool. Added conversion of vnf management option to dhv change speed sync subnet status with network update updated macroData vol assigned delete continue script Correct the name of DeleteVfModuleBB subprocess. fix the custom resolver to not convert int in string to int Write the returned value from Homing to gBBInput Use explicit conversion to JSON to read cloudConfiguration settings. added property for retry timer multiplier for testing avoid storing AAI yang models in execution added handlingCode to rollback test in workflowactionbb passed in alacarte flag to execute layer for rainy day added test cases for RollbackToAssigned rainy day hand added rollback to assign in catalog db rainy day hand Updated vnf adapter delete stubs to be a post for test. Added a javadoc to basic auth override method Added a check to not add blank headers to the headerMap in httpClient. Added check for if entity exist before calling readEntity. Fixed failing junits and updated way the body is obtained Added missing import statement for http client. Fixed mistakes and made updates caught during review. Removed post and httpPost methods from RESTClient and refactored references Refactored multiple http post references to use httpClient instead. Removed close connection method and randomized port in unit test Added http client unit test, coverage is currently at 90 percent Resolve conflict in sdnc adapter reste v1 method Began removing http delete and delete methods from RESTClient and aaiUtil. Removed http put method and executeput method, refactored references. fixed broken tests in the branch in jenkins build Fix Springboot 2.0 start up issues, and other issues added in implementation to generate self link if there isnt one removed dbcp2 from poms that still had them added rollbackstatusmessage to stub in testprocess added rollback_status_message to the schema sql file Added variable for rollbackStatusMessage Added rollbackStatusMessage to get response added rollback status message to archived infra request set rollback status message to successful on boolean added logic to split rollback and regular error message added rollback status message to infra active requests pushing the cloud config changes as well Added media type and fixed cast plural issue. Made various updated and fixes to code that was changed. Removed all no longer used RESTClient imports from classes Removed and refactored references for aaiUtil methods and all remaining RESTClient methods, removed RESTClient project and updated poms. Return canonical stack id on multicloud create Fix OOF Config Ingestion Fix variable to retrieve sdnc endpoint Prepare resources for service uuid req Fix swapped parameters for multicloud DELETE Update msb-java-sdk to resolve license issues cloud owner support for SDNC interface correlationId is now read from userParams Fix up request body of multicloud adapter body removed LinkedHashMap<?,?> from java classes Cut over logging project to release not snapshot Update unit tests, revert test code, fix comments Fix remaining number of Unit Tests, on avpn flow Fix JUNITS add callback url, fix BPMN issues Update SDNC interaction to support a-sync updated bpm assert import and corrected tests updated test case to be mockito 2 compliant additional changes to import statements and tests Change the place where the data for multistage gets set Update treatment of PENDING_ACTIVATION VF_MODULE CREATE entries to SILENT_SUCCESS to support first stage of multistage. Implement second stage of multistage design VF Module Creation removed LinkedHashMap<?,?> from java classes Removed SNAPSHOT from dependency Cut over logging project to release not snapshot Fixed failing BBInputSetup tests Update unit tests, revert test code, fix comments Updated apih tests to use networkInstanceGroup Updated ModelType enum and fixed compilation issues Fix remaining number of Unit Tests, on avpn flow Fix JUNITS add callback url, fix BPMN issues Implementation of the first stage of multistage design for VF Module creation. Update SDNC interaction to support a-sync no longer leave modified files after test runs Remove generated CSAR, that occurs during JUNIT Update Camunda Pods to use Flyway Migration in 1902 Updated hashcode method and removed comment. Added aggregate routes to the sdnw request and updated pom sdnw dependency. Began to set aggreagate route information for vrf configuration. modified remaining files with att-aic references Correct rollbackData setting and protect against potential null objects. correct AAIObjectPlurals enum value name Update POJO to use type URL for selfLink. Optional<URL> - construct SelfLink Url format. Construct SelfLink Url format from full Url. added missing properties to application-test.yaml fixed compliation error after merge of unit test restored files which should not have been deleted Fix SO vulnerabilities with cxf Fixing bpmn infra endpoint in so-monitoring yaml removed att-aic from codebase default cloud owner now configurable Set homingService in WorkflowAction Fix Java Ex in Homing Version should be 1.3.1 to release new dockers Pnf Spring Environment correction test property now has dynamic wiremock port removed test specific wiremock rule that was causing problems re-enabled and corrected integration tests for so-bpmn-tasks Test to get sniro homing v2 test working by splitting test suites for each spring application Reverted changes to old migration scripts.. Fixed spring context issue with test HomingV2. Removed unused import to fix compilation errors Fixed onap changes to homing, migrated homingV2 to homingBB, fixed broken junits again. - Updated isUseHttpsWithDmaapTest to check assertTrue rather than assertFalse. - Upgraded code to make the isUseHttpsWithDmaap configurable. It will default to true if no value is found in the config file. moved workflowaction test class to the test section added status message update for retry and rollback beefed up error message debug logging and req db msg added debug lines to workflowactionbbtasks reqdbcall Issue-ID: SO-1187 Change-Id: Iec1aff4ed30a43c0e0b2cdb06c28d8db8a99a830 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-05Springboot 2.0 upgradeBenjamin, Max (mb388a)1-5/+8
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-10-15Update msb-java-sdk to resolve license issuesGary Wu1-12/+0
Upgrade or remove msb-java-sdk library version in order to resolve possible license issues with com.google.code.findbugs:annotations:2.0.1. Change-Id: I8f16ec293fcd9f2e328dacb86eda9687fba3f8dc Issue-ID: SO-1140 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2018-09-20Standardize 3rd party library versionsGary Wu1-5/+0
Use applicable 3rd party library versions from oparent. Includes upgrade to oparent 1.2.1. Change-Id: I04941105fc659a1829018da26d59ba56ad08ad42 Issue-ID: INT-656 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2018-08-28Use managed guava versionGary Wu1-4/+4
Use centrally managed guava version specified in oparent. Includes upgrade to oparent 1.2.0. This change was submitted by script and may include additional whitespace or formatting changes. Change-Id: I4da3f582e347da62f9d6fe8d6f20c147d493b8a0 Issue-ID: INT-619 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2018-08-11made required pom changes for cxfBenjamin, Max (mb388a)1-1/+1
cxf 3.2.5 also requires us to move to javax.ws.rs-api 2.1 javax.ws.rs-api 2.1 is fully backwards compatible with 2.0 it will not be a problem with our other dependencies Issue-ID: SO-850 Change-Id: I2a6d9c5d6fb9025de8e5b4a00788275d7cc496a1 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-08Fix Invalid BPMNSmokowski, Steve (ss835w)1-39/+44
Fix invalid BPMN for a 2nd time, add JUNIT to fail verify on invalid BPMN Issue-ID: SO-804 Change-Id: I0ead7d8ebc42dbfe6b18cb29e3962cceb6d7cc23 Change-Id: I0ead7d8ebc42dbfe6b18cb29e3962cceb6d7cc23 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-08-07Upgrade CXFSmokowski, Steve (ss835w)1-3/+3
Upgrade to latest version of CXF for Security Report Issue-ID: SO-807 Change-Id: I7f61fa3fd5f8a41c0654dd03314f0b6f4835b100 Change-Id: I7f61fa3fd5f8a41c0654dd03314f0b6f4835b100 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-07-31Containerization feature of SOBenjamin, Max (mb388a)1-0/+286
Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>