You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2022/05/25 18:16:55 UTC
[trafficcontrol] branch master updated: Updated success message (curl and TP) for deleting a DS (#6855)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 7e6af10807 Updated success message (curl and TP) for deleting a DS (#6855)
7e6af10807 is described below
commit 7e6af1080735c083e8669995cab320a84b9abdb3
Author: Rima Shah <22...@users.noreply.github.com>
AuthorDate: Wed May 25 12:16:51 2022 -0600
Updated success message (curl and TP) for deleting a DS (#6855)
* Updated success message (curl and TP) for deleting a DS
* Updated CHANGELOG.md
* Updated DS integration test's validation message
* updated message to info level on TP and TO
* grammar check.
---
CHANGELOG.md | 1 +
traffic_ops/traffic_ops_golang/api/shared_handlers.go | 8 +++++++-
.../edit/FormEditDeliveryServiceController.js | 5 ++++-
traffic_portal/test/integration/Data/deliveryservices.ts | 12 ++++++------
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ee6b7c859..8ec525f362 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
traffic_ctl commands, and adds new markup-poll-threshold config.
- Traffic Monitor now defaults to 100 historical "CRConfig" Snapshots stored internally if not specified in configuration (previous default was 20,000)
- `TRAFFIC_ROUTER`-type Profiles no longer need to have names that match any kind of pattern (e.g. `CCR_.*`)
+- [#4351](https://github.com/apache/trafficcontrol/issues/4351) Updated message to an informative one when deleting a delivery service.
## [6.1.0] - 2022-01-18
### Added
diff --git a/traffic_ops/traffic_ops_golang/api/shared_handlers.go b/traffic_ops/traffic_ops_golang/api/shared_handlers.go
index 2e86dff6eb..92d2b49b04 100644
--- a/traffic_ops/traffic_ops_golang/api/shared_handlers.go
+++ b/traffic_ops/traffic_ops_golang/api/shared_handlers.go
@@ -324,7 +324,13 @@ func DeleteHandler(deleter Deleter) http.HandlerFunc {
deleter,
HandleErr,
func(w http.ResponseWriter, r *http.Request, message string) {
- WriteRespAlert(w, r, tc.SuccessLevel, message)
+ if deleter.GetType() == "ds" {
+ alerts := tc.CreateAlerts(tc.SuccessLevel, message)
+ alerts.AddNewAlert(tc.InfoLevel, "Perform a CDN snapshot then queue updates on all servers in the cdn for the changes to take effect.")
+ WriteAlerts(w, r, http.StatusOK, alerts)
+ } else {
+ WriteRespAlert(w, r, tc.SuccessLevel, message)
+ }
},
)
}
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
index 7e278d8939..49d83c2bbe 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
@@ -299,7 +299,10 @@ var FormEditDeliveryServiceController = function(deliveryService, origin, topolo
deliveryServiceService.deleteDeliveryService(deliveryService)
.then(
function() {
- messageModel.setMessages([ { level: 'success', text: 'Delivery service [ ' + deliveryService.xmlId + ' ] deleted' } ], true);
+ messageModel.setMessages([
+ { level: 'success', text: 'Delivery service [ ' + deliveryService.xmlId + ' ] deleted.' },
+ { level: 'info', text: 'Perform a CDN snapshot then queue updates on all servers in the cdn for the changes to take effect.' }
+ ], true);
locationUtils.navigateToPath('/delivery-services');
},
function(fault) {
diff --git a/traffic_portal/test/integration/Data/deliveryservices.ts b/traffic_portal/test/integration/Data/deliveryservices.ts
index c6f9316895..4f20f4b38c 100644
--- a/traffic_portal/test/integration/Data/deliveryservices.ts
+++ b/traffic_portal/test/integration/Data/deliveryservices.ts
@@ -357,17 +357,17 @@ export const deliveryservices = {
{
description: "delete a delivery service",
Name: "tpdservice1",
- validationMessage: "Delivery service [ tpdservice1 ] deleted"
+ validationMessage: "Delivery service [ tpdservice1 ] deleted."
},
{
description: "delete a delivery service",
Name: "tpdservice2",
- validationMessage: "Delivery service [ tpdservice2 ] deleted"
+ validationMessage: "Delivery service [ tpdservice2 ] deleted."
},
{
description: "delete a delivery service",
Name: "tpdservice3",
- validationMessage: "Delivery service [ tpdservice3 ] deleted"
+ validationMessage: "Delivery service [ tpdservice3 ] deleted."
}
]
},
@@ -479,17 +479,17 @@ export const deliveryservices = {
{
description: "delete a delivery service",
Name: "optpdservice1",
- validationMessage: "Delivery service [ optpdservice1 ] deleted"
+ validationMessage: "Delivery service [ optpdservice1 ] deleted."
},
{
description: "delete a delivery service",
Name: "optpdservice2",
- validationMessage: "Delivery service [ optpdservice2 ] deleted"
+ validationMessage: "Delivery service [ optpdservice2 ] deleted."
},
{
description: "delete a delivery service",
Name: "optpdservice3",
- validationMessage: "Delivery service [ optpdservice3 ] deleted"
+ validationMessage: "Delivery service [ optpdservice3 ] deleted."
}
]
}