etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7625: UI > IP Address page > EnableVPN > If createRemoteAccessVpn returns success, but the newly created remoteaccessvpn object's state is not Running, treat it as a failure. 

(cherry picked from commit b592e0af34)
This commit is contained in:
Jessica Wang 2014-09-24 14:25:22 -07:00 committed by David Nalley
parent d036168ecb
commit 555b20f7ec
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/scripts/network.js
View File

@ -2361,10 +2361,15 @@
success: function(data) {
args.response.success({
_custom: {
getUpdatedItem: function(json) {
getUpdatedItem: function(json) {
var vpnenabledAndRunning = false;
if (json.queryasyncjobresultresponse.jobresult.remoteaccessvpn.state == "Running") {
vpnenabledAndRunning = true;
}
return {
vpn: json.queryasyncjobresultresponse.jobresult.remoteaccessvpn,
vpnenabled: true
vpnenabled: vpnenabledAndRunning
};
},
getActionFilter: function() {
@ -2387,7 +2392,13 @@
return 'label.enable.vpn';
},
complete: function(args) {
return _l('message.enabled.vpn') + ' ' + args.vpn.publicip + '.' + '<br/>' + _l('message.enabled.vpn.ip.sec') + '<br/>' + args.vpn.presharedkey;
var msg;
if (args.vpn.state == "Running") {
msg = _l('message.enabled.vpn') + ' ' + args.vpn.publicip + '.' + '<br/>' + _l('message.enabled.vpn.ip.sec') + '<br/>' + args.vpn.presharedkey;
} else {
msg = "VPN configuration has been generated, but it failed to apply. Please check connectivity of the network element, then re-try.";
}
return msg;
}
},
notification: {