19826 Commits

Author SHA1 Message Date
Sheng Yang
6ebf7e273d Automation: Fix test_vpc_network_lbrules.py 2013-07-31 22:34:22 -07:00
Radhika PC
59854fd505 CLOUDSTACK-1567 2013-08-01 10:58:00 +05:30
Mice Xia
55bc01cc98 fix UI display bug for vmsnapshot, detailView of vmsnapshot always show the same one 2013-08-01 12:46:20 +08:00
John Burwell
e2bcbe90c0 - CLOUDSTACK-3229: Fixes a think-o in the handling of unmodifiable
collections and adds a rail in s3xen to raise an exception if the file being
put does not exist
2013-08-01 00:14:57 -04:00
John Burwell
1ae682de78 - CLOUDSTACK-3229: Properly serialize the https property to the s3Xen
plugin
  - Extracts the duplicated serializeProperties methods to
    ReflectUtils#flattenProperties
  - Adds unit tests for ReflectUtils#flattenProperties
2013-08-01 00:14:43 -04:00
Mice Xia
51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-08-01 10:47:36 +08:00
Sheng Yang
7e9e804484 Automation: Fix test_vpc_network_pfrules.py
Need to wait VM to boot up before stop the VR.

Also test 4 is identical to test 3, fix it.
2013-07-31 19:09:45 -07:00
Sheng Yang
a3df696fd6 Automation: Fix SSH connection test
And increase default retry to 10 times, each 30 seconds.

Comment out auth exception part because sometime it caused failure when VM
is starting up.

Now we just wait anyway for 5 minutes if it's failing.
2013-07-31 18:28:33 -07:00
Edison Su
6ea9d8b159 CLOUDSTACK-3976: if the snapshot is empty and it's the last one in the chain, we need to take full snapshot for the snapshots in sequence 2013-07-31 17:43:49 -07:00
Edison Su
06b9976371 CLOUDSTACK-3976: delete parent snapshot if child snapshots are deleted 2013-07-31 17:03:27 -07:00
Min Chen
f23c7d21a1 CLOUDSTACK-3987: Setting extract.url.expiration.interval is not honored
for S3 generated url, which is hard-coded to 1 hour.
2013-07-31 16:30:46 -07:00
Murali Reddy
5695db80ac CLOUDSTACK-3731: [GSLB] deleteGlobalLoadBalancerRule fails with the
java.lang.NumberFormatException

While deleting LB monitor and GSLB service binding Nitro API fails
with wierd NumberFormatException. Adding a workaround to delete the LB
monitor after GSLB service is delted (which ensures intenrally LB
monitor is delted).
2013-08-01 04:51:24 +05:30
Wido den Hollander
b611394cca rbd: Enable snapshotting of RBD images
Signed-off-by: Wido den Hollander <wido@42on.com>
2013-08-01 01:12:42 +02:00
Edison Su
4eefce15be CLOUDSTACK-3950: the issue can be reproduced by: copy iso failed during the first time, for some reason, then copy the same iso again, the issue be triggered. 2013-07-31 15:49:48 -07:00
Alena Prokharchyk
29ec4dc323 CLOUDSTACK-3982: listAccounts - count only UserVms when calculate total number of Running vms per account 2013-07-31 15:28:51 -07:00
Sheng Yang
536c377752 Marvin: Add missing __init__ to StaticRoute 2013-07-31 15:10:39 -07:00
Sheng Yang
b0dda92025 Automation: Fix test_vpc_routers.py
Account cannot be cleaned per test case since it's setup in setUpClass()
2013-07-31 15:03:58 -07:00
Min Chen
ad653bf9f5 CLOUDSTACK-3977: vm deployement is failing ;: Resource [Host:5] is
unreachable: Host 5: Unable to send class
org.apache.cloudstack.storage.command.CopyCommand because agent is in
maintenance mode.
2013-07-31 14:04:20 -07:00
Alena Prokharchyk
2cacbeac2c CLOUDSTACK-3974: 410-420 db upgrade - exclude is_inline field from the query when insert the entry for the F5 load balancer as this field was dropped as a part of 40-41 upgrade 2013-07-31 13:33:52 -07:00
Brian Federle
6007da198c CLOUDSTACK-2944: Fix typo in addIpToNic dialog 2013-07-31 10:34:46 -07:00
Chip Childers
86aafa2db6 Fixing setnextversion.sh 2013-07-31 11:08:43 -04:00
John Burwell
ceed152426 - CLOUDSTACK-3229: Passes the bucket name as "bucket" into the s3xen
plugin
2013-07-31 09:58:22 -04:00
Bharat Kumar
980b227817 recalculate the capacity after overcomit change.
Conflicts:
	server/src/com/cloud/capacity/CapacityManager.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-07-31 18:39:14 +05:30
Wido den Hollander
ce06d6542a CLOUDSTACK-3951: Don't require SSH access to KVM nodes when cancelling maintenance 2013-07-31 15:07:32 +02:00
Prasanna Santhanam
cce14f3974 Include SSH retry logic when encountering channel failures.
Only on SSHExceptions we attempted retries, but during socket failures,
like Network Unreachable we failed the ssh connection immediately.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit dcbb2fcaa18e3faaf1c0765633300f7d0fa46d2c)
2013-07-31 17:20:35 +05:30
Prasanna Santhanam
476bd93e43 Cleanup the marvin logger
It is useful to have the same logger used in the marvinplugin into the
testcase. The testcase can then append its name to the logger making
the logs specify exactly which test is executing when the logs are
generated

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c84a2d8801b7898dbfee18e17950cb9fca7d36e7)
2013-07-31 17:20:35 +05:30
Harikrishna Patnala
3d9fc3dbc0 CLOUDSTACK-2717: listCapabilities API to return
allow.public.user.templates configuration parameter value
 defined at account level.
