[2/2] git commit: updated refs/heads/master to 76e40ba
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76e40ba5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76e40ba5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76e40ba5 Branch: refs/heads/master Commit: 76e40ba5add5fe23c660b747746945fce1440db7 Parents: c8bfbfd 0c1d268 Author: Pranav Saxena Authored: Thu Apr 25 12:34:10 2013 +0530 Committer: Pranav Saxena Committed: Thu Apr 25 12:34:10 2013 +0530 -- .../com/cloud/agent/api/UnregisterVMCommand.java | 34 + api/src/com/cloud/hypervisor/HypervisorGuru.java |9 + .../region/ha/GlobalLoadBalancingRulesService.java |3 + .../org/apache/cloudstack/api/ApiConstants.java|1 + .../command/admin/storage/ListStoragePoolsCmd.java |7 + .../cloudstack/api/command/user/vm/ListVMsCmd.java | 10 +- .../api/command/user/volume/ListVolumesCmd.java|7 + .../api/response/GlobalLoadBalancerResponse.java | 10 + .../classes/resources/messages_ca.properties | 306 ++ .../classes/resources/messages_de_DE.properties| 747 .../classes/resources/messages_es.properties | 861 + .../classes/resources/messages_it_IT.properties| 618 +++ .../classes/resources/messages_ja.properties | 2909 +++ .../classes/resources/messages_ko_KR.properties| 2887 +++ .../classes/resources/messages_nb_NO.properties| 365 ++ .../classes/resources/messages_pt_BR.properties| 2094 +-- .../classes/resources/messages_ru_RU.properties| 2892 +++ docs/en-US/about-working-with-vms.xml | 85 +- docs/en-US/append-displayname-vms.xml | 84 + docs/en-US/creating-network-offerings.xml | 45 + docs/en-US/delete-event-alerts.xml | 47 + docs/en-US/elastic-ip.xml | 90 + docs/en-US/events.xml |3 +- docs/en-US/images/add-vlan-icon.png| Bin 0 -> 860 bytes docs/en-US/network-offerings.xml | 83 +- docs/en-US/networks.xml|1 + docs/en-US/non-contiguous-vlan.xml | 68 + docs/en-US/set-up-network-for-users.xml| 13 +- docs/en-US/using-netscaler-load-balancers.xml | 132 +- docs/en-US/virtual-machines.xml|1 + docs/en-US/vlan-provisioning.xml |2 + .../debian/config/etc/init.d/cloud-early-config|2 +- .../hypervisor/kvm/resource/KVMHAMonitor.java |7 +- .../hypervisor/kvm/resource/LibvirtConnection.java | 14 +- .../kvm/storage/KVMStoragePoolManager.java | 12 +- .../src/com/cloud/hypervisor/guru/VMwareGuru.java |9 + .../hypervisor/vmware/resource/VmwareResource.java | 44 +- scripts/vm/network/security_group.py |2 +- server/src/com/cloud/api/ApiDBUtils.java |9 + server/src/com/cloud/api/ApiResponseHelper.java|8 + .../src/com/cloud/api/query/QueryManagerImpl.java | 24 +- .../com/cloud/hypervisor/HypervisorGuruBase.java |5 + server/src/com/cloud/server/Criteria.java |1 + server/src/com/cloud/vm/UserVmManagerImpl.java |1 + .../com/cloud/vm/VirtualMachineManagerImpl.java| 24 + .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 14 + .../resource/NfsSecondaryStorageResource.java | 22 + ui/index.jsp |7 +- ui/scripts/instances.js| 38 +- ui/scripts/regions.js | 111 +- ui/scripts/storage.js | 12 +- ui/scripts/system.js | 33 +- 52 files changed, 9010 insertions(+), 5803 deletions(-) --
[1/2] git commit: updated refs/heads/master to 76e40ba
Updated Branches:
refs/heads/master 0c1d2680a -> 76e40ba5a
CLOUDSTACK-1903:Delete event/alerts date parameter handling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8bfbfda
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8bfbfda
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8bfbfda
Branch: refs/heads/master
Commit: c8bfbfda31ce0c27e73050231e1d2ec47be6956b
Parents: ff7112a
Author: Pranav Saxena
Authored: Thu Apr 25 12:33:24 2013 +0530
Committer: Pranav Saxena
Committed: Thu Apr 25 12:33:24 2013 +0530
--
ui/scripts/events.js |8
1 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8bfbfda/ui/scripts/events.js
--
diff --git a/ui/scripts/events.js b/ui/scripts/events.js
index 3b6874c..0e72eda 100644
--- a/ui/scripts/events.js
+++ b/ui/scripts/events.js
@@ -73,7 +73,7 @@
$.extend(data, { type:args.data.type });
if(args.data.date != "")
- $.extend(data, {date:args.data.date });
+ $.extend(data, {olderthan:args.data.date });
$.ajax({
@@ -118,7 +118,7 @@
$.extend(data, { type:args.data.type });
if(args.data.date != "")
- $.extend(data, {date:args.data.date });
+ $.extend(data, {olderthan:args.data.date });
$.ajax({
@@ -359,7 +359,7 @@
$.extend(data, { type:args.data.type });
if(args.data.date != "")
- $.extend(data, {date:args.data.date });
+ $.extend(data, {olderthan:args.data.date });
$.ajax({
@@ -404,7 +404,7 @@
$.extend(data, { type:args.data.type });
if(args.data.date != "")
- $.extend(data, {date:args.data.date });
+ $.extend(data, {olderthan:args.data.date });
$.ajax({
Git Push Summary
Updated Branches: refs/heads/CS-2163 [created] 2c176ab9e
[1/3] =iniitial changes
Updated Branches:
refs/heads/CS-2163 2c176ab9e -> a3958cda9
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3958cda/server/src/com/cloud/vm/dao/UserVmDaoImpl.java
--
diff --git a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java
b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java
index 4922828..9dc74a3 100755
--- a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -1,60 +1,60 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.vm.dao;
-
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.Local;
-import javax.inject.Inject;
-
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import com.cloud.configuration.Resource;
-import com.cloud.server.ResourceTag.TaggedResourceType;
-import com.cloud.tags.dao.ResourceTagDao;
-import com.cloud.tags.dao.ResourceTagsDaoImpl;
-import com.cloud.user.Account;
-
-import com.cloud.utils.db.Attribute;
-import com.cloud.utils.db.GenericDaoBase;
-import com.cloud.utils.db.GenericSearchBuilder;
-import com.cloud.utils.db.JoinBuilder;
-import com.cloud.utils.db.SearchBuilder;
-import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.SearchCriteria.Func;
-import com.cloud.utils.db.Transaction;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.NicVO;
-import com.cloud.vm.UserVmVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.State;
-import com.cloud.vm.dao.UserVmData.NicData;
-import com.cloud.vm.dao.UserVmData.SecurityGroupData;
-
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.vm.dao;
+
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Local;
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import com.cloud.configuration.Resource;
+import com.cloud.server.ResourceTag.TaggedResourceType;
+import com.cloud.tags.dao.ResourceTagDao;
+import com.cloud.tags.dao.ResourceTagsDaoImpl;
+import com.cloud.user.Account;
+
+import com.cloud.utils.db.Attribute;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.GenericSearchBuilder;
+import com.cloud.utils.db.JoinBuilder;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.SearchCriteria.Func;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.NicVO;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.dao.UserVmData.NicData;
+import com.cloud.vm.dao.UserVmData.SecurityGroupData;
+
@Local(value={UserVmDao.class})
public class UserVmDaoImpl extends GenericDaoBase implements
UserVmDao {
@@ -73,14 +73,14 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use
protected SearchBuilder DestroySearch;
prote
Git Push Summary
Updated Branches: refs/heads/vmware-datamodel [created] 33006ff19
git commit: updated refs/heads/master to 08f6a24
Updated Branches: refs/heads/master 76e40ba5a -> 08f6a24d1 Update the chinese (zh_CN) resource file for Web UI. 100% translate. Thanks to Gavin Lee. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08f6a24d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08f6a24d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08f6a24d Branch: refs/heads/master Commit: 08f6a24d193fbcd5c85b9aa25871c023b3da5682 Parents: 76e40ba Author: Milamber Authored: Thu Apr 25 08:42:28 2013 + Committer: Milamber Committed: Thu Apr 25 08:42:28 2013 + -- .../classes/resources/messages_zh_CN.properties| 33 +++ 1 files changed, 33 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08f6a24d/client/WEB-INF/classes/resources/messages_zh_CN.properties -- diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index 1f22105..f62439d 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -229,6 +229,9 @@ label.action.update.OS.preference.processing=\u6b63\u5728\u66f4\u65b0\u64cd\u4f5 label.action.update.OS.preference=\u66f4\u65b0\u64cd\u4f5c\u7cfb\u7edf\u9996\u9009\u9879 label.action.update.resource.count.processing=\u6b63\u5728\u66f4\u65b0\u8d44\u6e90\u6570\u91cf... label.action.update.resource.count=\u66f4\u65b0\u8d44\u6e90\u6570\u91cf +label.action.vmsnapshot.create=\u6293\u53d6\u865a\u673a\u5feb\u7167 +label.action.vmsnapshot.delete=\u5220\u9664\u865a\u673a\u5feb\u7167 +label.action.vmsnapshot.revert=\u6062\u590d\u5230\u865a\u673a\u5feb\u7167 label.activate.project=\u6fc0\u6d3b\u9879\u76ee label.active.sessions=\u6d3b\u52a8\u4f1a\u8bdd label.add.accounts.to=\u6dfb\u52a0\u5e10\u6237\u81f3 @@ -236,6 +239,7 @@ label.add.accounts=\u6dfb\u52a0\u5e10\u6237 label.add.account.to.project=\u5411\u9879\u76ee\u4e2d\u6dfb\u52a0\u5e10\u6237 label.add.account=\u6dfb\u52a0\u5e10\u6237 label.add.ACL=\u6dfb\u52a0 ACL +label.add.BigSwitchVns.device=\u6dfb\u52a0BigSwitch Vns\u63a7\u5236\u5668 label.add.by.cidr=\u6309 CIDR \u6dfb\u52a0 label.add.by.group=\u6309\u7ec4\u6dfb\u52a0 label.add.by=\u6dfb\u52a0\u65b9\u5f0f @@ -277,6 +281,7 @@ label.add.physical.network=\u6dfb\u52a0\u7269\u7406\u7f51\u7edc label.add.pod=\u6dfb\u52a0\u63d0\u4f9b\u70b9 label.add.port.forwarding.rule=\u6dfb\u52a0\u7aef\u53e3\u8f6c\u53d1\u89c4\u5219 label.add.primary.storage=\u6dfb\u52a0\u4e3b\u5b58\u50a8 +label.add.region=\u6dfb\u52a0\u533a\u57df label.add.resources=\u6dfb\u52a0\u8d44\u6e90 label.add.route=\u6dfb\u52a0\u8def\u7531 label.add.rule=\u6dfb\u52a0\u89c4\u5219 @@ -321,6 +326,8 @@ label.assign=\u5206\u914d label.associated.network.id=\u5df2\u5173\u8054\u7f51\u7edc ID label.associated.network=\u5173\u8054\u7f51\u7edc label.attached.iso=\u5df2\u9644\u52a0 ISO +label.author.email=\u4f5c\u8005\u90ae\u7bb1 +label.author.name=\u4f5c\u8005\u59d3\u540d label.availability=\u53ef\u7528\u6027 label.availability.zone=\u53ef\u7528\u533a\u57df label.available.public.ips=\u53ef\u7528\u516c\u7528 IP \u5730\u5740 @@ -329,6 +336,7 @@ label.back=\u8fd4\u56de label.bandwidth=\u5e26\u5bbd label.basic.mode=\u57fa\u672c\u6a21\u5f0f label.basic=\u57fa\u672c +label.bigswitch.controller.address=BigSwitch Vns \u63a7\u5236\u5668\u5730\u5740 label.bootable=\u53ef\u542f\u52a8 label.broadcast.domain.range=\u5e7f\u64ad\u57df\u8303\u56f4 label.broadcast.domain.type=\u5e7f\u64ad\u57df\u7c7b\u578b @@ -392,6 +400,7 @@ label.cpu.allocated.for.VMs=\u5df2\u5206\u914d\u7ed9 VM \u7684 CPU label.cpu.allocated=\u5df2\u5206\u914d\u7684 CPU label.CPU.cap=CPU \u4e0a\u9650 label.cpu=CPU +label.cpu.limits=CPU\u9650\u5236 label.cpu.mhz=CPU (MHz) label.cpu.utilized=CPU \u5229\u7528\u7387 label.created.by.system=\u7531\u7cfb\u7edf\u521b\u5efa @@ -412,6 +421,7 @@ label.dedicated=\u4e13\u7528 label.default=\u9ed8\u8ba4\u503c label.default.use=\u9ed8\u8ba4\u4f7f\u7528 label.default.view=\u9ed8\u8ba4\u89c6\u56fe +label.delete.BigSwitchVns=\u79fb\u9664BigSwitch Vns\u63a7\u5236\u5668 label.delete.F5=\u5220\u9664 F5 label.delete.gateway=\u5220\u9664\u7f51\u5173 label.delete.NetScaler=\u5220\u9664 NetScaler @@ -497,6 +507,7 @@ label.ESP.lifetime=ESP \u4f7f\u7528\u671f\u9650(\u7b2c\u4e8c\u9636\u6bb5) label.ESP.policy=ESP \u7b56\u7565 label.esx.host=ESX/ESXi \u4e3b\u673a label.example=\u793a\u4f8b +label.external.link=\u5916\u90e8\u94fe\u63a5 label.f5=F5 label.failed=\u5931\u8d25 label.featured=\u7cbe\u9009 @@ -644,10 +655,14 @@ label.management.ips=\u7ba1\u7406\u7c7b IP \u5730\u5740 label.management=\u7ba1\u7406 label.manage.resources=\u7ba1\u74
git commit: updated refs/heads/master to 1f97b52
Updated Branches:
refs/heads/master 08f6a24d1 -> 1f97b528c
CLOUDSTACK-1573 listNics response update for not showing vlan to normal user
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f97b528
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f97b528
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f97b528
Branch: refs/heads/master
Commit: 1f97b528c5fb73e8165b63ad5098e7191914aa59
Parents: 08f6a24
Author: Jayapal
Authored: Thu Apr 25 12:35:04 2013 +0530
Committer: Murali Reddy
Committed: Thu Apr 25 14:48:41 2013 +0530
--
server/src/com/cloud/api/ApiResponseHelper.java | 14 +-
1 files changed, 5 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f97b528/server/src/com/cloud/api/ApiResponseHelper.java
--
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java
b/server/src/com/cloud/api/ApiResponseHelper.java
index 894ec8d..c181495 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3659,7 +3659,10 @@ public class ApiResponseHelper implements
ResponseGenerator {
public NicResponse createNicResponse(Nic result) {
NicResponse response = new NicResponse();
+NetworkVO network = _entityMgr.findById(NetworkVO.class,
result.getNetworkId());
+
response.setId(result.getUuid());
+response.setNetworkid(network.getUuid());
response.setIpaddress(result.getIp4Address());
if (result.getSecondaryIp()) {
@@ -3677,18 +3680,11 @@ public class ApiResponseHelper implements
ResponseGenerator {
}
response.setGateway(result.getGateway());
-response.setId(result.getUuid());
-response.setGateway(result.getGateway());
response.setNetmask(result.getNetmask());
response.setMacAddress(result.getMacAddress());
-if (result.getBroadcastUri() != null) {
-response.setBroadcastUri(result.getBroadcastUri().toString());
-}
-if (result.getIsolationUri() != null) {
-response.setIsolationUri(result.getIsolationUri().toString());
-}
+
if (result.getIp6Address() != null) {
-response.setId(result.getIp6Address());
+response.setIp6Address(result.getIp6Address());
}
response.setIsDefault(result.isDefaultNic());
git commit: updated refs/heads/master to d5c3f87
Updated Branches:
refs/heads/master 1f97b528c -> d5c3f8790
CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d5c3f879
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d5c3f879
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d5c3f879
Branch: refs/heads/master
Commit: d5c3f87903ffa4362c9dc9688c199c10700c0ccb
Parents: 1f97b52
Author: Jayapal
Authored: Mon Apr 22 14:06:12 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Apr 25 15:16:26 2013 +0530
--
api/src/com/cloud/network/NetworkService.java |2 +-
.../apache/cloudstack/api/ResponseGenerator.java |4 +-
.../api/command/user/vm/AddIpToVmNicCmd.java |9 +--
.../api/command/test/AddIpToVmNicTest.java |6 +++-
server/src/com/cloud/api/ApiResponseHelper.java| 18 +--
.../src/com/cloud/network/NetworkServiceImpl.java | 17 +++--
.../com/cloud/network/MockNetworkManagerImpl.java |2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java |2 +-
8 files changed, 35 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5c3f879/api/src/com/cloud/network/NetworkService.java
--
diff --git a/api/src/com/cloud/network/NetworkService.java
b/api/src/com/cloud/network/NetworkService.java
index 5a6054d..6c9bebc 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -158,7 +158,7 @@ public interface NetworkService {
throws ResourceAllocationException,
ConcurrentOperationException, InsufficientCapacityException;
/* Requests an IP address for the guest nic */
-String allocateSecondaryGuestIP(Account account, long zoneId, Long nicId,
+NicSecondaryIp allocateSecondaryGuestIP(Account account, long zoneId, Long
nicId,
Long networkId, String ipaddress) throws
InsufficientAddressCapacityException;
boolean releaseSecondaryIpFromNic(long ipAddressId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5c3f879/api/src/org/apache/cloudstack/api/ResponseGenerator.java
--
diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
index a3aa9de..cbf8bb2 100644
--- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
@@ -20,6 +20,7 @@ import java.text.DecimalFormat;
import java.util.EnumSet;
import java.util.List;
+import com.cloud.vm.NicSecondaryIp;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ApiConstants.HostDetails;
@@ -389,8 +390,7 @@ public interface ResponseGenerator {
TrafficMonitorResponse createTrafficMonitorResponse(Host trafficMonitor);
VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot);
-NicSecondaryIpResponse createSecondaryIPToNicResponse(String ip,
-Long nicId, Long networkId);
+NicSecondaryIpResponse createSecondaryIPToNicResponse(NicSecondaryIp
result);
public NicResponse createNicResponse(Nic result);
AffinityGroupResponse createAffinityGroupResponse(AffinityGroup group);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5c3f879/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
index df6b399..ae5482b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
@@ -16,6 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import com.cloud.vm.NicSecondaryIp;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
@@ -146,6 +147,7 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd {
UserContext.current().setEventDetails("Nic Id: " + getNicId() );
String ip;
+NicSecondaryIp result;
String secondaryIp = null;
if ((ip = getIpaddress()) != null) {
if (!NetUtils.isValidIp(ip)) {
@@ -154,12 +156,13 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd {
}
try {
-secondaryIp =
_networkService.allocateSecondaryGuestIP(_accountService.getAccount(getEntityOwner
git commit: updated refs/heads/master to 0e2ffe7
Updated Branches: refs/heads/master d5c3f8790 -> 0e2ffe72a add lang key for Catalan, German, Italian, Norwegian. (from 4.1 branch) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e2ffe72 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e2ffe72 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e2ffe72 Branch: refs/heads/master Commit: 0e2ffe72aa641f4551cae63fbc36454c5934342f Parents: d5c3f87 Author: Milamber Authored: Thu Apr 25 10:01:29 2013 + Committer: Milamber Committed: Thu Apr 25 10:01:29 2013 + -- .../WEB-INF/classes/resources/messages.properties |4 1 files changed, 4 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e2ffe72/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 fbc0471..0e051f1 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -624,11 +624,15 @@ label.key=Key label.kvm.traffic.label=KVM traffic label label.label=Label label.lang.brportugese=Brazilian Portugese +label.lang.catalan=Catalan label.lang.chinese=Chinese (Simplified) label.lang.english=English label.lang.french=French +label.lang.german=German +label.lang.italian=Italian label.lang.japanese=Japanese label.lang.korean=Korean +label.lang.norwegian=Norwegian label.lang.russian=Russian label.lang.spanish=Spanish label.last.disconnected=Last Disconnected
[1/2] CLOUDSTACK-763: Added filters to list APIs. Seperated service interface implementation to NetworkACLServiceImpl. Added default ACL to upgrade schema
Updated Branches:
refs/heads/network_acl 2f189f22e -> 8e73d8b25
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e73d8b2/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
new file mode 100644
index 000..381bc6a
--- /dev/null
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -0,0 +1,372 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.network.vpc;
+
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.Network;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.element.NetworkACLServiceProvider;
+import com.cloud.network.firewall.NetworkACLService;
+import com.cloud.network.vpc.dao.NetworkACLDao;
+import com.cloud.projects.Project.ListProjectResourcesCriteria;
+import com.cloud.server.ResourceTag.TaggedResourceType;
+import com.cloud.tags.ResourceTagVO;
+import com.cloud.tags.dao.ResourceTagDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.UserContext;
+import com.cloud.utils.Pair;
+import com.cloud.utils.Ternary;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.JoinBuilder;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.net.NetUtils;
+import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd;
+import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+@Component
+@Local(value = { NetworkACLService.class})
+public class NetworkACLServiceImpl extends ManagerBase implements
NetworkACLService{
+private static final Logger s_logger =
Logger.getLogger(NetworkACLServiceImpl.class);
+
+@Inject
+AccountManager _accountMgr;
+@Inject
+NetworkModel _networkMgr;
+@Inject
+VpcManager _vpcMgr;
+@Inject
+ResourceTagDao _resourceTagDao;
+@Inject
+NetworkACLDao _networkACLDao;
+@Inject
+NetworkACLItemDao _networkACLItemDao;
+@Inject
+List _networkAclElements;
+@Inject
+NetworkModel _networkModel;
+@Inject
+NetworkDao _networkDao;
+@Inject
+NetworkACLManager _networkAclMgr;
+
+@Override
+public NetworkACL createNetworkACL(String name, String description, long
vpcId) {
+Account caller = UserContext.current().getCaller();
+Vpc vpc = _vpcMgr.getVpc(vpcId);
+if(vpc == null){
+throw new InvalidParameterValueException("Unable to find VPC");
+}
+_accountMgr.checkAccess(caller, null, true, vpc);
+return _networkAclMgr.createNetworkACL(name, description, vpcId);
+}
+
+@Override
+public NetworkACL getNetworkACL(long id) {
+return _networkAclMgr.getNetworkACL(id);
+}
+
+@Override
+public Pair, Integer> listNetworkACLs(Long id,
String name, Long networkId, Long vpcId) {
+SearchBuilder sb = _networkACLDao.createSearchBuilder();
+sb.and("id", sb.entity().getId(), Op.EQ);
+sb.and("name", sb.entity().getName(), Op.EQ);
+sb.and("vpcId", sb.entity().getVpcId(), Op.EQ);
+
+if(networkId != null){
+SearchBuilder network =
_networkDao.createSearchBuilder();
+network.and("networkId", network.entity().getId(), Op.EQ);
+sb.join("networkJoin", network, sb.entity().getId(),
network.entity().getNetworkACLId(), JoinBuilder.JoinType.INNER);
+}
+
+SearchCriteria sc
git commit: updated refs/heads/4.1 to 8836c85
Updated Branches:
refs/heads/4.1 3be175462 -> 8836c85f2
CLOUDSTACK-2173: Don't do KVM heartbeat on secondary storage sources, primary
only
The KVM HA runner uses any NFS secondary storage resource available to a
host to store it's HA data. This causes template deletes to fail because
it cannot delete KVMHA, which is a directory that is not empty. So if
KVMHA directory is found, delete it's contents before trying to delete
it.
Tested with a new 4.1 zone deployment. Verified bug was reproducable
with 4.1 HEAD, applied patch, ran through adding two NFS primary
storages, verified KVM heartbeat was working on them, then ran various
secondary storage operations (register template, download volume, take
snapshot) and verified that they worked, and that KVM heartbeat
operations were NOT acting on them.
Signed-off-by: Chip Childers
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8836c85f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8836c85f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8836c85f
Branch: refs/heads/4.1
Commit: 8836c85f2d1c44959bafc5ba8c435451d838ac17
Parents: 3be1754
Author: Marcus Sorensen
Authored: Thu Apr 25 14:37:01 2013 +0100
Committer: Chip Childers
Committed: Thu Apr 25 14:45:42 2013 +0100
--
.../hypervisor/kvm/resource/KVMHAMonitor.java |7 ---
.../kvm/storage/KVMStoragePoolManager.java | 12 ++--
2 files changed, 14 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8836c85f/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
--
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
index d1470d6..0e4d9ee 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
@@ -55,9 +55,10 @@ public class KVMHAMonitor extends KVMHABase implements
Runnable {
public void removeStoragePool(String uuid) {
synchronized (_storagePool) {
NfsStoragePool pool = this._storagePool.get(uuid);
-Script.runSimpleBashScript("umount " + pool._mountDestPath);
-s_logger.debug("attempted to umount '" + pool._mountDestPath +
"'");
-this._storagePool.remove(uuid);
+if (pool != null) {
+Script.runSimpleBashScript("umount " + pool._mountDestPath);
+this._storagePool.remove(uuid);
+}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8836c85f/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
--
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
index c2bfad9..0482cec 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
@@ -93,18 +93,26 @@ public class KVMStoragePoolManager {
protocol = StoragePoolType.NetworkFilesystem;
}
-return createStoragePool(uuid, sourceHost, 0, sourcePath, "",
protocol);
+// secondary storage registers itself through here
+return createStoragePool(uuid, sourceHost, 0, sourcePath, "",
protocol, false);
}
public KVMStoragePool createStoragePool( String name, String host, int
port,
String path, String userInfo,
StoragePoolType type) {
+// primary storage registers itself through here
+return createStoragePool(name, host, port, path, userInfo, type, true);
+}
+
+private KVMStoragePool createStoragePool( String name, String host, int
port,
+ String path, String userInfo,
+ StoragePoolType type, boolean
primaryStorage) {
StorageAdaptor adaptor = getStorageAdaptor(type);
KVMStoragePool pool = adaptor.createStoragePool(name,
host, port, path, userInfo, type);
// LibvirtStorageAdaptor-specific statement
-if (type == StoragePoolType.NetworkFilesystem) {
+if (type == StoragePoolType.NetworkFilesystem && primaryStorage) {
KVMHABase.NfsStoragePool nfspool = new KVMHABase.N
git commit: updated refs/heads/master to 6bc0b70
Updated Branches:
refs/heads/master cfc0633ec -> 6bc0b70f3
CLOUDSTACK-2186:migrateVolume API gets undefined storageid
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6bc0b70f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6bc0b70f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6bc0b70f
Branch: refs/heads/master
Commit: 6bc0b70f38db07e80fd6af4f4b75c17c871b7cd9
Parents: cfc0633
Author: Pranav Saxena
Authored: Thu Apr 25 19:40:44 2013 +0530
Committer: Pranav Saxena
Committed: Thu Apr 25 19:40:44 2013 +0530
--
ui/scripts/storage.js |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bc0b70f/ui/scripts/storage.js
--
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index cf40769..9b66083 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1056,7 +1056,7 @@
},
action: function(args) {
$.ajax({
-url: createURL("migrateVolume&storageid=" +
args.data.storagePool + "&volumeid=" + args.context.volumes[0].id),
+url: createURL("migrateVolume&storageid=" +
args.data.storageId + "&volumeid=" + args.context.volumes[0].id),
dataType: "json",
async: true,
success: function(json) {
git commit: updated refs/heads/4.1 to 41e6e9f
Updated Branches:
refs/heads/4.1 8836c85f2 -> 41e6e9f30
CLOUDSTACK-2172: adding database upgrade to 4.1.0 in
PremiumDatabaseUpgradeChecker
Add migration to 4.1.0 in the PremiumDatabaseUpgradeChecker, like in the
DatabaseUpgradeChecker.
I opened the ticket CS 2172, and this fix corrects the issue.
Regards.
Signed-off-by: Chip Childers
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/41e6e9f3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/41e6e9f3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/41e6e9f3
Branch: refs/heads/4.1
Commit: 41e6e9f30f035d9bd99d1aa3f4279ff748e8bcd4
Parents: 8836c85
Author: Nicolas Lamirault
Authored: Thu Apr 25 15:14:34 2013 +0100
Committer: Chip Childers
Committed: Thu Apr 25 15:14:34 2013 +0100
--
.../upgrade/PremiumDatabaseUpgradeChecker.java | 75 ---
1 files changed, 42 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/41e6e9f3/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
--
diff --git a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
index 14a8143..bad3253 100755
--- a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
+++ b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
@@ -40,6 +40,7 @@ import com.cloud.upgrade.dao.Upgrade229to2210;
import com.cloud.upgrade.dao.Upgrade301to302;
import com.cloud.upgrade.dao.Upgrade302to40;
import com.cloud.upgrade.dao.Upgrade30to301;
+import com.cloud.upgrade.dao.Upgrade40to41;
import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
import com.cloud.upgrade.dao.VersionDaoImpl;
@@ -53,87 +54,95 @@ public class PremiumDatabaseUpgradeChecker extends
DatabaseUpgradeChecker {
new Upgrade221to222Premium(), new UpgradeSnapshot217to224(),
new Upgrade222to224Premium(),
new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228Premium(), new Upgrade228to229(),
new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212Premium(),
-new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30(), new Upgrade30to301(),
-new Upgrade301to302(), new Upgrade302to40() });
+new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30(), new Upgrade30to301(),
+new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41() });
_upgradeMap.put("2.1.8", new DbUpgrade[] { new
Upgrade218to22Premium(), new Upgrade221to222Premium(),
new UpgradeSnapshot217to224(), new Upgrade222to224Premium(),
new Upgrade218to224DomainVlans(),
new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228Premium(), new Upgrade228to229(),
-new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212Premium(), new Upgrade2212to2213()
-, new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
-new Upgrade302to40() });
+new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212Premium(), new Upgrade2212to2213(),
+new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
+new Upgrade302to40(), new Upgrade40to41() });
_upgradeMap.put("2.1.9", new DbUpgrade[] { new
Upgrade218to22Premium(), new Upgrade221to222Premium(),
new UpgradeSnapshot217to224(), new Upgrade222to224Premium(),
new Upgrade218to224DomainVlans(),
new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228Premium(), new Upgrade228to229(),
new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212Premium(), new Upgrade2212to2213(),
-new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
-new Upgrade302to40() });
+new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
+new Upgrade302to40(), new Upgrade40to41() });
_upgradeMap.put("2.2.1", new DbUpgrade[] { new
Upgrade221to222Premium(), new Upgrade222to224Premium(),
new UpgradeSnapshot223to224(), new Upgrade224to225(), new
Upgrade225to226(), new Upgrade227to228Premium(),
new Upgrade228to229(), new Upgrade229to2210(), new
Upgrade2210to2211(), new Upgrade2211to2212Premium(),
-new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade
[04/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-832, CLOUDSTACK-812,CLOUDSTACK-808 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b7f5197c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b7f5197c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b7f5197c Branch: refs/heads/marvin_refactor Commit: b7f5197c850f772980b5f4f416878589c3d3e853 Parents: 7e5fd88 Author: unknown Authored: Wed Apr 24 23:06:25 2013 +0530 Committer: unknown Committed: Wed Apr 24 23:06:25 2013 +0530 -- docs/en-US/about-working-with-vms.xml | 85 - docs/en-US/append-displayname-vms.xml | 84 + docs/en-US/creating-network-offerings.xml | 45 +++ docs/en-US/elastic-ip.xml | 90 + docs/en-US/network-offerings.xml | 83 +--- docs/en-US/networks.xml |1 + docs/en-US/set-up-network-for-users.xml | 13 +- docs/en-US/using-netscaler-load-balancers.xml | 132 docs/en-US/virtual-machines.xml |1 + 9 files changed, 425 insertions(+), 109 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7f5197c/docs/en-US/about-working-with-vms.xml -- diff --git a/docs/en-US/about-working-with-vms.xml b/docs/en-US/about-working-with-vms.xml index 259c61b..90e5abf 100644 --- a/docs/en-US/about-working-with-vms.xml +++ b/docs/en-US/about-working-with-vms.xml @@ -3,37 +3,62 @@ %BOOK_ENTITIES; ]> - - - About Working with Virtual Machines - &PRODUCT; provides administrators with complete control over the lifecycle of all guest VMs executing in the cloud. &PRODUCT; provides several guest management operations for end users and administrators. VMs may be stopped, started, rebooted, and destroyed. - Guest VMs have a name and group. VM names and groups are opaque to &PRODUCT; and are available for end users to organize their VMs. Each VM can have three names for use in different contexts. Only two of these names can be controlled by the user: - - Instance name â a unique, immutable ID that is generated by &PRODUCT;, and can not be modified by the user. This name conforms to the requirements in IETF RFC 1123. - Display name â the name displayed in the &PRODUCT; web UI. Can be set by the user. Defaults to instance name. - Name â host name that the DHCP server assigns to the VM. Can be set by the user. Defaults to instance name - - Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is monitored by the system. If the system detects that the VM is down, it will attempt to restart the VM, possibly on a different host. For more information, see HA-Enabled Virtual Machines on - Each new VM is allocated one public IP address. When the VM is started, &PRODUCT; automatically creates a static NAT between this public IP address and the private IP address of the VM. - If elastic IP is in use (with the NetScaler load balancer), the IP address initially allocated to the new VM is not marked as elastic. The user must replace the automatically configured IP with a specifically acquired elastic IP, and set up the static NAT mapping between this new IP and the guest VMâs private IP. The VMâs original IP address is then released and returned to the pool of available public IPs. - &PRODUCT; cannot distinguish a guest VM that was shut down by the user (such as with the âshutdownâ command in Linux) from a VM that shut down unexpectedly. If an HA-enabled VM is shut down from inside the VM, &PRODUCT; will restart it. To shut down an HA-enabled VM, you must go through the &PRODUCT; UI or API. + About Working with Virtual Machines + &PRODUCT; provides administrators with complete control over the lifecycle of all guest VMs +executing in the cloud. &PRODUCT; provides several guest management operations for end users and +administrators. VMs may be stopped, started, rebooted, and destroyed. + Guest VMs have a name and group. VM names and groups are opaque to &PRODUCT; and are +available for end users to organize their VMs. Each VM can have three names for use in different +contexts. Only two of these names can be controlled by the user: + + + Instance name – a unique, immutable ID that is generated by &PRODUCT; and can not +be modified by the user. This name conforms to the requirements in IETF RFC 1123. + + + Display name – the name displayed in the &PRODUCT; web UI. Can be set by the user. +Defaults to instanc
[05/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-2120: mixed zone management - (1) extend listVirtualMachines API to
to take in zonetype. (2) UI: populate Instances list page with instances whose
zonetype matches selected option in zone type dropdown on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cdd459bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cdd459bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cdd459bb
Branch: refs/heads/marvin_refactor
Commit: cdd459bb0bfb502df056a553a42735d4bd8f0e31
Parents: b7f5197
Author: Jessica Wang
Authored: Wed Apr 24 10:35:47 2013 -0700
Committer: Jessica Wang
Committed: Wed Apr 24 10:38:28 2013 -0700
--
.../cloudstack/api/command/user/vm/ListVMsCmd.java |7 +++
.../src/com/cloud/api/query/QueryManagerImpl.java | 14 -
server/src/com/cloud/server/Criteria.java |1 +
ui/scripts/instances.js| 38 +--
4 files changed, 32 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdd459bb/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
--
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
index dae9df3..d93d657 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -79,6 +79,9 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd {
description="the availability zone ID")
private Long zoneId;
+@Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING,
description="the network type of the zone that the virtual machine belongs to")
+private String zoneType;
+
@Parameter(name=ApiConstants.FOR_VIRTUAL_NETWORK, type=CommandType.BOOLEAN,
description="list by network type; true if need to list vms using
Virtual Network, false otherwise")
private Boolean forVirtualNetwork;
@@ -147,6 +150,10 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd
{
return zoneId;
}
+public String getZoneType() {
+return zoneType;
+}
+
public Boolean getForVirtualNetwork() {
return forVirtualNetwork;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdd459bb/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 2298252..d0b4237 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -632,6 +632,7 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
c.addCriteria(Criteria.NAME, cmd.getInstanceName());
c.addCriteria(Criteria.STATE, cmd.getState());
c.addCriteria(Criteria.DATACENTERID, cmd.getZoneId());
+c.addCriteria(Criteria.DATACENTERTYPE, cmd.getZoneType());
c.addCriteria(Criteria.GROUPID, cmd.getGroupId());
c.addCriteria(Criteria.FOR_VIRTUAL_NETWORK,
cmd.getForVirtualNetwork());
c.addCriteria(Criteria.NETWORKID, cmd.getNetworkId());
@@ -680,7 +681,8 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
Object name = c.getCriteria(Criteria.NAME);
Object state = c.getCriteria(Criteria.STATE);
Object notState = c.getCriteria(Criteria.NOTSTATE);
-Object zone = c.getCriteria(Criteria.DATACENTERID);
+Object zoneId = c.getCriteria(Criteria.DATACENTERID);
+Object zoneType = c.getCriteria(Criteria.DATACENTERTYPE);
Object pod = c.getCriteria(Criteria.PODID);
Object hostId = c.getCriteria(Criteria.HOSTID);
Object hostName = c.getCriteria(Criteria.HOSTNAME);
@@ -703,6 +705,7 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
sb.and("stateNEQ", sb.entity().getState(), SearchCriteria.Op.NEQ);
sb.and("stateNIN", sb.entity().getState(), SearchCriteria.Op.NIN);
sb.and("dataCenterId", sb.entity().getDataCenterId(),
SearchCriteria.Op.EQ);
+sb.and("dataCenterType", sb.entity().getDataCenterType(),
SearchCriteria.Op.EQ);
sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ);
sb.and("hypervisorType", sb.entity().getHypervisorType(),
SearchCriteria.Op.EQ);
sb.and("hostIdEQ", sb.entity().getHostId(), SearchCriteria.Op.EQ);
@@ -809,13 +812,18 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
[01/51] [abbrv] Merge branch 'master' into marvin_refactor
Updated Branches:
refs/heads/marvin_refactor 0b5fe9a90 -> dbcfc6661
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cea6012/tools/marvin/marvin/utils.py
--
diff --cc tools/marvin/marvin/utils.py
index 74d4d27,000..73ed0e6
mode 100644,00..100644
--- a/tools/marvin/marvin/utils.py
+++ b/tools/marvin/marvin/utils.py
@@@ -1,176 -1,0 +1,185 @@@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Utilities functions
+"""
+
+import marvin
+import time
+from marvin.remoteSSHClient import remoteSSHClient
+from marvin.cloudstackAPI import *
+import logging
+import string
+import random
+import imaplib
+import email
+import datetime
+
+
+def restart_mgmt_server(server):
+"""Restarts the management server"""
+
+try:
+# Get the SSH client
+ssh = is_server_ssh_ready(
+ server["ipaddress"],
+ server["port"],
+ server["username"],
+ server["password"],
+)
+result = ssh.execute("/etc/init.d/cloud-management restart")
+res = str(result)
+# Server Stop - OK
+# Server Start - OK
+if res.count("OK") != 2:
+raise ("ErrorInReboot!")
+except Exception as e:
+raise e
+return
+
+
+def fetch_latest_mail(services, from_mail):
+"""Fetch mail"""
+
+# Login to mail server to verify email
+mail = imaplib.IMAP4_SSL(services["server"])
+mail.login(
+ services["email"],
+ services["password"]
+ )
+mail.list()
+mail.select(services["folder"])
+date = (datetime.date.today() -
datetime.timedelta(1)).strftime("%d-%b-%Y")
+
+result, data = mail.uid(
+'search',
+None,
+'(SENTSINCE {date} HEADER FROM "{mail}")'.format(
+ date=date,
+ mail=from_mail
+ )
+)
+# Return False if email is not present
+if data == []:
+return False
+
+latest_email_uid = data[0].split()[-1]
+result, data = mail.uid('fetch', latest_email_uid, '(RFC822)')
+raw_email = data[0][1]
+email_message = email.message_from_string(raw_email)
+result = get_first_text_block(email_message)
+return result
+
+
+def get_first_text_block(email_message_instance):
+"""fetches first text block from the mail"""
+maintype = email_message_instance.get_content_maintype()
+if maintype == 'multipart':
+for part in email_message_instance.get_payload():
+if part.get_content_maintype() == 'text':
+return part.get_payload()
+elif maintype == 'text':
+return email_message_instance.get_payload()
+
+
+def random_gen(size=6, chars=string.ascii_uppercase + string.digits):
+"""Generate Random Strings of variable length"""
+return ''.join(random.choice(chars) for x in range(size))
+
+
+def cleanup_resources(api_client, resources):
+"""Delete resources"""
+for obj in resources:
+obj.delete(api_client)
+
+
- def is_server_ssh_ready(ipaddress, port, username, password, retries=50):
++def is_server_ssh_ready(ipaddress, port, username, password, retries=50,
keyPairFileLocation=None):
+"""Return ssh handle else wait till sshd is running"""
+loop_cnt = retries
+while True:
+try:
- ssh = remoteSSHClient(ipaddress, port, username, password)
++ssh = remoteSSHClient(
++host=ipaddress,
++port=port,
++user=username,
++passwd=password,
++keyPairFileLocation=keyPairFileLocation)
+except Exception as e:
+if loop_cnt == 0:
+raise e
+loop_
[09/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
regression, need to modify iptables rules in rules.v4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c89bc78
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c89bc78
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c89bc78
Branch: refs/heads/marvin_refactor
Commit: 1c89bc78fd02f394f933a6bc0f8c2e029b8d514d
Parents: 7fa5792
Author: Edison Su
Authored: Wed Apr 24 14:52:44 2013 -0700
Committer: Edison Su
Committed: Wed Apr 24 14:52:44 2013 -0700
--
.../debian/config/etc/init.d/cloud-early-config|2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c89bc78/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 4b3cb5f..187ae25 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -519,7 +519,7 @@ setup_sshd(){
local ip=$1
local eth=$2
[ -f /etc/ssh/sshd_config ] && sed -i -e
"s/^[#]*ListenAddress.*$/ListenAddress $ip/" /etc/ssh/sshd_config
- sed -i "/3922/s/eth./$eth/" /etc/iptables/rules
+ sed -i "/3922/s/eth./$eth/" /etc/iptables/rules.v4
}
[06/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
in case vm doesn't exist on kvm host, getconnectionbyname will throw exception,
need to catch the exception, and return the default connection
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/435f4bce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/435f4bce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/435f4bce
Branch: refs/heads/marvin_refactor
Commit: 435f4bceb27f7b7bc96ad1ee46f4688b9a971355
Parents: cdd459b
Author: Edison Su
Authored: Wed Apr 24 10:38:14 2013 -0700
Committer: Edison Su
Committed: Wed Apr 24 10:39:07 2013 -0700
--
.../hypervisor/kvm/resource/LibvirtConnection.java | 14 ++
1 files changed, 10 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/435f4bce/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java
--
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java
index 2ad1616..2fc5425 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java
@@ -61,13 +61,19 @@ public class LibvirtConnection {
static public Connect getConnectionByVmName(String vmName) throws
LibvirtException {
HypervisorType[] hypervisors = new HypervisorType[]
{HypervisorType.KVM, Hypervisor.HypervisorType.LXC};
+
for (HypervisorType hypervisor : hypervisors) {
- Connect conn =
LibvirtConnection.getConnectionByType(hypervisor.toString());
- if
(conn.domainLookupByUUID(UUID.nameUUIDFromBytes(vmName.getBytes())) != null) {
- return conn;
- }
+try {
+Connect conn =
LibvirtConnection.getConnectionByType(hypervisor.toString());
+if
(conn.domainLookupByUUID(UUID.nameUUIDFromBytes(vmName.getBytes())) != null) {
+return conn;
+}
+} catch (Exception e) {
+ s_logger.debug("can't find connection: " +
hypervisor.toString() + ", for vm: " + vmName + ", continue");
+}
}
+s_logger.debug("can't find which hypervisor the vm used , then use the
default hypervisor");
// return the default connection
return getConnection();
}
[11/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-2120: mixed zone management - (1) extend listStoragePools API to to
take in zonetype. (2) UI: populate Primary Storages list page with ones whose
zonetype matches selected option in zone type dropdown on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48b82a6f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48b82a6f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48b82a6f
Branch: refs/heads/marvin_refactor
Commit: 48b82a6f91d9ef762a2a301d408ba72bc50a922a
Parents: 8f5d8d5
Author: Jessica Wang
Authored: Wed Apr 24 16:36:07 2013 -0700
Committer: Jessica Wang
Committed: Wed Apr 24 16:36:07 2013 -0700
--
.../command/admin/storage/ListStoragePoolsCmd.java |7 +++
.../src/com/cloud/api/query/QueryManagerImpl.java |5 ++
ui/scripts/system.js | 33 ---
3 files changed, 29 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48b82a6f/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
index 02b9803..17adb18 100644
---
a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
@@ -60,6 +60,9 @@ public class ListStoragePoolsCmd extends BaseListCmd {
description="the Zone ID for the storage pool")
private Long zoneId;
+@Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING,
description="the network type of the zone that the virtual machine belongs to")
+private String zoneType;
+
@Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType =
StoragePoolResponse.class,
description="the ID of the storage pool")
private Long id;
@@ -92,6 +95,10 @@ public class ListStoragePoolsCmd extends BaseListCmd {
return zoneId;
}
+public String getZoneType() {
+return zoneType;
+}
+
public Long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48b82a6f/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index ea260c3..6690b24 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1859,6 +1859,7 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
private Pair, Integer>
searchForStoragePoolsInternal(ListStoragePoolsCmd cmd) {
Long zoneId =
_accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(),
cmd.getZoneId());
+String zoneType = cmd.getZoneType();
Object id = cmd.getId();
Object name = cmd.getStoragePoolName();
Object path = cmd.getPath();
@@ -1878,6 +1879,7 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("path", sb.entity().getPath(), SearchCriteria.Op.EQ);
sb.and("dataCenterId", sb.entity().getZoneId(), SearchCriteria.Op.EQ);
+sb.and("dataCenterType", sb.entity().getZoneType(),
SearchCriteria.Op.EQ);
sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ);
sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ);
sb.and("hostAddress", sb.entity().getHostAddress(),
SearchCriteria.Op.EQ);
@@ -1908,6 +1910,9 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
if (zoneId != null) {
sc.setParameters("dataCenterId", zoneId);
}
+if (zoneType != null) {
+ sc.setParameters("dataCenterType", zoneType);
+}
if (pod != null) {
sc.setParameters("podId", pod);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48b82a6f/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 50dd66d..8f07ee4 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -258,24 +258,15 @@
primaryStorageCount: function(data) {
$.ajax({
url: createURL('listStoragePools'),
- data: {
-
[07/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-2120: mixed zone management - (1) extend listVolumes API to to take
in zonetype. (2) UI: populate Volumes list page with instances whose zonetype
matches selected option in zone type dropdown on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d893ba88
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d893ba88
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d893ba88
Branch: refs/heads/marvin_refactor
Commit: d893ba881b6ea00de00910a0d5f259b1397e16de
Parents: 435f4bc
Author: Jessica Wang
Authored: Wed Apr 24 11:26:43 2013 -0700
Committer: Jessica Wang
Committed: Wed Apr 24 11:26:58 2013 -0700
--
.../cloudstack/api/command/user/vm/ListVMsCmd.java |3 +--
.../api/command/user/volume/ListVolumesCmd.java|7 +++
.../src/com/cloud/api/query/QueryManagerImpl.java |5 +
ui/scripts/storage.js | 12 +---
4 files changed, 22 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d893ba88/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
--
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
index d93d657..b2a2ce0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -75,8 +75,7 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd {
@Parameter(name=ApiConstants.STATE, type=CommandType.STRING,
description="state of the virtual machine")
private String state;
-@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID,
entityType=ZoneResponse.class,
-description="the availability zone ID")
+@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID,
entityType=ZoneResponse.class, description="the availability zone ID")
private Long zoneId;
@Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING,
description="the network type of the zone that the virtual machine belongs to")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d893ba88/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
index 4c78eed..91316b0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
@@ -67,6 +67,9 @@ public class ListVolumesCmd extends
BaseListTaggedResourcesCmd {
description="the ID of the availability zone")
private Long zoneId;
+@Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING,
description="the network type of the zone that the virtual machine belongs to")
+private String zoneType;
+
/
/// Accessors ///
/
@@ -100,6 +103,10 @@ public class ListVolumesCmd extends
BaseListTaggedResourcesCmd {
return zoneId;
}
+public String getZoneType() {
+return zoneType;
+}
+
/
/// API Implementation///
/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d893ba88/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index d0b4237..ea260c3 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1522,6 +1522,7 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
Map tags = cmd.getTags();
Long zoneId = cmd.getZoneId();
+String zoneType = cmd.getZoneType();
Long podId = null;
if (_accountMgr.isAdmin(caller.getType())) {
podId = cmd.getPodId();
@@ -1549,6 +1550,7 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
sb.and("volumeType", sb.entity().getVolumeType(),
SearchCriteria.Op.LIKE);
sb.and("instanceId", sb.entity().getVmId(), SearchCriteria.Op.EQ);
sb.and("dataCenterId", sb.entity().getDataCenterId(),
[10/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-1910: cloudstack UI - Regions menu - GSLB - assigned load balancing
- display assigned load balancing in listView and exclude assigned one from LB
dropdown in Assign more load balancing dialog.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8f5d8d50
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8f5d8d50
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8f5d8d50
Branch: refs/heads/marvin_refactor
Commit: 8f5d8d505243372d241e1ce90a16cbaa9991c1d2
Parents: 1c89bc7
Author: Jessica Wang
Authored: Wed Apr 24 14:55:50 2013 -0700
Committer: Jessica Wang
Committed: Wed Apr 24 14:57:47 2013 -0700
--
ui/scripts/regions.js | 111 +++-
1 files changed, 58 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f5d8d50/ui/scripts/regions.js
--
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
index ef6f976..334eb26 100644
--- a/ui/scripts/regions.js
+++ b/ui/scripts/regions.js
@@ -382,7 +382,7 @@
detailView: {
name: 'GSLB details',
-viewAll: { path: 'regions.lbUnderGSLB', label: 'load balancer
rules' },
+viewAll: { path: 'regions.lbUnderGSLB', label: 'assigned load
balancing' },
actions: {
remove: {
label: 'delete GSLB',
@@ -452,77 +452,82 @@
}
},
- lbUnderGSLB: {
+ lbUnderGSLB: {
id: 'lbUnderGSLB',
type: 'select',
-title: 'assigned load balancer rules',
+title: 'assigned load balancing',
listView: {
section: 'lbUnderGSLB',
id: 'lbUnderGSLB',
- label: 'assigned load balancer rules',
+ label: 'assigned load balancing',
fields: {
-name: { label: 'label.name' },
+'name': { label: 'label.name' },
publicport: { label: 'label.public.port' },
- privateport: { label:
'label.private.port' },
- algorithm: { label:
'label.algorithm' }
+ privateport: { label: 'label.private.port' },
+ algorithm: { label: 'label.algorithm' }
},
- dataProvider: function(args) {
- var data = {
- globalloadbalancerruleid:
args.context.GSLB[0].id,
- listAll: true
- };
-$.ajax({
- url: createURL('listLoadBalancerRules'),
- data: data,
- success: function(json) {
-var items =
json.listloadbalancerrulesresponse.loadbalancerrule;
-args.response.success({
- data: items
-});
- }
+ dataProvider: function(args) {
+ var items = args.context.GSLB[0].loadbalancerrule;
+args.response.success({
+ data: items
});
},
- actions: {
+ actions: {
add: {
- label: 'assign load balancer rule to GSLB',
- messages: {
-confirm: function(args) {
- return 'Please confirm you want to assign load balancer rule
to GSLB';
-},
+ label: 'assign more load balancing',
+ messages: {
notification: function(args) {
- return 'assign load balancer rule to GSLB';
+ return 'assign more load balancing';
}
},
createForm: {
-title: 'assign load balancer rule to GSLB',
+title: 'assign more load balancing',
fields: {
loadbalancerrule: {
-label: 'load balancer rule',
+label: 'load balancing rule',
[14/51] [abbrv] CLOUDSTACK-2138 : add ca, de_DE, it_IT ja, koçKR,nb_NO pt_BR, ru_RU resource files for UI with ASCII with unicode encoding. (Merging for 4.1/Transifex, sync with transifex), add some l
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2db2e7b3/client/WEB-INF/classes/resources/messages_nb_NO.properties -- diff --git a/client/WEB-INF/classes/resources/messages_nb_NO.properties b/client/WEB-INF/classes/resources/messages_nb_NO.properties new file mode 100644 index 000..be41244 --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_nb_NO.properties @@ -0,0 +1,365 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +changed.item.properties=Endrede egenskaper +error.could.not.enable.zone=Kunne ikke aktivere sonen +error.installWizard.message=Noe gikk galt. G\u00e5 tilbake og korriger feilene. +error.password.not.match=Passordfeltene sammensvarer ikke +error.something.went.wrong.please.correct.the.following=Noe gikk galt. Vennligst korrig\u00e9r f\u00f8lgende +force.delete=Tving sletting +force.remove=Tving fjerning +force.stop=Tving stopp +instances.actions.reboot.label=Omstart av instans +label.accept.project.invitation=Aksepter prosjektinvitasjon +label.action.disable.cluster=Deaktiver klyngen +label.action.disable.cluster.processing=Deaktiverer klyngen... +label.action.disable.pod=Deaktiver pod +label.action.disable.pod.processing=Deaktiverer pod... +label.action.disable.zone=Deaktiver sonen +label.action.disable.zone.processing=Deaktiverer sonen... +label.action.enable.cluster=Aktiver klynge +label.action.enable.cluster.processing=Aktiverer klyngen... +label.action.enable.pod=Aktiver pod +label.action.enable.pod.processing=Aktiverer pod... +label.action.enable.zone=Aktiver sone +label.action.enable.zone.processing=Aktiverer sone... +label.action.unmanage.cluster.processing=Fjerner administrasjon av klynge... +label.activate.project=Aktiver prosjekt +label.add.accounts=Legg til kontoer +label.add.accounts.to=Legg kontoer til +label.add.account.to.project=Legg kontoen til prosjektet +label.add.by=Legg til ved +label.add.guest.network=Legg til gjestenettverk +label.add.network.device=Legg til nettverksenhet +label.add.new.F5=Legg til ny F5 +label.add.new.NetScaler=Legg til ny NetScaler +label.add.new.SRX=Legg til ny SRX +label.add.physical.network=Legg til fysisk nettverk +label.add.resources=Legg til ressurser +label.add.system.service.offering=Legg til et systemtilbud +label.add.to.group=Legg til gruppe +label.add.vms=Legg til VMer +label.advanced=Avansert +label.agree=Godtar +label.allocated=Allokert +label.allocation.state=Allokeringsstatus +label.apply=Bruk +label.bandwidth=B\u00e5ndbredde +label.basic=Basis +label.capacity=Kapasitet +label.change.service.offering=Endre tjenestetilbud +label.change.value=Endre verdi +label.cidr=CIDR +label.cidr.list=Kilde-CIDR +label.clean.up=Rydd opp +label.clvm=CLVM +label.compute.and.storage=Regnekraft og lagring +label.compute=Beregne +label.configure=Konfigurer +label.confirm.password=Bekreft passord +label.congratulations=Gratulerer\! +label.continue.basic.install=Fortsett med enkelt oppsett +label.continue=Fortsett +label.corrections.saved=Endringer lagret +label.CPU.cap=CPU begrensning +label.created.by.system=Opprettet av systemet +label.create.project=Opprett prosjekt +label.create.template=Opprett mal +label.decline.invitation=Avvis invitasjon +label.dedicated=Dedikert +label.default=Standardverdi +label.default.use=Standard bruk +label.default.view=Standardvisning +label.delete.project=Slett prosjekt +label.destination.physical.network.id=Fysisk nettverksid-destinasjon +label.destroy.router=Slett ruter +label.dhcp=DHCP +label.DHCP.server.type=DHCP servertype +label.disabled=Inaktiv +label.disable.provider=Deaktiver tilbyder +label.display.name=Visningsnavn +label.done=Utf\u00f8rt +label.drag.new.position=Dra til ny posisjon +label.edit.network.details=Edit\u00e9r nettverksdetaljer +label.edit.project.details=Editer prosjektdetaljer +label.elastic=Elastisk +label.elastic.IP=Elastisk IP +label.elastic.LB=Elastisk LB +label.enable.provider=Aktiver tilbyder +label.enable.vpn=Aktiver VPN +label.end.IP=Slutt-IP +label.end.vlan=Slutt-VLAN +label.enter.token=Skriv inn koden +label.error=Feil +label.f5=F5 +label.filterBy=Filtrer etter +label.guest.end.ip=Gjest slutt-IP +label.guest=Gjest +label.guest.networks=Gjestenettverk +la
[03/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
Merge branch 'master' into marvin_refactor Conflicts: tools/marvin/marvin/cloudstackConnection.py tools/marvin/marvin/cloudstackTestClient.py tools/marvin/marvin/oldbase.py ui/scripts/zoneWizard.js Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5cea6012 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5cea6012 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5cea6012 Branch: refs/heads/marvin_refactor Commit: 5cea60128fed0467d098c5e307fdd6e90ddc6caa Parents: 0b5fe9a a1ef9d7 Author: Prasanna Santhanam Authored: Wed Apr 24 22:10:48 2013 +0530 Committer: Prasanna Santhanam Committed: Wed Apr 24 22:10:48 2013 +0530 -- api/src/com/cloud/vm/UserVmService.java| 27 +- .../org/apache/cloudstack/api/ApiConstants.java|1 + api/src/org/apache/cloudstack/api/BaseCmd.java | 24 + .../command/admin/account/CreateAccountCmd.java| 14 +- .../api/command/admin/vm/MigrateVMCmd.java |2 +- .../api/command/user/vm/DeployVMCmd.java | 12 +- .../api/command/user/vm/UpdateVMCmd.java |2 +- .../cloudstack/api/response/ClusterResponse.java |9 +- .../api/response/DomainRouterResponse.java | 11 + .../cloudstack/api/response/HostResponse.java |9 +- .../cloudstack/api/response/NetworkResponse.java |7 + .../cloudstack/api/response/PodResponse.java |9 +- .../cloudstack/api/response/SnapshotResponse.java | 16 + .../api/response/StoragePoolResponse.java | 15 +- .../cloudstack/api/response/SystemVmResponse.java | 11 + .../cloudstack/api/response/TemplateResponse.java |7 + .../cloudstack/api/response/UserVmResponse.java|7 + .../cloudstack/api/response/VolumeResponse.java|8 + .../WEB-INF/classes/resources/messages.properties | 1857 ++-- .../classes/resources/messages_fr_FR.properties| 216 +- core/src/com/cloud/vm/UserVmVO.java|6 +- debian/rules |5 +- docs/en-US/Common_Content/feedback.xml | 24 + docs/en-US/Preface.xml |2 +- docs/en-US/Release_Notes.xml |11164 --- docs/en-US/changed-API-commands-4.2.xml| 123 + docs/en-US/feedback.xml| 24 + docs/en-US/hypervisor-kvm-install-flow.xml |2 +- .../hypervisor-support-for-primarystorage.xml | 148 +- docs/en-US/limit-accounts-domains.xml | 371 + docs/en-US/vm-snapshots.xml| 10 +- docs/en-US/work-with-usage.xml | 26 +- .../cloudstack/storage/image/ImageServiceImpl.java | 85 +- .../storage/motion/AncientDataMotionStrategy.java |5 +- packaging/centos63/package.sh |1 + server/src/com/cloud/api/ApiDispatcher.java|9 - server/src/com/cloud/api/ApiResponseHelper.java| 12 + server/src/com/cloud/api/ApiServer.java| 155 +- server/src/com/cloud/api/ApiServerService.java |1 + server/src/com/cloud/api/ApiServlet.java |6 +- .../api/query/dao/DomainRouterJoinDaoImpl.java |1 + .../com/cloud/api/query/dao/HostJoinDaoImpl.java |1 + .../api/query/dao/StoragePoolJoinDaoImpl.java |1 + .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |1 + .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |3 +- .../com/cloud/api/query/vo/DomainRouterJoinVO.java | 12 + server/src/com/cloud/api/query/vo/HostJoinVO.java | 11 + .../com/cloud/api/query/vo/StoragePoolJoinVO.java | 11 + .../src/com/cloud/api/query/vo/UserVmJoinVO.java | 13 + .../src/com/cloud/api/query/vo/VolumeJoinVO.java | 15 + server/src/com/cloud/configuration/Config.java | 17 +- .../configuration/ConfigurationManagerImpl.java| 13 +- server/src/com/cloud/dc/dao/DataCenterDao.java |2 + server/src/com/cloud/dc/dao/DataCenterDaoImpl.java |8 + .../ExternalLoadBalancerDeviceManagerImpl.java |4 +- .../src/com/cloud/network/NetworkServiceImpl.java |7 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 31 +- .../com/cloud/template/TemplateManagerImpl.java| 17 +- .../com/cloud/usage/UsageNetworkOfferingVO.java| 14 +- .../usage/dao/UsageNetworkOfferingDaoImpl.java |9 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 100 +- server/src/com/cloud/vm/UserVmStateListener.java | 21 +- .../com/cloud/vm/VirtualMachineManagerImpl.java| 13 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 48 +- server/test/com/cloud/vm/UserVmManagerTest.java| 45 +- .../test/com/cloud/vm/dao/UserVmDaoImplTest.java | 43 +- .../cloud/vm/dao/UserVmDaoTestConfiguration.java | 50 + server/test/resources/U
[08/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
Detail: Delete KVMHA dir contents if found when deleting templates, volumes
from Nfs Secondary storage
BUG-ID: CLOUDSTACK-2173
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen 1366838425 -0600
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7fa57922
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7fa57922
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7fa57922
Branch: refs/heads/marvin_refactor
Commit: 7fa57922a40428d73e80f5f2a48ff67c8cecd148
Parents: d893ba8
Author: Marcus Sorensen
Authored: Wed Apr 24 15:20:25 2013 -0600
Committer: Marcus Sorensen
Committed: Wed Apr 24 15:20:25 2013 -0600
--
.../resource/NfsSecondaryStorageResource.java | 22 +++
1 files changed, 22 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fa57922/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
--
diff --git
a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 1176d76..638d5ca 100755
---
a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++
b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -1291,6 +1291,17 @@ SecondaryStorageResource {
if (!found && f.getName().equals("template.properties")) {
found = true;
}
+
+// KVM HA monitor makes a mess in the templates with its
heartbeat tests
+// Don't let this stop us from cleaning up the template
+if (f.isDirectory() && f.getName().equals("KVMHA")) {
+s_logger.debug("Deleting KVMHA directory contents from
template location");
+File[] haFiles = f.listFiles();
+for (File haFile : haFiles) {
+haFile.delete();
+}
+}
+
if (!f.delete()) {
return new Answer(cmd, false, "Unable to delete file " +
f.getName() + " under Template path "
+ relativeTemplatePath);
@@ -1339,6 +1350,17 @@ SecondaryStorageResource {
if (!found && f.getName().equals("volume.properties")) {
found = true;
}
+
+// KVM HA monitor makes a mess in the templates with its
heartbeat tests
+// Don't let this stop us from cleaning up the template
+if (f.isDirectory() && f.getName().equals("KVMHA")) {
+s_logger.debug("Deleting KVMHA directory contents from
template location");
+File[] haFiles = f.listFiles();
+for (File haFile : haFiles) {
+haFile.delete();
+}
+}
+
if (!f.delete()) {
return new Answer(cmd, false, "Unable to delete file " +
f.getName() + " under Volume path "
+ relativeVolumePath);
[18/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-2138 : add ca, de_DE, it_IT ja, koçKR,nb_NO pt_BR, ru_RU resource files for UI with ASCII with unicode encoding. (Merging for 4.1/Transifex, sync with transifex), add some languages in combo list on login page on UI Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2db2e7b3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2db2e7b3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2db2e7b3 Branch: refs/heads/marvin_refactor Commit: 2db2e7b3af26021175776205bdeb6caa73f02c5e Parents: 48b82a6 Author: Milamber Authored: Thu Apr 25 00:18:21 2013 + Committer: Milamber Committed: Thu Apr 25 00:18:21 2013 + -- .../classes/resources/messages_ca.properties | 306 ++ .../classes/resources/messages_de_DE.properties| 747 .../classes/resources/messages_it_IT.properties| 618 +++ .../classes/resources/messages_ja.properties | 2909 +++ .../classes/resources/messages_ko_KR.properties| 2887 +++ .../classes/resources/messages_nb_NO.properties| 365 ++ .../classes/resources/messages_pt_BR.properties| 2094 +-- .../classes/resources/messages_ru_RU.properties| 2892 +++ 8 files changed, 7244 insertions(+), 5574 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2db2e7b3/client/WEB-INF/classes/resources/messages_ca.properties -- diff --git a/client/WEB-INF/classes/resources/messages_ca.properties b/client/WEB-INF/classes/resources/messages_ca.properties new file mode 100644 index 000..2d8e953 --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_ca.properties @@ -0,0 +1,306 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +confirm.enable.swift=Si us plau ompliu la seg\u00fcent informaci\u00f3 per habilitar el suport per a Swift +error.installWizard.message=Quelcom ha fallat, vost\u00e8 pot tornar enrere i corregir els errors detalls suggerime +error.password.not.match=Els camps de contrasenya no coincideixen +extractable=Es pot extreure +inline=En l\u00ednia +label.accept.project.invitation=Accpetar invitaci\u00f3 al projecte +label.action.edit.host=Editar Host +label.action.migrate.router=Migrar router +label.action.migrate.router.processing=Migrant router... +label.action.migrate.systemvm=Migrar MV de Sistema +label.action.migrate.systemvm.processing=Migrant MV de Sistema... +label.activate.project=Activar projecte +label.add.accounts=Afegir comptes +label.add.accounts.to=Afegir comptes a +label.add.account.to.project=Afegir compte al projecte +label.add.by=Afegir per +label.add.egress.rule=Afegir regla de sortida +label.add.new.F5=Afegir nou F5 +label.add.new.NetScaler=Afegir un nou NetScaler +label.add.new.SRX=Afegir nou SRX +label.add.physical.network=Afegir xarxa f\u00edsica +label.add.rule=Afegir regla +label.add.static.nat.rule=Afegir regla de NAT est\u00e0tic +label.add.to.group=Afegir a grup +label.add.vm=Afegir MV +label.add.vms=Afegir MVs +label.add.vms.to.lb=Afegir MV(s) a la regla de balanceig de c\u00e0rrega +label.add.vpn.user=Afegir usuari VPN +label.agree=D\\'acord +label.apply=Aplicar +label.bandwidth=Ample de banda +label.broadcast.domain.range=Rang del domini de broadcast +label.capacity=Capacitat +label.change.service.offering=Canvia oferta de servei +label.change.value=Canviar valor +label.clear.list=Esborra llista +label.community=Comunitat +label.compute.and.storage=Computaci\u00f3 i Emmagatzematge +label.compute=Computaci\u00f3 +label.configuration=Configuraci\u00f3 +label.configure=Configurar +label.confirm.password=Confirmar contrasenya +label.congratulations=Enorabona\! +label.continue.basic.install=Continueu amb la instal\u00b7laci\u00f3 b\u00e0sica +label.continue=Continuar +label.corrections.saved=Correccions guardades +label.create.project=Crear projecte +label.decline.invitation=Declinar invitaci\u00f3 +label.dedicated=Dedicat +label.default=Per defecte +label.delete.F5=Esborrar F5 +label.delete.Net
[17/51] [abbrv] CLOUDSTACK-2138 : add ca, de_DE, it_IT ja, koçKR,nb_NO pt_BR, ru_RU resource files for UI with ASCII with unicode encoding. (Merging for 4.1/Transifex, sync with transifex), add some l
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2db2e7b3/client/WEB-INF/classes/resources/messages_it_IT.properties -- diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties b/client/WEB-INF/classes/resources/messages_it_IT.properties new file mode 100644 index 000..c6bc2db --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_it_IT.properties @@ -0,0 +1,618 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +changed.item.properties=Elementi delle propriet\u00e0 modificati +confirm.enable.s3=Si prega di inserire i valori richiesti per abilitare il supporto per il Secondary Storage di tipo S3 +confirm.enable.swift=Si prega di inserire i valori richiesti per abilitare il supporto per Swift +error.could.not.enable.zone=Impossibile abilitare la zona +error.installWizard.message=E\\' stato rilevato un errore\: tornare agli step precedenti e correggere gli errori +error.invalid.username.password=Username o Password non valida +error.password.not.match=I campi password non corrispondono +error.please.specify.physical.network.tags=Le offerte di rete non sono disponibili se non si specificano tag per questa rete fisica. +error.something.went.wrong.please.correct.the.following=E\\' stato rilevato un errore; si prega di correggere quanto indicato di seguito +error.unable.to.reach.management.server=Impossibile raggiungere il Management Server +instances.actions.reboot.label=Riavviare una instanza +label.accept.project.invitation=Accettare un invito ad un progetto +label.account.and.security.group=Account, Security group +label.action.delete.nexusVswitch=Cancellare Nexus 1000v +label.action.delete.physical.network=Cancellazione di una rete fisica +label.action.delete.system.service.offering=Cancellare Offerta di Servizio di Sistema +label.action.disable.nexusVswitch=Disabilitare Nexus 1000v +label.action.disable.physical.network=Disabilitare la rete fisica +label.action.enable.nexusVswitch=Abilitare Nexus 1000v +label.action.enable.physical.network=Abilitare la rete fisica +label.action.list.nexusVswitch=Elencare Nexus 1000v +label.action.migrate.router.processing=Migrazione Router... +label.action.register.iso=Registrare una ISO +label.action.register.template=Registrare un template +label.activate.project=Attivare il Progetto +label.add.accounts=Aggiungere utenti +label.add.accounts.to=Aggiungere utenti a +label.add.account.to.project=Aggiungere account al progetto +label.add.ACL=Aggiungere ACL +label.add.compute.offering=Aggiungere una offerta computazionale +label.add.egress.rule=Aggiungere una regola d\\'uscita +label.add.F5.device=Aggiungere device F5 +label.add.guest.network=Aggiungere una rete guest +label.add.netScaler.device=Aggiungere device Netscaler +label.add.network.ACL=Aggiungere le ACL di rete +label.add.network.offering=Aggiungere offerta di rete +label.add.new.F5=Aggiungere nuovo F5 +label.add.new.gateway=Aggiungere un nuovo gateway +label.add.new.NetScaler=Aggiungere nuovo NetScaler +label.add.new.SRX=Aggiungere nuovo SRX +label.add.new.tier=Aggiungere un nuovo livello +label.add.physical.network=Aggiungere rete fisica +label.add.port.forwarding.rule=Aggiungere una regola di port forwarding +label.add.resources=Aggiungere Risorse +label.add.route=Aggiungere una rotta +label.add.rule=Aggiungere regola +label.add.SRX.device=Aggiungere device SRX +label.add.static.nat.rule=Aggiungere regola di NAT statico +label.add.static.route=Aggiungere una rotta statica +label.add.system.service.offering=Aggiungere Offerte di Servizio di Sistema +label.add.to.group=Aggiungere al gruppo +label.add.vm=Aggiungere VM +label.add.vms=Aggiunvere VM +label.add.vms.to.lb=Aggiungere VM a regola di bilanciamento di carico +label.add.VM.to.tier=Aggiungere una VM al livello +label.add.vpc=Aggiungere VPC +label.add.vpn.customer.gateway=Aggiungere Gateway VPN del Cliente +label.add.VPN.gateway=Aggiungere un Gateway VPN +label.add.vpn.user=Aggiungere utente VPN +label.advanced=Avanzato +label.agent.password=Password per l\\'Agent +label.agent.username=Username per l\\'Agent +label.allocated=Allocato +label.apply=Applicare +label.associated.network=Rete Associata +label.bandwidth=C
[27/51] [abbrv] Revert "CLOUDSTACK-2138: fix an issue on JA (japanese) resource file"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f5fc383/client/WEB-INF/classes/resources/messages_it_IT.properties.native -- diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties.native b/client/WEB-INF/classes/resources/messages_it_IT.properties.native deleted file mode 100644 index a0b63c1..000 --- a/client/WEB-INF/classes/resources/messages_it_IT.properties.native +++ /dev/null @@ -1,618 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -changed.item.properties=Elementi delle proprietà modificati -confirm.enable.s3=Si prega di inserire i valori richiesti per abilitare il supporto per il Secondary Storage di tipo S3 -confirm.enable.swift=Si prega di inserire i valori richiesti per abilitare il supporto per Swift -error.could.not.enable.zone=Impossibile abilitare la zona -error.installWizard.message=E' stato rilevato un errore\: tornare agli step precedenti e correggere gli errori -error.invalid.username.password=Username o Password non valida -error.password.not.match=I campi password non corrispondono -error.please.specify.physical.network.tags=Le offerte di rete non sono disponibili se non si specificano tag per questa rete fisica. -error.something.went.wrong.please.correct.the.following=E' stato rilevato un errore; si prega di correggere quanto indicato di seguito -error.unable.to.reach.management.server=Impossibile raggiungere il Management Server -instances.actions.reboot.label=Riavviare una instanza -label.accept.project.invitation=Accettare un invito ad un progetto -label.account.and.security.group=Account, Security group -label.action.delete.nexusVswitch=Cancellare Nexus 1000v -label.action.delete.physical.network=Cancellazione di una rete fisica -label.action.delete.system.service.offering=Cancellare Offerta di Servizio di Sistema -label.action.disable.nexusVswitch=Disabilitare Nexus 1000v -label.action.disable.physical.network=Disabilitare la rete fisica -label.action.enable.nexusVswitch=Abilitare Nexus 1000v -label.action.enable.physical.network=Abilitare la rete fisica -label.action.list.nexusVswitch=Elencare Nexus 1000v -label.action.migrate.router.processing=Migrazione Router... -label.action.register.iso=Registrare una ISO -label.action.register.template=Registrare un template -label.activate.project=Attivare il Progetto -label.add.accounts=Aggiungere utenti -label.add.accounts.to=Aggiungere utenti a -label.add.account.to.project=Aggiungere account al progetto -label.add.ACL=Aggiungere ACL -label.add.compute.offering=Aggiungere una offerta computazionale -label.add.egress.rule=Aggiungere una regola d'uscita -label.add.F5.device=Aggiungere device F5 -label.add.guest.network=Aggiungere una rete guest -label.add.netScaler.device=Aggiungere device Netscaler -label.add.network.ACL=Aggiungere le ACL di rete -label.add.network.offering=Aggiungere offerta di rete -label.add.new.F5=Aggiungere nuovo F5 -label.add.new.gateway=Aggiungere un nuovo gateway -label.add.new.NetScaler=Aggiungere nuovo NetScaler -label.add.new.SRX=Aggiungere nuovo SRX -label.add.new.tier=Aggiungere un nuovo livello -label.add.physical.network=Aggiungere rete fisica -label.add.port.forwarding.rule=Aggiungere una regola di port forwarding -label.add.resources=Aggiungere Risorse -label.add.route=Aggiungere una rotta -label.add.rule=Aggiungere regola -label.add.SRX.device=Aggiungere device SRX -label.add.static.nat.rule=Aggiungere regola di NAT statico -label.add.static.route=Aggiungere una rotta statica -label.add.system.service.offering=Aggiungere Offerte di Servizio di Sistema -label.add.to.group=Aggiungere al gruppo -label.add.vm=Aggiungere VM -label.add.vms=Aggiunvere VM -label.add.vms.to.lb=Aggiungere VM a regola di bilanciamento di carico -label.add.VM.to.tier=Aggiungere una VM al livello -label.add.vpc=Aggiungere VPC -label.add.vpn.customer.gateway=Aggiungere Gateway VPN del Cliente -label.add.VPN.gateway=Aggiungere un Gateway VPN -label.add.vpn.user=Aggiungere utente VPN -label.advanced=Avanzato -label.agent.password=Password per l'Agent -label.agent.username=Username per l'Agent -label.allocated=Allocato -label.apply=Applicare -label.associated.network=Rete Associata
[24/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-2138: fix an issue on JA (japanese) resource file Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26029f0a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26029f0a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26029f0a Branch: refs/heads/marvin_refactor Commit: 26029f0a268cf509b82b5b07ded0bc46b29bdb1b Parents: 1d493ac Author: Milamber Authored: Thu Apr 25 00:50:01 2013 + Committer: Milamber Committed: Thu Apr 25 00:50:01 2013 + -- .../resources/messages_ca.properties.native| 306 ++ .../resources/messages_de_DE.properties.native | 747 .../classes/resources/messages_es.properties | 861 + .../resources/messages_it_IT.properties.native | 618 .../classes/resources/messages_ja.properties | 2704 +++--- .../resources/messages_nb_NO.properties.native | 365 ++ 6 files changed, 4249 insertions(+), 1352 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26029f0a/client/WEB-INF/classes/resources/messages_ca.properties.native -- diff --git a/client/WEB-INF/classes/resources/messages_ca.properties.native b/client/WEB-INF/classes/resources/messages_ca.properties.native new file mode 100644 index 000..5f524fe --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_ca.properties.native @@ -0,0 +1,306 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +confirm.enable.swift=Si us plau ompliu la següent informació per habilitar el suport per a Swift +error.installWizard.message=Quelcom ha fallat, vostè pot tornar enrere i corregir els errors detalls suggerime +error.password.not.match=Els camps de contrasenya no coincideixen +extractable=Es pot extreure +inline=En lÃnia +label.accept.project.invitation=Accpetar invitació al projecte +label.action.edit.host=Editar Host +label.action.migrate.router=Migrar router +label.action.migrate.router.processing=Migrant router... +label.action.migrate.systemvm=Migrar MV de Sistema +label.action.migrate.systemvm.processing=Migrant MV de Sistema... +label.activate.project=Activar projecte +label.add.accounts=Afegir comptes +label.add.accounts.to=Afegir comptes a +label.add.account.to.project=Afegir compte al projecte +label.add.by=Afegir per +label.add.egress.rule=Afegir regla de sortida +label.add.new.F5=Afegir nou F5 +label.add.new.NetScaler=Afegir un nou NetScaler +label.add.new.SRX=Afegir nou SRX +label.add.physical.network=Afegir xarxa fÃsica +label.add.rule=Afegir regla +label.add.static.nat.rule=Afegir regla de NAT està tic +label.add.to.group=Afegir a grup +label.add.vm=Afegir MV +label.add.vms=Afegir MVs +label.add.vms.to.lb=Afegir MV(s) a la regla de balanceig de cà rrega +label.add.vpn.user=Afegir usuari VPN +label.agree=D'acord +label.apply=Aplicar +label.bandwidth=Ample de banda +label.broadcast.domain.range=Rang del domini de broadcast +label.capacity=Capacitat +label.change.service.offering=Canvia oferta de servei +label.change.value=Canviar valor +label.clear.list=Esborra llista +label.community=Comunitat +label.compute.and.storage=Computació i Emmagatzematge +label.compute=Computació +label.configuration=Configuració +label.configure=Configurar +label.confirm.password=Confirmar contrasenya +label.congratulations=Enorabona\! +label.continue.basic.install=Continueu amb la instal·lació bà sica +label.continue=Continuar +label.corrections.saved=Correccions guardades +label.create.project=Crear projecte +label.decline.invitation=Declinar invitació +label.dedicated=Dedicat +label.default=Per defecte +label.delete.F5=Esborrar F5 +label.delete.NetScaler=Esborrar NetScaler +label.delete.project=Esborrar projecte +label.delete.SRX=Esborar SRX +label.delete.vpn.user=Esborrar usuari VPN +label.destination.physical.network.id=ID de xarxa fÃsica de destà +label.destination.zone=Zona de destà +label.destroy.router=Destruir router +label.dhcp=DHCP +label.disabled=Deshabilitat +label.disable.provider=Desha
[28/51] [abbrv] Revert "CLOUDSTACK-2138: fix an issue on JA (japanese) resource file"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f5fc383/client/WEB-INF/classes/resources/messages_es.properties -- diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties deleted file mode 100644 index 28f9363..000 --- a/client/WEB-INF/classes/resources/messages_es.properties +++ /dev/null @@ -1,861 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -error.installWizard.message=Algo salio mal, debes ir para atr\u00e1s y corregir los error. -error.login=Su nombre de usuario / contrase\u00c3\u00b1a no coincide con nuestros registros. -error.mgmt.server.inaccessible=El Servidor de Gesti\u00c3\u00b3n es inaccesible. Por favor, int\u00c3\u00a9ntelo de nuevo m\u00c3\u00a1s tarde. -error.session.expired=Su sesi\u00c3\u00b3n ha caducado. -error.unresolved.internet.name=El nombre de Internet no se puede resolver. -extractable=extra\u00c3\u00adble -force.delete.domain.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, la supresi\u00c3\u00b3n de todos los dominios secundarios y todas las cuentas asociadas y sus recursos. -force.delete=Fuerza Borrar -force.remove=Fuerza Retire -force.remove.host.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, CloudStack para detener la fuerza todas las m\u00c3\u00a1quinas virtuales en ejecuci\u00c3\u00b3n antes de retirar este host del cl\u00c3\u00baster. -force.stop=Grupo de Alto -force.stop.instance.warning=Advertencia\: Obligar a una parada en este caso deber\u00c3\u00ada ser su \u00c3\u00baltima opci\u00c3\u00b3n. Puede conducir a la p\u00c3\u00a9rdida de datos, as\u00c3\u00ad como un comportamiento incoherente del Estado de la m\u00c3\u00a1quina virtual. -ICMP.code=ICMP C\u00c3\u00b3digo -ICMP.type=Tipo ICMP -image.directory=Directorio de la imagen -inline=en l\u00c3\u00adnea -label.account=Cuenta -label.account.id=ID de la cuenta -label.account.name=Nombre de la cuenta -label.accounts=Cuentas -label.account.specific=espec\u00c3\u00adficas de la cuenta -label.acquire.new.ip=adquirir nuevas IP -label.action.attach.disk=Conecte el disco -label.action.attach.disk.processing=disco Fijaci\u00c3\u00b3n -label.action.attach.iso=Adjuntar ISO -label.action.attach.iso.processing=Colocaci\u00c3\u00b3n de la norma ISO -label.action.cancel.maintenance.mode=Cancelar modo de mantenimiento -label.action.cancel.maintenance.mode.processing=Cancelaci\u00c3\u00b3n del modo de mantenimiento -label.action.change.password=Cambiar contrase\u00c3\u00b1a -label.action.change.service=Cambio de Servicio -label.action.change.service.processing=Cambio de servicio -label.action.copy.ISO=Copia de la ISO -label.action.copy.ISO.processing=hacer frente ISO -label.action.copy.template=Copia de plantilla -label.action.copy.template.processing=hacer frente plantilla -label.action.create.template=Crear plantilla -label.action.create.template.from.vm=Crear plantilla de VM -label.action.create.template.from.volume=Crear plantilla de volumen -label.action.create.template.processing=Creaci\u00c3\u00b3n de plantillas -label.action.create.vm=Crear VM -label.action.create.vm.processing=Creaci\u00c3\u00b3n de m\u00c3\u00a1quina virtual -label.action.create.volume=Crear volumen -label.action.create.volume.processing=Crear volumen -label.action.delete.account=Eliminar cuenta -label.action.delete.account.processing=Eliminar cuentas -label.action.delete.cluster=Borrar Grupo -label.action.delete.cluster.processing=Borrar Grupo -label.action.delete.disk.offering=Borrar disco Ofrenda -label.action.delete.disk.offering.processing=Borrar disco ofrece -label.action.delete.domain=Eliminar de dominio -label.action.delete.domain.processing=Eliminaci\u00c3\u00b3n de dominio -label.action.delete.firewall=Eliminar servidor de seguridad -label.action.delete.firewall.processing=Eliminaci\u00c3\u00b3n de firewall -label.action.delete.ingress.rule=Borrar ingreso Regla -label.action.delete.ingress.rule.processing=Eliminaci\u00c3\u00b3n de ingreso regla -label.action.delete.IP.range=Eliminar Rango de IP -label.action.d
[22/51] [abbrv] CLOUDSTACK-2138: fix an issue on JA (japanese) resource file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26029f0a/client/WEB-INF/classes/resources/messages_it_IT.properties.native -- diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties.native b/client/WEB-INF/classes/resources/messages_it_IT.properties.native new file mode 100644 index 000..a0b63c1 --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_it_IT.properties.native @@ -0,0 +1,618 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +changed.item.properties=Elementi delle proprietà modificati +confirm.enable.s3=Si prega di inserire i valori richiesti per abilitare il supporto per il Secondary Storage di tipo S3 +confirm.enable.swift=Si prega di inserire i valori richiesti per abilitare il supporto per Swift +error.could.not.enable.zone=Impossibile abilitare la zona +error.installWizard.message=E' stato rilevato un errore\: tornare agli step precedenti e correggere gli errori +error.invalid.username.password=Username o Password non valida +error.password.not.match=I campi password non corrispondono +error.please.specify.physical.network.tags=Le offerte di rete non sono disponibili se non si specificano tag per questa rete fisica. +error.something.went.wrong.please.correct.the.following=E' stato rilevato un errore; si prega di correggere quanto indicato di seguito +error.unable.to.reach.management.server=Impossibile raggiungere il Management Server +instances.actions.reboot.label=Riavviare una instanza +label.accept.project.invitation=Accettare un invito ad un progetto +label.account.and.security.group=Account, Security group +label.action.delete.nexusVswitch=Cancellare Nexus 1000v +label.action.delete.physical.network=Cancellazione di una rete fisica +label.action.delete.system.service.offering=Cancellare Offerta di Servizio di Sistema +label.action.disable.nexusVswitch=Disabilitare Nexus 1000v +label.action.disable.physical.network=Disabilitare la rete fisica +label.action.enable.nexusVswitch=Abilitare Nexus 1000v +label.action.enable.physical.network=Abilitare la rete fisica +label.action.list.nexusVswitch=Elencare Nexus 1000v +label.action.migrate.router.processing=Migrazione Router... +label.action.register.iso=Registrare una ISO +label.action.register.template=Registrare un template +label.activate.project=Attivare il Progetto +label.add.accounts=Aggiungere utenti +label.add.accounts.to=Aggiungere utenti a +label.add.account.to.project=Aggiungere account al progetto +label.add.ACL=Aggiungere ACL +label.add.compute.offering=Aggiungere una offerta computazionale +label.add.egress.rule=Aggiungere una regola d'uscita +label.add.F5.device=Aggiungere device F5 +label.add.guest.network=Aggiungere una rete guest +label.add.netScaler.device=Aggiungere device Netscaler +label.add.network.ACL=Aggiungere le ACL di rete +label.add.network.offering=Aggiungere offerta di rete +label.add.new.F5=Aggiungere nuovo F5 +label.add.new.gateway=Aggiungere un nuovo gateway +label.add.new.NetScaler=Aggiungere nuovo NetScaler +label.add.new.SRX=Aggiungere nuovo SRX +label.add.new.tier=Aggiungere un nuovo livello +label.add.physical.network=Aggiungere rete fisica +label.add.port.forwarding.rule=Aggiungere una regola di port forwarding +label.add.resources=Aggiungere Risorse +label.add.route=Aggiungere una rotta +label.add.rule=Aggiungere regola +label.add.SRX.device=Aggiungere device SRX +label.add.static.nat.rule=Aggiungere regola di NAT statico +label.add.static.route=Aggiungere una rotta statica +label.add.system.service.offering=Aggiungere Offerte di Servizio di Sistema +label.add.to.group=Aggiungere al gruppo +label.add.vm=Aggiungere VM +label.add.vms=Aggiunvere VM +label.add.vms.to.lb=Aggiungere VM a regola di bilanciamento di carico +label.add.VM.to.tier=Aggiungere una VM al livello +label.add.vpc=Aggiungere VPC +label.add.vpn.customer.gateway=Aggiungere Gateway VPN del Cliente +label.add.VPN.gateway=Aggiungere un Gateway VPN +label.add.vpn.user=Aggiungere utente VPN +label.advanced=Avanzato +label.agent.password=Password per l'Agent +label.agent.username=Username per l'Agent +label.allocated=Allocato +label.apply=Applicare +label.associated.network=Rete Associata +lab
[23/51] [abbrv] CLOUDSTACK-2138: fix an issue on JA (japanese) resource file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26029f0a/client/WEB-INF/classes/resources/messages_es.properties -- diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties new file mode 100644 index 000..28f9363 --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -0,0 +1,861 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +error.installWizard.message=Algo salio mal, debes ir para atr\u00e1s y corregir los error. +error.login=Su nombre de usuario / contrase\u00c3\u00b1a no coincide con nuestros registros. +error.mgmt.server.inaccessible=El Servidor de Gesti\u00c3\u00b3n es inaccesible. Por favor, int\u00c3\u00a9ntelo de nuevo m\u00c3\u00a1s tarde. +error.session.expired=Su sesi\u00c3\u00b3n ha caducado. +error.unresolved.internet.name=El nombre de Internet no se puede resolver. +extractable=extra\u00c3\u00adble +force.delete.domain.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, la supresi\u00c3\u00b3n de todos los dominios secundarios y todas las cuentas asociadas y sus recursos. +force.delete=Fuerza Borrar +force.remove=Fuerza Retire +force.remove.host.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, CloudStack para detener la fuerza todas las m\u00c3\u00a1quinas virtuales en ejecuci\u00c3\u00b3n antes de retirar este host del cl\u00c3\u00baster. +force.stop=Grupo de Alto +force.stop.instance.warning=Advertencia\: Obligar a una parada en este caso deber\u00c3\u00ada ser su \u00c3\u00baltima opci\u00c3\u00b3n. Puede conducir a la p\u00c3\u00a9rdida de datos, as\u00c3\u00ad como un comportamiento incoherente del Estado de la m\u00c3\u00a1quina virtual. +ICMP.code=ICMP C\u00c3\u00b3digo +ICMP.type=Tipo ICMP +image.directory=Directorio de la imagen +inline=en l\u00c3\u00adnea +label.account=Cuenta +label.account.id=ID de la cuenta +label.account.name=Nombre de la cuenta +label.accounts=Cuentas +label.account.specific=espec\u00c3\u00adficas de la cuenta +label.acquire.new.ip=adquirir nuevas IP +label.action.attach.disk=Conecte el disco +label.action.attach.disk.processing=disco Fijaci\u00c3\u00b3n +label.action.attach.iso=Adjuntar ISO +label.action.attach.iso.processing=Colocaci\u00c3\u00b3n de la norma ISO +label.action.cancel.maintenance.mode=Cancelar modo de mantenimiento +label.action.cancel.maintenance.mode.processing=Cancelaci\u00c3\u00b3n del modo de mantenimiento +label.action.change.password=Cambiar contrase\u00c3\u00b1a +label.action.change.service=Cambio de Servicio +label.action.change.service.processing=Cambio de servicio +label.action.copy.ISO=Copia de la ISO +label.action.copy.ISO.processing=hacer frente ISO +label.action.copy.template=Copia de plantilla +label.action.copy.template.processing=hacer frente plantilla +label.action.create.template=Crear plantilla +label.action.create.template.from.vm=Crear plantilla de VM +label.action.create.template.from.volume=Crear plantilla de volumen +label.action.create.template.processing=Creaci\u00c3\u00b3n de plantillas +label.action.create.vm=Crear VM +label.action.create.vm.processing=Creaci\u00c3\u00b3n de m\u00c3\u00a1quina virtual +label.action.create.volume=Crear volumen +label.action.create.volume.processing=Crear volumen +label.action.delete.account=Eliminar cuenta +label.action.delete.account.processing=Eliminar cuentas +label.action.delete.cluster=Borrar Grupo +label.action.delete.cluster.processing=Borrar Grupo +label.action.delete.disk.offering=Borrar disco Ofrenda +label.action.delete.disk.offering.processing=Borrar disco ofrece +label.action.delete.domain=Eliminar de dominio +label.action.delete.domain.processing=Eliminaci\u00c3\u00b3n de dominio +label.action.delete.firewall=Eliminar servidor de seguridad +label.action.delete.firewall.processing=Eliminaci\u00c3\u00b3n de firewall +label.action.delete.ingress.rule=Borrar ingreso Regla +label.action.delete.ingress.rule.processing=Eliminaci\u00c3\u00b3n de ingreso regla +label.action.delete.IP.range=Eliminar Rango de IP +label.action.delet
[20/51] [abbrv] CLOUDSTACK-2138: fix an issue on JA (japanese) resource file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26029f0a/client/WEB-INF/classes/resources/messages_nb_NO.properties.native -- diff --git a/client/WEB-INF/classes/resources/messages_nb_NO.properties.native b/client/WEB-INF/classes/resources/messages_nb_NO.properties.native new file mode 100644 index 000..026a247 --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_nb_NO.properties.native @@ -0,0 +1,365 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +changed.item.properties=Endrede egenskaper +error.could.not.enable.zone=Kunne ikke aktivere sonen +error.installWizard.message=Noe gikk galt. Gå tilbake og korriger feilene. +error.password.not.match=Passordfeltene sammensvarer ikke +error.something.went.wrong.please.correct.the.following=Noe gikk galt. Vennligst korrigér følgende +force.delete=Tving sletting +force.remove=Tving fjerning +force.stop=Tving stopp +instances.actions.reboot.label=Omstart av instans +label.accept.project.invitation=Aksepter prosjektinvitasjon +label.action.disable.cluster=Deaktiver klyngen +label.action.disable.cluster.processing=Deaktiverer klyngen... +label.action.disable.pod=Deaktiver pod +label.action.disable.pod.processing=Deaktiverer pod... +label.action.disable.zone=Deaktiver sonen +label.action.disable.zone.processing=Deaktiverer sonen... +label.action.enable.cluster=Aktiver klynge +label.action.enable.cluster.processing=Aktiverer klyngen... +label.action.enable.pod=Aktiver pod +label.action.enable.pod.processing=Aktiverer pod... +label.action.enable.zone=Aktiver sone +label.action.enable.zone.processing=Aktiverer sone... +label.action.unmanage.cluster.processing=Fjerner administrasjon av klynge... +label.activate.project=Aktiver prosjekt +label.add.accounts=Legg til kontoer +label.add.accounts.to=Legg kontoer til +label.add.account.to.project=Legg kontoen til prosjektet +label.add.by=Legg til ved +label.add.guest.network=Legg til gjestenettverk +label.add.network.device=Legg til nettverksenhet +label.add.new.F5=Legg til ny F5 +label.add.new.NetScaler=Legg til ny NetScaler +label.add.new.SRX=Legg til ny SRX +label.add.physical.network=Legg til fysisk nettverk +label.add.resources=Legg til ressurser +label.add.system.service.offering=Legg til et systemtilbud +label.add.to.group=Legg til gruppe +label.add.vms=Legg til VMer +label.advanced=Avansert +label.agree=Godtar +label.allocated=Allokert +label.allocation.state=Allokeringsstatus +label.apply=Bruk +label.bandwidth=Båndbredde +label.basic=Basis +label.capacity=Kapasitet +label.change.service.offering=Endre tjenestetilbud +label.change.value=Endre verdi +label.cidr=CIDR +label.cidr.list=Kilde-CIDR +label.clean.up=Rydd opp +label.clvm=CLVM +label.compute.and.storage=Regnekraft og lagring +label.compute=Beregne +label.configure=Konfigurer +label.confirm.password=Bekreft passord +label.congratulations=Gratulerer\! +label.continue.basic.install=Fortsett med enkelt oppsett +label.continue=Fortsett +label.corrections.saved=Endringer lagret +label.CPU.cap=CPU begrensning +label.created.by.system=Opprettet av systemet +label.create.project=Opprett prosjekt +label.create.template=Opprett mal +label.decline.invitation=Avvis invitasjon +label.dedicated=Dedikert +label.default=Standardverdi +label.default.use=Standard bruk +label.default.view=Standardvisning +label.delete.project=Slett prosjekt +label.destination.physical.network.id=Fysisk nettverksid-destinasjon +label.destroy.router=Slett ruter +label.dhcp=DHCP +label.DHCP.server.type=DHCP servertype +label.disabled=Inaktiv +label.disable.provider=Deaktiver tilbyder +label.display.name=Visningsnavn +label.done=Utført +label.drag.new.position=Dra til ny posisjon +label.edit.network.details=Editér nettverksdetaljer +label.edit.project.details=Editer prosjektdetaljer +label.elastic=Elastisk +label.elastic.IP=Elastisk IP +label.elastic.LB=Elastisk LB +label.enable.provider=Aktiver tilbyder +label.enable.vpn=Aktiver VPN +label.end.IP=Slutt-IP +label.end.vlan=Slutt-VLAN +label.enter.token=Skriv inn koden +label.error=Feil +label.f5=F5 +label.filterBy=Filtrer etter +label.guest.end.ip=Gjest slutt-IP +label.guest=Gjest +label.guest.networks=Gjestenettverk
[33/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
Summary: Don't add secondary storage to KVM heartbeat
BUG-ID: CLOUDSTACK-2173
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen 1366865750 -0600
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33006ff1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33006ff1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33006ff1
Branch: refs/heads/marvin_refactor
Commit: 33006ff1978dda435f717ff5e9125c9a522af4d4
Parents: 299cccf
Author: Marcus Sorensen
Authored: Wed Apr 24 22:55:50 2013 -0600
Committer: Marcus Sorensen
Committed: Wed Apr 24 22:55:50 2013 -0600
--
.../hypervisor/kvm/resource/KVMHAMonitor.java |7 ---
.../kvm/storage/KVMStoragePoolManager.java | 12 ++--
2 files changed, 14 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33006ff1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
--
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
index d1470d6..0e4d9ee 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
@@ -55,9 +55,10 @@ public class KVMHAMonitor extends KVMHABase implements
Runnable {
public void removeStoragePool(String uuid) {
synchronized (_storagePool) {
NfsStoragePool pool = this._storagePool.get(uuid);
-Script.runSimpleBashScript("umount " + pool._mountDestPath);
-s_logger.debug("attempted to umount '" + pool._mountDestPath +
"'");
-this._storagePool.remove(uuid);
+if (pool != null) {
+Script.runSimpleBashScript("umount " + pool._mountDestPath);
+this._storagePool.remove(uuid);
+}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33006ff1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
--
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
index f5719ba..31d491c 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
@@ -94,18 +94,26 @@ public class KVMStoragePoolManager {
protocol = StoragePoolType.NetworkFilesystem;
}
-return createStoragePool(uuid, sourceHost, 0, sourcePath, "",
protocol);
+// secondary storage registers itself through here
+return createStoragePool(uuid, sourceHost, 0, sourcePath, "",
protocol, false);
}
public KVMStoragePool createStoragePool( String name, String host, int
port,
String path, String userInfo,
StoragePoolType type) {
+// primary storage registers itself through here
+return createStoragePool(name, host, port, path, userInfo, type, true);
+}
+
+private KVMStoragePool createStoragePool( String name, String host, int
port,
+ String path, String userInfo,
+ StoragePoolType type, boolean
primaryStorage) {
StorageAdaptor adaptor = getStorageAdaptor(type);
KVMStoragePool pool = adaptor.createStoragePool(name,
host, port, path, userInfo, type);
// LibvirtStorageAdaptor-specific statement
-if (type == StoragePoolType.NetworkFilesystem) {
+if (type == StoragePoolType.NetworkFilesystem && primaryStorage) {
KVMHABase.NfsStoragePool nfspool = new KVMHABase.NfsStoragePool(
pool.getUuid(), host, path, pool.getLocalPath(),
PoolType.PrimaryStorage);
[19/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-2138 : add ca, de_DE, it_IT ja, koçKR,nb_NO pt_BR, ru_RU resource files for UI with ASCII with unicode encoding. (Merging for 4.1/Transifex, sync with transifex), add some languages in combo list on login page on UI Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1d493acf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1d493acf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1d493acf Branch: refs/heads/marvin_refactor Commit: 1d493acfcc311445a3fd506b8887ec7fc35a1740 Parents: 2db2e7b Author: Milamber Authored: Thu Apr 25 00:22:46 2013 + Committer: Milamber Committed: Thu Apr 25 00:22:46 2013 + -- ui/index.jsp |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1d493acf/ui/index.jsp -- diff --git a/ui/index.jsp b/ui/index.jsp index 9e1743e..12cb955 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -71,11 +71,16 @@ under the License. - + + + + + +
[29/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
Revert "CLOUDSTACK-2138: fix an issue on JA (japanese) resource file" This reverts commit 26029f0a268cf509b82b5b07ded0bc46b29bdb1b. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9f5fc383 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9f5fc383 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9f5fc383 Branch: refs/heads/marvin_refactor Commit: 9f5fc3833c25c296840d949e0f426ac8cb7f8620 Parents: 26029f0 Author: Milamber Authored: Thu Apr 25 00:52:01 2013 + Committer: Milamber Committed: Thu Apr 25 00:52:01 2013 + -- .../resources/messages_ca.properties.native| 306 -- .../resources/messages_de_DE.properties.native | 747 .../classes/resources/messages_es.properties | 861 - .../resources/messages_it_IT.properties.native | 618 .../classes/resources/messages_ja.properties | 2704 +++--- .../resources/messages_nb_NO.properties.native | 365 -- 6 files changed, 1352 insertions(+), 4249 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f5fc383/client/WEB-INF/classes/resources/messages_ca.properties.native -- diff --git a/client/WEB-INF/classes/resources/messages_ca.properties.native b/client/WEB-INF/classes/resources/messages_ca.properties.native deleted file mode 100644 index 5f524fe..000 --- a/client/WEB-INF/classes/resources/messages_ca.properties.native +++ /dev/null @@ -1,306 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -confirm.enable.swift=Si us plau ompliu la següent informació per habilitar el suport per a Swift -error.installWizard.message=Quelcom ha fallat, vostè pot tornar enrere i corregir els errors detalls suggerime -error.password.not.match=Els camps de contrasenya no coincideixen -extractable=Es pot extreure -inline=En lÃnia -label.accept.project.invitation=Accpetar invitació al projecte -label.action.edit.host=Editar Host -label.action.migrate.router=Migrar router -label.action.migrate.router.processing=Migrant router... -label.action.migrate.systemvm=Migrar MV de Sistema -label.action.migrate.systemvm.processing=Migrant MV de Sistema... -label.activate.project=Activar projecte -label.add.accounts=Afegir comptes -label.add.accounts.to=Afegir comptes a -label.add.account.to.project=Afegir compte al projecte -label.add.by=Afegir per -label.add.egress.rule=Afegir regla de sortida -label.add.new.F5=Afegir nou F5 -label.add.new.NetScaler=Afegir un nou NetScaler -label.add.new.SRX=Afegir nou SRX -label.add.physical.network=Afegir xarxa fÃsica -label.add.rule=Afegir regla -label.add.static.nat.rule=Afegir regla de NAT està tic -label.add.to.group=Afegir a grup -label.add.vm=Afegir MV -label.add.vms=Afegir MVs -label.add.vms.to.lb=Afegir MV(s) a la regla de balanceig de cà rrega -label.add.vpn.user=Afegir usuari VPN -label.agree=D'acord -label.apply=Aplicar -label.bandwidth=Ample de banda -label.broadcast.domain.range=Rang del domini de broadcast -label.capacity=Capacitat -label.change.service.offering=Canvia oferta de servei -label.change.value=Canviar valor -label.clear.list=Esborra llista -label.community=Comunitat -label.compute.and.storage=Computació i Emmagatzematge -label.compute=Computació -label.configuration=Configuració -label.configure=Configurar -label.confirm.password=Confirmar contrasenya -label.congratulations=Enorabona\! -label.continue.basic.install=Continueu amb la instal·lació bà sica -label.continue=Continuar -label.corrections.saved=Correccions guardades -label.create.project=Crear projecte -label.decline.invitation=Declinar invitació -label.dedicated=Dedicat -label.default=Per defecte -label.delete.F5=Esborrar F5 -label.delete.NetScaler=Esborrar NetScaler -label.delete.project=Esborrar projecte -label.delete.SRX=Esborar SRX -label.delete.vpn.user=Esborrar usuari VPN -label.destination.physical.network.id=ID de xarxa fÃsica de destà -label.destination.zone=Zona de destà -label.destroy.router=Destruir router
[25/51] [abbrv] Revert "CLOUDSTACK-2138: fix an issue on JA (japanese) resource file"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f5fc383/client/WEB-INF/classes/resources/messages_nb_NO.properties.native -- diff --git a/client/WEB-INF/classes/resources/messages_nb_NO.properties.native b/client/WEB-INF/classes/resources/messages_nb_NO.properties.native deleted file mode 100644 index 026a247..000 --- a/client/WEB-INF/classes/resources/messages_nb_NO.properties.native +++ /dev/null @@ -1,365 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -changed.item.properties=Endrede egenskaper -error.could.not.enable.zone=Kunne ikke aktivere sonen -error.installWizard.message=Noe gikk galt. Gå tilbake og korriger feilene. -error.password.not.match=Passordfeltene sammensvarer ikke -error.something.went.wrong.please.correct.the.following=Noe gikk galt. Vennligst korrigér følgende -force.delete=Tving sletting -force.remove=Tving fjerning -force.stop=Tving stopp -instances.actions.reboot.label=Omstart av instans -label.accept.project.invitation=Aksepter prosjektinvitasjon -label.action.disable.cluster=Deaktiver klyngen -label.action.disable.cluster.processing=Deaktiverer klyngen... -label.action.disable.pod=Deaktiver pod -label.action.disable.pod.processing=Deaktiverer pod... -label.action.disable.zone=Deaktiver sonen -label.action.disable.zone.processing=Deaktiverer sonen... -label.action.enable.cluster=Aktiver klynge -label.action.enable.cluster.processing=Aktiverer klyngen... -label.action.enable.pod=Aktiver pod -label.action.enable.pod.processing=Aktiverer pod... -label.action.enable.zone=Aktiver sone -label.action.enable.zone.processing=Aktiverer sone... -label.action.unmanage.cluster.processing=Fjerner administrasjon av klynge... -label.activate.project=Aktiver prosjekt -label.add.accounts=Legg til kontoer -label.add.accounts.to=Legg kontoer til -label.add.account.to.project=Legg kontoen til prosjektet -label.add.by=Legg til ved -label.add.guest.network=Legg til gjestenettverk -label.add.network.device=Legg til nettverksenhet -label.add.new.F5=Legg til ny F5 -label.add.new.NetScaler=Legg til ny NetScaler -label.add.new.SRX=Legg til ny SRX -label.add.physical.network=Legg til fysisk nettverk -label.add.resources=Legg til ressurser -label.add.system.service.offering=Legg til et systemtilbud -label.add.to.group=Legg til gruppe -label.add.vms=Legg til VMer -label.advanced=Avansert -label.agree=Godtar -label.allocated=Allokert -label.allocation.state=Allokeringsstatus -label.apply=Bruk -label.bandwidth=Båndbredde -label.basic=Basis -label.capacity=Kapasitet -label.change.service.offering=Endre tjenestetilbud -label.change.value=Endre verdi -label.cidr=CIDR -label.cidr.list=Kilde-CIDR -label.clean.up=Rydd opp -label.clvm=CLVM -label.compute.and.storage=Regnekraft og lagring -label.compute=Beregne -label.configure=Konfigurer -label.confirm.password=Bekreft passord -label.congratulations=Gratulerer\! -label.continue.basic.install=Fortsett med enkelt oppsett -label.continue=Fortsett -label.corrections.saved=Endringer lagret -label.CPU.cap=CPU begrensning -label.created.by.system=Opprettet av systemet -label.create.project=Opprett prosjekt -label.create.template=Opprett mal -label.decline.invitation=Avvis invitasjon -label.dedicated=Dedikert -label.default=Standardverdi -label.default.use=Standard bruk -label.default.view=Standardvisning -label.delete.project=Slett prosjekt -label.destination.physical.network.id=Fysisk nettverksid-destinasjon -label.destroy.router=Slett ruter -label.dhcp=DHCP -label.DHCP.server.type=DHCP servertype -label.disabled=Inaktiv -label.disable.provider=Deaktiver tilbyder -label.display.name=Visningsnavn -label.done=Utført -label.drag.new.position=Dra til ny posisjon -label.edit.network.details=Editér nettverksdetaljer -label.edit.project.details=Editer prosjektdetaljer -label.elastic=Elastisk -label.elastic.IP=Elastisk IP -label.elastic.LB=Elastisk LB -label.enable.provider=Aktiver tilbyder -label.enable.vpn=Aktiver VPN -label.end.IP=Slutt-IP -label.end.vlan=Slutt-VLAN -label.enter.token=Skriv inn koden -label.error=Feil -label.f5=F5 -label.filterBy=Filtrer etter -label.guest.end.ip=Gjest slutt-IP -label.guest=Gjest -label.guest.networks=Gjestenett
[32/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
fix copy/paste bug
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/299cccf7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/299cccf7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/299cccf7
Branch: refs/heads/marvin_refactor
Commit: 299cccf779f75c3ba04d9ec7303bed88394c3562
Parents: 1fed7df
Author: Edison Su
Authored: Wed Apr 24 18:31:45 2013 -0700
Committer: Edison Su
Committed: Wed Apr 24 18:32:06 2013 -0700
--
scripts/vm/network/security_group.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/299cccf7/scripts/vm/network/security_group.py
--
diff --git a/scripts/vm/network/security_group.py
b/scripts/vm/network/security_group.py
index 49d9be6..6c12409 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -275,7 +275,7 @@ def remove_secip_log_for_vm(vmName):
try:
os.remove(logfilename)
except:
-util.SMlog("Failed to delete rule log file " + logfilename)
+logging.debug("Failed to delete rule log file " + logfilename)
result = False
return result
[31/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-2138: fix an issue on JA (japanese) resource file. Add ES (spanish) resource file Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1fed7df0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1fed7df0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1fed7df0 Branch: refs/heads/marvin_refactor Commit: 1fed7df0baaac0fc63dbb980c88b6483ef150578 Parents: 9f5fc38 Author: Milamber Authored: Thu Apr 25 00:53:28 2013 + Committer: Milamber Committed: Thu Apr 25 00:53:28 2013 + -- .../classes/resources/messages_es.properties | 861 + .../classes/resources/messages_ja.properties | 2704 +++--- 2 files changed, 2213 insertions(+), 1352 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1fed7df0/client/WEB-INF/classes/resources/messages_es.properties -- diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties new file mode 100644 index 000..28f9363 --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -0,0 +1,861 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +error.installWizard.message=Algo salio mal, debes ir para atr\u00e1s y corregir los error. +error.login=Su nombre de usuario / contrase\u00c3\u00b1a no coincide con nuestros registros. +error.mgmt.server.inaccessible=El Servidor de Gesti\u00c3\u00b3n es inaccesible. Por favor, int\u00c3\u00a9ntelo de nuevo m\u00c3\u00a1s tarde. +error.session.expired=Su sesi\u00c3\u00b3n ha caducado. +error.unresolved.internet.name=El nombre de Internet no se puede resolver. +extractable=extra\u00c3\u00adble +force.delete.domain.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, la supresi\u00c3\u00b3n de todos los dominios secundarios y todas las cuentas asociadas y sus recursos. +force.delete=Fuerza Borrar +force.remove=Fuerza Retire +force.remove.host.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, CloudStack para detener la fuerza todas las m\u00c3\u00a1quinas virtuales en ejecuci\u00c3\u00b3n antes de retirar este host del cl\u00c3\u00baster. +force.stop=Grupo de Alto +force.stop.instance.warning=Advertencia\: Obligar a una parada en este caso deber\u00c3\u00ada ser su \u00c3\u00baltima opci\u00c3\u00b3n. Puede conducir a la p\u00c3\u00a9rdida de datos, as\u00c3\u00ad como un comportamiento incoherente del Estado de la m\u00c3\u00a1quina virtual. +ICMP.code=ICMP C\u00c3\u00b3digo +ICMP.type=Tipo ICMP +image.directory=Directorio de la imagen +inline=en l\u00c3\u00adnea +label.account=Cuenta +label.account.id=ID de la cuenta +label.account.name=Nombre de la cuenta +label.accounts=Cuentas +label.account.specific=espec\u00c3\u00adficas de la cuenta +label.acquire.new.ip=adquirir nuevas IP +label.action.attach.disk=Conecte el disco +label.action.attach.disk.processing=disco Fijaci\u00c3\u00b3n +label.action.attach.iso=Adjuntar ISO +label.action.attach.iso.processing=Colocaci\u00c3\u00b3n de la norma ISO +label.action.cancel.maintenance.mode=Cancelar modo de mantenimiento +label.action.cancel.maintenance.mode.processing=Cancelaci\u00c3\u00b3n del modo de mantenimiento +label.action.change.password=Cambiar contrase\u00c3\u00b1a +label.action.change.service=Cambio de Servicio +label.action.change.service.processing=Cambio de servicio +label.action.copy.ISO=Copia de la ISO +label.action.copy.ISO.processing=hacer frente ISO +label.action.copy.template=Copia de plantilla +label.action.copy.template.processing=hacer frente plantilla +label.action.create.template=Crear plantilla +label.action.create.template.from.vm=Crear plantilla de VM +label.action.create.template.from.volume=Crear plantilla de volumen +label.action.create.template.processing=Creaci\u00c3\u00b3n de plantillas +label.action.create.vm=Crear VM +label.action.create.vm.processing=Creaci\u00c3\u00b3n de m\u00c3\u00a1quina virtual ..
[35/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
fix CLOUDSTACK-2157 On VMWare ESXi host deployment: Expunged VMs are not
getting cleaned up from the host
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/79cc241c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/79cc241c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/79cc241c
Branch: refs/heads/marvin_refactor
Commit: 79cc241c64df1451ce2413b206f6723e3e58de18
Parents: 96837ed
Author: Mice Xia
Authored: Thu Apr 25 14:23:36 2013 +0800
Committer: Mice Xia
Committed: Thu Apr 25 14:25:03 2013 +0800
--
.../com/cloud/agent/api/UnregisterVMCommand.java | 34
api/src/com/cloud/hypervisor/HypervisorGuru.java |9 +++
.../src/com/cloud/hypervisor/guru/VMwareGuru.java |9 +++
.../hypervisor/vmware/resource/VmwareResource.java | 40 +++
.../com/cloud/hypervisor/HypervisorGuruBase.java |5 ++
server/src/com/cloud/vm/UserVmManagerImpl.java |1 +
.../com/cloud/vm/VirtualMachineManagerImpl.java| 24 +
7 files changed, 122 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79cc241c/api/src/com/cloud/agent/api/UnregisterVMCommand.java
--
diff --git a/api/src/com/cloud/agent/api/UnregisterVMCommand.java
b/api/src/com/cloud/agent/api/UnregisterVMCommand.java
new file mode 100644
index 000..428ffea
--- /dev/null
+++ b/api/src/com/cloud/agent/api/UnregisterVMCommand.java
@@ -0,0 +1,34 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.agent.api;
+
+public class UnregisterVMCommand extends Command {
+String vmName;
+
+public UnregisterVMCommand(String vmName){
+this.vmName = vmName;
+}
+
+@Override
+public boolean executeInSequence() {
+return false;
+}
+
+public String getVmName() {
+return vmName;
+}
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79cc241c/api/src/com/cloud/hypervisor/HypervisorGuru.java
--
diff --git a/api/src/com/cloud/hypervisor/HypervisorGuru.java
b/api/src/com/cloud/hypervisor/HypervisorGuru.java
index b4a0b06..eab4e4e 100644
--- a/api/src/com/cloud/hypervisor/HypervisorGuru.java
+++ b/api/src/com/cloud/hypervisor/HypervisorGuru.java
@@ -16,6 +16,8 @@
// under the License.
package com.cloud.hypervisor;
+import java.util.List;
+
import com.cloud.agent.api.Command;
import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.VirtualMachineTO;
@@ -57,4 +59,11 @@ public interface HypervisorGuru extends Adapter {
* @return
*/
NicTO toNicTO(NicProfile profile);
+
+/**
+ * Give hypervisor guru opportunity to decide if certain command needs to
be done after expunge VM from DB
+ * @param vm
+ * @return a list of Commands
+ */
+List finalizeExpunge(VirtualMachine vm);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79cc241c/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
index 122ba3b..ee1b324 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -36,6 +36,7 @@ import com.cloud.agent.api.Command;
import com.cloud.agent.api.CreatePrivateTemplateFromSnapshotCommand;
import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand;
import com.cloud.agent.api.CreateVolumeFromSnapshotCommand;
+import com.cloud.agent.api.UnregisterVMCommand;
import com.cloud.agent.api.storage.CopyVolumeCommand;
import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
import com.cloud.agent.api.to.NicTO;
@@ -353,4 +354,12 @@ public class VMwareGuru extends Hype
[37/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-1903:Delete event/alerts date parameter handling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8bfbfda
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8bfbfda
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8bfbfda
Branch: refs/heads/marvin_refactor
Commit: c8bfbfda31ce0c27e73050231e1d2ec47be6956b
Parents: ff7112a
Author: Pranav Saxena
Authored: Thu Apr 25 12:33:24 2013 +0530
Committer: Pranav Saxena
Committed: Thu Apr 25 12:33:24 2013 +0530
--
ui/scripts/events.js |8
1 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8bfbfda/ui/scripts/events.js
--
diff --git a/ui/scripts/events.js b/ui/scripts/events.js
index 3b6874c..0e72eda 100644
--- a/ui/scripts/events.js
+++ b/ui/scripts/events.js
@@ -73,7 +73,7 @@
$.extend(data, { type:args.data.type });
if(args.data.date != "")
- $.extend(data, {date:args.data.date });
+ $.extend(data, {olderthan:args.data.date });
$.ajax({
@@ -118,7 +118,7 @@
$.extend(data, { type:args.data.type });
if(args.data.date != "")
- $.extend(data, {date:args.data.date });
+ $.extend(data, {olderthan:args.data.date });
$.ajax({
@@ -359,7 +359,7 @@
$.extend(data, { type:args.data.type });
if(args.data.date != "")
- $.extend(data, {date:args.data.date });
+ $.extend(data, {olderthan:args.data.date });
$.ajax({
@@ -404,7 +404,7 @@
$.extend(data, { type:args.data.type });
if(args.data.date != "")
- $.extend(data, {date:args.data.date });
+ $.extend(data, {olderthan:args.data.date });
$.ajax({
[41/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d5c3f879
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d5c3f879
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d5c3f879
Branch: refs/heads/marvin_refactor
Commit: d5c3f87903ffa4362c9dc9688c199c10700c0ccb
Parents: 1f97b52
Author: Jayapal
Authored: Mon Apr 22 14:06:12 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Apr 25 15:16:26 2013 +0530
--
api/src/com/cloud/network/NetworkService.java |2 +-
.../apache/cloudstack/api/ResponseGenerator.java |4 +-
.../api/command/user/vm/AddIpToVmNicCmd.java |9 +--
.../api/command/test/AddIpToVmNicTest.java |6 +++-
server/src/com/cloud/api/ApiResponseHelper.java| 18 +--
.../src/com/cloud/network/NetworkServiceImpl.java | 17 +++--
.../com/cloud/network/MockNetworkManagerImpl.java |2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java |2 +-
8 files changed, 35 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5c3f879/api/src/com/cloud/network/NetworkService.java
--
diff --git a/api/src/com/cloud/network/NetworkService.java
b/api/src/com/cloud/network/NetworkService.java
index 5a6054d..6c9bebc 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -158,7 +158,7 @@ public interface NetworkService {
throws ResourceAllocationException,
ConcurrentOperationException, InsufficientCapacityException;
/* Requests an IP address for the guest nic */
-String allocateSecondaryGuestIP(Account account, long zoneId, Long nicId,
+NicSecondaryIp allocateSecondaryGuestIP(Account account, long zoneId, Long
nicId,
Long networkId, String ipaddress) throws
InsufficientAddressCapacityException;
boolean releaseSecondaryIpFromNic(long ipAddressId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5c3f879/api/src/org/apache/cloudstack/api/ResponseGenerator.java
--
diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
index a3aa9de..cbf8bb2 100644
--- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
@@ -20,6 +20,7 @@ import java.text.DecimalFormat;
import java.util.EnumSet;
import java.util.List;
+import com.cloud.vm.NicSecondaryIp;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ApiConstants.HostDetails;
@@ -389,8 +390,7 @@ public interface ResponseGenerator {
TrafficMonitorResponse createTrafficMonitorResponse(Host trafficMonitor);
VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot);
-NicSecondaryIpResponse createSecondaryIPToNicResponse(String ip,
-Long nicId, Long networkId);
+NicSecondaryIpResponse createSecondaryIPToNicResponse(NicSecondaryIp
result);
public NicResponse createNicResponse(Nic result);
AffinityGroupResponse createAffinityGroupResponse(AffinityGroup group);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5c3f879/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
index df6b399..ae5482b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
@@ -16,6 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import com.cloud.vm.NicSecondaryIp;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
@@ -146,6 +147,7 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd {
UserContext.current().setEventDetails("Nic Id: " + getNicId() );
String ip;
+NicSecondaryIp result;
String secondaryIp = null;
if ((ip = getIpaddress()) != null) {
if (!NetUtils.isValidIp(ip)) {
@@ -154,12 +156,13 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd {
}
try {
-secondaryIp =
_networkService.allocateSecondaryGuestIP(_accountService.getAccount(getEntityOwnerId()),
getZoneId(), getNicId(), getNetworkId(), getI
[46/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
Chain subFactory calls SubFactories now can call in a nested fashion to populate attributes in dependant entities. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d54820a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d54820a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d54820a Branch: refs/heads/marvin_refactor Commit: 4d54820aa9e8ba5851e946779610f77ded80849c Parents: dce00d4 Author: Prasanna Santhanam Authored: Thu Apr 25 16:58:24 2013 +0530 Committer: Prasanna Santhanam Committed: Thu Apr 25 16:58:24 2013 +0530 -- tools/marvin/marvin/base/Account.py|4 +++- tools/marvin/marvin/factory/AccountFactory.py | 13 ++--- .../marvin/marvin/factory/CloudStackBaseFactory.py |2 +- tools/marvin/marvin/factory/UserFactory.py | 14 +++--- tools/marvin/marvin/factory/test/testFactories.py |2 +- tools/marvin/marvin/factory/test/test_factories.py |2 +- 6 files changed, 23 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d54820a/tools/marvin/marvin/base/Account.py -- diff --git a/tools/marvin/marvin/base/Account.py b/tools/marvin/marvin/base/Account.py index aaf72ed..32744c9 100644 --- a/tools/marvin/marvin/base/Account.py +++ b/tools/marvin/marvin/base/Account.py @@ -14,6 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. + from marvin.base import CloudStackEntity from marvin.cloudstackAPI import enableAccount from marvin.cloudstackAPI import lockAccount @@ -24,8 +25,8 @@ from marvin.cloudstackAPI import disableAccount from marvin.cloudstackAPI import deleteAccount from marvin.cloudstackAPI import markDefaultZoneForAccount -class Account(CloudStackEntity.CloudStackEntity): +class Account(CloudStackEntity.CloudStackEntity): def __init__(self, items): self.__dict__.update(items) @@ -91,6 +92,7 @@ class Account(CloudStackEntity.CloudStackEntity): account = apiclient.deleteAccount(cmd) return account + def mark(self, apiclient, zoneid, **kwargs): cmd = markDefaultZoneForAccount.markDefaultZoneForAccountCmd() cmd.id = self.id http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d54820a/tools/marvin/marvin/factory/AccountFactory.py -- diff --git a/tools/marvin/marvin/factory/AccountFactory.py b/tools/marvin/marvin/factory/AccountFactory.py index 3c07683..db38732 100644 --- a/tools/marvin/marvin/factory/AccountFactory.py +++ b/tools/marvin/marvin/factory/AccountFactory.py @@ -20,11 +20,18 @@ from marvin.factory.CloudStackBaseFactory import CloudStackBaseFactory from marvin.base import Account from marvin.utils import random_gen -@factory.use_strategy(new_strategy=factory.BUILD_STRATEGY) class AccountFactory(CloudStackBaseFactory): FACTORY_FOR = Account.Account +accounttype = None +firstname = None +lastname = None +email = None +username = None +password = None + +class UserAccountFactory(AccountFactory): accounttype = 0 firstname = factory.Sequence(lambda n: random_gen()) lastname = factory.Sequence(lambda n: random_gen()) @@ -33,10 +40,10 @@ class AccountFactory(CloudStackBaseFactory): password = 'password' -class AdminAccountFactory(AccountFactory): +class AdminAccountFactory(UserAccountFactory): accounttype = 1 -class DomainAdminFactory(AccountFactory): +class DomainAdminFactory(UserAccountFactory): accounttype = 2 domainid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d54820a/tools/marvin/marvin/factory/CloudStackBaseFactory.py -- diff --git a/tools/marvin/marvin/factory/CloudStackBaseFactory.py b/tools/marvin/marvin/factory/CloudStackBaseFactory.py index 499dbc2..c4a7c77 100644 --- a/tools/marvin/marvin/factory/CloudStackBaseFactory.py +++ b/tools/marvin/marvin/factory/CloudStackBaseFactory.py @@ -32,7 +32,7 @@ class CloudStackBaseFactory(factory.Factory): @classmethod def _create(cls, target_class, *args, **kwargs): -if cls.apiclient: +if hasattr(cls, 'apiclient'): members = inspect.getmembers(target_class, predicate=inspect.ismethod) creators = filter(lambda x: x[0] in CREATORS, members) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d54820a/tools/marvin/marvin/factory/UserFactory.py -- diff --git a/tools/marvin/marvin/factory/UserFactory.p
[51/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
Merge branch 'master' into marvin_refactor Conflicts: tools/marvin/marvin/cloudstackConnection.py tools/marvin/marvin/cloudstackTestClient.py Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dbcfc666 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dbcfc666 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dbcfc666 Branch: refs/heads/marvin_refactor Commit: dbcfc66616e35319a89538e4963c839e3af1c8b2 Parents: de716db d61aa6d Author: Prasanna Santhanam Authored: Thu Apr 25 20:15:05 2013 +0530 Committer: Prasanna Santhanam Committed: Thu Apr 25 20:15:05 2013 +0530 -- .../com/cloud/agent/api/UnregisterVMCommand.java | 34 + api/src/com/cloud/hypervisor/HypervisorGuru.java |9 + api/src/com/cloud/network/NetworkService.java |2 +- .../region/ha/GlobalLoadBalancingRulesService.java |3 + .../org/apache/cloudstack/api/ApiConstants.java|1 + .../apache/cloudstack/api/ResponseGenerator.java |4 +- .../command/admin/storage/ListStoragePoolsCmd.java |7 + .../api/command/user/vm/AddIpToVmNicCmd.java |9 +- .../cloudstack/api/command/user/vm/ListVMsCmd.java | 10 +- .../api/command/user/volume/ListVolumesCmd.java|7 + .../api/response/GlobalLoadBalancerResponse.java | 10 + .../api/command/test/AddIpToVmNicTest.java |6 +- .../com/cloud/bridge/service/core/s3/S3Engine.java |2 +- .../WEB-INF/classes/resources/messages.properties |4 + .../classes/resources/messages_ca.properties | 306 ++ .../classes/resources/messages_de_DE.properties| 747 .../classes/resources/messages_es.properties | 861 + .../classes/resources/messages_it_IT.properties| 618 +++ .../classes/resources/messages_ja.properties | 2909 +++--- .../classes/resources/messages_ko_KR.properties| 2887 +++--- .../classes/resources/messages_nb_NO.properties| 365 ++ .../classes/resources/messages_pt_BR.properties| 2094 +-- .../classes/resources/messages_ru_RU.properties| 2892 +++ .../classes/resources/messages_zh_CN.properties| 2989 +++ docs/en-US/about-working-with-vms.xml | 85 +- docs/en-US/append-displayname-vms.xml | 84 + docs/en-US/creating-network-offerings.xml | 45 + docs/en-US/delete-event-alerts.xml | 47 + docs/en-US/elastic-ip.xml | 90 + docs/en-US/events.xml |3 +- docs/en-US/images/add-vlan-icon.png| Bin 0 -> 860 bytes docs/en-US/network-offerings.xml | 83 +- docs/en-US/networks.xml|1 + docs/en-US/non-contiguous-vlan.xml | 68 + docs/en-US/set-up-network-for-users.xml| 13 +- docs/en-US/using-netscaler-load-balancers.xml | 132 +- docs/en-US/virtual-machines.xml|1 + docs/en-US/vlan-provisioning.xml |2 + .../debian/config/etc/init.d/cloud-early-config| 14 +- .../hypervisor/kvm/resource/KVMHAMonitor.java |7 +- .../hypervisor/kvm/resource/LibvirtConnection.java | 14 +- .../kvm/storage/KVMStoragePoolManager.java | 12 +- .../src/com/cloud/hypervisor/guru/VMwareGuru.java |9 + .../hypervisor/vmware/resource/VmwareResource.java | 44 +- scripts/vm/network/security_group.py |2 +- server/src/com/cloud/api/ApiDBUtils.java |9 + server/src/com/cloud/api/ApiResponseHelper.java| 40 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 24 +- .../com/cloud/hypervisor/HypervisorGuruBase.java |5 + .../network/ExternalFirewallDeviceManagerImpl.java |2 +- .../src/com/cloud/network/NetworkServiceImpl.java | 19 +- .../com/cloud/network/guru/GuestNetworkGuru.java |2 +- server/src/com/cloud/server/Criteria.java |1 + server/src/com/cloud/vm/UserVmManagerImpl.java |2 + .../com/cloud/vm/VirtualMachineManagerImpl.java| 24 + .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 14 + .../com/cloud/network/MockNetworkManagerImpl.java |2 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java |2 +- .../resource/NfsSecondaryStorageResource.java | 22 + ui/index.jsp |7 +- ui/scripts/events.js |8 +- ui/scripts/instances.js| 38 +- ui/scripts/regions.js | 111 +- ui/scripts/storage.js | 14 +- ui/scripts/system.js | 33 +- 65 files changed, 10559 insertions(+), 7352 deletions(-) -- http://git-wip-us.apac
[36/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
remove a debug log in vmwareResource
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c1d2680
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c1d2680
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c1d2680
Branch: refs/heads/marvin_refactor
Commit: 0c1d2680a547c0b4352a76441ddec75a989fe30a
Parents: 79cc241
Author: Mice Xia
Authored: Thu Apr 25 14:24:30 2013 +0800
Committer: Mice Xia
Committed: Thu Apr 25 14:25:03 2013 +0800
--
.../hypervisor/vmware/resource/VmwareResource.java |4
1 files changed, 0 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c1d2680/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index dbcb318..99ad1ca 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2856,10 +2856,6 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
vmMo.setCustomFieldValue(CustomFieldConstants.CLOUD_NIC_MASK, "0");
if (getVmState(vmMo) != State.Stopped) {
-
-// before we stop VM, remove all possible snapshots on
the VM to let
-// disk chain be collapsed
-s_logger.info("Remove all snapshot before stopping VM
" + cmd.getVmName());
if (vmMo.safePowerOff(_shutdown_waitMs)) {
state = State.Stopped;
return new StopAnswer(cmd, "Stop VM " +
cmd.getVmName() + " Succeed", 0, true);
[42/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
add lang key for Catalan, German, Italian, Norwegian. (from 4.1 branch) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e2ffe72 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e2ffe72 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e2ffe72 Branch: refs/heads/marvin_refactor Commit: 0e2ffe72aa641f4551cae63fbc36454c5934342f Parents: d5c3f87 Author: Milamber Authored: Thu Apr 25 10:01:29 2013 + Committer: Milamber Committed: Thu Apr 25 10:01:29 2013 + -- .../WEB-INF/classes/resources/messages.properties |4 1 files changed, 4 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e2ffe72/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 fbc0471..0e051f1 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -624,11 +624,15 @@ label.key=Key label.kvm.traffic.label=KVM traffic label label.label=Label label.lang.brportugese=Brazilian Portugese +label.lang.catalan=Catalan label.lang.chinese=Chinese (Simplified) label.lang.english=English label.lang.french=French +label.lang.german=German +label.lang.italian=Italian label.lang.japanese=Japanese label.lang.korean=Korean +label.lang.norwegian=Norwegian label.lang.russian=Russian label.lang.spanish=Spanish label.last.disconnected=Last Disconnected
[40/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-1573 listNics response update for not showing vlan to normal user
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f97b528
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f97b528
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f97b528
Branch: refs/heads/marvin_refactor
Commit: 1f97b528c5fb73e8165b63ad5098e7191914aa59
Parents: 08f6a24
Author: Jayapal
Authored: Thu Apr 25 12:35:04 2013 +0530
Committer: Murali Reddy
Committed: Thu Apr 25 14:48:41 2013 +0530
--
server/src/com/cloud/api/ApiResponseHelper.java | 14 +-
1 files changed, 5 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f97b528/server/src/com/cloud/api/ApiResponseHelper.java
--
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java
b/server/src/com/cloud/api/ApiResponseHelper.java
index 894ec8d..c181495 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3659,7 +3659,10 @@ public class ApiResponseHelper implements
ResponseGenerator {
public NicResponse createNicResponse(Nic result) {
NicResponse response = new NicResponse();
+NetworkVO network = _entityMgr.findById(NetworkVO.class,
result.getNetworkId());
+
response.setId(result.getUuid());
+response.setNetworkid(network.getUuid());
response.setIpaddress(result.getIp4Address());
if (result.getSecondaryIp()) {
@@ -3677,18 +3680,11 @@ public class ApiResponseHelper implements
ResponseGenerator {
}
response.setGateway(result.getGateway());
-response.setId(result.getUuid());
-response.setGateway(result.getGateway());
response.setNetmask(result.getNetmask());
response.setMacAddress(result.getMacAddress());
-if (result.getBroadcastUri() != null) {
-response.setBroadcastUri(result.getBroadcastUri().toString());
-}
-if (result.getIsolationUri() != null) {
-response.setIsolationUri(result.getIsolationUri().toString());
-}
+
if (result.getIp6Address() != null) {
-response.setId(result.getIp6Address());
+response.setIp6Address(result.getIp6Address());
}
response.setIsDefault(result.isDefaultNic());
[44/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
cloudConnection is now CloudConnection Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a2318d2f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a2318d2f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a2318d2f Branch: refs/heads/marvin_refactor Commit: a2318d2f80d7a6f84b95161f16236769b20b0a68 Parents: c133636 Author: Prasanna Santhanam Authored: Thu Apr 25 16:56:29 2013 +0530 Committer: Prasanna Santhanam Committed: Thu Apr 25 16:56:29 2013 +0530 -- tools/marvin/marvin/cloudstackConnection.py |2 +- tools/marvin/marvin/cloudstackTestClient.py |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a2318d2f/tools/marvin/marvin/cloudstackConnection.py -- diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py index 5266c75..553a165 100644 --- a/tools/marvin/marvin/cloudstackConnection.py +++ b/tools/marvin/marvin/cloudstackConnection.py @@ -60,7 +60,7 @@ class CloudConnection(object): % (self.protocol, self.mgtSvr, self.port, self.path) def __copy__(self): -return cloudConnection(self.mgtSvr, self.port, self.user, self.passwd, +return CloudConnection(self.mgtSvr, self.port, self.user, self.passwd, self.apiKey, self.securityKey, self.asyncTimeout, self.logging, self.protocol, self.path) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a2318d2f/tools/marvin/marvin/cloudstackTestClient.py -- diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py index d85a61c..e448aba 100644 --- a/tools/marvin/marvin/cloudstackTestClient.py +++ b/tools/marvin/marvin/cloudstackTestClient.py @@ -28,7 +28,7 @@ class cloudstackTestClient(object): apiKey=None, securityKey=None, asyncTimeout=3600, defaultWorkerThreads=10, logging=None): self.connection = \ -cloudstackConnection.cloudConnection( +cloudstackConnection.CloudConnection( mgtSvr, port, user, passwd, apiKey, securityKey, asyncTimeout, logging)
[43/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
adding doc strings to jsonHelper
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c133636e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c133636e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c133636e
Branch: refs/heads/marvin_refactor
Commit: c133636e68f4c482970cb6e13435fc2ace7245cc
Parents: 5cea601
Author: Prasanna Santhanam
Authored: Thu Apr 25 16:55:48 2013 +0530
Committer: Prasanna Santhanam
Committed: Thu Apr 25 16:55:48 2013 +0530
--
tools/marvin/marvin/asyncJobMgr.py |2 +-
tools/marvin/marvin/jsonHelper.py | 94 +-
2 files changed, 54 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c133636e/tools/marvin/marvin/asyncJobMgr.py
--
diff --git a/tools/marvin/marvin/asyncJobMgr.py
b/tools/marvin/marvin/asyncJobMgr.py
index 6984627..f131acb 100644
--- a/tools/marvin/marvin/asyncJobMgr.py
+++ b/tools/marvin/marvin/asyncJobMgr.py
@@ -93,7 +93,7 @@ class workThread(threading.Thread):
jobstatus.jobId = jobId
try:
responseName = cmd.__class__.__name__.replace("Cmd",
"Response")
-jobstatus.responsecls =
jsonHelper.getclassFromName(cmd, responseName)
+jobstatus.responsecls = jsonHelper.getClass(cmd,
responseName)
except:
pass
jobstatus.status = True
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c133636e/tools/marvin/marvin/jsonHelper.py
--
diff --git a/tools/marvin/marvin/jsonHelper.py
b/tools/marvin/marvin/jsonHelper.py
index 8316ddb..fd6bd74 100644
--- a/tools/marvin/marvin/jsonHelper.py
+++ b/tools/marvin/marvin/jsonHelper.py
@@ -22,6 +22,7 @@ from cloudstackAPI import *
class jsonLoader:
'''The recursive class for building and representing objects with.'''
+
def __init__(self, obj):
for k in obj:
v = obj[k]
@@ -33,18 +34,21 @@ class jsonLoader:
else:
setattr(self, k, v)
else:
-setattr(self,k,v)
+setattr(self, k, v)
+
def __getattr__(self, val):
if val in self.__dict__:
return self.__dict__[val]
else:
return None
+
def __repr__(self):
return '{%s}' % str(', '.join('%s : %s' % (k, repr(v)) for (k, v) in
self.__dict__.iteritems()))
+
def __str__(self):
return '{%s}' % str(', '.join('%s : %s' % (k, repr(v)) for (k, v) in
self.__dict__.iteritems()))
-
-
+
+
class jsonDump:
@staticmethod
def __serialize(obj):
@@ -59,7 +63,7 @@ class jsonDump:
if (isinstance(obj[key], list) and len(obj[key]) == 0):
continue
newobj[key] = jsonDump.__serialize(obj[key])
-
+
return newobj
elif isinstance(obj, list):
return [jsonDump.__serialize(item) for item in obj]
@@ -69,24 +73,31 @@ class jsonDump:
return jsonDump.__serialize(obj.__dict__)
else:
return repr(obj) # Don't know how to handle, convert to string
-
+
@staticmethod
def dump(obj):
return jsonDump.__serialize(obj)
-def getclassFromName(cmd, name):
-module = inspect.getmodule(cmd)
+
+def getClass(module, name):
+"""Get the CloudStack command class in a module given the name
+@param module: cloudstack API module eg: createVolume
+@param name: string name of the class within the module eg:
createVolumeResponse
+@return: response class
+"""
+module = inspect.getmodule(module)
return getattr(module, name)()
+
def finalizeResultObj(result, responseName, responsecls):
if responsecls is None and responseName.endswith("response") and
responseName != "queryasyncjobresultresponse":
'''infer the response class from the name'''
moduleName = responseName.replace("response", "")
try:
-responsecls = getclassFromName(moduleName, responseName)
+responsecls = getClass(moduleName, responseName)
except:
pass
-
+
if responseName is not None and responseName ==
"queryasyncjobresultresponse" and responsecls is not None and result.jobresult
is not None:
result.jobresult = finalizeResultObj(result.jobresult, None,
responsecls)
return result
@@ -96,32 +107,33 @@ def finalizeResultObj(result, responseName, responsecls):
if not isinstance(value, jsonLoader):
return result
-mirrorObj =
[38/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76e40ba5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76e40ba5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76e40ba5 Branch: refs/heads/marvin_refactor Commit: 76e40ba5add5fe23c660b747746945fce1440db7 Parents: c8bfbfd 0c1d268 Author: Pranav Saxena Authored: Thu Apr 25 12:34:10 2013 +0530 Committer: Pranav Saxena Committed: Thu Apr 25 12:34:10 2013 +0530 -- .../com/cloud/agent/api/UnregisterVMCommand.java | 34 + api/src/com/cloud/hypervisor/HypervisorGuru.java |9 + .../region/ha/GlobalLoadBalancingRulesService.java |3 + .../org/apache/cloudstack/api/ApiConstants.java|1 + .../command/admin/storage/ListStoragePoolsCmd.java |7 + .../cloudstack/api/command/user/vm/ListVMsCmd.java | 10 +- .../api/command/user/volume/ListVolumesCmd.java|7 + .../api/response/GlobalLoadBalancerResponse.java | 10 + .../classes/resources/messages_ca.properties | 306 ++ .../classes/resources/messages_de_DE.properties| 747 .../classes/resources/messages_es.properties | 861 + .../classes/resources/messages_it_IT.properties| 618 +++ .../classes/resources/messages_ja.properties | 2909 +++ .../classes/resources/messages_ko_KR.properties| 2887 +++ .../classes/resources/messages_nb_NO.properties| 365 ++ .../classes/resources/messages_pt_BR.properties| 2094 +-- .../classes/resources/messages_ru_RU.properties| 2892 +++ docs/en-US/about-working-with-vms.xml | 85 +- docs/en-US/append-displayname-vms.xml | 84 + docs/en-US/creating-network-offerings.xml | 45 + docs/en-US/delete-event-alerts.xml | 47 + docs/en-US/elastic-ip.xml | 90 + docs/en-US/events.xml |3 +- docs/en-US/images/add-vlan-icon.png| Bin 0 -> 860 bytes docs/en-US/network-offerings.xml | 83 +- docs/en-US/networks.xml|1 + docs/en-US/non-contiguous-vlan.xml | 68 + docs/en-US/set-up-network-for-users.xml| 13 +- docs/en-US/using-netscaler-load-balancers.xml | 132 +- docs/en-US/virtual-machines.xml|1 + docs/en-US/vlan-provisioning.xml |2 + .../debian/config/etc/init.d/cloud-early-config|2 +- .../hypervisor/kvm/resource/KVMHAMonitor.java |7 +- .../hypervisor/kvm/resource/LibvirtConnection.java | 14 +- .../kvm/storage/KVMStoragePoolManager.java | 12 +- .../src/com/cloud/hypervisor/guru/VMwareGuru.java |9 + .../hypervisor/vmware/resource/VmwareResource.java | 44 +- scripts/vm/network/security_group.py |2 +- server/src/com/cloud/api/ApiDBUtils.java |9 + server/src/com/cloud/api/ApiResponseHelper.java|8 + .../src/com/cloud/api/query/QueryManagerImpl.java | 24 +- .../com/cloud/hypervisor/HypervisorGuruBase.java |5 + server/src/com/cloud/server/Criteria.java |1 + server/src/com/cloud/vm/UserVmManagerImpl.java |1 + .../com/cloud/vm/VirtualMachineManagerImpl.java| 24 + .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 14 + .../resource/NfsSecondaryStorageResource.java | 22 + ui/index.jsp |7 +- ui/scripts/instances.js| 38 +- ui/scripts/regions.js | 111 +- ui/scripts/storage.js | 12 +- ui/scripts/system.js | 33 +- 52 files changed, 9010 insertions(+), 5803 deletions(-) --
[49/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
improve the entity auto-generator with error checks
Signed-off-by: Prasanna Santhanam
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de716db7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de716db7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de716db7
Branch: refs/heads/marvin_refactor
Commit: de716db7ef96db7fab620289841ed7ec38fe8b5f
Parents: 4d54820
Author: Prasanna Santhanam
Authored: Thu Apr 25 20:12:34 2013 +0530
Committer: Prasanna Santhanam
Committed: Thu Apr 25 20:12:34 2013 +0530
--
tools/marvin/marvin/codegenerator.py |2 +-
tools/marvin/marvin/cs_entity_generator.py | 28 +++---
2 files changed, 20 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de716db7/tools/marvin/marvin/codegenerator.py
--
diff --git a/tools/marvin/marvin/codegenerator.py
b/tools/marvin/marvin/codegenerator.py
index 36ba180..0783af9 100644
--- a/tools/marvin/marvin/codegenerator.py
+++ b/tools/marvin/marvin/codegenerator.py
@@ -338,7 +338,7 @@ class codeGenerator:
assert paramProperty.name
if param.has_key('required'):
-paramProperty.required = param['required']
+paramProperty.required = str(param['required']).lower()
if param.has_key('description'):
paramProperty.desc = param['description']
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de716db7/tools/marvin/marvin/cs_entity_generator.py
--
diff --git a/tools/marvin/marvin/cs_entity_generator.py
b/tools/marvin/marvin/cs_entity_generator.py
index c4592ad..f0c5fb8 100644
--- a/tools/marvin/marvin/cs_entity_generator.py
+++ b/tools/marvin/marvin/cs_entity_generator.py
@@ -80,7 +80,7 @@ def singularize(word, num=0):
@return: singular of `word`
"""
inflector = inflect.engine()
-return inflector.singular_noun(word, num)
+return inflector.singular_noun(word)
def transform_entity(entity):
@@ -102,16 +102,17 @@ def skip_list():
return ['ldapConfigCmd', 'ldapRemoveCmd']
-def get_verb_and_entity(api):
+def get_verb_and_entity(cmd):
"""Break down the API cmd instance in to `verb` and `Entity`
@return: verb, Entity tuple
"""
+api = cmd.__class__.__name__
matching_verbs = filter(lambda v: api.startswith(v), grammar)
if len(matching_verbs) > 0:
verb = matching_verbs[0]
entity = api.replace(verb, '').replace('Cmd', '')
entity = transform_entity(entity)
-return verb, singularize(entity)
+return verb, singularize(entity) if singularize(entity) else entity
else:
print "No matching verb, entity breakdown for api %s" % api
@@ -122,7 +123,8 @@ def get_actionable_entities():
along with the required arguments to satisfy the action
@return: Dictionary of Entity { "verb" : [required] }
"""
-cmdlets = sorted(get_api_cmds(), key=lambda k:
get_verb_and_entity(k.__class__.__name__))
+cmdlets = sorted(filter(lambda api: api.__class__.__name__ not in
skip_list(), get_api_cmds()),
+key=lambda k: get_verb_and_entity(k)[1])
entities = {}
for cmd in cmdlets:
requireds = getattr(cmd, 'required')
@@ -130,7 +132,7 @@ def get_actionable_entities():
api = cmd.__class__.__name__
if api in skip_list():
continue
-verb, entity = get_verb_and_entity(api)
+verb, entity = get_verb_and_entity(cmd)
if entity not in entities:
entities[entity] = {}
entities[entity][verb] = {}
@@ -184,14 +186,17 @@ def write_entity_classes(entities, module=None):
else:
body.append(tabspace * 2 + 'return %s if %s else None' %
(entity.lower(), entity.lower()))
else:
-body.append(tabspace + 'def %s(cls, apiclient, %s,
factory=None, **kwargs):' % (
-action, ', '.join(map(lambda arg: arg + '=None',
list(set(details['args'], entity))
+if len(details['args']) > 0:
+body.append(tabspace + 'def %s(cls, apiclient, %s,
factory=None, **kwargs):' % (
+action, ', '.join(map(lambda arg: arg + '=None',
list(set(details['args']))
+else:
+body.append(tabspace + 'def %s(cls, apiclient,
factory=None, **kwargs):' % action)
#TODO: Add docs for actions
body.append(tabspace * 2 + 'cmd = %(module)s.%(command)s()' %
{"module": details["apimodule"],
[45/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
changes to the entity_generator
adding support for capturing plurals
adding filtering for non-conforming entities
adding more error checking in entity.action {return}
Signed-off-by: Prasanna Santhanam
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dce00d43
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dce00d43
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dce00d43
Branch: refs/heads/marvin_refactor
Commit: dce00d43e1c1cc59a5e6478887ab12ff769f9c1e
Parents: a2318d2
Author: Prasanna Santhanam
Authored: Thu Apr 25 16:57:17 2013 +0530
Committer: Prasanna Santhanam
Committed: Thu Apr 25 16:57:17 2013 +0530
--
tools/marvin/marvin/cs_entity_generator.py | 213 ++-
tools/marvin/marvin/generateBase.py| 202 -
2 files changed, 132 insertions(+), 283 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dce00d43/tools/marvin/marvin/cs_entity_generator.py
--
diff --git a/tools/marvin/marvin/cs_entity_generator.py
b/tools/marvin/marvin/cs_entity_generator.py
index f6d94c0..c4592ad 100644
--- a/tools/marvin/marvin/cs_entity_generator.py
+++ b/tools/marvin/marvin/cs_entity_generator.py
@@ -15,20 +15,21 @@
# specific language governing permissions and limitations
# under the License.
-import marvin
from marvin.cloudstackAPI import *
import os
+import inflect
-# Add verbs in grammar - same as cloudmonkey
+# Grammar for CloudStack APIs
grammar = ['create', 'list', 'delete', 'update',
'enable', 'activate', 'disable', 'add', 'remove',
- 'attach', 'detach', 'associate', 'generate', 'ldap',
- 'assign', 'authorize', 'change', 'register', 'configure',
+ 'attach', 'detach', 'associate', 'generate', 'assign',
+ 'authorize', 'change', 'register', 'configure',
'start', 'restart', 'reboot', 'stop', 'reconnect',
'cancel', 'destroy', 'revoke', 'mark', 'reset',
'copy', 'extract', 'migrate', 'restore', 'suspend',
'get', 'query', 'prepare', 'deploy', 'upload', 'lock',
- 'disassociate', 'scale']
+ 'disassociate', 'scale', 'dedicate', 'archive', 'find',
+ 'recover', 'release', 'resize', 'revert']
LICENSE = """# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -48,105 +49,155 @@ LICENSE = """# Licensed to the Apache Software Foundation
(ASF) under one
# under the License.
"""
-
def get_api_cmds():
+"""@return: instances of all the API commands exposed by CloudStack
+"""
api_classes = __import__('marvin.cloudstackAPI')
-
cmdlist = map(
-lambda f: getattr(api_classes.cloudstackAPI, f),
-filter(
-lambda t: t.startswith('__') == False,
-dir(api_classes.cloudstackAPI)
-)
+lambda f: getattr(api_classes.cloudstackAPI, f),
+filter(
+lambda t: t.startswith('__') == False,
+dir(api_classes.cloudstackAPI)
+)
)
-
cmdlist = filter(
-lambda g: g is not None,
-cmdlist
+lambda g: g is not None,
+cmdlist
)
-
clslist = map(
-lambda g: getattr(g, g.__name__.split('.')[-1] + 'Cmd'),
-filter(
-lambda h: h.__name__.split('.')[-1] not in ['baseCmd',
'baseResponse', 'cloudstackAPIClient'],
-cmdlist
-)
+lambda g: getattr(g, g.__name__.split('.')[-1] + 'Cmd'),
+filter(
+lambda h: h.__name__.split('.')[-1] not in ['baseCmd',
'baseResponse', 'cloudstackAPIClient'],
+cmdlist
+)
)
-
cmdlets = map(lambda t: t(), clslist)
return cmdlets
-def get_entity_from_api(api):
-matching_verbs = filter(lambda v: api.__class__.__name__.startswith(v),
grammar)
+
+def singularize(word, num=0):
+"""Use the inflect engine to make singular nouns of the entities
+@return: singular of `word`
+"""
+inflector = inflect.engine()
+return inflector.singular_noun(word, num)
+
+
+def transform_entity(entity):
+if entity == 'DefaultZoneForAccount':
+#markDefaultZoneForAccount -> Zone
+return 'Zone'
+elif entity in ['ToGlobalLoadBalancerRule', 'FromGlobalLoadBalancerRule']:
+return 'GlobalLoadBalancerRule'
+elif entity in ['AccountToProject', 'AccountFromProject']:
+return 'Project'
+elif entity in ['ToSnapshot']:
+return 'Snapshot'
+return entity
+
+
+def skip_list():
+"""Entities and APIs that we will not auto-gene
[47/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
Fix a issue with the russian Web UI (one key with a '\n' as value) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cfc0633e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cfc0633e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cfc0633e Branch: refs/heads/marvin_refactor Commit: cfc0633ec7fcf8ded42c0652b541cd493a9168db Parents: 0e2ffe7 Author: Milamber Authored: Thu Apr 25 12:27:21 2013 + Committer: Milamber Committed: Thu Apr 25 12:27:21 2013 + -- .../classes/resources/messages_ru_RU.properties|2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cfc0633e/client/WEB-INF/classes/resources/messages_ru_RU.properties -- diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties b/client/WEB-INF/classes/resources/messages_ru_RU.properties index b0ffe40..b28f6b6 100644 --- a/client/WEB-INF/classes/resources/messages_ru_RU.properties +++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties @@ -1052,7 +1052,7 @@ message.acquire.public.ip=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442 message.action.cancel.maintenance.mode=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f. message.action.cancel.maintenance=\u0423\u0437\u0435\u043b \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0432\u044b\u0448\u0435\u043b \u0438\u0437 \u0440\u0435\u0436\u0438\u043c\u0430 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f. \u042d\u0442\u043b\u044c \u043f\u0440\u043e\u0446\u0435\u0441\u0441 \u043c\u043e\u0436\u0435\u0442 \u0434\u043b\u0438\u0442\u044c\u0441\u044f \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043c\u0438\u043d\u0443\u0442. message.action.change.service.warning.for.instance=\u0414\u043b\u044f \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0442\u0435\u043a\u0443\u0449\u0435\u0433\u043e \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u043e\u0433\u043e \u0440\u0435\u0441\u0443\u0440\u0441\u0430 \u0432\u0430\u0448\u0430 \u043c\u0430\u0448\u0438\u043d\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430. -message.action.change.service.warning.for.router=\n +message.action.change.service.warning.for.router=\u0414\u043b\u044f \u0440\u043e\u0443\u0442\u0435\u0440 \u0442\u0435\u043a\u0443\u0449\u0435\u0433\u043e \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u043e\u0433\u043e \u0440\u0435\u0441\u0443\u0440\u0441\u0430 \u0432\u0430\u0448\u0430 \u043c\u0430\u0448\u0438\u043d\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430. message.action.delete.cluster=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u043a\u043b\u0430\u0441\u0442\u0435\u0440. message.action.delete.disk.offering=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0434\u0438\u0441\u043a\u043e\u0432\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441. message.action.delete.domain=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0434\u043e\u043c\u0435\u043d.
[48/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-2186:migrateVolume API gets undefined storageid
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6bc0b70f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6bc0b70f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6bc0b70f
Branch: refs/heads/marvin_refactor
Commit: 6bc0b70f38db07e80fd6af4f4b75c17c871b7cd9
Parents: cfc0633
Author: Pranav Saxena
Authored: Thu Apr 25 19:40:44 2013 +0530
Committer: Pranav Saxena
Committed: Thu Apr 25 19:40:44 2013 +0530
--
ui/scripts/storage.js |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bc0b70f/ui/scripts/storage.js
--
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index cf40769..9b66083 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1056,7 +1056,7 @@
},
action: function(args) {
$.ajax({
-url: createURL("migrateVolume&storageid=" +
args.data.storagePool + "&volumeid=" + args.context.volumes[0].id),
+url: createURL("migrateVolume&storageid=" +
args.data.storageId + "&volumeid=" + args.context.volumes[0].id),
dataType: "json",
async: true,
success: function(json) {
[34/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
CLOUDSTACK-1567 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96837eda Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96837eda Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96837eda Branch: refs/heads/marvin_refactor Commit: 96837eda0f869859058f977b7e8b9e8918b597ce Parents: 33006ff Author: Radhika PC Authored: Thu Apr 25 11:16:44 2013 +0530 Committer: Radhika PC Committed: Thu Apr 25 11:18:00 2013 +0530 -- docs/en-US/delete-event-alerts.xml | 47 +++ docs/en-US/events.xml |3 +- 2 files changed, 48 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96837eda/docs/en-US/delete-event-alerts.xml -- diff --git a/docs/en-US/delete-event-alerts.xml b/docs/en-US/delete-event-alerts.xml new file mode 100644 index 000..3eebcb7 --- /dev/null +++ b/docs/en-US/delete-event-alerts.xml @@ -0,0 +1,47 @@ + +http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + +%BOOK_ENTITIES; +]> + + + + Deleting and Archiving Events and Alerts + &PRODUCT; provides you the ability to delete or archive the existing alerts and events that +you no longer want to implement. You can regularly delete or archive any alerts or events that +you cannot, or do not want to resolve from the database. + You can delete or archive individual alerts or events either directly by using the Quickview +or by using the Details page. If you want to delete multiple alerts or events at the same time, +you can use the respective context menu. You can delete alerts or events by category for a time +period. + +Archived alerts or events cannot be viewed in the UI, or by using the API. They are + maintained in the database for auditing or compliance purposes. + + +Permissions +Consider the following: + + + + The root admin can delete or archive one or multiple alerts or events. + + + The domain admin or end user can delete or archive one or multiple events. + + + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96837eda/docs/en-US/events.xml -- diff --git a/docs/en-US/events.xml b/docs/en-US/events.xml index 49ef86e..4a14458 100644 --- a/docs/en-US/events.xml +++ b/docs/en-US/events.xml @@ -11,9 +11,7 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -34,4 +32,5 @@ http://www.w3.org/2001/XInclude"/> http://www.w3.org/2001/XInclude"/> http://www.w3.org/2001/XInclude"/> + http://www.w3.org/2001/XInclude"/>
[39/51] [abbrv] git commit: updated refs/heads/marvin_refactor to dbcfc66
Update the chinese (zh_CN) resource file for Web UI. 100% translate. Thanks to Gavin Lee. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08f6a24d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08f6a24d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08f6a24d Branch: refs/heads/marvin_refactor Commit: 08f6a24d193fbcd5c85b9aa25871c023b3da5682 Parents: 76e40ba Author: Milamber Authored: Thu Apr 25 08:42:28 2013 + Committer: Milamber Committed: Thu Apr 25 08:42:28 2013 + -- .../classes/resources/messages_zh_CN.properties| 33 +++ 1 files changed, 33 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08f6a24d/client/WEB-INF/classes/resources/messages_zh_CN.properties -- diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index 1f22105..f62439d 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -229,6 +229,9 @@ label.action.update.OS.preference.processing=\u6b63\u5728\u66f4\u65b0\u64cd\u4f5 label.action.update.OS.preference=\u66f4\u65b0\u64cd\u4f5c\u7cfb\u7edf\u9996\u9009\u9879 label.action.update.resource.count.processing=\u6b63\u5728\u66f4\u65b0\u8d44\u6e90\u6570\u91cf... label.action.update.resource.count=\u66f4\u65b0\u8d44\u6e90\u6570\u91cf +label.action.vmsnapshot.create=\u6293\u53d6\u865a\u673a\u5feb\u7167 +label.action.vmsnapshot.delete=\u5220\u9664\u865a\u673a\u5feb\u7167 +label.action.vmsnapshot.revert=\u6062\u590d\u5230\u865a\u673a\u5feb\u7167 label.activate.project=\u6fc0\u6d3b\u9879\u76ee label.active.sessions=\u6d3b\u52a8\u4f1a\u8bdd label.add.accounts.to=\u6dfb\u52a0\u5e10\u6237\u81f3 @@ -236,6 +239,7 @@ label.add.accounts=\u6dfb\u52a0\u5e10\u6237 label.add.account.to.project=\u5411\u9879\u76ee\u4e2d\u6dfb\u52a0\u5e10\u6237 label.add.account=\u6dfb\u52a0\u5e10\u6237 label.add.ACL=\u6dfb\u52a0 ACL +label.add.BigSwitchVns.device=\u6dfb\u52a0BigSwitch Vns\u63a7\u5236\u5668 label.add.by.cidr=\u6309 CIDR \u6dfb\u52a0 label.add.by.group=\u6309\u7ec4\u6dfb\u52a0 label.add.by=\u6dfb\u52a0\u65b9\u5f0f @@ -277,6 +281,7 @@ label.add.physical.network=\u6dfb\u52a0\u7269\u7406\u7f51\u7edc label.add.pod=\u6dfb\u52a0\u63d0\u4f9b\u70b9 label.add.port.forwarding.rule=\u6dfb\u52a0\u7aef\u53e3\u8f6c\u53d1\u89c4\u5219 label.add.primary.storage=\u6dfb\u52a0\u4e3b\u5b58\u50a8 +label.add.region=\u6dfb\u52a0\u533a\u57df label.add.resources=\u6dfb\u52a0\u8d44\u6e90 label.add.route=\u6dfb\u52a0\u8def\u7531 label.add.rule=\u6dfb\u52a0\u89c4\u5219 @@ -321,6 +326,8 @@ label.assign=\u5206\u914d label.associated.network.id=\u5df2\u5173\u8054\u7f51\u7edc ID label.associated.network=\u5173\u8054\u7f51\u7edc label.attached.iso=\u5df2\u9644\u52a0 ISO +label.author.email=\u4f5c\u8005\u90ae\u7bb1 +label.author.name=\u4f5c\u8005\u59d3\u540d label.availability=\u53ef\u7528\u6027 label.availability.zone=\u53ef\u7528\u533a\u57df label.available.public.ips=\u53ef\u7528\u516c\u7528 IP \u5730\u5740 @@ -329,6 +336,7 @@ label.back=\u8fd4\u56de label.bandwidth=\u5e26\u5bbd label.basic.mode=\u57fa\u672c\u6a21\u5f0f label.basic=\u57fa\u672c +label.bigswitch.controller.address=BigSwitch Vns \u63a7\u5236\u5668\u5730\u5740 label.bootable=\u53ef\u542f\u52a8 label.broadcast.domain.range=\u5e7f\u64ad\u57df\u8303\u56f4 label.broadcast.domain.type=\u5e7f\u64ad\u57df\u7c7b\u578b @@ -392,6 +400,7 @@ label.cpu.allocated.for.VMs=\u5df2\u5206\u914d\u7ed9 VM \u7684 CPU label.cpu.allocated=\u5df2\u5206\u914d\u7684 CPU label.CPU.cap=CPU \u4e0a\u9650 label.cpu=CPU +label.cpu.limits=CPU\u9650\u5236 label.cpu.mhz=CPU (MHz) label.cpu.utilized=CPU \u5229\u7528\u7387 label.created.by.system=\u7531\u7cfb\u7edf\u521b\u5efa @@ -412,6 +421,7 @@ label.dedicated=\u4e13\u7528 label.default=\u9ed8\u8ba4\u503c label.default.use=\u9ed8\u8ba4\u4f7f\u7528 label.default.view=\u9ed8\u8ba4\u89c6\u56fe +label.delete.BigSwitchVns=\u79fb\u9664BigSwitch Vns\u63a7\u5236\u5668 label.delete.F5=\u5220\u9664 F5 label.delete.gateway=\u5220\u9664\u7f51\u5173 label.delete.NetScaler=\u5220\u9664 NetScaler @@ -497,6 +507,7 @@ label.ESP.lifetime=ESP \u4f7f\u7528\u671f\u9650(\u7b2c\u4e8c\u9636\u6bb5) label.ESP.policy=ESP \u7b56\u7565 label.esx.host=ESX/ESXi \u4e3b\u673a label.example=\u793a\u4f8b +label.external.link=\u5916\u90e8\u94fe\u63a5 label.f5=F5 label.failed=\u5931\u8d25 label.featured=\u7cbe\u9009 @@ -644,10 +655,14 @@ label.management.ips=\u7ba1\u7406\u7c7b IP \u5730\u5740 label.management=\u7ba1\u7406 label.manage.resources=\u7ba1\u7406\u8d44\u6e90 label.manage=\u6258\u7ba1 +label.max.c
git commit: updated refs/heads/master to 099677a
Updated Branches:
refs/heads/master 6bc0b70f3 -> 099677a12
CLOUDSTACK-2172: adding database upgrade to 4.1.0 in
PremiumDatabaseUpgradeChecker
Add migration to 4.1.0 in the PremiumDatabaseUpgradeChecker, like in the
DatabaseUpgradeChecker.
I opened the ticket CS 2172, and this fix corrects the issue.
Regards.
Signed-off-by: Chip Childers
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/099677a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/099677a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/099677a1
Branch: refs/heads/master
Commit: 099677a1244cd55fb98d3c40ee7881223dd9ac7c
Parents: 6bc0b70
Author: Nicolas Lamirault
Authored: Thu Apr 25 15:14:34 2013 +0100
Committer: Chip Childers
Committed: Thu Apr 25 15:20:26 2013 +0100
--
.../upgrade/PremiumDatabaseUpgradeChecker.java | 75 ---
1 files changed, 42 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/099677a1/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
--
diff --git a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
index 14a8143..bad3253 100755
--- a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
+++ b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
@@ -40,6 +40,7 @@ import com.cloud.upgrade.dao.Upgrade229to2210;
import com.cloud.upgrade.dao.Upgrade301to302;
import com.cloud.upgrade.dao.Upgrade302to40;
import com.cloud.upgrade.dao.Upgrade30to301;
+import com.cloud.upgrade.dao.Upgrade40to41;
import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
import com.cloud.upgrade.dao.VersionDaoImpl;
@@ -53,87 +54,95 @@ public class PremiumDatabaseUpgradeChecker extends
DatabaseUpgradeChecker {
new Upgrade221to222Premium(), new UpgradeSnapshot217to224(),
new Upgrade222to224Premium(),
new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228Premium(), new Upgrade228to229(),
new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212Premium(),
-new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30(), new Upgrade30to301(),
-new Upgrade301to302(), new Upgrade302to40() });
+new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30(), new Upgrade30to301(),
+new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41() });
_upgradeMap.put("2.1.8", new DbUpgrade[] { new
Upgrade218to22Premium(), new Upgrade221to222Premium(),
new UpgradeSnapshot217to224(), new Upgrade222to224Premium(),
new Upgrade218to224DomainVlans(),
new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228Premium(), new Upgrade228to229(),
-new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212Premium(), new Upgrade2212to2213()
-, new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
-new Upgrade302to40() });
+new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212Premium(), new Upgrade2212to2213(),
+new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
+new Upgrade302to40(), new Upgrade40to41() });
_upgradeMap.put("2.1.9", new DbUpgrade[] { new
Upgrade218to22Premium(), new Upgrade221to222Premium(),
new UpgradeSnapshot217to224(), new Upgrade222to224Premium(),
new Upgrade218to224DomainVlans(),
new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228Premium(), new Upgrade228to229(),
new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212Premium(), new Upgrade2212to2213(),
-new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
-new Upgrade302to40() });
+new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(), new Upgrade301to302(),
+new Upgrade302to40(), new Upgrade40to41() });
_upgradeMap.put("2.2.1", new DbUpgrade[] { new
Upgrade221to222Premium(), new Upgrade222to224Premium(),
new UpgradeSnapshot223to224(), new Upgrade224to225(), new
Upgrade225to226(), new Upgrade227to228Premium(),
new Upgrade228to229(), new Upgrade229to2210(), new
Upgrade2210to2211(), new Upgrade2211to2212Premium(),
-new Upgrade2212to2213(), new Upgrade2213to2214(), new
U
git commit: updated refs/heads/master to ee02311
Updated Branches:
refs/heads/master 099677a12 -> ee02311fa
CLOUDSTACK-2120: mixed zone management - (1) extend listHosts API to to take in
zonetype. (2) UI: populate Hosts/SecondaryStorages list page with ones whose
zonetype matches selected option in zone type dropdown on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ee02311f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ee02311f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ee02311f
Branch: refs/heads/master
Commit: ee02311fae2b8991ed1dc13e58d8dbe627262a8d
Parents: 099677a
Author: Jessica Wang
Authored: Thu Apr 25 09:51:40 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 25 09:51:57 2013 -0700
--
.../api/command/admin/host/ListHostsCmd.java |7
.../src/com/cloud/api/query/QueryManagerImpl.java |5 +++
ui/scripts/system.js | 27 +-
3 files changed, 37 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee02311f/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
index 5ec7cf3..69c6980 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
@@ -75,6 +75,9 @@ public class ListHostsCmd extends BaseListCmd {
description="the Zone ID for the host")
private Long zoneId;
+@Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING,
description="the network type of the zone that the virtual machine belongs to")
+private String zoneType;
+
@Parameter(name=ApiConstants.VIRTUAL_MACHINE_ID, type=CommandType.UUID,
entityType = UserVmResponse.class,
required=false, description="lists hosts in the same cluster as
this VM and flag hosts with enough CPU/RAm to host this VM")
private Long virtualMachineId;
@@ -124,6 +127,10 @@ public class ListHostsCmd extends BaseListCmd {
return zoneId;
}
+public String getZoneType() {
+return zoneType;
+}
+
public Long getVirtualMachineId() {
return virtualMachineId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee02311f/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 6690b24..f92b4fc 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1400,6 +1400,7 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
public Pair, Integer>
searchForServersInternal(ListHostsCmd cmd) {
Long zoneId =
_accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(),
cmd.getZoneId());
+String zoneType = cmd.getZoneType();
Object name = cmd.getHostName();
Object type = cmd.getType();
Object state = cmd.getState();
@@ -1421,6 +1422,7 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
sb.and("type", sb.entity().getType(), SearchCriteria.Op.LIKE);
sb.and("status", sb.entity().getStatus(), SearchCriteria.Op.EQ);
sb.and("dataCenterId", sb.entity().getZoneId(), SearchCriteria.Op.EQ);
+sb.and("dataCenterType", sb.entity().getZoneType(),
SearchCriteria.Op.EQ);
sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ);
sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ);
sb.and("resourceState", sb.entity().getResourceState(),
SearchCriteria.Op.EQ);
@@ -1465,6 +1467,9 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
if (zoneId != null) {
sc.setParameters("dataCenterId", zoneId);
}
+if (zoneType != null) {
+ sc.setParameters("dataCenterType", zoneType);
+}
if (pod != null) {
sc.setParameters("podId", pod);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee02311f/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 8f07ee4..3aaa830 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5534,9 +5534,16 @@
var searchByArgs = args.filterBy.search.value.length ?
'&name=
git commit: updated refs/heads/4.1 to 3eeaff0
Updated Branches:
refs/heads/4.1 41e6e9f30 -> 3eeaff03e
CLOUDSTACK-2190: Syncing AWSAPI packaging from master to 4.1
Signed-off-by: Chip Childers
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3eeaff03
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3eeaff03
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3eeaff03
Branch: refs/heads/4.1
Commit: 3eeaff03ec865b94f3fc161f5416da63cf59fc14
Parents: 41e6e9f
Author: Chip Childers
Authored: Thu Apr 25 17:16:32 2013 +0100
Committer: Chip Childers
Committed: Thu Apr 25 17:16:32 2013 +0100
--
debian/rules | 20 +++-
1 files changed, 19 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3eeaff03/debian/rules
--
diff --git a/debian/rules b/debian/rules
index ad82cc5..d7222a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ build: build-indep
build-indep: build-indep-stamp
build-indep-stamp: configure
- mvn package -DskipTests -Dsystemvm \
+ mvn package -Pawsapi -DskipTests -Dsystemvm \
-Dcs.replace.properties=replace.properties.tmp \
${ACS_BUILD_OPTS}
touch $@
@@ -148,7 +148,25 @@ install:
install -D packaging/debian/init/cloud-usage
$(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
# cloudstack-awsapi
+ mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/awsapi
mkdir $(DESTDIR)/var/log/$(PACKAGE)/awsapi
+ mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge
+ mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
+ mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup
+ cp -r awsapi/target/cloud-awsapi-$(VERSION)-SNAPSHOT/*
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
+ install -D awsapi-setup/setup/cloud-setup-bridge
$(DESTDIR)/usr/bin/cloudstack-setup-bridge
+ install -D awsapi-setup/setup/cloudstack-aws-api-register
$(DESTDIR)/usr/bin/cloudstack-aws-api-register
+ cp -r awsapi-setup/db/mysql/*
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup
+ for i in applicationContext.xml cloud-bridge.properties
commons-logging.properties crypto.properties xes.keystore
ec2-service.properties; do \
+ mv
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/$$i
$(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/; \
+ done
+ rm
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml
+ rm
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties
+ rm
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/db.properties
+ rm
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt
+ rm
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt
+ rm
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/services.xml
+ rm -rf
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/META-INF
dh_installdirs
dh_install
git commit: updated refs/heads/master to b5979ba
Updated Branches:
refs/heads/master ee02311fa -> b5979ba9b
LOUDSTACK-2120: mixed zone management - (1) extend listZones API to to take in
networktype. (2) UI: populate Zones list page with ones whose networktype
matches selected option in zone type dropdown on top menu. (3) UI: count total
number of zones based on selected option in zone type dropdown on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b5979ba9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b5979ba9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b5979ba9
Branch: refs/heads/master
Commit: b5979ba9b58caf0f306907e11c9a34fe36ff6ca6
Parents: ee02311
Author: Jessica Wang
Authored: Thu Apr 25 10:40:08 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 25 10:40:08 2013 -0700
--
.../api/command/user/zone/ListZonesByCmd.java |7 ++
.../src/com/cloud/api/query/QueryManagerImpl.java |4 +++
ui/scripts/system.js | 17 --
3 files changed, 25 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5979ba9/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
index bbfb598..d0dc736 100644
--- a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
@@ -56,6 +56,9 @@ public class ListZonesByCmd extends BaseListCmd {
@Parameter(name=ApiConstants.NAME, type=CommandType.STRING,
description="the name of the zone")
private String name;
+@Parameter(name=ApiConstants.NETWORK_TYPE, type=CommandType.STRING,
description="the network type of the zone")
+private String networkType;
+
@Parameter(name=ApiConstants.SHOW_CAPACITIES, type=CommandType.BOOLEAN,
description="flag to display the capacity of the zones")
private Boolean showCapacities;
@@ -79,6 +82,10 @@ public class ListZonesByCmd extends BaseListCmd {
return name;
}
+public String getNetworkType(){
+return networkType;
+}
+
public Boolean getShowCapacities() {
return showCapacities;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5979ba9/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index f92b4fc..67af7e4 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2213,10 +2213,14 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
Long id = cmd.getId();
String keyword = cmd.getKeyword();
String name = cmd.getName();
+String networkType = cmd.getNetworkType();
Filter searchFilter = new Filter(DataCenterJoinVO.class, null, false,
cmd.getStartIndex(), cmd.getPageSizeVal());
SearchCriteria sc =
_dcJoinDao.createSearchCriteria();
+if(networkType != null)
+ sc.addAnd("networkType", SearchCriteria.Op.EQ, networkType);
+
if (id != null) {
sc.addAnd("id", SearchCriteria.Op.EQ, id);
} else if (name != null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5979ba9/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 3aaa830..4692b61 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -184,9 +184,16 @@
dashboard: {
dataProvider: function(args) {
var dataFns = {
- zoneCount: function(data) {
+ zoneCount: function(data) {
+var data = {};
+ if(cloudStack.context.zoneType != null &&
cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
+ $.extend(data, {
+networktype: cloudStack.context.zoneType
+ });
+}
$.ajax({
url: createURL('listZones'),
+ data: data,
success: function(json) {
dataFns.podCount($.extend(data, {
zoneCount: json.listzonesresponse.count ?
@@ -4665,6 +4672,10 @@
}
}
+if(args.context.zoneType != null &&
args.context.zoneType.length > 0) { //Basic type or Advanced type
[01/43] git commit: updated refs/heads/master to 5ce2890
Updated Branches:
refs/heads/master b5979ba9b -> 5ce289034
VM multiple NICs: Fix broken UI due to API call changes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/876e93b4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/876e93b4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/876e93b4
Branch: refs/heads/master
Commit: 876e93b441f5042fb872fd7e01c1e793988e0915
Parents: 685a8a7
Author: Brian Federle
Authored: Tue Apr 9 14:15:29 2013 -0700
Committer: Brian Federle
Committed: Tue Apr 9 14:15:29 2013 -0700
--
ui/scripts/network.js |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876e93b4/ui/scripts/network.js
--
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index cc1aad3..6f6a073 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1186,7 +1186,7 @@
virtualmachineid: args.context.instances[0].id
},
success: function(json) {
-var ips = json.listnics.nic ? json.listnics.nic[0].secondaryip
: [];
+var ips = json.listnicsresponse.nic ?
json.listnicsresponse.nic[0].secondaryip : [];
args.response.success({
data: $(ips).map(function(index, ip) {
@@ -1252,7 +1252,7 @@
virtualmachineid: args.context.instances[0].id
},
success: function(json) {
- var ips = json.listnics.nic[0].secondaryip
+ var ips = json.listnicsresponse.nic[0].secondaryip
args.response.success({
data: $.grep($(ips).map(function(index, ip) {
[02/43] git commit: updated refs/heads/master to 5ce2890
List view UI: Fix 'no data to show' message not appearing in some cases
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e0692b39
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0692b39
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0692b39
Branch: refs/heads/master
Commit: e0692b39d9409fb2913b26533790f495d17beaf4
Parents: 876e93b
Author: Brian Federle
Authored: Tue Apr 9 14:16:01 2013 -0700
Committer: Brian Federle
Committed: Tue Apr 9 14:16:01 2013 -0700
--
ui/scripts/ui/widgets/listView.js |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0692b39/ui/scripts/ui/widgets/listView.js
--
diff --git a/ui/scripts/ui/widgets/listView.js
b/ui/scripts/ui/widgets/listView.js
index 4b88647..1c74056 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -863,7 +863,7 @@
var uiCustom = listViewArgs.uiCustom;
var subselect = uiCustom ? listViewArgs.listView.subselect : null;
-if (!data || ($.isArray(data) && !data.length)) {
+if (!data || !data.length) {
if (!$tbody.find('tr').size()) {
return [
$('').addClass('empty').append(
[03/43] git commit: updated refs/heads/master to 5ce2890
Instance wizard: clean up JS formatting
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d5c3756
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d5c3756
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d5c3756
Branch: refs/heads/master
Commit: 9d5c375678fd7477361b8f6aaab914ba682e4cf8
Parents: e0692b3
Author: Brian Federle
Authored: Tue Apr 9 14:52:06 2013 -0700
Committer: Brian Federle
Committed: Tue Apr 9 14:52:06 2013 -0700
--
ui/scripts/instanceWizard.js | 890 ++--
1 files changed, 445 insertions(+), 445 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d5c3756/ui/scripts/instanceWizard.js
--
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index e1aeafd..277719c 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -68,475 +68,475 @@
// Data providers for each wizard step
steps: [
-
- // Step 1: Setup
-function(args) {
- if(args.initArgs.pluginForm != null &&
args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier
chart
- //populate only one zone to the dropdown, the zone
which the VPC is under.
- zoneObjs = [{
- id: args.context.vpc[0].zoneid,
- name: args.context.vpc[0].zonename,
- networktype: 'Advanced'
- }];
- args.response.success({ data: {zones:
zoneObjs}});
- }
- else { //from Instance page
- $.ajax({
- url:
createURL("listZones&available=true"),
- dataType: "json",
- async: false,
- success: function(json) {
- zoneObjs =
json.listzonesresponse.zone;
- args.response.success({ data:
{zones: zoneObjs}});
- }
- });
- }
-},
-
-// Step 2: Select template
-function(args) {
- $(zoneObjs).each(function(){
-if(this.id == args.currentData.zoneid) {
- selectedZoneObj = this;
- return false; //break the $.each() loop
-}
- });
- if(selectedZoneObj == null) {
-alert("error: can't find matched zone object");
-return;
- }
-
- $.ajax({
-url: createURL("listHypervisors&zoneid="+args.currentData.zoneid),
-dataType: "json",
-async: false,
-success: function(json) {
- hypervisorObjs = json.listhypervisorsresponse.hypervisor;
-}
- });
-
- //* get templates/ISOs (begin) *
- var selectedTemplate = args.currentData['select-template'];
- if (selectedTemplate == 'select-template') {
-var hypervisorArray = [];
-$(hypervisorObjs).each(function(index, item) {
- hypervisorArray.push(item.name);
-});
-
-$.ajax({
- url:
createURL("listTemplates&templatefilter=featured&zoneid="+args.currentData.zoneid),
- dataType: "json",
- async: false,
- success: function(json) {
-if(json.listtemplatesresponse.template == null) {
- featuredTemplateObjs = null;
- }
- else {
- featuredTemplateObjs =
$.grep(json.listtemplatesresponse.template, function(item, index) {
-
if($.inArray(item.hypervisor, hypervisorArray) > -1)
- return
true;
- });
- }
- }
-});
-$.ajax({
- url:
createURL("listTemplates&templatefilter=community&zoneid="+args.
[05/43] git commit: updated refs/heads/master to 5ce2890
Merge branch 'master' into ui-vm-affinity Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6c354a0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6c354a0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6c354a0 Branch: refs/heads/master Commit: b6c354a057a5be49185ca87fa7982ba154d11317 Parents: e907a08 f66b9b5 Author: Brian Federle Authored: Wed Apr 10 14:58:50 2013 -0700 Committer: Brian Federle Committed: Wed Apr 10 14:58:50 2013 -0700 -- agent/src/com/cloud/agent/AgentShell.java |3 +- .../consoleproxy/ConsoleProxyResource.java |4 +- api/src/com/cloud/agent/api/to/FirewallRuleTO.java |6 + .../api/commands/CreatePrivateNetworkCmd.java | 197 -- .../cloud/api/commands/DestroyConsoleProxyCmd.java | 93 - .../cloud/consoleproxy/ConsoleProxyService.java| 23 - api/src/com/cloud/offering/NetworkOffering.java|1 + api/src/org/apache/cloudstack/api/BaseCmd.java |2 - .../user/vmsnapshot/CreateVMSnapshotCmd.java |2 +- .../user/vmsnapshot/DeleteVMSnapshotCmd.java |2 +- .../command/user/vmsnapshot/ListVMSnapshotCmd.java |2 +- .../user/vmsnapshot/RevertToSnapshotCmd.java |2 +- .../api/response/FirewallRuleResponse.java | 12 + client/pom.xml | 16 + client/tomcatconf/applicationContext.xml.in|2 +- .../cloud/hypervisor/HypervisorCapabilitiesVO.java | 13 +- .../src/com/cloud/resource/ServerResourceBase.java |2 +- .../resource/CifsSecondaryStorageResource.java | 755 -- .../resource/LocalSecondaryStorageResource.java| 246 -- .../resource/NfsSecondaryStorageResource.java | 1842 -- .../storage/resource/SecondaryStorageResource.java | 28 - .../resource/SecondaryStorageResourceHandler.java | 24 - .../cloud/storage/template/DownloadManager.java| 103 - .../storage/template/DownloadManagerImpl.java | 1049 .../com/cloud/storage/template/UploadManager.java | 85 - .../cloud/storage/template/UploadManagerImpl.java | 645 - deps/install-non-oss.sh| 13 - docs/en-US/Book_Info.xml |2 +- docs/en-US/Release_Notes.xml | 90 +- docs/en-US/add-clusters-vsphere.xml| 104 +- docs/en-US/added-API-commands-4.2.xml | 43 + docs/en-US/added-API-commands.xml |2 +- docs/en-US/aws-ec2-introduction.xml|2 +- docs/en-US/building-documentation.xml |2 +- docs/en-US/building-marvin.xml |2 +- docs/en-US/building-translation.xml|2 +- ...change-console-proxy-ssl-certificate-domain.xml |2 +- docs/en-US/citrix-xenserver-installation.xml |2 +- docs/en-US/configure-package-repository.xml|2 +- docs/en-US/configure-vpn.xml |2 +- docs/en-US/console-proxy.xml |2 +- docs/en-US/hypervisor-host-install-libvirt.xml |2 +- ...hypervisor-host-install-network-openvswitch.xml |2 +- docs/en-US/hypervisor-host-install-network.xml |4 +- docs/en-US/images/add-cluster.png | Bin 46302 -> 35697 bytes docs/en-US/images/dvswitch-config.png | Bin 0 -> 41955 bytes docs/en-US/images/dvswitchconfig.png | Bin 0 -> 38642 bytes .../en-US/management-server-install-prepare-os.xml |2 +- docs/en-US/management-server-lb.xml|2 +- docs/en-US/minimum-system-requirements.xml |2 +- docs/en-US/multiple-ip-nic.xml | 91 + docs/en-US/networks.xml|1 + docs/en-US/translating-documentation.xml |2 +- docs/en-US/using-sshkeys.xml |2 +- docs/en-US/vmware-cluster-config-dvswitch.xml | 193 ++ docs/en-US/vmware-install.xml | 511 +++-- docs/en-US/vmware-requirements.xml |2 +- docs/en-US/whats-new.xml |6 +- docs/en-US/writing-new-documentation.xml |4 +- .../cloud/entity/api/VMEntityManagerImpl.java |2 +- .../debian/config/etc/init.d/cloud-early-config| 56 +- plugins/hypervisors/simulator/pom.xml |5 + .../com/cloud/resource/AgentStorageResource.java |2 +- .../resource/SimulatorSecondaryDiscoverer.java |3 +- plugins/hypervisors/vmware/pom.xml |5 + .../src/com/cloud/hypervisor/guru/VMwareGuru.java |5 +- .../resource/PremiumSecondaryStorageResource.java |2 + .../VmwareSecondaryStorageResourceHandler.java |1 + .../xen/resource/CitrixResourceBase.java |2 +- .../element/JuniperSRXExternalFirewall
[06/43] git commit: updated refs/heads/master to 5ce2890
Merge branch 'master' into ui-vm-affinity Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96999bec Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96999bec Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96999bec Branch: refs/heads/master Commit: 96999becf91d18243f2b3ca7700b2f04e11950c9 Parents: b6c354a 5f8a278 Author: Brian Federle Authored: Thu Apr 11 15:12:56 2013 -0700 Committer: Brian Federle Committed: Thu Apr 11 15:12:56 2013 -0700 -- api/src/com/cloud/async/AsyncJob.java |3 +- api/src/com/cloud/event/EventTypes.java|8 +- .../cloud/exception/AffinityConflictException.java | 34 ++ api/src/com/cloud/server/ManagementService.java|4 +- api/src/com/cloud/vm/UserVmService.java| 183 + .../apache/cloudstack/affinity/AffinityGroup.java | 31 ++ .../affinity/AffinityGroupProcessor.java | 49 ++ .../cloudstack/affinity/AffinityGroupResponse.java | 155 +++ .../cloudstack/affinity/AffinityGroupService.java | 79 .../affinity/AffinityGroupTypeResponse.java| 48 ++ .../cloudstack/affinity/AffinityProcessorBase.java | 44 ++ .../org/apache/cloudstack/api/ApiConstants.java|5 +- api/src/org/apache/cloudstack/api/BaseCmd.java |8 +- .../apache/cloudstack/api/ResponseGenerator.java | 18 +- .../admin/config/ListDeploymentPlannersCmd.java| 71 +++ .../admin/offering/CreateServiceOfferingCmd.java |7 + .../user/affinitygroup/CreateAffinityGroupCmd.java | 167 +++ .../user/affinitygroup/DeleteAffinityGroupCmd.java | 154 +++ .../affinitygroup/ListAffinityGroupTypesCmd.java | 67 +++ .../user/affinitygroup/ListAffinityGroupsCmd.java | 90 .../affinitygroup/UpdateVMAffinityGroupCmd.java| 164 +++ .../api/command/user/vm/DeployVMCmd.java | 41 ++- .../api/response/DeploymentPlannersResponse.java | 37 ++ .../cloudstack/api/response/UserVmResponse.java| 14 + .../org/apache/cloudstack/query/QueryService.java |4 + .../com/cloud/bridge/service/EC2RestServlet.java |2 +- client/pom.xml |7 +- client/tomcatconf/applicationContext.xml.in| 10 + client/tomcatconf/commands.properties.in |7 + client/tomcatconf/componentContext.xml.in | 11 +- client/tomcatconf/simulatorComponentContext.xml.in | 23 +- .../cloud/entity/api/VMEntityManagerImpl.java | 82 ++-- .../platform/orchestration/CloudOrchestrator.java | 63 ++-- .../host-anti-affinity/pom.xml | 33 ++ .../affinity/HostAntiAffinityProcessor.java| 91 plugins/pom.xml|1 + server/src/com/cloud/api/ApiDBUtils.java | 28 ++- server/src/com/cloud/api/ApiResponseHelper.java| 69 +++- .../src/com/cloud/api/query/QueryManagerImpl.java | 108 + .../com/cloud/api/query/ViewResponseHelper.java| 20 +- .../cloud/api/query/dao/AffinityGroupJoinDao.java | 37 ++ .../api/query/dao/AffinityGroupJoinDaoImpl.java| 142 ++ .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 27 ++ .../cloud/api/query/vo/AffinityGroupJoinVO.java| 248 +++ .../src/com/cloud/api/query/vo/UserVmJoinVO.java | 37 ++ .../cloud/configuration/ConfigurationManager.java |3 +- .../configuration/ConfigurationManagerImpl.java|6 +- .../cloud/deploy/DeploymentPlanningManager.java| 45 ++ .../deploy/DeploymentPlanningManagerImpl.java | 96 server/src/com/cloud/deploy/FirstFitPlanner.java | 56 ++- server/src/com/cloud/domain/dao/DomainDaoImpl.java | 11 +- .../com/cloud/server/ConfigurationServerImpl.java | 22 +- .../src/com/cloud/server/ManagementServerImpl.java | 123 ++ .../src/com/cloud/service/ServiceOfferingVO.java | 81 +++-- server/src/com/cloud/user/AccountManagerImpl.java |9 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 69 +++- .../com/cloud/vm/VirtualMachineManagerImpl.java| 132 +++--- .../affinity/AffinityGroupServiceImpl.java | 346 +++ .../cloudstack/affinity/AffinityGroupVMMapVO.java | 66 +++ .../cloudstack/affinity/AffinityGroupVO.java | 114 + .../cloudstack/affinity/dao/AffinityGroupDao.java | 30 ++ .../affinity/dao/AffinityGroupDaoImpl.java | 102 + .../affinity/dao/AffinityGroupVMMapDao.java| 47 ++ .../affinity/dao/AffinityGroupVMMapDaoImpl.java| 167 +++ .../test/com/cloud/vm/MockUserVmManagerImpl.java | 16 +- .../cloud/vpc/MockConfigurationManagerImpl.java|2 +- .../affinity/AffinityApiTestConfiguration.java | 332 ++ .../cloudstack/affinity/AffinityApiUnitTest.java | 174 server/test/resources/affinityContext.xml
[07/43] git commit: updated refs/heads/master to 5ce2890
Merge branch 'master' into ui-vm-affinity Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6629eb74 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6629eb74 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6629eb74 Branch: refs/heads/master Commit: 6629eb7468eef95cbe9afc62db99649cb0e571e4 Parents: 96999be 95cbb79 Author: Brian Federle Authored: Fri Apr 12 10:37:18 2013 -0700 Committer: Brian Federle Committed: Fri Apr 12 10:37:18 2013 -0700 -- .../command/admin/cluster/UpdateClusterCmd.java| 15 +++- .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java |3 + .../api/response/GlobalLoadBalancerResponse.java |8 +++ core/src/com/cloud/vm/VmDetailConstants.java |1 + .../cloudstack/storage/test/DirectAgentTest.java |4 +- .../command/CreateVolumeFromBaseImageCommand.java |6 +- .../provider/DataStoreProviderManagerImpl.java |4 +- .../storage/to/ImageOnPrimaryDataStoreTO.java | 44 + .../storage/to/ImageOnPrimayDataStoreTO.java | 44 - .../affinity/HostAntiAffinityProcessor.java| 50 --- .../cloudstack/syslog/AlertsSyslogAppender.java|4 +- .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 19 +- .../hypervisor/vmware/resource/VmwareResource.java | 18 + .../xen/resource/XenServerStorageResource.java |4 +- server/pom.xml |2 - server/src/com/cloud/api/ApiResponseHelper.java|2 + .../src/com/cloud/api/query/QueryManagerImpl.java |6 ++- server/src/com/cloud/configuration/Config.java |1 + server/src/com/cloud/network/NetworkModelImpl.java | 26 ++-- .../com/cloud/resource/ResourceManagerImpl.java| 22 ++- .../affinity/dao/AffinityGroupVMMapDao.java|2 +- .../affinity/dao/AffinityGroupVMMapDaoImpl.java|4 +- .../affinity/AffinityApiTestConfiguration.java | 18 +- .../cloudstack/affinity/AffinityApiUnitTest.java | 21 +- .../networkoffering/ChildTestConfiguration.java|7 ++- .../networkoffering/CreateNetworkOfferingTest.java |1 - test/integration/smoke/test_ScaleVm.py |4 +- tools/build/build_docs.sh | 12 +++- ui/scripts/regions.js | 24 ++- 29 files changed, 247 insertions(+), 129 deletions(-) --
[09/43] git commit: updated refs/heads/master to 5ce2890
Merge branch 'master' into ui-vm-affinity Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26756848 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26756848 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26756848 Branch: refs/heads/master Commit: 267568483b6219c810caa1bd007f6037a73df666 Parents: 51cfc07 1f76d8b Author: Brian Federle Authored: Mon Apr 15 10:24:36 2013 -0700 Committer: Brian Federle Committed: Mon Apr 15 10:24:36 2013 -0700 -- DISCLAIMER |7 - .../cloud/configuration/ConfigurationService.java |6 + api/src/com/cloud/event/EventTypes.java|4 + api/src/com/cloud/network/Network.java |1 + api/src/com/cloud/network/NetworkService.java |2 +- api/src/com/cloud/vm/DiskProfile.java |2 +- .../org/apache/cloudstack/api/ApiConstants.java|1 + .../admin/vlan/DedicatePublicIpRangeCmd.java | 108 + .../admin/vlan/ReleasePublicIpRangeCmd.java| 77 + .../command/user/address/AssociateIPAddrCmd.java | 31 +- .../network/ExternalNetworkDeviceManager.java |1 + client/pom.xml | 10 + client/tomcatconf/applicationContext.xml.in|6 +- client/tomcatconf/commands.properties.in | 13 + client/tomcatconf/componentContext.xml.in |1 + client/tomcatconf/nonossComponentContext.xml.in| 20 + debian/cloudstack-awsapi.install | 10 +- debian/rules | 20 +- docs/en-US/Release_Notes.xml | 4414 ++- docs/en-US/hypervisor-kvm-install-flow.xml |1 + .../subsystem/api/storage/CommandResult.java |2 +- .../api/storage/ObjectInDataStoreStateMachine.java |2 +- .../image/motion/DefaultImageMotionStrategy.java |4 +- .../test/MockHypervisorHostEndPointRpcServer.java | 72 + .../test/MockHypervsiorHostEndPointRpcServer.java | 72 - .../integration-test/test/resource/component.xml |2 +- .../storage/HypervisorHostEndPointRpcServer.java | 119 + .../storage/HypervsiorHostEndPointRpcServer.java | 119 - .../allocator/AbstractStoragePoolAllocator.java|2 +- .../allocator/ZoneWideStoragePoolAllocator.java|2 +- .../storage/datastore/DataObjectManagerImpl.java |6 +- .../driver/DefaultPrimaryDataStoreDriverImpl.java |4 +- .../DefaultPrimaryDatastoreProviderImpl.java |6 +- .../volume/TemplateInstallStrategyImpl.java|6 +- packaging/centos63/cloud.spec | 19 +- .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 18 +- .../vmware/manager/VmwareManagerImpl.java |3 +- .../hypervisor/vmware/resource/VmwareResource.java | 13 +- plugins/network-elements/cisco-vnmc/pom.xml| 42 + .../scripts/network/cisco/assoc-asa1000v.xml | 34 + .../network/cisco/associate-acl-policy-set.xml | 37 + .../network/cisco/associate-dhcp-policy.xml| 34 + .../network/cisco/associate-dhcp-server.xml| 32 + .../network/cisco/associate-nat-policy-set.xml | 35 + .../network/cisco/associate-route-policy.xml | 33 + .../network/cisco/create-acl-policy-ref.xml| 38 + .../network/cisco/create-acl-policy-set.xml| 36 + .../scripts/network/cisco/create-acl-policy.xml| 35 + .../network/cisco/create-acl-rule-for-dnat.xml | 82 + .../network/cisco/create-acl-rule-for-pf.xml | 156 + .../scripts/network/cisco/create-dhcp-policy.xml | 72 + .../scripts/network/cisco/create-dnat-rule.xml | 91 + .../network/cisco/create-edge-device-profile.xml | 32 + .../cisco/create-edge-device-route-policy.xml | 30 + .../network/cisco/create-edge-device-route.xml | 35 + .../scripts/network/cisco/create-edge-firewall.xml | 89 + .../network/cisco/create-edge-security-profile.xml | 41 + .../network/cisco/create-egress-acl-rule.xml | 201 + .../cisco/create-generic-egress-acl-rule.xml | 122 + .../cisco/create-generic-ingress-acl-rule.xml | 121 + .../network/cisco/create-ingress-acl-rule.xml | 201 + .../scripts/network/cisco/create-ip-pool.xml | 58 + .../network/cisco/create-nat-policy-ref.xml| 38 + .../network/cisco/create-nat-policy-set.xml| 37 + .../scripts/network/cisco/create-nat-policy.xml| 33 + .../scripts/network/cisco/create-pf-rule.xml | 166 + .../scripts/network/cisco/create-port-pool.xml | 72 + .../network/cisco/create-source-nat-pool.xml | 58 + .../network/cisco/create-source-nat-rule.xml | 103 + .../scripts/network/cisco/create-tenant.xml| 29 + .../scripts/network/cisco/create-vdc.xml | 30 + .../ne
[30/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - "View Instances" drilldown - new
parameter "affinitygroupid" has been added to listVirtualMachines API. Here is
related UI change.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c4fa5c0f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c4fa5c0f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c4fa5c0f
Branch: refs/heads/master
Commit: c4fa5c0f170bfb8fe6dbb385b8c87d890e2f97f1
Parents: ef4ed01
Author: Jessica Wang
Authored: Fri Apr 19 14:05:58 2013 -0700
Committer: Jessica Wang
Committed: Fri Apr 19 14:06:25 2013 -0700
--
ui/scripts/instances.js | 50 ++---
1 files changed, 3 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c4fa5c0f/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index cb20124..8699b4d 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -199,53 +199,9 @@
}
if("affinityGroups" in args.context) {
- var vmIds =
args.context.affinityGroups[0].virtualmachineIds;
- if(vmIds == null || vmIds.length == 0) {
- args.response.success({data:
null});
- return;
- }
- $.ajax({
- url:
createURL('listVirtualMachines'),
- data: data,
- success: function(json) {
- var firstPageVms =
json.listvirtualmachinesresponse.virtualmachine;
- var items = [];
- if(vmIds != null) {
- for(var i = 0;
i < vmIds.length; i++) {
- var
item = null;
- var
matchFound = false;
-
if(firstPageVms != null) {
-
for(var k = 0; k < firstPageVms.length; k++) {
-
if(firstPageVms[k].id == vmIds[i]) {
-
matchFound = true;
-
item = firstPageVms[k];
-
break; //break for looup
-
}
-
}
- }
- /*
-
if(matchFound == false) { //Either the VM is not in API response of
"listVirtualMachines&page=1&pagesize=500" OR its state doesn't match value in
state filter on top in instance listView
-
$.ajax({
-
url: createURL('listVirtualMachines'),
-
async: false,
-
data: {id: vmIds[i]},
-
success: function(json) {
-
[40/43] git commit: updated refs/heads/master to 5ce2890
Merge branch 'master' into ui-vm-affinity Conflicts: ui/scripts/instances.js Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/25f2f0fc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/25f2f0fc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/25f2f0fc Branch: refs/heads/master Commit: 25f2f0fcb795017fb8e54af86814a1663eea21bb Parents: 922b51c 8f5d8d5 Author: Brian Federle Authored: Wed Apr 24 16:02:56 2013 -0700 Committer: Brian Federle Committed: Wed Apr 24 16:02:56 2013 -0700 -- .../region/ha/GlobalLoadBalancingRulesService.java |3 + api/src/com/cloud/vm/UserVmService.java| 27 +- .../org/apache/cloudstack/api/ApiConstants.java|1 + api/src/org/apache/cloudstack/api/BaseCmd.java | 24 + .../command/admin/account/CreateAccountCmd.java| 14 +- .../api/command/admin/vm/MigrateVMCmd.java |2 +- .../api/command/user/vm/DeployVMCmd.java | 12 +- .../cloudstack/api/command/user/vm/ListVMsCmd.java | 10 +- .../api/command/user/vm/UpdateVMCmd.java |2 +- .../api/command/user/volume/ListVolumesCmd.java|7 + .../cloudstack/api/response/ClusterResponse.java |9 +- .../api/response/DomainRouterResponse.java | 11 + .../api/response/GlobalLoadBalancerResponse.java | 10 + .../cloudstack/api/response/HostResponse.java |9 +- .../cloudstack/api/response/NetworkResponse.java |7 + .../cloudstack/api/response/PodResponse.java |9 +- .../cloudstack/api/response/SnapshotResponse.java | 16 + .../api/response/StoragePoolResponse.java | 15 +- .../cloudstack/api/response/SystemVmResponse.java | 11 + .../cloudstack/api/response/TemplateResponse.java |7 + .../cloudstack/api/response/VolumeResponse.java|8 + .../com/cloud/bridge/service/core/s3/S3Engine.java |2 +- .../classes/resources/messages_zh_CN.properties| 2956 +++ core/src/com/cloud/vm/UserVmVO.java|6 +- debian/rules |5 +- docs/en-US/about-working-with-vms.xml | 85 +- docs/en-US/append-displayname-vms.xml | 84 + docs/en-US/changed-API-commands-4.2.xml| 16 + docs/en-US/creating-network-offerings.xml | 45 + docs/en-US/elastic-ip.xml | 90 + docs/en-US/images/add-vlan-icon.png| Bin 0 -> 860 bytes docs/en-US/network-offerings.xml | 83 +- docs/en-US/networks.xml|1 + docs/en-US/non-contiguous-vlan.xml | 68 + docs/en-US/set-up-network-for-users.xml| 13 +- docs/en-US/using-netscaler-load-balancers.xml | 132 +- docs/en-US/virtual-machines.xml|1 + docs/en-US/vlan-provisioning.xml |2 + docs/en-US/vm-snapshots.xml| 10 +- packaging/centos63/package.sh |1 + .../debian/config/etc/init.d/cloud-early-config| 14 +- .../hypervisor/kvm/resource/LibvirtConnection.java | 14 +- server/src/com/cloud/api/ApiDBUtils.java |9 + server/src/com/cloud/api/ApiDispatcher.java|9 - server/src/com/cloud/api/ApiResponseHelper.java| 20 + server/src/com/cloud/api/ApiServer.java| 155 +- server/src/com/cloud/api/ApiServerService.java |1 + server/src/com/cloud/api/ApiServlet.java |6 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 19 +- .../api/query/dao/DomainRouterJoinDaoImpl.java |1 + .../com/cloud/api/query/dao/HostJoinDaoImpl.java |1 + .../api/query/dao/StoragePoolJoinDaoImpl.java |1 + .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |3 +- .../com/cloud/api/query/vo/DomainRouterJoinVO.java | 12 + server/src/com/cloud/api/query/vo/HostJoinVO.java | 11 + .../com/cloud/api/query/vo/StoragePoolJoinVO.java | 11 + .../src/com/cloud/api/query/vo/VolumeJoinVO.java | 15 + server/src/com/cloud/configuration/Config.java | 17 +- .../configuration/ConfigurationManagerImpl.java| 13 +- server/src/com/cloud/dc/dao/DataCenterDao.java |2 + server/src/com/cloud/dc/dao/DataCenterDaoImpl.java |8 + .../network/ExternalFirewallDeviceManagerImpl.java |2 +- .../src/com/cloud/network/NetworkServiceImpl.java |2 +- .../com/cloud/network/guru/GuestNetworkGuru.java |2 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 31 +- server/src/com/cloud/server/Criteria.java |1 + server/src/com/cloud/vm/UserVmManagerImpl.java | 99 +- .../com/cloud/vm/VirtualMachineManagerImpl.java|2 +- .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 14 + .../test/com/cloud/vm/MockUserVmManagerImpl.java | 48 +
[35/43] git commit: updated refs/heads/master to 5ce2890
Affinity UI: Pass _custom to fix broken async poll
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/57686aee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/57686aee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/57686aee
Branch: refs/heads/master
Commit: 57686aeeaffed74832c20a96a7eaf403ba8c90a1
Parents: 382e8f3
Author: Brian Federle
Authored: Mon Apr 22 11:27:37 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 22 11:27:37 2013 -0700
--
ui/scripts/ui-custom/affinity.js |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57686aee/ui/scripts/ui-custom/affinity.js
--
diff --git a/ui/scripts/ui-custom/affinity.js b/ui/scripts/ui-custom/affinity.js
index 6c237ed..1f51b52 100644
--- a/ui/scripts/ui-custom/affinity.js
+++ b/ui/scripts/ui-custom/affinity.js
@@ -103,6 +103,7 @@
response: {
success: function(args) {
complete({
+_custom: args._custom,
$item: $instanceRow
});
},
[16/43] git commit: updated refs/heads/master to 5ce2890
Add new 'affinity' UI section for managing affinity groups
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d235f69
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d235f69
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d235f69
Branch: refs/heads/master
Commit: 5d235f690d4d8a5413a4dc0e530e1760dee3514a
Parents: 38ca737
Author: Brian Federle
Authored: Mon Apr 15 14:56:44 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 15 14:56:44 2013 -0700
--
ui/scripts/affinity.js | 147 +
ui/scripts/cloudStack.js |9 +-
ui/scripts/ui-custom/affinity.js |2 +-
3 files changed, 153 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d235f69/ui/scripts/affinity.js
--
diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js
new file mode 100644
index 000..8bfd844
--- /dev/null
+++ b/ui/scripts/affinity.js
@@ -0,0 +1,147 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+(function(cloudStack) {
+ cloudStack.sections.affinityGroups = {
+title: 'label.affinity.groups',
+listView: {
+ id: 'affinityGroups',
+ fields: {
+name: { label: 'label.name' },
+type: { label: 'label.type' }
+ },
+ dataProvider: function(args) {
+args.response.success({
+ data: [
+{ id: 1, name: 'Affinity Group 1', type: 'Affinity' },
+{ id: 2, name: 'Affinity Group 2', type: 'Anti-affinity' },
+{ id: 3, name: 'Anti-affinity Group', type: 'Anti-affinity' }
+ ]
+});
+ },
+ actions: {
+add: {
+ label: 'label.add.affinity.group',
+
+ messages: {
+confirm: function(args) {
+ return 'message.add.volume';
+},
+notification: function(args) {
+ return 'label.add.affinity.group';
+}
+ },
+
+ createForm: {
+title: 'label.add.affinity.group',
+fields: {
+ name: {
+label: 'label.name',
+validation: { required: true }
+ },
+ type: {
+label: 'label.availability.zone',
+select: function(args) {
+ args.response.success({
+data: [
+ { id: 'Affinity', description: 'Affinity' },
+ { id: 'AntiAffinity', description: 'Anti-Affinity' }
+]
+ });
+}
+ },
+ availabilityZone: {
+label: 'label.availability.zone',
+select: function(args) {
+ $.ajax({
+url: createURL("listZones&available=true"),
+dataType: "json",
+async: true,
+success: function(json) {
+ var items = json.listzonesresponse.zone;
+ args.response.success({descriptionField: 'name', data:
items});
+}
+ });
+}
+ },
+}
+ },
+
+ action: function(args) {
+args.response.success();
+ },
+
+ notification: {
+poll: function(args) { args.complete(); }
+ }
+}
+ },
+ detailView: {
+actions: {
+ edit: {
+label: 'label.edit',
+action: function(args) {
+ args.response.success();
+},
+messages: {
+ notification: function(args) { return
'label.edit.affinity.group'; }
+}
+ },
+ remove: {
+label: 'label.delete.affinity.group',
+action: function(args) {
+ args.response.success();
+},
+messages: {
+ confirm:
[10/43] git commit: updated refs/heads/master to 5ce2890
'Change VM affinity' select UI: Pass data to action
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/66a16a1f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/66a16a1f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/66a16a1f
Branch: refs/heads/master
Commit: 66a16a1fd32bf864745d2404edd2386b8f1f648a
Parents: 2675684
Author: Brian Federle
Authored: Mon Apr 15 13:01:23 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 15 13:01:23 2013 -0700
--
ui/scripts/instances.js |6 +++---
ui/scripts/ui-custom/affinity.js |6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66a16a1f/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6273a78..e360dbe 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -645,9 +645,9 @@
dataProvider: function(args) {
args.response.success({
data: [
- { name: 'Affinity Group 1', type: 'Affinity' },
- { name: 'Affinity Group 2', type: 'Anti-affinity' },
- { name: 'Anti-affinity Group', type: 'Anti-affinity'
}
+ { id: 1, name: 'Affinity Group 1', type: 'Affinity'
},
+ { id: 2, name: 'Affinity Group 2', type:
'Anti-affinity' },
+ { id: 3, name: 'Anti-affinity Group', type:
'Anti-affinity' }
]
});
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66a16a1f/ui/scripts/ui-custom/affinity.js
--
diff --git a/ui/scripts/ui-custom/affinity.js b/ui/scripts/ui-custom/affinity.js
index 1a1eb55..281ea2f 100644
--- a/ui/scripts/ui-custom/affinity.js
+++ b/ui/scripts/ui-custom/affinity.js
@@ -97,9 +97,9 @@
tierID: $dataList.find('.tier-select select').val(),
_subselect: $dataList.find('tr.multi-edit-selected
.subselect select').val(),
context: $.extend(true, {}, context, {
-instances: [
- $dataList.find('tr.multi-edit-selected').data('json-obj')
-]
+affinityGroups:
$dataList.find('tr.multi-edit-selected').map(function(index, elem) {
+ return $(elem).data('json-obj');
+})
}),
response: {
success: function(args) {
[12/43] git commit: updated refs/heads/master to 5ce2890
Affinity UI: Pre-select checkboxes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2f0e0d9a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2f0e0d9a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2f0e0d9a
Branch: refs/heads/master
Commit: 2f0e0d9a7dfb106f5639ecf2d95adf66de2d050b
Parents: a589a36
Author: Brian Federle
Authored: Mon Apr 15 14:02:58 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 15 14:02:58 2013 -0700
--
ui/scripts/instances.js |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f0e0d9a/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index e360dbe..baf1823 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -645,9 +645,9 @@
dataProvider: function(args) {
args.response.success({
data: [
- { id: 1, name: 'Affinity Group 1', type: 'Affinity'
},
+ { id: 1, name: 'Affinity Group 1', type: 'Affinity',
_isSelected: true },
{ id: 2, name: 'Affinity Group 2', type:
'Anti-affinity' },
- { id: 3, name: 'Anti-affinity Group', type:
'Anti-affinity' }
+ { id: 3, name: 'Anti-affinity Group', type:
'Anti-affinity', _isSelected: true }
]
});
}
[18/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - implement Delete Affinity Group
action.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9827d79f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9827d79f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9827d79f
Branch: refs/heads/master
Commit: 9827d79fbdf9bc59687e9aab14cb19f84599b862
Parents: df15cea
Author: Jessica Wang
Authored: Wed Apr 17 17:17:54 2013 -0700
Committer: Jessica Wang
Committed: Wed Apr 17 17:17:54 2013 -0700
--
ui/scripts/affinity.js | 114 ++
1 files changed, 38 insertions(+), 76 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9827d79f/ui/scripts/affinity.js
--
diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js
index 7a15533..0bb08cc 100644
--- a/ui/scripts/affinity.js
+++ b/ui/scripts/affinity.js
@@ -21,7 +21,7 @@
id: 'affinityGroups',
fields: {
name: { label: 'label.name' },
-description: { label: 'label.description' }
+type: { label: 'label.type' }
},
dataProvider: function(args) {
$.ajax({
@@ -69,53 +69,7 @@
}
});
}
- },
- domainid: {
- label:
'Domain',
- select:
function(args) {
-
if(isAdmin() || isDomainAdmin()) {
-
$.ajax({
-
url: createURL('listDomains'),
-
data: {
-
listAll: true,
-
details: 'min'
-
},
-
success: function(json) {
-
var array1 = [{id: '', description: ''}];
-
var domains = json.listdomainsresponse.domain;
-
if(domains != null && domains.length > 0) {
-
for(var i = 0; i < domains.length; i++) {
-
array1.push({id: domains[i].id, description:
domains[i].path});
-
}
-
}
-
args.response.success({
-
data: array1
-
});
-
}
-
});
- }
- else {
-
args.response.success({
-
data: null
-
});
- }
- },
- isHid
[20/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - VM Wizard - collect affinity group
IDs and pass them to API call.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7566eae2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7566eae2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7566eae2
Branch: refs/heads/master
Commit: 7566eae20909e115b230bc0de12fe04d2f61b48c
Parents: b203e6c
Author: Jessica Wang
Authored: Thu Apr 18 10:30:34 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 18 10:30:34 2013 -0700
--
ui/scripts/instanceWizard.js | 50
1 files changed, 33 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7566eae2/ui/scripts/instanceWizard.js
--
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 43c2757..e7aa673 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -18,7 +18,7 @@
(function($, cloudStack) {
var zoneObjs, hypervisorObjs, featuredTemplateObjs, communityTemplateObjs,
myTemplateObjs, featuredIsoObjs, community, networkObjs;
var selectedZoneObj, selectedTemplateObj, selectedHypervisor,
selectedDiskOfferingObj;
- var step5ContainerType = 'nothing-to-select'; //'nothing-to-select',
'select-network', 'select-security-group', 'select-advanced-sg'(advanced
sg-enabled zone)
+ var step6ContainerType = 'nothing-to-select'; //'nothing-to-select',
'select-network', 'select-security-group', 'select-advanced-sg'(advanced
sg-enabled zone)
cloudStack.instanceWizard = {
maxDiskOfferingSize: function() {
@@ -339,26 +339,26 @@
var $networkStepContainer =
$('.step.network:visible');
if(args.initArgs.pluginForm != null &&
args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier
chart
- step5ContainerType = 'nothing-to-select';
+ step6ContainerType = 'nothing-to-select';
$networkStep.find("#from_instance_page_1").hide();
$networkStep.find("#from_instance_page_2").hide();
$networkStep.find("#from_vpc_tier").text("tier " +
args.context.networks[0].name);
$networkStep.find("#from_vpc_tier").show();
} else { //from Instance page
if(selectedZoneObj.securitygroupsenabled !=
true) { // Advanced SG-disabled zone
- step5ContainerType =
'select-network';
+ step6ContainerType =
'select-network';
$networkStep.find("#from_instance_page_1").show();
$networkStep.find("#from_instance_page_2").show();
$networkStep.find("#from_vpc_tier").text("");
$networkStep.find("#from_vpc_tier").hide();
$networkStepContainer.removeClass('next-use-security-groups');
} else { // Advanced SG-enabled zone
- step5ContainerType =
'select-advanced-sg';
+ step6ContainerType =
'select-advanced-sg';
}
if ($networkStepContainer.hasClass('next-use-security-groups')) {
$networkStepContainer.removeClass('repeat
next-use-security-groups loaded');
- step5ContainerType = 'select-security-group';
+ step6ContainerType = 'select-security-group';
}
}
}
@@ -385,15 +385,15 @@
});
if(includingSecurityGroupService == false || selectedHypervisor ==
"VMware") {
-step5ContainerType = 'nothing-to-select';
+step6ContainerType = 'nothing-to-select';
}
else {
-step5ContainerType = 'select-security-group';
+step6ContainerType = 'select-security-group';
}
}
-//step5ContainerType = 'nothing-to-select'; //for testing only,
comment it out before checking in
-if(step5ContainerType == 'select-network' || step5Containe
[21/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - instance detail page - add new tab
"Affinity Groups".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/935b08b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/935b08b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/935b08b2
Branch: refs/heads/master
Commit: 935b08b216c2b48c2035feecc9e14503de73a7cb
Parents: 7566eae
Author: Jessica Wang
Authored: Thu Apr 18 10:55:56 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 18 10:55:56 2013 -0700
--
ui/scripts/instances.js | 18 ++
1 files changed, 18 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/935b08b2/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index baf1823..95f23ed 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1432,6 +1432,24 @@
}
},
+ /**
+ * Affinity Groups tab
+ */
+ affinityGroups: {
+title: 'label.affinity.groups',
+multiple: true,
+fields: [
+ {
+id: { label: 'ID' },
+name: { label: 'label.name' },
+description: { label: 'label.description' }
+ }
+],
+dataProvider: function(args) {
+ args.response.success({data:
args.context.instances[0].affinitygroup});
+}
+ },
+
/**
* Statistics tab
*/
[42/43] git commit: updated refs/heads/master to 5ce2890
Add icons for 'add account,' 'release from account'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1bdae00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1bdae00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1bdae00
Branch: refs/heads/master
Commit: f1bdae006ad9d9345a9f1707437b051b27c55492
Parents: 7cef521
Author: Brian Federle
Authored: Wed Apr 24 16:53:22 2013 -0700
Committer: Brian Federle
Committed: Wed Apr 24 16:53:22 2013 -0700
--
ui/css/cloudstack3.css | 16
ui/images/sprites.png | Bin 189677 -> 192407 bytes
2 files changed, 16 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1bdae00/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 15190d4..340b089 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -12050,6 +12050,22 @@ div.ui-dialog div.autoscaler div.field-group
div.form-container form div.form-it
background-position: -263px -583px;
}
+.releaseFromAccount .icon {
+ background-position: -230px -123px;
+}
+
+.releaseFromAccount:hover .icon {
+ background-position: -229px -704px;
+}
+
+.addAccount .icon {
+ background-position: -231px -96px;
+}
+
+.addAccount:hover .icon {
+ background-position: -230px -677px;
+}
+
.label-hovered {
cursor: pointer;
color: #FF !important;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1bdae00/ui/images/sprites.png
--
diff --git a/ui/images/sprites.png b/ui/images/sprites.png
index ac7a276..132588d 100644
Binary files a/ui/images/sprites.png and b/ui/images/sprites.png differ
[13/43] git commit: updated refs/heads/master to 5ce2890
Detail view: CSS fixes for edit mode
-Fix scrollbars on select box
-Fix apply/cancel buttons being hidden
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd8a9e92
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd8a9e92
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd8a9e92
Branch: refs/heads/master
Commit: bd8a9e920e02c7d44ca5db34d80b662f2725ed21
Parents: 2f0e0d9
Author: Brian Federle
Authored: Mon Apr 15 14:06:42 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 15 14:06:42 2013 -0700
--
ui/css/cloudstack3.css |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd8a9e92/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 1890476..06fcbae 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1697,7 +1697,7 @@ div.list-view td.state.off span {
}
.detail-view .main-groups {
- max-height: 455px;
+ max-height: 407px;
overflow: auto;
overflow-x: hidden;
margin-right: 12px;
@@ -1754,6 +1754,10 @@ div.list-view td.state.off span {
width: 245px;
}
+.detail-group .main-groups table td.value > span select {
+ width: 100% !important;
+}
+
.detail-group .main-groups table td.value .view-all {
cursor: pointer;
/*[empty]height:;*/
[08/43] git commit: updated refs/heads/master to 5ce2890
Affinity rules UI: Add 'changeAffinity' action for VM
-Adds action to VM on stopped state
-Add dialog with list view showing affinity groups and checkboxes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51cfc070
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51cfc070
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51cfc070
Branch: refs/heads/master
Commit: 51cfc0709fdd956fedd0f774974eaaabf2d48cd5
Parents: 6629eb7
Author: Brian Federle
Authored: Fri Apr 12 16:55:01 2013 -0700
Committer: Brian Federle
Committed: Fri Apr 12 16:55:01 2013 -0700
--
ui/index.jsp |2 +
ui/scripts/instances.js | 81 +++-
ui/scripts/ui-custom/affinity.js | 171 +
3 files changed, 249 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51cfc070/ui/index.jsp
--
diff --git a/ui/index.jsp b/ui/index.jsp
index e82ff10..ed18645 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1664,6 +1664,8 @@ under the License.
+
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51cfc070/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 1c4c38c..b230cf7 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -437,7 +437,6 @@
poll: pollAsyncJobResult
}
},
-
snapshot: {
messages: {
notification: function(args) {
@@ -500,7 +499,6 @@
pool: pollAsyncJobResult
}
},
-
destroy: {
label: 'label.action.destroy.instance',
compactLabel: 'label.destroy',
@@ -566,7 +564,6 @@
}
}
},
-
reset: {
label: 'Reset VM',
messages:{
@@ -597,8 +594,81 @@
}
}
- },
+ },
+
+ changeAffinity: {
+label: 'Change affinity',
+
+action: {
+ custom: cloudStack.uiCustom.affinity({
+tierSelect: function(args) {
+ if ('vpc' in args.context) { //from VPC section
+args.$tierSelect.show(); //show tier dropdown
+
+$.ajax({ //populate tier dropdown
+ url: createURL("listNetworks"),
+ async: false,
+ data: {
+vpcid: args.context.vpc[0].id,
+//listAll: true, //do not pass listAll to
listNetworks under VPC
+
domainid: args.context.vpc[0].domainid,
+ account:
args.context.vpc[0].account,
+supportedservices: 'StaticNat'
+ },
+ success: function(json) {
+var networks = json.listnetworksresponse.network;
+var items = [{ id: -1, description: 'Please select a
tier' }];
+$(networks).each(function(){
+ items.push({id: this.id, description:
this.displaytext});
+});
+args.response.success({ data: items });
+ }
+});
+ }
+ else { //from Guest Network section
+args.$tierSelect.hide();
+ }
+ args.$tierSelect.change(function() {
+args.$tierSelect.closest('.list-view').listView('refresh');
+ });
+ args.$tierSelect.closest('.list-view').listView('refresh');
+},
+
+listView: {
+ listView: {
+id: 'affinityGroups',
+fields: {
+ name: { label: 'label.name' },
+ type: { label: 'label.type' }
+},
+dataProvider: function(args) {
+ args.response.success({
+data: [
+ { name: 'Affinity Group 1', type: 'Affinity' },
+ { name: 'Affinity Group 2', type: 'Anti-affinity' },
+ { name: 'Anti-affinity Group', type: 'Anti-affinity'
}
+]
+ });
+}
+ }
+},
+action: function(args) {
[11/43] git commit: updated refs/heads/master to 5ce2890
List view UI: Support pre-selected checkboxes
In listings with checkbox actions, if _isSelected: true is passed in a
data item, then pre-select the checkbox on load.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a589a367
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a589a367
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a589a367
Branch: refs/heads/master
Commit: a589a367d07d01e22356d8eb123c9ed482e05c96
Parents: 66a16a1
Author: Brian Federle
Authored: Mon Apr 15 14:02:42 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 15 14:02:42 2013 -0700
--
ui/scripts/ui/widgets/listView.js |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a589a367/ui/scripts/ui/widgets/listView.js
--
diff --git a/ui/scripts/ui/widgets/listView.js
b/ui/scripts/ui/widgets/listView.js
index c5e0561..4bd4a42 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -734,6 +734,8 @@
var makeActionIcons = function($td, actions, options) {
options = options ? options : {};
var allowedActions = options.allowedActions;
+var $tr = $td.closest('tr');
+var data = $tr && $tr.data('json-obj') ? $tr.data('json-obj') : null;
$.each(actions, function(actionName, action) {
if (actionName == 'add' || action.isHeader)
@@ -766,7 +768,9 @@
.append(
$('').attr({
type: 'checkbox',
-name: actionName
+name: actionName,
+checked: data && data._isSelected ?
+ 'checked' : false
})
)
.attr({
[14/43] git commit: updated refs/heads/master to 5ce2890
Merge branch 'master' into ui-vm-affinity Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/10696101 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/10696101 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/10696101 Branch: refs/heads/master Commit: 106961017478564ad8f9099d07075240c9a085e1 Parents: bd8a9e9 4cc1097 Author: Brian Federle Authored: Mon Apr 15 14:07:19 2013 -0700 Committer: Brian Federle Committed: Mon Apr 15 14:07:19 2013 -0700 -- docs/en-US/ipv6-support.xml|4 ++-- .../com/cloud/server/ConfigurationServerImpl.java |3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) --
[24/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - Instances page - Change Affinity
action - populate affinity groups in dialog.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2198dda7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2198dda7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2198dda7
Branch: refs/heads/master
Commit: 2198dda74214866732235e33e391e608958d2ac2
Parents: 030235b
Author: Jessica Wang
Authored: Thu Apr 18 16:38:25 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 18 16:38:25 2013 -0700
--
ui/scripts/instances.js | 34 ++
1 files changed, 26 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2198dda7/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 7976ee6..08e7570 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -692,14 +692,32 @@
name: { label: 'label.name' },
type: { label: 'label.type' }
},
-dataProvider: function(args) {
- args.response.success({
-data: [
- { id: 1, name: 'Affinity Group 1', type: 'Affinity',
_isSelected: true },
- { id: 2, name: 'Affinity Group 2', type:
'Anti-affinity' },
- { id: 3, name: 'Anti-affinity Group', type:
'Anti-affinity', _isSelected: true }
-]
- });
+dataProvider: function(args) {
+
$.ajax({
+
url: createURL('listAffinityGroups'),
+
success: function(json) {
+ var items = [];
+
var allAffinityGroups =
json.listaffinitygroupsresponse.affinitygroup;
+
var previouslySelectedAffinityGroups =
args.context.instances[0].affinitygroup;
+
if(allAffinityGroups != null) {
+
for(var i = 0; i < allAffinityGroups.length; i++) {
+
var isPreviouslySelected = false;
+
if(previouslySelectedAffinityGroups !=
null) {
+
for(var k = 0; k <
previouslySelectedAffinityGroups.length; k++) {
+
if(previouslySelectedAffinityGroups[k].id == allAffinityGroups[i].id) {
+
isPreviouslySelected
= true;
+
break; //break for
loop
+
}
+
}
+
}
[27/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - Instances page - remove "Affinity
Groups" tab that has been replaced with "View Affinity Groups" drilldown in
Details tab.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea2a43e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea2a43e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea2a43e9
Branch: refs/heads/master
Commit: ea2a43e98a18285eeeb9b60268839733b0cc5161
Parents: 6c98696
Author: Jessica Wang
Authored: Thu Apr 18 17:37:53 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 18 17:37:53 2013 -0700
--
ui/scripts/instances.js | 18 --
1 files changed, 0 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea2a43e9/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 03656e2..cb20124 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1501,24 +1501,6 @@
args.response.success({data:
args.context.instances[0].securitygroup});
}
},
-
- /**
- * Affinity Groups tab
- */
- affinityGroups: {
-title: 'label.affinity.groups',
-multiple: true,
-fields: [
- {
-id: { label: 'ID' },
-name: { label: 'label.name' },
-description: { label: 'label.description' }
- }
-],
-dataProvider: function(args) {
- args.response.success({data:
args.context.instances[0].affinitygroup});
-}
- },
/**
* Statistics tab
[32/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - Instances page - Change Affinity
action - implement API call.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35681f3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35681f3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35681f3e
Branch: refs/heads/master
Commit: 35681f3e06fc17e2a499e76a0c3694aac995c328
Parents: b03fb20
Author: Jessica Wang
Authored: Fri Apr 19 17:37:22 2013 -0700
Committer: Jessica Wang
Committed: Fri Apr 19 17:37:22 2013 -0700
--
ui/scripts/instances.js | 40 ++--
1 files changed, 34 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35681f3e/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 8699b4d..b497a78 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -679,20 +679,48 @@
}
}
},
-action: function(args) {
- args.response.success();
+action: function(args) {
+ var
affinityGroupIdArray = [];
+
if(args.context.affinityGroups != null) {
+
for(var i = 0; i < args.context.affinityGroups.length; i++) {
+
if(args.context.affinityGroups[i]._isSelected == true) {
+
affinityGroupIdArray.push(args.context.affinityGroups[i].id);
+
}
+
}
+ }
+ var
data = {
+ id:
args.context.instances[0].id,
+
affinitygroupids: affinityGroupIdArray.join(",")
+ };
+ $.ajax({
+ url:
createURL('updateVMAffinityGroup'),
+
data: data,
+
success: function(json) {
+
var jid = json.updatevirtualmachineresponse.jobid;
+
args.response.success(
+
{_custom:
+
{jobId: jid,
+
getUpdatedItem: function(json) {
+
return
json.queryasyncjobresultresponse.jobresult.virtualmachine;
+
},
+
getActionFilter: function() {
+
return vmActionfilter;
+
}
+
}
+
[19/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - VM Wizard - populate Affinity step.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b203e6cb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b203e6cb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b203e6cb
Branch: refs/heads/master
Commit: b203e6cbf04dbc49dc58e4bf17848544718101fa
Parents: 9827d79
Author: Jessica Wang
Authored: Wed Apr 17 17:43:59 2013 -0700
Committer: Jessica Wang
Committed: Wed Apr 17 17:43:59 2013 -0700
--
ui/scripts/instanceWizard.js | 17 -
1 files changed, 8 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b203e6cb/ui/scripts/instanceWizard.js
--
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 2013cb4..43c2757 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -313,15 +313,14 @@
},
// Step 5: Affinity
- function(args) {
-args.response.success({
- data: {
-affinityGroups: [
- { id: 1, name: 'affinity1', description: 'Dummy Affinity Group
1' },
- { id: 2, name: 'affinity2', description: 'Dummy Affinity Group
2' },
-]
- }
-});
+ function(args) {
+ $.ajax({
+ url: createURL('listAffinityGroups'),
+ success: function(json) {
+ var items =
json.listaffinitygroupsresponse.affinitygroup;
+ args.response.success({data:
{affinityGroups: items}});
+ }
+ });
},
// Step 6: Network
[34/43] git commit: updated refs/heads/master to 5ce2890
Change affinity UI: Allow 0 checkbox selections
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/382e8f36
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/382e8f36
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/382e8f36
Branch: refs/heads/master
Commit: 382e8f36f377b8508e759a2976b0a6d47345ce89
Parents: 72da1ae
Author: Brian Federle
Authored: Mon Apr 22 11:27:16 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 22 11:27:16 2013 -0700
--
ui/scripts/ui-custom/affinity.js |8
1 files changed, 0 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/382e8f36/ui/scripts/ui-custom/affinity.js
--
diff --git a/ui/scripts/ui-custom/affinity.js b/ui/scripts/ui-custom/affinity.js
index f3356dd..6c237ed 100644
--- a/ui/scripts/ui-custom/affinity.js
+++ b/ui/scripts/ui-custom/affinity.js
@@ -80,14 +80,6 @@
return false;
}
- if (!$dataList.find(
-'input[type=radio]:checked, input[type=checkbox]:checked'
- ).size()) {
-cloudStack.dialog.notice({ message:
_l('message.select.instance')});
-
-return false;
- }
-
var complete = args.complete;
var start = args.start;
[29/43] git commit: updated refs/heads/master to 5ce2890
Detail view UI: Fix wrapping 'view all' buttons
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef4ed01c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef4ed01c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef4ed01c
Branch: refs/heads/master
Commit: ef4ed01c19c6292bc9974b6257a990615f349595
Parents: f548ce4
Author: Brian Federle
Authored: Fri Apr 19 13:02:08 2013 -0700
Committer: Brian Federle
Committed: Fri Apr 19 13:02:08 2013 -0700
--
ui/css/cloudstack3.css | 11 +--
1 files changed, 5 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef4ed01c/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 06fcbae..0f1041a 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1502,7 +1502,6 @@ div.list-view td.state.off span {
position: relative;
left: 0px;
float: left;
- width: 460px;
height: 22px;
border-top: 1px solid #808080;
/*+box-shadow:inset 0px 1px #FF;*/
@@ -1907,7 +1906,7 @@ div.detail-group td.view-all a {
background: url(../images/gradients.png) repeat-x 0px -529px;
font-size: 11px;
display: block;
- height: 25px;
+ height: 27px;
text-decoration: none;
color: #4C5D6C;
/*+text-shadow:0px 1px 2px #FF;*/
@@ -1916,7 +1915,7 @@ div.detail-group td.view-all a {
-o-text-shadow: 0px 1px 2px #FF;
text-shadow: 0px 1px 2px #FF;
float: left;
- padding: 0 8px 0 5px;
+ padding: 0 1px;
border-left: 1px solid #9B9EA2;
/*+border-radius:5px 0 0 5px;*/
-moz-border-radius: 5px 0 0 5px;
@@ -1971,10 +1970,10 @@ div.details .main-groups label.error {
}
.detail-view td.view-all.multiple {
- width: 123px !important;
- height: 22px;
- float: left;
+ max-width: 145px;
+ height: 17px;
display: block;
+ float: left;
margin: 8px 2px 8px 8px;
border: none !important;
/*+box-shadow:none;*/
[37/43] git commit: updated refs/heads/master to 5ce2890
detailView UI: Fix quickview actions not updating list view row
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5cea020
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5cea020
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5cea020
Branch: refs/heads/master
Commit: e5cea0204b36e3634e173fb7d510bc79ac40e478
Parents: 2be8368
Author: Brian Federle
Authored: Mon Apr 22 11:52:52 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 22 11:52:52 2013 -0700
--
ui/scripts/ui/widgets/detailView.js | 29 +++--
1 files changed, 19 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5cea020/ui/scripts/ui/widgets/detailView.js
--
diff --git a/ui/scripts/ui/widgets/detailView.js
b/ui/scripts/ui/widgets/detailView.js
index 4b520f9..0146b36 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -15,8 +15,9 @@
// specific language governing permissions and limitations
// under the License.
(function($, cloudStack, _l) {
- var replaceListViewItem = function($detailView, newData) {
-var $row = $detailView.data('list-view-row');
+ var replaceListViewItem = function($detailView, newData, options) {
+var $row = $detailView ? $detailView.data('list-view-row') :
+ options.$row;
if (!$row) return;
@@ -32,7 +33,9 @@
$row: $row,
data: $.extend(jsonObj, newData),
after: function($newRow) {
- $detailView.data('list-view-row', $newRow);
+ if ($detailView) {
+$detailView.data('list-view-row', $newRow);
+ }
setTimeout(function() {
$('.data-table').dataTable('selectRow', $newRow.index());
@@ -42,11 +45,13 @@
}
// Refresh detail view context
-$.extend(
- $detailView.data('view-args').context[
-$detailView.data('view-args').section
- ][0], newData
-);
+if ($detailView) {
+ $.extend(
+$detailView.data('view-args').context[
+ $detailView.data('view-args').section
+][0], newData
+ );
+}
};
/**
@@ -125,6 +130,7 @@
args = args ? args : {};
var $item = args.$item;
+ var $row = $detailView.data('list-view-row');
notification.desc = messages.notification(args.messageArgs);
notification._custom = $.extend(args._custom ? args._custom :
{}, {
@@ -140,11 +146,14 @@
viewArgs.onActionComplete();
}
- if (!$detailView.parents('html').size()) return;
+ if (!$detailView.parents('html').size()) {
+replaceListViewItem(null, args.data, { $row: $row });
+return;
+ }
+ replaceListViewItem($detailView, args.data);
$loading.remove();
$detailView.removeClass('detail-view-loading-state');
- replaceListViewItem($detailView, args.data);
if (!noRefresh) {
updateTabContent(args.data);
[26/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - Instances page - implement "View
Affinity Groups" drilldown.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c98696d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c98696d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c98696d
Branch: refs/heads/master
Commit: 6c98696d8ca0825dcfcd07d9381682e26f0325ce
Parents: 7f6e7c6
Author: Jessica Wang
Authored: Thu Apr 18 17:31:29 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 18 17:31:29 2013 -0700
--
ui/scripts/affinity.js |9 +
ui/scripts/instances.js |1 +
2 files changed, 10 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c98696d/ui/scripts/affinity.js
--
diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js
index d59d129..e6e8e34 100644
--- a/ui/scripts/affinity.js
+++ b/ui/scripts/affinity.js
@@ -24,8 +24,17 @@
type: { label: 'label.type' }
},
dataProvider: function(args) {
+ var data = {};
+ if (args.context != null) {
+ if ("instances" in args.context) {
+ $.extend(data, {
+ virtualmachineid:
args.context.instances[0].id
+ });
+ }
+}
$.ajax({
url: createURL('listAffinityGroups'),
+ data: data,
success: function(json) {
var items =
json.listaffinitygroupsresponse.affinitygroup;
args.response.success({data:
items});
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c98696d/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 03153a1..03656e2 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -284,6 +284,7 @@
viewAll: [
{ path: 'storage.volumes', label: 'label.volumes' },
{ path: 'vmsnapshots', label: 'label.snapshots' },
+ { path: 'affinityGroups', label:
'label.affinity.groups' },
{
path: '_zone.hosts',
label: 'label.hosts',
[36/43] git commit: updated refs/heads/master to 5ce2890
Affinity UI: Cleanup dialog on close
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2be8368f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2be8368f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2be8368f
Branch: refs/heads/master
Commit: 2be8368f449e49ac1629c230268c8af15912ffc5
Parents: 57686ae
Author: Brian Federle
Authored: Mon Apr 22 11:27:47 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 22 11:27:47 2013 -0700
--
ui/scripts/ui-custom/affinity.js |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2be8368f/ui/scripts/ui-custom/affinity.js
--
diff --git a/ui/scripts/ui-custom/affinity.js b/ui/scripts/ui-custom/affinity.js
index 1f51b52..1a23ff7 100644
--- a/ui/scripts/ui-custom/affinity.js
+++ b/ui/scripts/ui-custom/affinity.js
@@ -117,6 +117,7 @@
$('div.overlay').fadeOut(function() {
$('div.overlay').remove();
+$(':ui-dialog').dialog('destroy');
});
}
},
@@ -129,6 +130,7 @@
});
$('div.overlay').fadeOut(function() {
$('div.overlay').remove();
+$(':ui-dialog').dialog('destroy');
});
}
}
[17/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - (1) populate listView by API call.
(2) implement Add Affinity Group action.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df15ceac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df15ceac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df15ceac
Branch: refs/heads/master
Commit: df15ceac265e2b088515c7b7c7bdb02f637f8fb9
Parents: 5d235f6
Author: Jessica Wang
Authored: Wed Apr 17 16:27:20 2013 -0700
Committer: Jessica Wang
Committed: Wed Apr 17 16:27:20 2013 -0700
--
ui/scripts/affinity.js | 139 +++---
1 files changed, 102 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df15ceac/ui/scripts/affinity.js
--
diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js
index 8bfd844..7a15533 100644
--- a/ui/scripts/affinity.js
+++ b/ui/scripts/affinity.js
@@ -21,25 +21,22 @@
id: 'affinityGroups',
fields: {
name: { label: 'label.name' },
-type: { label: 'label.type' }
+description: { label: 'label.description' }
},
dataProvider: function(args) {
-args.response.success({
- data: [
-{ id: 1, name: 'Affinity Group 1', type: 'Affinity' },
-{ id: 2, name: 'Affinity Group 2', type: 'Anti-affinity' },
-{ id: 3, name: 'Anti-affinity Group', type: 'Anti-affinity' }
- ]
-});
+$.ajax({
+ url: createURL('listAffinityGroups'),
+ success: function(json) {
+ var items =
json.listaffinitygroupsresponse.affinitygroup;
+ args.response.success({data:
items});
+ }
+ });
},
actions: {
add: {
label: 'label.add.affinity.group',
- messages: {
-confirm: function(args) {
- return 'message.add.volume';
-},
+ messages: {
notification: function(args) {
return 'label.add.affinity.group';
}
@@ -52,40 +49,108 @@
label: 'label.name',
validation: { required: true }
},
+ description: {
+label: 'label.description'
+ },
type: {
-label: 'label.availability.zone',
+label: 'label.type',
select: function(args) {
- args.response.success({
-data: [
- { id: 'Affinity', description: 'Affinity' },
- { id: 'AntiAffinity', description: 'Anti-Affinity' }
-]
- });
+ $.ajax({
+ url:
createURL('listAffinityGroupTypes'),
+
success: function(json) {
+
var types = [];
+
var items = json.listaffinitygrouptypesresponse.affinityGroupType;
+
if(items != null) {
+
for(var i = 0; i < items.length; i++) {
+
types.push({id: items[i].type, description: items[i].type});
+
}
+
}
+
args.response.success({data: types})
+
}
+ });
}
- },
[23/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - Affinity Group page - details tab -
implement "View Instances" on right top corner.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/030235ba
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/030235ba
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/030235ba
Branch: refs/heads/master
Commit: 030235ba5203ddc78be88adba6da95b0534df656
Parents: 3390f01
Author: Jessica Wang
Authored: Thu Apr 18 14:04:31 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 18 14:04:31 2013 -0700
--
ui/scripts/affinity.js |7 +
ui/scripts/instances.js | 52 +-
2 files changed, 53 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/030235ba/ui/scripts/affinity.js
--
diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js
index daa8fb7..d59d129 100644
--- a/ui/scripts/affinity.js
+++ b/ui/scripts/affinity.js
@@ -201,8 +201,7 @@
for(var k = 0; k < firstPageVms.length; k++) {
if(firstPageVms[k].id == vmIds[i]) {
matchFound = true;
-
item.displayname = firstPageVms[k].displayname;
-
item.state = firstPageVms[k].state;
+
item = firstPageVms[k];
break; //break for looup
}
}
@@ -213,9 +212,7 @@
async: false,
data: {id: vmIds[i]},
success: function(json) {
-
var vmObj =
json.listvirtualmachinesresponse.virtualmachine[0];
-
item.displayname = vmObj.displayname;
-
item.state = vmObj.state;
+
item =
json.listvirtualmachinesresponse.virtualmachine[0];
}
});
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/030235ba/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 95f23ed..7976ee6 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -197,7 +197,57 @@
hostid: args.context.hosts[0].id
});
}
-
+
+ if("affinityGroups" in args.context) {
+ var vmIds =
args.context.affinityGroups[0].virtualmachineIds;
+ if(vmIds == null || vmIds.length == 0) {
+ args.response.success({data:
null});
+ return;
+ }
+ $.ajax({
+
[39/43] git commit: updated refs/heads/master to 5ce2890
Fix review step label -- should be step 7, not 6 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/922b51ca Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/922b51ca Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/922b51ca Branch: refs/heads/master Commit: 922b51ca79f7658b8391d0be2bf894617834d6a5 Parents: 7b011e7 Author: Brian Federle Authored: Mon Apr 22 14:02:58 2013 -0700 Committer: Brian Federle Committed: Mon Apr 22 14:02:58 2013 -0700 -- ui/index.jsp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/922b51ca/ui/index.jsp -- diff --git a/ui/index.jsp b/ui/index.jsp index 1fbd662..bbb8b36 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -91,7 +91,7 @@ under the License. 4 5 6 -6 +7 @@ -329,7 +329,7 @@ under the License. - +
[22/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - Affinity Group page - add new tab
"instances" that displays all vm instances under this affinity group.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3390f011
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3390f011
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3390f011
Branch: refs/heads/master
Commit: 3390f0114b2a6f52802fb6cb1f0e8321e3da4a71
Parents: 935b08b
Author: Jessica Wang
Authored: Thu Apr 18 12:24:44 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 18 12:24:44 2013 -0700
--
ui/scripts/affinity.js | 62 ++-
1 files changed, 61 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3390f011/ui/scripts/affinity.js
--
diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js
index 0bb08cc..daa8fb7 100644
--- a/ui/scripts/affinity.js
+++ b/ui/scripts/affinity.js
@@ -166,7 +166,67 @@
}
});
}
- }
+ },
+
+ /**
+ * VMs tab
+ */
+ vms: {
+title: 'label.instances',
+multiple: true,
+fields: [
+ {
+id: { label: 'ID' },
+displayname: { label: 'label.display.name' },
+state: { label: 'label.state' }
+ }
+],
+dataProvider: function(args) {
+ var vmIds =
args.context.affinityGroups[0].virtualmachineIds;
+ if(vmIds == null ||
vmIds.length == 0) {
+
args.response.success({data: null});
+ return;
+ }
+
+ $.ajax({
+ url:
createURL('listVirtualMachines'),
+ success:
function(json) {
+ var
firstPageVms = json.listvirtualmachinesresponse.virtualmachine;
+ var
items = [];
+
if(vmIds != null) {
+
for(var i = 0; i < vmIds.length; i++) {
+
var item = {id: vmIds[i]};
+ var matchFound = false;
+
if(firstPageVms != null) {
+
for(var k = 0; k < firstPageVms.length; k++) {
+
if(firstPageVms[k].id == vmIds[i]) {
+
matchFound = true;
+
item.displayname = firstPageVms[k].displayname;
+
item.state = firstPageVms[k].state;
+
break; //break for looup
+
}
+
}
+
}
+ if(matc
[41/43] git commit: updated refs/heads/master to 5ce2890
Add icon for 'change affinity' action
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7cef5212
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7cef5212
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7cef5212
Branch: refs/heads/master
Commit: 7cef52122796414e18e5d23b1bcdb2caed93361f
Parents: 25f2f0f
Author: Brian Federle
Authored: Wed Apr 24 16:46:17 2013 -0700
Committer: Brian Federle
Committed: Wed Apr 24 16:46:17 2013 -0700
--
ui/css/cloudstack3.css | 19 +++
ui/images/sprites.png | Bin 188552 -> 189677 bytes
2 files changed, 11 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7cef5212/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 5f916a6..15190d4 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -11690,7 +11690,6 @@ div.ui-dialog div.autoscaler div.field-group
div.form-container form div.form-it
background-position: 0px -707px;
}
-
.attach .icon,
.attachISO .icon,
.attachDisk .icon {
@@ -11874,16 +11873,13 @@ div.ui-dialog div.autoscaler div.field-group
div.form-container form div.form-it
}
.removeVlanRange .icon {
-
background-position: 1px -92px;
}
-.removeVlanRange:hover .icon{
-
+.removeVlanRange:hover .icon {
background-position: 1px -92px;
}
-
.resize .icon,
.updateResourceCount .icon {
background-position: -167px -66px;
@@ -11913,9 +11909,8 @@ div.ui-dialog div.autoscaler div.field-group
div.form-container form div.form-it
background-position: -168px -31px;
}
-.scaleUp .icon{
- background-position: -167px -66px;
-
+.scaleUp .icon {
+ background-position: -167px -66px;
}
.restoreVM:hover .icon,
@@ -12047,6 +12042,14 @@ div.ui-dialog div.autoscaler div.field-group
div.form-container form div.form-it
background-position: -228px -646px;
}
+.changeAffinity .icon {
+ background-position: -264px -2px;
+}
+
+.changeAffinity:hover .icon {
+ background-position: -263px -583px;
+}
+
.label-hovered {
cursor: pointer;
color: #FF !important;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7cef5212/ui/images/sprites.png
--
diff --git a/ui/images/sprites.png b/ui/images/sprites.png
index 03b01b3..ac7a276 100644
Binary files a/ui/images/sprites.png and b/ui/images/sprites.png differ
[43/43] git commit: updated refs/heads/master to 5ce2890
Merge branch 'ui-vm-affinity' Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ce28903 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ce28903 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ce28903 Branch: refs/heads/master Commit: 5ce289034d398290b10adf6b2345bcddbf3731e7 Parents: b5979ba f1bdae0 Author: Brian Federle Authored: Thu Apr 25 11:04:35 2013 -0700 Committer: Brian Federle Committed: Thu Apr 25 11:04:35 2013 -0700 -- .../WEB-INF/classes/resources/messages.properties | 11 +- ui/css/cloudstack3.css | 67 +- ui/dictionary.jsp | 10 + ui/images/sprites.png | Bin 188552 -> 192407 bytes ui/index.jsp | 19 +- ui/scripts/affinity.js | 183 +++ ui/scripts/cloudStack.js |9 +- ui/scripts/instanceWizard.js | 941 --- ui/scripts/instances.js| 151 +++- ui/scripts/ui-custom/affinity.js | 173 +++ ui/scripts/ui-custom/instanceWizard.js | 19 + ui/scripts/ui/widgets/detailView.js| 29 +- ui/scripts/ui/widgets/listView.js | 10 +- 13 files changed, 1109 insertions(+), 513 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ce28903/client/WEB-INF/classes/resources/messages.properties -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ce28903/ui/index.jsp --
[25/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - Instances page - Change Affinity
action dialog - a workaround to avoid dataProvider() being called twice that
populates duplicate data.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f6e7c6f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f6e7c6f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f6e7c6f
Branch: refs/heads/master
Commit: 7f6e7c6f81addd935721113d1a898aad4b9820cf
Parents: 2198dda
Author: Jessica Wang
Authored: Thu Apr 18 17:01:45 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 18 17:01:45 2013 -0700
--
ui/scripts/instances.js |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f6e7c6f/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 08e7570..03153a1 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -695,6 +695,7 @@
dataProvider: function(args) {
$.ajax({
url: createURL('listAffinityGroups'),
+
async: false, //make it sync to avoid dataProvider() being
called twice which produces duplicate data
success: function(json) {
var items = [];
var allAffinityGroups =
json.listaffinitygroupsresponse.affinitygroup;
[28/43] git commit: updated refs/heads/master to 5ce2890
CLOUDSTACK-2074: cloudstack UI - Affinity - Affinity Groups page - remove
"Instances" tab that has been replaced with "View Instances" drilldown in
Details tab.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f548ce4f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f548ce4f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f548ce4f
Branch: refs/heads/master
Commit: f548ce4fad95ee7e03357143b419261d6688b9a9
Parents: ea2a43e
Author: Jessica Wang
Authored: Thu Apr 18 17:52:20 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 18 17:52:20 2013 -0700
--
ui/scripts/affinity.js | 59 +--
1 files changed, 1 insertions(+), 58 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f548ce4f/ui/scripts/affinity.js
--
diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js
index e6e8e34..a9c6695 100644
--- a/ui/scripts/affinity.js
+++ b/ui/scripts/affinity.js
@@ -175,64 +175,7 @@
}
});
}
- },
-
- /**
- * VMs tab
- */
- vms: {
-title: 'label.instances',
-multiple: true,
-fields: [
- {
-id: { label: 'ID' },
-displayname: { label: 'label.display.name' },
-state: { label: 'label.state' }
- }
-],
-dataProvider: function(args) {
- var vmIds =
args.context.affinityGroups[0].virtualmachineIds;
- if(vmIds == null ||
vmIds.length == 0) {
-
args.response.success({data: null});
- return;
- }
-
- $.ajax({
- url:
createURL('listVirtualMachines'),
- success:
function(json) {
- var
firstPageVms = json.listvirtualmachinesresponse.virtualmachine;
- var
items = [];
-
if(vmIds != null) {
-
for(var i = 0; i < vmIds.length; i++) {
-
var item = {id: vmIds[i]};
- var matchFound = false;
-
if(firstPageVms != null) {
-
for(var k = 0; k < firstPageVms.length; k++) {
-
if(firstPageVms[k].id == vmIds[i]) {
-
matchFound = true;
-
item = firstPageVms[k];
-
break; //break for looup
-
}
-
}
-
}
- if(matchFound == false) { //the VM is not in API
response of "listVirtualMachines&page=1&pagesize=500"
-$.ajax({
-
[31/43] git commit: updated refs/heads/master to 5ce2890
Fix to pass all affinity group rows to action fn
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b03fb208
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b03fb208
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b03fb208
Branch: refs/heads/master
Commit: b03fb208a9a2f3421d9975c981307842dd3d22e9
Parents: c4fa5c0
Author: Brian Federle
Authored: Fri Apr 19 15:51:57 2013 -0700
Committer: Brian Federle
Committed: Fri Apr 19 15:51:57 2013 -0700
--
ui/scripts/ui-custom/affinity.js | 11 +--
1 files changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b03fb208/ui/scripts/ui-custom/affinity.js
--
diff --git a/ui/scripts/ui-custom/affinity.js b/ui/scripts/ui-custom/affinity.js
index 1012e7b..f3356dd 100644
--- a/ui/scripts/ui-custom/affinity.js
+++ b/ui/scripts/ui-custom/affinity.js
@@ -97,8 +97,15 @@
tierID: $dataList.find('.tier-select select').val(),
_subselect: $dataList.find('tr.multi-edit-selected
.subselect select').val(),
context: $.extend(true, {}, context, {
-affinityGroups:
$dataList.find('tr.multi-edit-selected').map(function(index, elem) {
- return $(elem).data('json-obj');
+affinityGroups: $dataList.find('tbody
tr').map(function(index, elem) {
+ var itemData = $(elem).data('json-obj');
+ itemData._isSelected = false;
+
+ if ($(elem).hasClass('multi-edit-selected')) {
+itemData._isSelected = true;
+ }
+
+ return itemData;
})
}),
response: {
[33/43] git commit: updated refs/heads/master to 5ce2890
listView, custom checkbox UI: Fix pre-checked checkbox state
Fixes pre-checked checkboxes not having multi-edit-selected class,
preventing item data from being passed to custom widget actions.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/72da1ae9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/72da1ae9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/72da1ae9
Branch: refs/heads/master
Commit: 72da1ae96960bc89f64a50bbcb9c9c6ac97662d2
Parents: 35681f3
Author: Brian Federle
Authored: Mon Apr 22 11:26:24 2013 -0700
Committer: Brian Federle
Committed: Mon Apr 22 11:26:24 2013 -0700
--
ui/scripts/ui/widgets/listView.js |4
1 files changed, 4 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/72da1ae9/ui/scripts/ui/widgets/listView.js
--
diff --git a/ui/scripts/ui/widgets/listView.js
b/ui/scripts/ui/widgets/listView.js
index 4bd4a42..f368951 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -780,6 +780,10 @@
.data('list-view-action-id', actionName)
);
+if ($td.find('input[type=checkbox]').is(':checked')) {
+ $tr.addClass('multi-edit-selected');
+}
+
return true;
}
git commit: updated refs/heads/master to e8b6c7b
Updated Branches:
refs/heads/master 5ce289034 -> e8b6c7b33
CLOUDSTACK-2120: mixed zone management - UI: count total number of hosts based
on selected option in zone type dropdown on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8b6c7b3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8b6c7b3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8b6c7b3
Branch: refs/heads/master
Commit: e8b6c7b33da77fadef337168f43074802c1bf4d2
Parents: 5ce2890
Author: Jessica Wang
Authored: Thu Apr 25 11:11:55 2013 -0700
Committer: Jessica Wang
Committed: Thu Apr 25 11:14:20 2013 -0700
--
ui/scripts/system.js | 16 +++-
1 files changed, 11 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8b6c7b3/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4692b61..312d5f4 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -246,13 +246,19 @@
},
hostCount: function(data) {
+ var data2= {
+ type: 'routing',
+ page: 1,
+ pagesize: 1
//specifying pagesize as 1 because we don't need any embedded objects to be
returned here. The only thing we need from API response is "count" property.
+};
+if(cloudStack.context.zoneType != null &&
cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
+ $.extend(data2, {
+zonetype: cloudStack.context.zoneType
+ });
+}
$.ajax({
url: createURL('listHosts'),
- data: {
-type: 'routing',
- page: 1,
- pagesize: 1
//specifying pagesize as 1 because we don't need any embedded objects to be
returned here. The only thing we need from API response is "count" property.
- },
+ data: data2,
success: function(json) {
dataFns.primaryStorageCount($.extend(data, {
hostCount: json.listhostsresponse.count ?
