Updated Branches: refs/heads/vpc 532806ba1 -> feb2ed1d2
cloudstack 3.0 UI - site to site VPN - Edit mode - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/feb2ed1d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/feb2ed1d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/feb2ed1d Branch: refs/heads/vpc Commit: feb2ed1d2de475b9626f6ba795e64134cbde3bdf Parents: 532806b Author: Jessica Wang <[email protected]> Authored: Mon Aug 6 13:04:55 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Mon Aug 6 13:26:59 2012 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/feb2ed1d/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 978625a..13040c4 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -4088,18 +4088,34 @@ actions: { edit: { label: 'label.edit', - action: function(args) { + action: function(args) { var data = { id: args.context.vpnCustomerGateway[0].id, name: args.data.name, gateway: args.data.gateway, cidrlist: args.data.cidrlist, - ipsecpsk: args.data.ipsecpsk, - ikepolicy: args.data.ikepolicy, - esppolicy: args.data.esppolicy, - lifetime: args.data.lifetime + ipsecpsk: args.data.ipsecpsk, + ikelifetime: args.data.ikelifetime, + esplifetime: args.data.esplifetime, + dpd: (args.data.dpd == "on") }; + + var ikepolicy = args.data.ikeEncryption + '-' + args.data.ikeHash; + if(args.data.ikeDh != null && args.data.ikeDh.length > 0) + ikepolicy += ';' + args.data.ikeDh; + $.extend(data, { + ikepolicy: ikepolicy + }); + + var esppolicy = args.data.espEncryption + '-' + args.data.espHash; + if(args.data.perfectForwardSecrecy != null && args.data.perfectForwardSecrecy.length > 0) + esppolicy += ';' + args.data.perfectForwardSecrecy; + + $.extend(data, { + esppolicy: esppolicy + }); + $.ajax({ url: createURL('updateVpnCustomerGateway'), data: data, @@ -4258,12 +4274,12 @@ ikelifetime: { label: 'IKE lifetime (second)', - defaultValue: '86400', + isEditable: true, validation: { required: false, number: true } }, esplifetime: { label: 'ESP Lifetime (second)', - defaultValue: '3600', + isEditable: true, validation: { required: false, number: true } },