Signed by - Nitin Mehta<nitin.mehta@citrix.com>
2013-07-31 16:58:32 +05:30
Bharat Kumar
c7a1dbb176 Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-31 15:31:42 +05:30
Harikrishna Patnala
9939d09455 CLOUDSTACK-3969: Upgrade failed from 3.0.3 to 4.2 in KVM host with error 4.2.0 KVM SystemVm template not found though systemvm-kvm-4.2 template is uploaded during 3.0.3 setup
This is due to mysql version conflict with '=' and 'LIKE'.
Changing to '=' while searching for new system template.
2013-07-31 15:12:10 +05:30
Harikrishna Patnala
2c53ede1de CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM 2013-07-31 15:07:17 +05:30
Prasanna Santhanam
fee7a868e1 CLOUDSTACK-3916: Fix silly string formatting mistake
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-31 11:12:48 +05:30
SrikanteswaraRao Talluri
bd7bff792b CLOUDSTACK-3923: Fix the scripts to select default vpc offering
CLOUDSTACK-3923: Fix the scripts to select default vpc offering

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-31 11:12:48 +05:30
Rajesh Battala
2cca335856 CLOUDSTACK-3924 NPE while internal LB vm is getting created
Issue:
======
Unable to created internalLB Vm. this is due while determining maxconn
value from networkoffering.
to find the networking offering, networkid is passed instead of
networkoffering id which is causing the issue.

fixed:
=====
fixed the issue by passing the network offering id instead of network
id.

Conflicts:
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
2013-07-31 10:53:02 +05:30
Marcus Sorensen
ac59a4f136 Summary: Move Xen vmdata to new, non-ssh method
Detail: KVM recently got a patch that did away with a few dozen ssh calls
when programming virtual router (CLOUDSTACK-3163), saving several seconds
for each vm served by the virtual router when the router is rebooted. This
patch updates Xen to use the same method, and cleans up the old script refs.

Reviewed-by: Sheng Yang, Prasanna Santhanam
2013-07-30 21:45:36 -06:00
Marcus Sorensen
eea3bb84d5 CLOUDSTACK-3964 Change permissions on vm router vmdata script
Submitted-by: Toshiaki Hatano
2013-07-30 20:46:37 -06:00
Sheng Yang
7882ef512c CLOUDSTACK-3864: Fix test_blocker_bugs.py for firewall
Currently we're using enable/disable static nat rather than create IP forwarding
command. The list of StaticNAT won't work.

Also change to use API to verify the rules rather than look into db directly.
2013-07-30 19:04:35 -07:00
Min Chen
622a9e1b95 CLOUDSTACK-3949:[Object_Store_Refactor][Usage] No usage event is
generated for registered ISO.
2013-07-30 18:08:05 -07:00
Prachi Damle
a8360e41c0 CLOUDSTACK-3942 NPE from findStoragePool method
Changes:
- Added null checks for podId

Conflicts:

	server/src/com/cloud/storage/StorageManagerImpl.java
2013-07-30 17:53:31 -07:00
Min Chen
c2192808aa CLOUDSTACK-3686: Registering a template does not generate a usage event. 2013-07-30 17:35:12 -07:00
Anthony Xu
f1fb7c3efe in security group, CS put a rule in ebtables filter table FORWARD chain to prevent user from changing VM mac address
util.pread2(['ebtables', '-A', vm_chain, '-i', vif, '-s', '!', vm_mac,  '-j', 'DROP'])

if user changes the VM mac address, all egress packet from the VM will be dropped, but the egress packet still contaminate the bridge cache with fake MAC,

This patch moves the rule to ebtables nat table PREROUTING chain, then the egress packet with modified MAC will not contaminate the bridge cache.

Anthony
2013-07-30 17:04:21 -07:00
Sheng Yang
e4f8068ef1 CLOUDSTACK-3826: Automation: Fix test_vpc_routers
1. You cannot check routers after your destroy them
2. You cannot use the old value in checking migration status.
3. You cannot upgrade VR to a non-system offering.
2013-07-30 16:52:53 -07:00
Toshiaki Hatano
7774ecfd5a CLOUDSTACK-3959: [KVM] agent setup failed when physical interface name is in pXpY format
Add handling.

Signed-off-by: Edison Su <sudison@gmail.com>
2013-07-30 16:17:12 -07:00
Edison Su
211524f3bc add note on vmwarweguru->getCommandHostDelegation 2013-07-30 16:17:06 -07:00
Edison Su
c42f51d75b CLOUDSTACK-3944: fix regression for vmware 2013-07-30 16:17:02 -07:00
Alex Huang
1e1ee902a2 Moved over the new jobs framework from vmsync. This has not been integrated into the server package yet. Will do that next 2013-07-30 15:00:58 -07:00
Min Chen
730d045085 CLOUDSTACK-3857: create VOLUME_CREATE event at CreateVolumeCmd instead
of at AttachVolumeCmd.
2013-07-30 14:51:02 -07:00
Alena Prokharchyk
9f66d18de6 CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id 2013-07-30 14:30:53 -07:00
Alena Prokharchyk
9b7c4a6c47 CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
2013-07-30 14:13:58 -07:00
Alex Huang
5595a099b2 Added commons io to server 2013-07-30 14:07:21 -07:00
Alex Huang
a8da8c8dff Added commons io to runtime 2013-07-30 14:07:20 -07:00