Age | Commit message (Collapse) | Author | Files | Lines |
|
Fix json parsing of resource input by adding escape character.
Change-Id: Ic19bd5dae5eea25faaeae2df3eb0bcc29482ea7c
Issue-ID: SO-1358
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
|
|
Update request input and sequence to DB.
Resource sequence has been added as new column in service table.
Resource input has been added as new column in resp resource.
Change-Id: I97c8227636f06692190a843a87178517db038bbd
Issue-ID: SO-1248
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
|
|
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064410
Issue-ID: SO-1235
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
|
|
SO's SDC Controller is not invoking automatic BPMN deployment
on Workflow distribution.
Submitting this change on behalf of Elena Kuleshov.
Change-Id: Ice68f15d505a88099da61c992a20b943dd40d756
Issue-ID: SO-1214
Signed-off-by: Rob Daugherty <rd472p@att.com>
|
|
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064406
Issue-ID: SO-1184
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
(cherry picked from commit a2e9ad5d9b34d764493951737ab73821b03bba0c)
|
|
building block validator test now passes
added buildingblockvalidator process instance test
Retrieve actual error from WorkflowExceptionErrorMessage when the error
message is empty, not only when null.
Propagate orchestrationStatusValidationResult values from BB to BB.
corrected use of constructor for AaiUtil
use AaiUtil method to create path for get call
modified how allotted resource urls are constructed
- Removed the findExistingVnfcInstanceGroup method. It is not required
to check this because the vnfResourceCustomization is always a new
object at this location.
Enable multiStage VF Module Create processing only when aLaCarte flag
is on.
Change-Id: If8cf397a84abc290e67e287d5b2264dd226398bc
Issue-ID: SO-1188
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
default cloud owner can now be set via a property
Change-Id: I9b900cb2a5c7176a78e889ad2ce31a4ed9d38585
Issue-ID: SO-1158
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
Updated builder to use String.format
Added exception specifically for issues interacting with
requestdbadapter
Updated exception message and added junit test case
Added case to handle when homing is not called during assign vnf.
include network ID for completion handler
Added exception handling for saving to requestdb
added null check to mdc and interceptors to sdnc cxf
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
updated how request db is set to failure in workflowA
updated in and out mapping to be generalBuildingBlock
change source out mapping to generalBuildingBlock
Use explicit conversion to JSON to read cloudConfiguration settings.
Use explicit conversion to JSON to read cloudConfiguration settings.
Correct the name of DeleteVfModuleBB subprocess.
Write the returned value from Homing to gBBInput
updated unit test coverage for update network
sync subnet status with network update
Added WorkflowException to out mapping which will trigger an exception
to be thrown when populated.
Correct the payload for HealthCheck APP-C Action to remove escaping and
change parameter name.
Added WorkflowException to out mapping which will trigger an exception
to be thrown when populated.
Commit a change that was not staged in previous commit
updated arguments to getConstructor method
forgot to extract throwable from Optional object
added throwable constructor to createException
fixed broken unit test and added a new test and method
set the network technology in the network request
remove namespace from added networkId payload element
- Updated SDWan test case to check the database to make sure the
VNFCustomization object exist.
- Updated code to only loop in iNotif.getResources() for VF resources,
all others are unnecessary and were causing issues with the Service
object.
- Removed modifiedHeatTemplate variable since this isn't needed in the
ONAP code base.
Make sure vnfResponseCode variable is set to 200 when VNF is correctly
retrieved from A&AI.
VRR VRRCreateVfModule - send availability_zone to SDNC Infra Assign
request
Safeguard the retrieval of Boolean setting for isRollbackEnabled.
Set isRollbackEnabled to opposite of suppressRollback early on in the
execution.
Reverse suppressRollback value to pass as backout parameter to VNF
Adapter
Add the exceptions to the calls to aai client queries
Correct retrieval of the object from Optional for A&AI queries.
Change-Id: I7d22e621b0316c14ce61bd51a9d5753473622697
Issue-ID: SO-1134
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
added in cloud configuration object to request params
Fix Bean scanning so it picks up the resttemplate
removed unnecessary RestTemplate Bean configurations
corrected typo in CloudConfiguration class
updated gr api test cases with dynamic cloud owner
updated groovy files to allow for dynamic cloud owner values
updated GR API layer to include cloud owner
added enum for default cloud owner
add cloud owner variable to camunda in mapping
removed references to att-aic from BBInputSetup
updated aai schema dependency to 1.3.1 from 1.3.0
Fixed incorrect type AAIUri and updated logging in the method.
use existing service instance id instead of generating
Pass cloudOwner to process to propagate to subprocesses.
NOTE: our aai-schema dependency is 1.3.1-SNAPSHOT to be
compatible with the cloud owner changes here. The
releaesed 1.3.0 version is NOT compatible.
Change-Id: I43b46774b77981d1c8bfe7c7a79b9434889e62ae
Issue-ID: SO-1128
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Signed-off-by: Rob Daugherty <rd472p@att.com>
|
|
Change-Id: Ia39c5e902532d22f4eb3eaa6739ae0c941f8180e
Issue-ID: SO-1106
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
|
|
Either log or rethrow this exception
Sonar Link:
https://sonar.onap.org/project/issues?assignees=sunilb&id=org.onap.so%3Aso&resolved=false&severities=CRITICAL
Location:
src\main\java\org\onap\so\asdc\client\ASDCController.java
Line No: L598 L630 L662 L708 L744
Change-Id: I40e5044236b5b4bb9c40155810569fa63c028b77
Issue-ID: SO-1088
Signed-off-by: Sunilkumar Shivangouda Biradar <sb00577584@techmahindra.com>
|
|
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>
|
|
|
|
Added license header to BpmnInstaller.java
ASDC Controller integration with BPMN Installer
Correct a test file name in a JUnit.
BPMN deployment mechanism for WorkflowDesigner
Change-Id: I670406dd09b8789c86ab0b85ef122b35ea057698
Issue-ID: SO-826
Signed-off-by: Elena Kuleshov <EK1439@att.com>
|
|
Update logging to meet Casablanca Spec
Change-Id: I029d6c63765992d6f091d96e2b4c34c60d30c484
Issue-ID: SO-947
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
|
|
|
|
Issue-ID: SO-1063
Change-Id: I6d627915297f9be0a383516df363d3adec8fc083
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
|
|
Remove conditional to not check VNF topology
add empty string verification for serviceName field
Add junits for CNRCR and NtwkAdptr changes.
Add search in new CollNtwkResCust tbl to get NtwkResource.
- Updated test data files to include 'pre-load' flag in both
VfModuleOperation and NetworkOperation json test data files.
- MSO to not to send <preload>boolean</from-preload> to SDNC in
network-topology-opertion and vf-module-topology-operation. Updated
GeneralTopologyObjectMapper to set 'from-preload' to null so that
elements with Nulls are not sent to SDNC. Updated
buildNetworkInformation() and buildVfModuleInformation() methods.
update flow stats to not cause bpmn flow to crash
Fix headers so SDNC does not return XML
Add implementation of deleteVolumeGroupResponse parsing; fix JUnits
that worked by accident.
Change-Id: Ia96d552d731e112505fcf739029a6fd4d0134546
Issue-ID: SO-1061
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
|
|
sdnc now logs the full response message as a json
removed erroneous encoding of variables with full XML
Return created network from getVirtualLinkL3Network
added exception logger to workflowaction aai check
Check for null value for vnfcPorts before referencing it
Added test case for invalid camunda response
Changed to use updateStatus method
Added saving for currentActiveReq and test for 401 resp
Change JUnit to use expectedException and clean up unused items.
Add vfModuleId to the exception message for missing model info.
Report an error if VF Module model info is expected but is null.
- Just renamed the Cvnfc and Vnfc set names
- Updated code to check for duplicate VNFC's across multiple modules in
the same VNF.
- Removed commented out if statement line for ALLOTTED_RESOURCE
- Reinitialize the Cvnfc and Vnfc Sets each time we iterate the
VFModule loop. This will avoid the concurrent modification exception.
Eliminated Ben from the sample request
Changed to use else if for null check
Added null check before catdb call and test case
Fix implementation of a call to VNF Adapter for DeleteVolumeGroupBB.
Update the method to no call save and do a put
Revert usage of PUT method, use save instead
Change-Id: I9f69fb68d0639c23b8e1de6931938119bd3ac54b
Issue-ID: SO-1032
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
Removed printstacktrace from exception block in
DistributionClientEmulator.java
Issue-ID: SO-1027
Change-Id: Ie8cefda90171d6478be007ba0525cf266e2547f0
Signed-off-by: Chandan Ghosh <cghosh12@in.ibm.com>
|
|
Seperate out Beans and repositories for RequestDB
Change-Id: I67d6597d580e9828b6bb8faafaea7e09cc6467c0
Issue-ID: SO-999
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
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>
|
|
Fix Autoincrement of ID field in table
Fix accidental removal of method
Update usage of requestdb client
removed unused imports in common tasks and test
Fix broken branch, have unit tests pass
references
the Epic branch
Fix broken branch from compiling
committing classpath for vfc adapter cause its not going away
added in the fail case for when there are no profiles
removed second set of adapters in application test yml
removed double adapters in request db application test
added jpa repo dependency to the so bpmn folder pom
add creation timestamp column to the table
added in null checks for Config returned from policy
switched to string in requestprocess with jenerate
switched to string in requestprocess with jenerate
updated aai version in common pom to 605 from 591
renamed the db scripts for flyway sync to register
added endpoint to application test yml for failing test
...
Change-Id: I800f837ea75d7cdff740dc3a387e4d7654cfd085
Issue-ID: SO-972
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
Issue-ID: SO-915
Change-Id: I8212e0723924b56d77be8f26536a5e69823418a1
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
|
|
Fixed Sonar issue by adding a logge message in the catch block of
exception.
Issue-ID: SO-917
Change-Id: I6163d5bd0706d1b426b9dd3cbdc709d2418a1e70
Signed-off-by: GOPINATH MATHIVANAN <gopinath.mathivanan@in.ibm.com>
|
|
[MSO-5031]_updated_JUnits_to_assert_request_body_for_requestDb_client
Marking JPARepositories as Remote Rest repositories for
TenantIsolationRunnable class | Minor refactoring
Add request DB Config to ATT specific ASDC controller test yaml
Adding requestDB Endpoint to yaml so as to pass the tests of asdc
controller
Adding requestDB Endpoint to yaml so as to pass the tests
Adding requestDB Endpoint to yaml so as to pass the tests
Handling the build failure due to mock mismatch
Handling the build failure due to conflicting beans and additional
minor refactoring
Handling the build failure due to conflicting beans
Adding RequestDB endpoint to yaml files for running tests
Removing non-entity classes from ClassURLMapper class
Marking JPARepositories as Remote Rest repositories for
TenantIsolationRunnable class | Fixing minor Bug
Marking JPARepositories as Remote Rest repositories for
TenantIsolationRunnable class | Fixing junits
Marking JPARepositories as Remote Rest repositories for
TenantIsolationRunnable class | Fixing
getMultipleOperationalEnvServiceModelStatus
Marking JPARepositories as Remote Rest repositories for
TenantIsolationRunnable class | Fixing Junits
Marking JPARepositories as Remote Rest repositories for RequestsDBHelper
Marking JPARepositories as Remote Rest repositories for
TenantIsolationRunnable class | Moving RequestsDbClient to requestdb
package
Marking JPARepositories as Remote Rest repositories for
TenantIsolationRunnable class | Fixing Junits
Marking JPARepositories as Remote Rest repositories for
TenantIsolationRunnable class | Initial Checkin
Change-Id: I4053919e98afb8db962511be0a3318b1bf8af88a
Issue-ID: SO-903
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
fixed the sonar issue in the file at line 39
Issue-ID: SO-874
Change-Id: Ic187fa42e81a503e99ff71ab9ab971c21aa82cd3
Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
|
|
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa70000009
Issue-ID: SO-668
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
|
|
updated mock in unassignnetworkbbtest instead of base
added mock to extract pojos method in unassignnetwork
Return gBuildingBlockExecution from calls to VnfAdapter subprocess
Correct JUnit data to expect modelInfoVfModule
Enable Spring Security for logging of unauthorized/bad credentials
errors
Fix handling of a case of no VF Modules in a VNF resource.
fix populating lookupKeyMap with resource ids
removed unnecessary test resources
Issue-ID: SO-848
Change-Id: Id89f075dcac4042bf8fb1e207e66d289d079171f
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
Fixes the new GR-API flow
Various fixes in the create VF Module area
Fixes issues parsing the SDNC GR API response
Fixes new resource type in ASDC controller
Fixes AppC mismatch in JSON marshaling
Issue-ID: SO-821
Change-Id: I4ace0d348483ab1303fcfee26c5801674be51466
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
Issue-ID: SO-799
Change-Id: Ia403872b2d81e7277f9329d6be08df6e04f7bd27
Change-Id: Ia403872b2d81e7277f9329d6be08df6e04f7bd27
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
|
|
Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
Change-Id: Ic9cdc62286cee9a62f3de325a3aa5b3a1008ec5f
Issue-ID: SO-647
Signed-off-by: Switon Tomasz <tomasz.switon@nokia.com>
|
|
Fix subcategory population for vnf resource.
Change-Id: Ib9b03a19cc12ed66f552096a9b3a499ac6ef574f
Issue-ID: SO-630
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
|
|
Fix parsing of VNF resource.
Change-Id: Ib2adfaab1ae9bb5fa9cff195cdecbdea5aea18e1
Issue-ID: SO-630
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
|
|
Fix resource population to DB.
Change-Id: Iae25ce2f15fa121a45a55559458fcbbd217f2c7d
Issue-ID: SO-624
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
|
|
csar files:
1. resource_Extvl.csar
2. service-ServiceFdnt-csar-0904-2.csar
3. service-ServiceFdnt-with-allotted.csar
4. service_Rg516VmmscSrvc_csar.csar
Change-Id: I8688a8a29508c9332eaa8a0130ff2f79db5308dd
Issue-ID: SO-611
Signed-off-by: sanchitap <sanchita@techmahindra.com>
|
|
File:RestfulUtil.java
Line:L85
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:E2EServiceInstances.java
Line:L263 L1059
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:OrchestrationRequests.java
Line:L343
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:ASDCConfiguration.java
Line:L286 L378
SonarLink:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:ResourceInput.java
Line:L287
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:ResourceRecipeRequest.java
Line:L136
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:ResourceRequestBuilder.java
Line:L108 L214
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:CheckAaiForCorrelationIdDelegate.java
Line:L70
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:AbstractSdncOperationTask.java
Line:L359
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:DmaapClient.java
Line:L62
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
File:HasAnnotationPropertyWithValueMatcher.java
Line:L60
Sonar Link:
https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL
Change-Id: Ic168a118790c31850a9f32f98465be5d52b8c96f
Issue-ID: SO-581
Signed-off-by: AS00465059 <AS00465059@techmahindra.com>
|
|
Adding support for Basic Auth in the AAI Rest Clients because
ONAP uses this (whereas ECOMP uses 2-way SSL).
In general, each AAI client will allow the user to configure
properties called "aai.auth" and "mso.msoKey". If these are
set, then the client will add the Authorization header to every
request.
Change-Id: I7c81ec05d2ec4a7dca131f2e9e19d341ac89b09f
Issue-ID: SO-576
Signed-off-by: Rob Daugherty <rd472p@att.com>
|
|
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>
|
|
Change-Id: I01f4f88d15f2152b7c951f4cc6f4f3682ee45e86
Issue-ID: SO-405
Signed-off-by: liboNet <libo.zhu@intel.com>
|
|
Issue-ID: SO-570
Change-Id: Ie597c0f1f1e982f840223e22e60a174082fd71fb
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
|
|
UT Coverage for asdc-controller
Issue-ID: SO-369
Change-Id: Id38747b83f41218024592eaf225eb52de91fd4c2
Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
|
|
UT Coverage for asdc-controller
Issue-ID: SO-369
Change-Id: I950750db64f69ef50185785e2c215d3401462001
Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
|
|
UT Coverage for asdc-controller emulators
Issue-ID: SO-369
Change-Id: If37ca5f4c8e7c0ace8430ae5a316d0287c66bb16
Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
|
|
UT Coverage for asdc-controller emulators
Issue-ID: SO-369
Change-Id: Ic34fdabd98713745232b2ecbb612cc958f7677a8
Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
|
|
UT Coverage for asdc-controller emulators
Issue-ID: SO-369
Change-Id: I5d59533fadfaa0e4b069d598d4495b8ef27ff37a
Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
|
|
UT Coverage for asdc-controller emulators
Issue-ID: SO-369
Change-Id: I9a63b488e79cbaa19b24f51ee77e0f5f825d5a90
Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
|
|
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>
|