aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aai
AgeCommit message (Collapse)AuthorFilesLines
2020-12-02[AAI] Reintegrate AAI OOM charts in main repoSylvain Desbureaux232-0/+16258
AAI chart is currently in its own directory. As a lot will be done in the charts with tight coordination between "common" part and components parts, it's a lot easier to have everything in a same place for now. Issue-ID: OOM-2513 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I5e27f7de286bf74e6d3a443e1cb31f63b3d83265 [Update aai to commit 18d4bd165e12cb4d03baa318e506f0dda381cd89] Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
2020-11-30Update git submodulesSylvain Desbureaux1-0/+0
* Update kubernetes/aai from branch 'master' to 18d4bd165e12cb4d03baa318e506f0dda381cd89 - [AAI] Version bump for Guilin Guilin chart uses 7.0.0 version. Issue-ID: OOM-2638 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I6a2816dd3870c2a8a0f578e2c7b86804d566dd75
2020-11-19Update git submoduleswreehil1-0/+0
* Update kubernetes/aai from branch 'master' to 540b846831e2053ccdcce9fa620cb7eeb7f5db46 - Upversion to the 1.7.13 version of the schema service including an edge rule update for network slicing Issue-ID: AAI-3220 Signed-off-by: wreehil <wr148d@att.com> Change-Id: I89245b4dd425cfadc7b3fd92127849c2e52f6c22
2020-11-06Update git submoduleswreehil1-0/+0
* Update kubernetes/aai from branch 'master' to 9eef36ac7a12292e749104dd5a7fa17e35bdfecc - [AAI] Bump Schema Service Use latest schema service version for helping the ccvpn network slicing use case with an edge multiplicity issue. Issue-ID: AAI-3212 Signed-off-by: wreehil <wr148d@att.com> Change-Id: I878e0c1f7b664fc97adf3256e97b79e351828ee0
2020-10-27Update git submoduleswreehil1-0/+0
* Update kubernetes/aai from branch 'master' to bac40922e4043c632e1a8a5fe1531a640cbfe6c2 - Release the 1.7.11 docker release for the network slicing functional use case Issue-ID: AAI-3211 Signed-off-by: wreehil <wr148d@att.com> Change-Id: I304c09b646cdf55b848f89b0fa1f1ee08ad3acf3
2020-10-15Update git submodulesVenkata Harish Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to a8c4e701f9c26038a9ac9f22d5dd95fd54ebc1ca - Merge "Configuration changes for concurrency issue in PNF uploading" - Configuration changes for concurrency issue in PNF uploading Issue-ID: AAI-3100 Signed-off-by: Niharika Sharma <niharika.sharma@amdocs.com> Change-Id: I8be8fb24e73cb614e22f6b2394b8bd5c3ee62170
2020-10-14Update git submoduleswreehil1-0/+0
* Update kubernetes/aai from branch 'master' to fa694e0feb325333cfffb7d7852aa97264f96b6c - Updated the schema service to 1.7.10 for the network slicing functional use case Issue-ID: AAI-2919 Signed-off-by: wreehil <wr148d@att.com> Change-Id: I6fee838caacd62a1fb7affa5998ec7e5ffe12f1f
2020-10-02Update git submodulesyoonsoonjahng1-0/+0
* Update kubernetes/aai from branch 'master' to 628ecd0d519acc6b4717d05aa12fd4f7b7dfc55f - Add keycloak configuration to aai-resource in order to support multi-tenency - Change Values.yaml to add host, port of keycloak server - add application-keycloak.properties - Update template/deployment.yaml to include application-keycloak.properties Issue-ID: AAI-3130 Change-Id: I2b741457a4d8c87e4b70b1f3903974170f35d571 Signed-off-by: yoonsoonjahng <yoonsoon.jahng@yoppworks.com>
2020-09-22Update git submodulesHarish Venkata Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to 944970742185cccb73110875d1b4ad9f7305337f - Update to latest guilin docker images Also update the pods to not use unlimited for the flavor Change also includes traversal, graphadmin, data router to be not using the root user Issue-ID: AAI-3175 Issue-ID: AAI-3180 Change-Id: Ia2237c0ff8025bb2649ef381ae447e6d39961674 Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2020-09-17Update git submodulesHarish Venkata Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to 447967d32676845a8f706f1080f2b123af79e11c - Fix the service instance issue and support v21 Issue-ID: AAI-3128 Issue-ID: SO-3216 Change-Id: Ibc8ff1dd31f42c3c17dc5491dbf56991c74e2785 Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2020-09-11Update git submodulesKrzysztof Opasiak1-0/+0
* Update kubernetes/aai from branch 'master' to 48ae4e9d7a9ef5f9e73f6a3c90fd808f086089f5 - [AAI] Revert commits that are breaking the master branch This reverts: b31e250091cd68edb77f3158691844decda82fc8 46961c4794a17f72643bd491af6c159ea7e53380 which are our main suspects for breaking testing in the master branch. As this issue prevents many SO related patches from being merged let's first revert those to make master work once again. Issue-ID: SO-3216 Change-Id: I7f7daaaef3f7911afb5c8729c296773a630b5fb6 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
2020-09-08Update git submodulesGrzegorz-Lis1-0/+0
* Update kubernetes/aai from branch 'master' to 5a01a0953803b3d1b140a77c779a3b942e293228 - [AAI] Use readiness container v3.0.1 Readiness container v3.x and up are now present in ONAP main repository. They're also not using root user anymore and then script path has changed. Finally, "job_complete" script has been integrated in main "ready" script. This change will align readinessImage definition with rest of ONAP components. Issue-ID: OOM-2545 Signed-off-by: Grzegorz Lis <grzegorz.lis@nokia.com> Change-Id: I766a16be3ae2669f562c9b4ebef875bfbdfac6a0
2020-09-02Update git submodulesWilliam Reehil1-0/+0
* Update kubernetes/aai from branch 'master' to 1990a02ce9295df7c94009401c24fa226a10f8e8 - Merge "Revert "[AAI] Add logs to STDOUT"" - Revert "[AAI] Add logs to STDOUT" This reverts commit befaa5500924f9ebda0b4bf65d8d6ab5a9f0745a. Reason for revert: Breaks the AAI HC Change-Id: Ie401f7bdc7408ce1171bc055a3e46cb610bd52c0
2020-09-01Update git submodulesWilliam Reehil1-0/+0
* Update kubernetes/aai from branch 'master' to bdbb69908135f5cee7c27fab7fbbcdde17ff5d57 - Merge "[AAI] Add logs to STDOUT" - [AAI] Add logs to STDOUT This commit add STDOUT appender to root level logging. Additionally, it approximates the logback.xml file to ONAP Application Logging Specification v1.2 Issue-ID: OOM-2514 Signed-off-by: Dominik Mizyn <d.mizyn@partner.samsung.com> Change-Id: Iee075bb1400fd2ab2afbc39bf87e93f269ebaf84
2020-09-01Update git submodulesefiacor1-0/+0
* Update kubernetes/aai from branch 'master' to b31e250091cd68edb77f3158691844decda82fc8 - [aai-oom] Bump versions for babel and schema-service Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: AAI-3099 Change-Id: Id6ebb67f39ed6f4b3dc24d1ef1447b1f272037a0
2020-08-27Update git submodulesVenkata Harish Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to 7e6e2bf385f85e85e008d06b2415290851fee2b7 - Merge "Updating the portal properties uebkey to remove the space in hopes this will fix 2905" - Updating the portal properties uebkey to remove the space in hopes this will fix 2905 Issue-ID: AAI-2905 Signed-off-by: wreehil <wr148d@att.com> Change-Id: I6155787d24e6704a7f5b8b919a30dcc4f3624912
2020-08-26Update git submodulesWilliam Reehil1-0/+0
* Update kubernetes/aai from branch 'master' to d1b50c9c6c2c2d4452483da67729298e5953a2db - Merge "AAI-2958 Fix data-router in crash loopback state when there is no internet access" - AAI-2958 Fix data-router in crash loopback state when there is no internet access The problem is due to the fact in the data-router-oxm.xml file was referencing spring-context-4.2.xsd but it's not part of the spring-context-<xxx>.jar. Therefore, it needs to reach out to the internet to download the internet. And in spring 5, it started to use versionless spring-context.xsd and it's part of spring-context-5.1.13.jar (which is packaged in data-router 1.6.2). The fix is to update data-router-oxm.xml to use the versionless spring-context.xsd (and it's only accessible via https). Change-Id: Icf62978b73ae097fc3bcbaf3e96a8f63706dc4fc Signed-off-by: Prudence Au <prudence.au@amdocs.com> Issue-ID: AAI-2958
2020-08-25Update git submodulesWilliam Reehil1-0/+0
* Update kubernetes/aai from branch 'master' to 5071da297b9e7f58c796bad7d4ae1e3415a039c4 - Merge "Prepare upgrade to readiness containers v3.0.1" - Prepare upgrade to readiness containers v3.0.1 Readiness 3.x is a new version, not using root user and using stable Kubernetes API. The upgrade is not doable by just changing version as script path has moved. Therefore, we must upgrade everything in one shot. As AAI is not in the same repo, it's not doable for this component. We then change variables only for AAI so we can continue to use older images. We'll move AAI just after the rest has been upgraded. Issue-ID: OOM-2545 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I5afa83892043f4844afe12e61724a8d368a9f2e0
2020-08-24Update git submodulesHarish Venkata Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to 46961c4794a17f72643bd491af6c159ea7e53380 - Update schema service to support v20 Issue-ID: AAI-3017 Change-Id: If46a1bfafbd2edb73cd7d3832468c06fac855911 Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2020-08-19Update git submodulesGrzegorz-Lis1-0/+0
* Update kubernetes/aai from branch 'master' to dceb913fa262d4d1112ae734e6f9768b0354f9be - [AAI] Make AAI compatible with Kubernetes v1.17 Issue-ID: OOM-2445 Signed-off-by: Grzegorz Lis <grzegorz.lis@nokia.com> Change-Id: I68624a283b9f3e0cb3f300defefd1ff0130a0b9c
2020-07-16Update git submoduleswr148d1-0/+0
* Update kubernetes/aai from branch 'master' to f1e329c458c48530da36dd1c6b38b7548116bd65 - Ensure Non-root user is running all processes Issue-ID: AAI-2822 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I7bb2900fb3521a43f883bf442aec3ff349493b03
2020-06-24Update git submodulesLukasz Muszkieta1-0/+0
* Update kubernetes/aai from branch 'master' to e77bd83639f77e68f4c7df9b35c95a4d70e70384 - Add support for PNF resources Issue-ID: AAI-2853 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com> Change-Id: I43a44ed1b34d486a5329595abd66e34b4086a8fe
2020-05-19[GENERIC] Follow master branchesSylvain Desbureaux1-0/+0
we were following frankfurt branches by mistake. Issue-ID: OOM-2406 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Ia59d84c75cecd5cc186eb61be25cc9a371282567
2020-05-11Update git submodulesSylvain Desbureaux1-0/+0
* Update kubernetes/aai from branch 'master' to d687fd0c9efe31e93287da11e3e390984a5fb6ce - [AAI] Fix Ingress configuration Set SSL to redirect when backend uses HTTPS. Issue-ID: OOM-2171 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Id9e7cf211f5c180ee5901463a63535892b221d84
2020-04-27Update git submodulesJames Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to 2d6141ab8bd7bfe58f5da0483e578032226e7ebb - Merge "Use released 1.6.8 container" - Use released 1.6.8 container Issue-ID: AAI-2883 Issue-ID: AAI-2593 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I0dd8217c2fee8596e663d65206f92bc5446f02ea
2020-04-20Update git submodulesVenkata Harish Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to 5ae975da2bc5c09318465405a343146a56b42a3a - Merge "Update sparky-be cert" - Update sparky-be cert Issue-ID: AAI-2869 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I716009d91897f89c6249aa34acef6a5d8d02007b
2020-04-14Update git submodulesMorgan Richomme1-0/+0
* Update kubernetes/aai from branch 'master' to 0c4cd899d53538202c23030ab278984897aede94 - Merge "Use released schema-service 1.6.7 container" - Use released schema-service 1.6.7 container Issue-ID: AAI-2838 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: Id996c09778a2209ed938cca4b64876e6221210d3
2020-04-07Update git submodulesForsyth, James (jf2512)1-0/+0
* Update kubernetes/aai from branch 'master' to 9b27009ab70a2d4fccd43247f7dbb887cb944293 - Set model-loader release 1.6.2 Issue-ID: AAI-2580 Signed-off-by: Forsyth, James (jf2512) <jf2512@att.com> Change-Id: Ic4f6adfc052cd2a006ddfb3ee53d2c9dc98e5cae
2020-04-07Update git submodulesJimmy Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to eb70b3f12b30d4d7ea010723707db8c3e2ef2354 - Update charts with release images Issue-ID: AAI-2580 Change-Id: Icd5f1a1b025defcc747cafa97bd65fd764392be6 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2020-04-02Update git submodulesJames Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to ab137ca81f5d4f9eb3d442f37f8e7ea52d7757f0 - Merge "Removed the PNF mappings from AAI-Babel cfg" - Removed the PNF mappings from AAI-Babel cfg It comes out, that when these mappings are filled in aai-babel tosca-mappings, the Service model distribution breaks. We will need a permanent fix in Guilin release, for now, let`s remove that mapping. Change-Id: I714979d6e032a09d74ad658d82b304c7165adb96 Signed-off-by: deen1985 <damian.nowak@nokia.com> Issue-ID: AAI-2845
2020-04-02Update git submodulesSylvain Desbureaux1-0/+0
* Update kubernetes/aai from branch 'master' to 39e940f450e0345d5328a1809bdc42779e9c3cb4 - Bump chart version Use 6.0.0 in preparation for Frankfurt release Issue-ID: OOM-2320 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I7280bb53c67230afd10483ac4a9b0508e47fb06b
2020-04-01Update git submodulesVenkata Harish Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to 734cab7fc193e701b59bacc9c234030b52449fa4 - Merge "Setup data router to trust ONAP root cert" - Setup data router to trust ONAP root cert Issue-ID: AAI-2766 Change-Id: I44d0be5e4009e5c712c098a95e4f2fc58c497ae9 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2020-04-01Update git submodulesdeen19851-0/+0
* Update kubernetes/aai from branch 'master' to ed4d83f3eadfc2b2c84ee5126bd5297f254770d3 - Corrected the Model Invariant UUI for PNF (remove o) Signed-off-by: deen1985 <damian.nowak@nokia.com> Change-Id: I707941be062ffd817570140d390b5c14506e5e1a Signed-off-by: deen1985 <damian.nowak@nokia.com> Issue-ID: AAI-2845
2020-04-01Update git submodulesJimmy Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to a7266921b688bc199d8c1dc722b64c203b7e0bea - Update dmaap cert Issue-ID: AAI-2766 Change-Id: Ic87dee2d8d140ab8e58b86ed54a84ad8d690dbb3 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2020-03-31Update git submodulesJames Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to ed292323735ea0b366960474d15fcfa23b209d0e - Merge "Update AAI certs to expiry 27 Mar 2021" - Update AAI certs to expiry 27 Mar 2021 Issue-ID: AAI-2821 Change-Id: I385598c62ee0f964e2c277a8b192b5bf7b50f1d1 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2020-03-30Update git submodulesForsyth, James (jf2512)1-0/+0
* Update kubernetes/aai from branch 'master' to 40aacd4952fc1d8a37f4ad44c89bef093762b81c - Add PNF to tosca mappings Issue-ID: AAI-2845 Change-Id: Iaf2474b38ea1b5a47d5dad7154fef0d0fd4beb68 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2020-03-26Update git submodulesJames Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to 93f574789eee8a44d9e77b940e352a9c413d5819 - Merge "[AAI-2765]-Sparky cannot communicate with search-data-service (certificate issue)" - [AAI-2765]-Sparky cannot communicate with search-data-service (certificate issue) Issue-ID: AAI-2765 Change-Id: I06b024d7a9a30de13e5adb2b087a83414bd1a64e Signed-off-by: rajeevme<rajeev.mehta@amdocs.com> Change-Id: I0ac22f77c445747303961fb35266194d697046df
2020-03-26Update git submodulesJimmy Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to 19dac30852f1dcde2fbebbacad15852c8a9b1f34 - Replace expiring AAF cert Issue-ID: AAI-2842 Change-Id: I9c55ea4c472692bf3c335f277ff78834831c842b Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2020-03-11Update git submodulesJimmy Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to 3d1bbe894ff20bc8b1512591c6d8993b4d2009b1 - Use release resources:1.6.6 Issue-ID: AAI-2831 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I7f561576db28439572ea95131efe12f1f3e953c7
2020-03-05Update git submodulesVenkata Harish Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to 4f4d14ab45a2225953961136220041189d566015 - Merge "Update logback.xml" - Update logback.xml Issue-ID: AAI-2824 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I9034b283a2cd47770a30db9e1eecf3ef5ad58d47
2020-03-05Update git submodulesHarish Venkata Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to c9fad710ea31ae6695c3914429266621d37ce8b8 - Fix the graphadmin logback issue Issue-ID: AAI-2751 Change-Id: Icce232aab798c2c1d2a072a5cbf040403879a48b Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2020-02-28Update git submodulesVenkata Harish Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to ac0ea8aa12226ac95683838e92d22928eb221630 - Merge "Fix MSB config section" - Fix MSB config section Issue-ID: AAI-2809 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I53bb71ce9d8989ee3d481bcf7f2db606455df1d3
2020-02-18Update git submodulesJames Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to 23f076495d36081f34a367067918d15fcc5ada8d - Merge "Add ingress controler support to AAI" - Add ingress controler support to AAI Issue-ID: OOM-2171 Signed-off-by: Lucjan Bryndza <l.bryndza@samsung.com> Change-Id: I9afdae36aa9afd1f80f88b5bb3a15935f9335a93
2020-02-12Update git submodulesjimmy1-0/+0
* Update kubernetes/aai from branch 'master' to 764cd8514707c1630dbfa6792b8d15953d5b9a59 - Use v1.6.4 of resources Issue-ID: AAI-2796 Change-Id: I865ce2259fe7112c60ca9ab6ab6a6222b20f0527 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2020-02-03Update git submodulesKrzysztof Opasiak1-0/+0
* Update kubernetes/aai from branch 'master' to 1c9c9bba658057f6147276fba4f84e7db9117e70 - [ONAP-wide] Replace .Release.Name with common.release ONAP is too big to be deployed using helm install so we need to use a custom helm plugin helm deploy. This script deloys onap component by component instead of deploying evrything at once. Unfortunately this script also modifies the helm release by appending component name to it. As a result of this behavior our objects are called for example: onap-mariadb-galera-mariadb-galera-0 instead of just being called onap-mariadb-galera-0. This patch simplifies this naming convention by replacing all direct usages of .Release.Name with common.release macro which strips the component specific part from the release name. Issue-ID: OOM-2275 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I450057f5b4a10842f09665ecccc58e4ed727cd89
2020-01-28Update git submodulesKrzysztof Opasiak1-0/+0
* Update kubernetes/aai from branch 'master' to f636b1cc2bf7d391dc76956e906a6f497ef1b092 - Remove space from file name Remove the awkward space from the file name and replace it with a dash. Issue-ID: OOM-2275 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: Ia0d55fae839d5ef865ac53659d93cbda5ba4212a
2020-01-23Update git submodulesForsyth, James (jf2512)1-0/+0
* Update kubernetes/aai from branch 'master' to 69f85c4ba9f621e5f5172c0dd637048fe7ef3cfd - Update charts for released containers Issue-ID: AAI-2763 Change-Id: Ie005febc51040e1dd7fffb104171ee1ee2ccdd98 Signed-off-by: Forsyth, James (jf2512) <jf2512@att.com>
2020-01-17Update git submodulesJames Forsyth1-0/+0
* Update kubernetes/aai from branch 'master' to c8663688eb2755ca5adc4f570c7acf76b6f9a077 - Merge "Remove the usage of uuidv4 since it was causing the deployment to change at every "helm deploy" causing AAI ha proxy pod to restart and cause AAI outage." - Remove the usage of uuidv4 since it was causing the deployment to change at every "helm deploy" causing AAI ha proxy pod to restart and cause AAI outage. Issue-ID: OOM-2226 Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca> Change-Id: I03aa47240251fe182ecd841a99a9b99a20c88d65
2020-01-13Update git submodulesHarish Venkata Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to d801a6ee395220b11bfac773c3111489282e735c - Use the frankfurt release data router image Issue-ID: AAI-2727 Change-Id: I85fc2b830156e913abc845b91348990ff2127b20 Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2019-12-11Update git submodulesHarish Venkata Kajur1-0/+0
* Update kubernetes/aai from branch 'master' to c56543fa8c464f839cde7d80ff2023d6448e4b28 - Fix the startup issue of data router liveness so that the pod does die before it even had a chance to start the application Issue-ID: AAI-2727 Change-Id: I94246883cc5b46c7e9873e70214599653514d7d8 Signed-off-by: Harish Venkata Kajur <vk250x@att.com>