19806 Commits

Author SHA1 Message Date
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
Alex Huang
b940947764 Revert "Updating conversion pattern strings from 1. to 1"
The actual fix was already put in.

This reverts commit 4c729e758b935d58a8e93027c604e6353ad05ff2.
2013-07-30 14:07:20 -07:00
Alena Prokharchyk
244cf3b20a CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command
Fixed the build: use CallerContext instead of UserContext
2013-07-30 13:53:31 -07:00
Jessica Wang
3bdaf55eb2 CLOUDSTACK-2569: UI > Infrastructure menu - zone detail - Cisco VNMC - apply action filter. 2013-07-30 13:41:18 -07:00
Brian Federle
f06ad9bcae CLOUDSTACK-3487: Add egress default policy to network offering UI 2013-07-30 12:55:42 -07:00
Alena Prokharchyk
43dc85cea1 Revert "CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command"
This reverts commit 416331ae800a4511913f2c2b8ef25d4c2b8606b0.
2013-07-30 12:05:09 -07:00
Alena Prokharchyk
416331ae80 CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command 2013-07-30 11:17:17 -07:00
Brian Federle
4e3dc2622d CLOUDSTACK-3531: Add isrouting checkbox to register template dialog 2013-07-30 11:09:47 -07:00
frank
6070a8b370 CloudStack CLOUDSTACK-1812
create physical network fails while creating basic zone
2013-07-30 11:11:17 -07:00
Jessica Wang
405f73267e CLOUDSTACK-2990: UI > scale up VM dialog - add description 'For VMware-based Linux VMs, please read the dynamic scaling section in the admin guide before scaling.' 2013-07-30 10:57:07 -07:00
Alena Prokharchyk
95fde83815 CLOUDSTACK-3936: db upgrade - added upgrade path from CCP 2.2.15,2.2.16 to CS 4.2 2013-07-30 10:53:23 -07:00
Marcus Sorensen
566ce3e625 Summary: Fix null pointer and op_networks blocker to account cleanup
Detail: Accounts can fail in cleanup/gc process due to inconsistent op_networks
table and null pointer in looking up account for event publishing.

BUG-ID: CLOUDSTACK-3957
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1375204815 -0600
2013-07-30 11:22:11 -06:00
Sebastien Goasguen
2b0946c6db [GSOC] Mesos integration mid-term report
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2013-07-30 13:17:46 -04:00
Alena Prokharchyk
a36c8a962b CLOUDSTACK-3902: createVpcOffering - throw an excpetion when sourceNat service is not passed in 2013-07-30 10:08:46 -07:00
Gaurav Aradhye
906ea82572 CLOUDSTACK-3168: Fix test_reboot_router.py to ssh using public IP
test_reboot_router.py was trying to ssh to vm using private IP
and hence it failed with error "No route to host."
Fixed the testcase to ssh using public IP.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-30 20:12:23 +05:30
Likitha Shetty
6cbcd9777d CLOUDSTACK-3139 - If management server doesn't have internet connection RegisterTemplate and UploadVolume will fail when CS tries to verify if the account has exceeded its secondary storage limit.
No change in behavior if management server has internet connection.
Now if management server doesn't have internet connection download process will not fail. But CS will noly check if the account has already reached or maxed its limits instead of checking if the limit will be breached with the addition of the new storage
2013-07-30 19:35:26 +05:30
Chip Childers
3364e29640 More license header fixes for tools/ngui 2013-07-30 10:06:10 -04:00
Chip Childers
aa9cd72418 Fixing license headers within the tools/ngui folder 2013-07-30 10:01:37 -04:00
Murali Reddy
b2fdfc5084 CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events
for portable IPs

generating usage event for acquire and release
2013-07-30 19:01:10 +05:30
Chip Childers
4c729e758b Updating conversion pattern strings from 1. to 1 2013-07-30 09:04:18 -04:00
Sanjay Tripathi
6ec2bb1518 CLOUDSTACK-2909: patch to fix TAB in US keyboard. 2013-07-30 18:02:27 +05:30