From a11b7de9fe47cbe69b1a33ecde983fa99fb97275 Mon Sep 17 00:00:00 2001 From: alena Date: Thu, 25 Aug 2011 16:12:55 -0700 Subject: [PATCH 01/19] Set firewall.rule.ui.enabled to false by default Conflicts: server/src/com/cloud/configuration/Config.java --- server/src/com/cloud/configuration/Config.java | 2 +- setup/db/db/schema-229to2210.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 656883df16d..66a822cbe45 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -79,7 +79,7 @@ public enum Config { SecurityGroupWorkerThreads("Network", ManagementServer.class, Integer.class, "network.securitygroups.workers.pool.size", "50", "Number of worker threads processing the security group update work queue", null), SecurityGroupWorkGlobalLockTimeout("Network", ManagementServer.class, Integer.class, "network.securitygroups.work.lock.timeout", "300", "Lock wait timeout (seconds) while updating the security group work queue", null), - FirewallRuleUiEnabled("Network", ManagementServer.class, Boolean.class, "firewall.rule.ui.enabled", "true", "enable/disable UI that separates firewall rules from NAT/LB rules", null), + FirewallRuleUiEnabled("Network", ManagementServer.class, Boolean.class, "firewall.rule.ui.enabled", "false", "enable/disable UI that separates firewall rules from NAT/LB rules", null), //VPN RemoteAccessVpnPskLength("Network", AgentManager.class, Integer.class, "remote.access.vpn.psk.length", "24", "The length of the ipsec preshared key (minimum 8, maximum 256)", null), diff --git a/setup/db/db/schema-229to2210.sql b/setup/db/db/schema-229to2210.sql index c0fe2086f48..027ce2c3d2e 100644 --- a/setup/db/db/schema-229to2210.sql +++ b/setup/db/db/schema-229to2210.sql @@ -27,7 +27,7 @@ ALTER TABLE `cloud`.`firewall_rules` ADD CONSTRAINT `fk_firewall_rules__related` ALTER TABLE `cloud`.`firewall_rules` MODIFY `start_port` int(10) COMMENT 'starting port of a port range'; ALTER TABLE `cloud`.`firewall_rules` MODIFY `end_port` int(10) COMMENT 'end port of a port range'; -INSERT IGNORE INTO `cloud`.`configuration` (category, instance, name, value, description) VALUES ('Network', 'DEFAULT', 'firewall.rule.ui.enabled', 'true', 'enable/disable UI that separates firewall rules from NAT/LB rules'); +INSERT IGNORE INTO `cloud`.`configuration` (category, instance, name, value, description) VALUES ('Network', 'DEFAULT', 'firewall.rule.ui.enabled', 'false', 'enable/disable UI that separates firewall rules from NAT/LB rules'); INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.load.threshold', '0.70', 'Percentage (as a value between 0 and 1) of connected agents after which agent load balancing will start happening'); From 2b5e673b0a07d61678ccc16b82b3085523d0467c Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 25 Aug 2011 17:22:59 -0700 Subject: [PATCH 02/19] bug 11261: cloudStack - host page - Edit Host action - (1) make hosttags editable. (2) consolidate update OS category from dialog box to main screen. --- .../classes/resources/messages.properties | 2 + .../classes/resources/messages_es.properties | 2 + .../classes/resources/messages_ja.properties | 2 + .../resources/messages_zh_CN.properties | 2 + ui/jsp/host.jsp | 14 ++- ui/scripts/cloud.core.host.js | 110 +++++++++++++++--- 6 files changed, 114 insertions(+), 18 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 948038c2e9b..21cd03bbb06 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -4,6 +4,8 @@ #Labels +label.action.edit.host=Edit Host + network.rate=Network Rate ICMP.type=ICMP Type diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties index 21259a7d7f7..30f0c3a88c8 100644 --- a/client/WEB-INF/classes/resources/messages_es.properties +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -4,6 +4,8 @@ #Labels +label.action.edit.host=edición Anfitrión + network.rate=Tasa de red ICMP.type=Tipo ICMP diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 77555ee743b..defd567977c 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -4,6 +4,8 @@ #Labels +label.action.edit.host=ホストを編集する + network.rate=ネットワーク速度 ICMP.type=ICMPタイプ diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index 3e05d429ad8..8de433f026f 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -4,6 +4,8 @@ #Labels +label.action.edit.host=编辑主机 + network.rate=网络速率 ICMP.type=ICMP类型 diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp index 92183facb53..ce4dd10c886 100644 --- a/ui/jsp/host.jsp +++ b/ui/jsp/host.jsp @@ -7,6 +7,7 @@