cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [40/43] git commit: updated refs/heads/master to 5ce2890
Date Thu, 25 Apr 2013 18:08:58 GMT
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 <brian.federle@citrix.com>
Authored: Wed Apr 24 16:02:56 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
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 +-
 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/UserVMDaoTestContext.xml     |   44 +
 .../resource/NfsSecondaryStorageResource.java      |   22 +
 setup/db/db/schema-410to420.sql                    |  334 ++-
 test/integration/smoke/test_affinity_groups.py     |   10 +-
 .../smoke/test_deploy_vm_with_userdata.py          |  144 +
 test/integration/smoke/test_public_ip_range.py     |    6 +-
 test/integration/smoke/test_vm_life_cycle.py       |   28 +-
 tools/marvin/marvin/cloudstackConnection.py        |   34 +-
 tools/marvin/marvin/codegenerator.py               |    4 +-
 tools/marvin/marvin/integration/lib/base.py        |   11 +-
 ui/css/cloudstack3.css                             |   26 +-
 ui/scripts/instances.js                            |   37 +-
 ui/scripts/regions.js                              |  111 +-
 ui/scripts/storage.js                              |   12 +-
 ui/scripts/system.js                               |   91 +-
 ui/scripts/zoneWizard.js                           |   29 +-
 89 files changed, 3464 insertions(+), 1974 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25f2f0fc/ui/css/cloudstack3.css
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25f2f0fc/ui/scripts/instances.js
----------------------------------------------------------------------
diff --cc ui/scripts/instances.js
index b1c3e2e,0c4c7d2..f95f0a3
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@@ -194,17 -194,17 +194,23 @@@
  				}
  
          if("hosts" in args.context) {
 -	  $.extend(data, {
 -	    hostid: args.context.hosts[0].id
 -	  });
 -	}
 -        
 +					$.extend(data, {
 +					  hostid: args.context.hosts[0].id
 +					});
 +				}
 +				
 +				if("affinityGroups" in args.context) {				  
 +					$.extend(data, {
 +					  affinitygroupid: args.context.affinityGroups[0].id
 +					});		
 +				}
- 								
++
+         if(args.context.zoneType != null && args.context.zoneType.length > 0)
{ //Basic type or Advanced type
+           $.extend(data, {
+             zonetype: args.context.zoneType
+           });
 -	}
 -	
++	      }
++        
          $.ajax({
            url: createURL('listVirtualMachines'),
            data: data,


Mime
View raw message