Age | Commit message (Collapse) | Author | Files | Lines |
|
Updated SO to use ONAP provided filters and constants to meet logging
standards.
Removed redundant classes
Updated constant references
Issue-ID: SO-2301
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Ia4e3c2b1a4dcb3881aa34d39885c8b2782880d64
|
|
Major Sonar fixes in different classes:
-Removed unnecessary code.
-Removed unused variables.
-Removed unnecessary imports.
-Simplified diamond operators.
-Improved String comparisons in equals.
Issue-ID: SO-2102
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: I279c63f8e7161d6e33d5d6a28b938c0c64e90f1f
|
|
Removing the application-local.yaml files because they're no longer
maintained or working.
Issue-ID: SO-2121
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I191c8775de931671a4657be8940e6aec64023359
|
|
General fixes and improvements according to the Sonar analysis.
-Fixed imports.
-Removed unnecessary code.
Issue-ID: SO-1992
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: I4299f3efc4444625f70fc36e65b57c500b113596
|
|
replaced String.repeat with static final strings
Change-Id: Ife14fde70e8f648881a03e9343ae8faf9cb87e2e
Issue-ID: SO-1999
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
Cleaned up Sonar code smells related to the duplicated
literals in loggers.
Issue-ID: SO-1932
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: I58c48cec0012c42b7b892ae76c24c6a087c60c7e
|
|
Increased junit tests coverage according to Sonar analyses.
Added missing tests for RestfulUtil.
Issue-ID: SO-1692
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: I8744960c0ad3a36ca4c36e23867168bfda5cbd1d
|
|
Added in maven plugins to enforce coding style rules
Added in eclipse java formatting xml
Change-Id: I3727bbf4ce8dc66abfd8ad21b6cfd0890c5d3ff0
Issue-ID: SO-1765
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
Increased junit tests coverage according to Sonar analyses.
Added missing tests for VfcManager.
Change-Id: Ib0057f4f8179f088fe4e94df563a3053601758e7
Issue-ID: SO-1692
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
|
|
Bye bye MsoLogger class.
Extracted constants to separated classes.
Fixed imports.
Change-Id: I7c8e0527e7dbd097d3ea93b9dab279354652da47
Issue-ID: LOG-631
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
|
|
Removed MsoLogger from adapters ('mso-vfc-adapter')
Replaced MsoLogger with plain slf4j.
Refactored login output.
Fixed imports.
Change-Id: Ib7561440520bdd9e1f0257639ab52f32f9bdb98e
Issue-ID: LOG-631
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
|
|
Re-enable Actuator for Springboot 2.0
Change-Id: Icee67885d9bd26d6b6ff8a4fceb9add56926b0a8
Issue-ID: SO-1377
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
update OperationStatus Based On ResourceStatus
add Authorization header to get csar from db
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064414
Issue-ID: SO-1256
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
|
|
Fix broken UT from removing alarm logger
fixed compilation and merge issues
Remove all usage of AlarmLogger
Change-Id: Ic87abd51423274570bfca0ed976d9642a91a843d
Issue-ID: SO-1229
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
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>
|
|
RequestsDbClient Junits and some fixes for RequestsDbClient
Change-Id: Icc2185030220d7bf973be5a23a51b6b5e313a360
Issue-ID: SO-1033
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
|
|
|
|
fixed sonar issue as detailed in SO-991
Issue-ID: SO-991
Change-Id: I016f1db14c5dd03f9b9bb872c16a221168c2d628
Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
|
|
fixed sonar issue as detailed in SO-990
Issue-ID: SO-990
Change-Id: Ie27a1040d64b53b699a14cae95e5641a70c18ec0
Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
|
|
|
|
|
|
fixed sonar issue detailed in SO-951
Issue-ID: SO-951
Change-Id: Ic4a086f339187a6c9d802d5ea09acd0c4416e7c9
Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
|
|
fixed sonar issue detailed in SO-950
Issue-ID: SO-950
Change-Id: Ic8089706054c785d4ef31957617b44222ab0030f
Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
|
|
fixed sonar issue detailed in so-949
Issue-ID: SO-949
Change-Id: I48b36854fa7e20c3c9e9958cdf6c7c107d0cf58a
Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
|
|
Add CXF interceptor for SOAP based logging
Clean up extra logging statements
Add UT to ensure MDC properly populated
Change package name on Jax-RS Filter to be more accurate
Issue-ID: SO-947
Change-Id: I3a2afc58de3bf370675658ce3d19cf899b90def7
Change-Id: I3a2afc58de3bf370675658ce3d19cf899b90def7
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.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>
|
|
Junit was using an illegal http error code
Issue-ID: SO-793
Change-Id: Ica36a5e22f32680710da649eb0dbfe5cac93b93c
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>
|
|
Replace with a single equalsIgnoreCase call
Sonar Link:
https://sonar.onap.org/project/issues?assigned=false&fileUuids=AWHCr-EdEU5FCDfKtlun&id=org.onap.so%3Aso&open=AWHCr-dlEU5FCDfKtmL0&resolved=false&severities=MAJOR
Location: src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
Line No: L110 L115 L120 L124
Change-Id: I36a727a5acf6a911e3f9ad4ca8b548b4c7f1f732
Issue-ID: SO-776
Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
|
|
Change-Id: I648e5a25337beca1f8c483ba6e5359d245e237d3
Issue-ID: SO-642
Signed-off-by: mkorman <michal.korman@nokia.com>
|
|
|
|
|
|
Issue-ID: SO-634
Change-Id: I57cc8f3e54de0fa02a437112aaa478b742c1ab9f
Signed-off-by: guochong <guochong@chinamobile.com>
|
|
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0643f8
Issue-ID: SO-632
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
|
|
but progress is 100 for wrong opertype
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0643f6
Issue-ID: SO-632
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
|
|
Fix progress update for VFC resources.
Change-Id: Ibd7d8fb3a399ae2b40ca82e459a7e47c05cbac6a
Issue-ID: SO-422
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
|
|
Remove operation status set in api-handler
Change-Id: I579d25044130b0701231c0a2d42534e8c63e3ebd
Issue-ID: SO-587
Signed-off-by: c00149107 <chenchuanyu@huawei.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>
|
|
Update create generic flow for E2E service
Change-Id: I7f5c912348ce0d0ee9035aa3a5e34979ee14b247
Issue-ID: SO-583
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
|
|
Issue-ID: SO-423
Change-Id: I752e096806ec513250a8fb1bf51a2ed57fb05f6e
Signed-off-by: guanwenyao <guanwenyao@chinamobile.com>
|
|
Improve code coverage.
Change-Id: Id7f710b6f535c2488cfd55e2f689caa9903fe4ca
Issue-ID: SO-369
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
|
|
|
|
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>
|
|
Adding Junit for:
ApplicationException.java
Sonar-Link:
https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so.adapters%3Amso-vfc-adapter%3Asrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fadapters%2Fvfc%2Fexceptions%2FApplicationException.java
Change-Id: I4a65874b63aa98aacbaabf6961c89ec500dc85d9
Issue-ID: SO-479
Signed-off-by: Sumapriya <SS00493505@techmahindra.com>
|
|
|
|
Change-Id: Ie00d5ec5a4677c99a9a689bf18a85055902f6384
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
|
|
Change-Id: I5a320c606ea3e0c47efa6d84e8b0cc1ab40f3b70
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
|
|
|
|
Change-Id: Ib26f47171384125847a1b31bc1a958b50d0bba70
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
|
|
Change-Id: Iddc39df32089e1a37c04d089522ead295a037118
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
|