You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/16 19:55:20 UTC
[13/28] git commit: updated refs/heads/master to 75b68c6
[UI] MADNESS
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b9272c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b9272c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b9272c0
Branch: refs/heads/master
Commit: 9b9272c019cf8d00846a5211a14ed7ec98ca7002
Parents: 74f670d
Author: Michael Andersen <ma...@schubergphilis.com>
Authored: Wed Jan 6 17:33:03 2016 +0100
Committer: Michael Andersen <ma...@schubergphilis.com>
Committed: Thu Jan 7 19:27:51 2016 +0100
----------------------------------------------------------------------
.../classes/resources/messages.properties | 1 +
.../classes/resources/messages_nl_NL.properties | 1 +
ui/dictionary2.jsp | 3 ++-
ui/scripts/docs.js | 6 +++++-
ui/scripts/network.js | 21 ++++++++++++++++++--
ui/scripts/vpc.js | 6 ++++++
6 files changed, 34 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b9272c0/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index e7beaa9..93e73fa 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -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.block.traffic=Configure the rules to block Traffic
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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b9272c0/client/WEB-INF/classes/resources/messages_nl_NL.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_nl_NL.properties b/client/WEB-INF/classes/resources/messages_nl_NL.properties
index 363be5f..a4e1991 100644
--- a/client/WEB-INF/classes/resources/messages_nl_NL.properties
+++ b/client/WEB-INF/classes/resources/messages_nl_NL.properties
@@ -1726,6 +1726,7 @@ label.vpc=VPC
label.VPN.connection=VPN Connectie
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=VPN
label.vsmctrlvlanid=Controle VLAN ID
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b9272c0/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 9d68974..4268104 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -1124,6 +1124,7 @@ under the License.
'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.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>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b9272c0/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index ed6ab0c..e02cbda 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -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.',
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
helpCopyTemplateDestination: {
desc: 'The zone to which you want to copy the template',
@@ -1329,4 +1333,4 @@ cloudStack.docs = {
helpLdapLinkDomainAdmin: {
desc: 'domain admin of the linked domain. Specify a username in GROUP/OU of LDAP'
}
-};
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b9272c0/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 2831aa0..5fd917a 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -6129,6 +6129,14 @@
docID: 'helpVPNGatewayDeadPeerDetection',
isBoolean: true,
isChecked: false
+ },
+
+ forceencap: {
+ label: 'label.vpn.force.encapsulation',
+ docID: 'helpVPNGatewayForceEncapsulation',
+ docID: 'helpVPNGatewayForceEncapsulation',
+ isBoolean: true,
+ isChecked: false
}
}
},
@@ -6140,7 +6148,8 @@
ipsecpsk: args.data.ipsecpsk,
ikelifetime: args.data.ikelifetime,
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;
@@ -6196,7 +6205,8 @@
ipsecpsk: args.data.ipsecpsk,
ikelifetime: args.data.ikelifetime,
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;
@@ -6465,6 +6475,13 @@
converter: cloudStack.converters.toBooleanText
},
+ forceencap: {
+ label: 'label.vpn.force.encapsulation',
+ isBoolean: true,
+ isEditable: true,
+ converter: cloudStack.converters.toBooleanText
+ },
+
id: {
label: 'label.id'
},
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b9272c0/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 4b10d8b..f7f7329 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -2904,6 +2904,12 @@
return str ? 'Yes' : 'No';
}
},
+ forceencap: {
+ label: 'label.vpn.force.encapsulation',
+ converter: function(str) {
+ return str ? 'Yes' : 'No';
+ }
+ },
state: {
label: 'label.state'
},