apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

[UI] MADNESS

Browse Source
This commit is contained in:
Michael Andersen 2016-01-06 17:33:03 +01:00
parent 74f670dc3c
commit 9b9272c019
6 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -2258,3 +2258,4 @@ message.please.select.ssh.key.pair.use.with.this.vm=Please select a ssh key pair
message.configure.firewall.rules.allow.traffic=Configure the rules to allow Traffic message.configure.firewall.rules.allow.traffic=Configure the rules to allow Traffic
message.configure.firewall.rules.block.traffic=Configure the rules to block Traffic message.configure.firewall.rules.block.traffic=Configure the rules to block Traffic
message.ldap.group.import=All The users from the given group name will be imported message.ldap.group.import=All The users from the given group name will be imported
label.vpn.force.encapsulation=Force UDP Encapsulation of ESP Packets

1
client/WEB-INF/classes/resources/messages_nl_NL.properties
View File

@ -1726,6 +1726,7 @@ label.vpc=VPC
label.VPN.connection=VPN Connectie label.VPN.connection=VPN Connectie
label.vpn.customer.gateway=VPN Customer Gateway label.vpn.customer.gateway=VPN Customer Gateway
label.VPN.customer.gateway=VPN Customer Gateway label.VPN.customer.gateway=VPN Customer Gateway
label.vpn.force.encapsulation=Forceer UDP Encapsulatie van ESP Packets
label.VPN.gateway=VPN Gateway label.VPN.gateway=VPN Gateway
label.vpn=VPN label.vpn=VPN
label.vsmctrlvlanid=Controle VLAN ID label.vsmctrlvlanid=Controle VLAN ID

3
ui/dictionary2.jsp
View File

@ -1124,6 +1124,7 @@ under the License.
'message.desc.create.ssh.key.pair': '<fmt:message key="message.desc.create.ssh.key.pair" />', 'message.desc.create.ssh.key.pair': '<fmt:message key="message.desc.create.ssh.key.pair" />',
'message.removed.ssh.key.pair': '<fmt:message key="message.removed.ssh.key.pair" />', 'message.removed.ssh.key.pair': '<fmt:message key="message.removed.ssh.key.pair" />',
'message.please.select.ssh.key.pair.use.with.this.vm': '<fmt:message key="message.please.select.ssh.key.pair.use.with.this.vm" />', 'message.please.select.ssh.key.pair.use.with.this.vm': '<fmt:message key="message.please.select.ssh.key.pair.use.with.this.vm" />',
'message.ldap.group.import': '<fmt:message key="message.ldap.group.import" />' 'message.ldap.group.import': '<fmt:message key="message.ldap.group.import" />',
'label.vpn.force.encapsulation': '<fmt:message key="label.vpn.force.encapsulation" />'
}); });
</script> </script>

4
ui/scripts/docs.js
View File

@ -1118,6 +1118,10 @@ cloudStack.docs = {
desc: 'Check this to make the virtual router query its IKE peer at regular intervals to ensure continued availability. It is recommended to have the same DPD setting on both sides of the VPN connection.', desc: 'Check this to make the virtual router query its IKE peer at regular intervals to ensure continued availability. It is recommended to have the same DPD setting on both sides of the VPN connection.',
externalLink: '' externalLink: ''
}, },
helpVPNGatewayForceEncapsulation: {
desc: 'Force UDP encapsulation for ESP packets even if no NAT situation is detected. This may help to surmount restrictive firewalls. In order to force the peer to encapsulate packets, NAT detection payloads are faked',
externalLink: ''
},
// Copy template // Copy template
helpCopyTemplateDestination: { helpCopyTemplateDestination: {
desc: 'The zone to which you want to copy the template', desc: 'The zone to which you want to copy the template',

21
ui/scripts/network.js
View File

@ -6129,6 +6129,14 @@
docID: 'helpVPNGatewayDeadPeerDetection', docID: 'helpVPNGatewayDeadPeerDetection',
isBoolean: true, isBoolean: true,
isChecked: false isChecked: false
},
forceencap: {
label: 'label.vpn.force.encapsulation',
docID: 'helpVPNGatewayForceEncapsulation',
docID: 'helpVPNGatewayForceEncapsulation',
isBoolean: true,
isChecked: false
} }
} }
}, },
@ -6140,7 +6148,8 @@
ipsecpsk: args.data.ipsecpsk, ipsecpsk: args.data.ipsecpsk,
ikelifetime: args.data.ikelifetime, ikelifetime: args.data.ikelifetime,
esplifetime: args.data.esplifetime, esplifetime: args.data.esplifetime,
dpd: (args.data.dpd == "on") dpd: (args.data.dpd == "on"),
forceencap: (args.data.forceencap == "on")
}; };
var ikepolicy = args.data.ikeEncryption + '-' + args.data.ikeHash; var ikepolicy = args.data.ikeEncryption + '-' + args.data.ikeHash;
@ -6196,7 +6205,8 @@
ipsecpsk: args.data.ipsecpsk, ipsecpsk: args.data.ipsecpsk,
ikelifetime: args.data.ikelifetime, ikelifetime: args.data.ikelifetime,
esplifetime: args.data.esplifetime, esplifetime: args.data.esplifetime,
dpd: (args.data.dpd == "on") dpd: (args.data.dpd == "on"),
forceencap: (args.data.forceencap == "on")
}; };
var ikepolicy = args.data.ikeEncryption + '-' + args.data.ikeHash; var ikepolicy = args.data.ikeEncryption + '-' + args.data.ikeHash;
@ -6465,6 +6475,13 @@
converter: cloudStack.converters.toBooleanText converter: cloudStack.converters.toBooleanText
}, },
forceencap: {
label: 'label.vpn.force.encapsulation',
isBoolean: true,
isEditable: true,
converter: cloudStack.converters.toBooleanText
},
id: { id: {
label: 'label.id' label: 'label.id'
}, },

6
ui/scripts/vpc.js
View File

@ -2904,6 +2904,12 @@
return str ? 'Yes' : 'No'; return str ? 'Yes' : 'No';
} }
}, },
forceencap: {
label: 'label.vpn.force.encapsulation',
converter: function(str) {
return str ? 'Yes' : 'No';
}
},
state: { state: {
label: 'label.state' label: 'label.state'
}, },