etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,959 Commits 323 Branches 325 Tags 836 MiB
Commit Graph

16959 Commits

Author SHA1 Message Date
Edison Su d3c0110d0e add trust="yes" option to ssh tasks 
ant r* targets would error out if you haven't added a host entry
for devcloud. This fixes the problem by trusting it.

Signed-off-by: Tomoe Sugihara <tomoe@midokura.com>
 2012-07-10 17:05:10 -07:00
Edison Su fb59fc5c8a disable virtualbox dhcp server for Vms created by cloudstack 2012-07-10 16:20:20 -07:00
Brian Federle 262bbbe800 Add block to show/hide tier select 
-- Hidden by default, needs real conditional code
 2012-07-10 15:41:23 -07:00
Brian Federle 9f093817f3 Implement static NAT tier select UI 
Adds a new drop-down to the enable static NAT dialog to allow selecting a tier to be associated with the VM. This is in the header of the list view.

It is defined as follows:

enableStaticNAT: {
  ...
    action: {
      noAdd: true,
      custom: cloudStack.uiCustom.enableStaticNAT({
        // VPC
        tierSelect: function(args) {
          args.response.success({
            data: [
              { id: '1', description: 'VPC 1' },
              { id: '2', description: 'VPC 2' }
            ]
          });
        },
    ...
 2012-07-10 15:41:23 -07:00
Alena Prokharchyk f59b935da5 VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call 
Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
 2012-07-10 15:20:39 -07:00
Brian Federle c87501d8ae Fix placement of header 2012-07-10 14:58:06 -07:00
Brian Federle 5b8f5d6ae3 multiEdit: Correctly pass context to header fields 2012-07-10 14:57:07 -07:00
Brian Federle dd52157f09 Add code to show/hide 'tiers' header fields 2012-07-10 14:57:07 -07:00
Brian Federle 5fa4f4cf37 Pass mulit-edit form data to add VM dialogs, as part of context 2012-07-10 14:57:06 -07:00
Brian Federle 04ac28202f Multi-edit: refactor form serialization 
To support header-level form items, serialize every form within the
multi-edit div (not just the main table form). For reusability, make
data serialization handled in separate 'getMultiData' function.
 2012-07-10 14:57:06 -07:00
Brian Federle 7de02b6d5c Update dummy tier data 2012-07-10 14:57:05 -07:00
Brian Federle 081f1e335d Add header fields 2012-07-10 14:57:05 -07:00
Sheng Yang ade3ae4e3c CS-15512: Fix delete vpn connection 2012-07-10 14:47:50 -07:00
Alena Prokharchyk c2f9417de4 VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method 2012-07-10 14:35:50 -07:00
Brian Federle b000b8047e CS-15475: Fix missing 'add guest network' action from network list 
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
 2012-07-10 11:24:07 -07:00
Edison Su 3bbb694413 For devcloudsetup.sh: 
Added dom0 memory settings to grub config.
    Added root password reset.
    Install xen ia32 instead of amd64, to 32bit compability
Send-by: chip.childers@sungard.com
RB: https://reviews.apache.org/r/5877/
 2012-07-10 11:18:32 -07:00
Sheng Yang 94c62f2127 CS-15513: Fix group 5 of s2s vpn 
Conflicts:

	utils/test/com/cloud/utils/net/NetUtilsTest.java
 2012-07-10 10:38:17 -07:00
Pranav Saxena 9eebdd808d CS-15475:Not showing Add GuestNetwork Tab in Network in multi zone setup of advanced and basic zones together 2012-07-10 15:40:14 +05:30
Pranav Saxena 692e8fb98c Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-10 15:36:24 +05:30
Chip Childers 7488b9d752 For devcloudsetup.sh: 
Added dom0 memory settings to grub config.
Added root password reset.
 2012-07-09 23:27:01 -04:00
Chip Childers c06d319ef4 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-09 22:54:01 -04:00
Alena Prokharchyk 911ed25fbc Merge branch 'master' into vpc 2012-07-09 18:31:28 -07:00
Alena Prokharchyk c2134b431f VPC: CS-15505 - allocate guest nics when new VR starts in VPC 2012-07-09 18:30:58 -07:00
Alena Prokharchyk 525ba472e8 VPC: CS-15481: don't allow creating networkACLs for overlapping cidrs/ports 2012-07-09 18:23:58 -07:00
Alena Prokharchyk 55db112990 CS-15503: don't send Ips in Releasing state as a part of VPC VR start 2012-07-09 18:23:50 -07:00
Alena Prokharchyk 21519070fc VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManager.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-09 18:23:35 -07:00
Alena Prokharchyk d52c6e2313 listPublicIpAddresses api: don't set associatedWithNetworkId if corresponding field is null in the DB 2012-07-09 18:13:32 -07:00
Alena Prokharchyk 10dcc117c3 VPC: CS-15486 - prepare public nic as a part of VR deployment 2012-07-09 18:12:54 -07:00
Deepti Dohare 29e90f8358 CS-15429: When an instance is created with data volume, account limit for this data volume was not checked against. Adding a check for that. 
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
 2012-07-10 06:02:30 +05:30
Brian Federle ccf2851ca6 CS-12739: VM wizard: add asterisk next to network 'name' field 
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
 2012-07-09 16:41:14 -07:00
Sheng Yang 8404dba5e0 CS-15452: Fix wrong repsonse ID for s2s vpn 2012-07-09 16:21:21 -07:00
Pranav Saxena e91dd3e653 CS-12739:DeployvM wizard when choosing to Add a new network if user does not provide the network name then clicking on Next does nothing 2012-07-10 04:43:01 +05:30
Alena Prokharchyk 84cdf2c28d CS-15459: fixed listTags by resourceType 2012-07-09 14:59:58 -07:00
Brian Federle 10e70bcb9c CS-15392: Add error handling to edit user action 
Original patch by: Olga Smola <olya.smola@gmail.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
 2012-07-09 14:54:15 -07:00
Chip Childers 20bbaf01ce Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-09 16:42:16 -04:00
Sheng Yang f6aea09a16 CS-15498: Fix delete s2s vpn NPE 2012-07-09 12:04:57 -07:00
Edison Su fa414bbf0a It's due to replace.properties is missing, by default the password is cloud for user cloud 
Revert "removing unneeded password from cloud-dev setup-script"

This reverts commit f157b702e4.
 2012-07-09 11:48:43 -07:00
Edison Su fe15da5e3e add replace.properties back 2012-07-09 11:47:10 -07:00
Chip Childers 444dba6edd Fixed origin merge cleanup error. 2012-07-09 11:49:22 -04:00
Chip Childers 082d5634d1 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Conflicts:
	server/src/com/cloud/netapp/NetappAllocator.java
	server/src/com/cloud/netapp/dao/LunDao.java
	server/src/com/cloud/netapp/dao/PoolDao.java
	server/src/com/cloud/netapp/dao/VolumeDao.java
	server/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java
	server/src/com/cloud/servlet/ConsoleProxyClientParam.java
	server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java
	server/src/com/cloud/servlet/ConsoleProxyServlet.java
	server/src/com/cloud/storage/dao/VolumeHostDao.java
	server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
 2012-07-09 11:48:34 -04:00
David Nalley f157b702e4 removing unneeded password from cloud-dev setup-script 2012-07-08 22:14:20 -04:00
Alena Prokharchyk a6086dc806 Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
Alena Prokharchyk 63d6941bdc ResourceTags: respect tag parameter in listTemplates/listIsos commands 
Conflicts:

	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
 2012-07-06 16:59:14 -07:00
Alena Prokharchyk 5be0a3eeb1 VPC: fixed listNetworkACLs by networkId 
Conflicts:

	api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
 2012-07-06 16:43:39 -07:00
Likitha Shetty 8d38f4e051 CS-15167: AWS API calls do not honor the "admin" accounts ability to view/act on the resources owned by regular users. 2012-07-06 16:00:27 -07:00
Alena Prokharchyk c9eb0c59bf VPC: allow adding private gateway to the VPC when the VR is in Stopped state 2012-07-06 15:28:07 -07:00
Alena Prokharchyk 818a3c72ac VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
 2012-07-06 14:57:26 -07:00
David Nalley 47ea9f254c Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-06 17:28:38 -04:00
Pradeep Soundararajan 32fef61ac2 [Defect / Enhancement / New Feature] CS-15281 : Removal of third party dependencies in Citrix code base 2012-07-06 17:28:29 -04:00
Brian Federle ca231fe8be CS-15401: Fix arrow BG for PF/LB UI for Japanese language 
When opening Network screen, arrows to the right side of "show all"
for firewall, load balancer and port forwarding are divided in
Japanese localized environment. This fix adjusts the CSS to fit longer
characters in this condition.

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
 2012-07-06 14:04:08 -07:00