Commit Graph

494 Commits

Author SHA1 Message Date
Alex Huang 57bafc8fe9 Another merge from master. This is just getting laborious 2013-07-01 11:29:57 -07:00
Alex Huang 1f5c672314 Added missing file 2013-07-01 11:19:27 -07:00
Alex Huang 3cddc36b29 Fixed a problem with the jobcontext being null if it came from the admin port 2013-07-01 11:19:19 -07:00
Edison Su 49ded7e4a3 the plugin better not touch database 2013-06-29 15:09:43 +05:30
Prasanna Santhanam f1134da8df Group storage subsystem components for spring
Breaking down storage components among oss, nonoss and simulator
contexts. The default components are loaded by

OSS - applicationContext + componentContext
NonOSS - applicationContext + nonossComponentContext
Simulator - applicationContext + simulatorComponentContext

provider beans are are selectively overridden for simpler configuration.
Where possible beans are loaded by local reference.

<list merge=true> does not unfortunately work perfectly for bean merging
the providers causing a bit of bloat. Explore for later.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:53:41 +05:30
Prasanna Santhanam de38cd815f Fix typo in class name
AsyncRpcConext -> AsyncRpcContext

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
Min Chen 87c401aaaf CLOUDSTACK-3144: [Automation] Deletion of templates failing. Fails to
find image store housing template.
2013-06-28 17:57:42 -07:00
Donal Lafferty 58f9202818 CLOUDSTACK-3215: Cannot Deploy VM when using S3 object store without NFS Cache
Signed-off-by: Edison Su <sudison@gmail.com>
2013-06-28 16:52:06 -07:00
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Prachi Damle 02ab2eb384 Revert "Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries"
This reverts commit 7f2f25d640.
2013-06-28 14:58:32 -07:00
Bharat Kumar 6b0df2566d Cloudstack-3106 Delete all ips except ipAlias. Cloudstack-3119 Shared network removal doesn't cleanup corresponding IP ranges
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
Bharat Kumar 7f2f25d640 Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:54 +05:30
Kishan Kavala 87a5dc582e encrypt vnc_password for removed Vms also. Snapshots of removed Vms still refer Vm VOs 2013-06-28 11:13:02 +05:30
Min Chen b09f69d917 CLOUDSTACK-3249: [Object_Store_Refactor] Unable to deployVm from
template when the management server was restarted in the middle of
Secondary to Primary storage template download.
2013-06-27 17:36:02 -07:00
Alena Prokharchyk 5437a0d058 CLOUDSTACK-3126: don't count system network (private gateway's network) when calculate networks count in the vpc 2013-06-27 17:10:14 -07:00
Alex Huang 52c9ea6a1f Cleanup some commented code 2013-06-27 16:21:56 -07:00
Alex Huang b7d61f09b9 Migration now works 2013-06-27 16:18:14 -07:00
Donal Lafferty 4361418e41 Removed Dead Code from Management Server Hyper-V 2012 Support
Update ImageFormat enum to include VHDX format introduced with Hyper-V
Server 2012.
Remove existing Hyper-V plugin, because it does not work and is dead
code.
Remove references to existing Hyper-V plugin from config files.
Remove Hypervisor.HypervisorType.Hyperv special cases from manager code
that are unused or unsupported.
Specifically, there is no CIFS secondary storage class
"CifsSecondaryStorageResource".  Also, the Hyper-V plugin's
ServerResource is contacted by the management server and not the other
way around.
Add Hyperv-V support to ListHypervisorsCmd API call

Signed-off-by: Edison Su <sudison@gmail.com>
2013-06-27 11:46:02 -07:00
Alex Huang 262352a1c6 Another merge from master to bring over fixes to bugs that broke the bvt 2013-06-27 11:16:32 -07:00
Kishan Kavala f96442a45b CLOUDSTACK-3231: Update service offering Id of allocated Vm usage whem service offering changes for a Vm 2013-06-27 16:01:39 +05:30
Min Chen de44a77878 Gracefully handle racing condition in updating state of dataobject and
data store mapping table.
2013-06-26 17:16:25 -07:00
Murali Reddy ff167134e4 CLOUDSTACK-3214: transferring portable IP across zones with enableStatic
NAT does not work

making an exception for portabe IP, so that if the current datacenter with
portable IP is associated is different from destiantion data center

also on transfer on to new zone, transfer the portable ip association to
new data center, physical network id's
2013-06-26 19:29:55 +05:30
Nitin Mehta 1c102a0589 CLOUDSTACK-2835: Change function from execute to executeUpdate 2013-06-26 17:47:17 +05:30
Harikrishna Patnala c0591531d8 CLOUDSTACK-3187: cluster.(cpu/memory).allocated.capacity.disablethreshold in not considering overcommit factor. cluster is getting disable based on actual use
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 16:02:21 +05:30
Harikrishna Patnala 9385cf0453 CLOUDSTACK-2835: VR Deployement from admin registered template is failing because registered template type is user. Additional parameter "isrouter" in register/update template API for the root admin. True if registered template is of type ROUTING.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 16:00:12 +05:30
Alex Huang 241d54696e Migrate bugs fixed 2013-06-25 16:49:56 -07:00
Alex Huang 5bd65daa03 How did these things actually pass in master 2013-06-25 13:32:37 -07:00
Alex Huang 4f709abd6a Merge fixes. Now started 2013-06-24 18:04:48 -07:00
Alex Huang 7b7db0560c merge is complete 2013-06-24 16:50:31 -07:00
Alex Huang a49109ae0b migration working 2013-06-24 13:31:11 -07:00
Alex Huang 95fe42cc7c Migration work 2013-06-24 10:16:37 -07:00
Alex Huang c0febea950 finished up the conversion to using outcome 2013-06-24 10:16:35 -07:00
Kishan Kavala da0006618f CLOUDSTACK-3124: Deletion of ACL associated with a tier/ pvt gateway should not be allowed. Check for associated tiers/gateways before deletion 2013-06-24 17:58:29 +05:30
Jayapal 6a7ae637dd CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider 2013-06-24 13:37:00 +05:30
Kelven Yang 340e1da4c4 Fix test cases in OSS build caused by CallContext changes 2013-06-20 18:03:08 -07:00
Alena Prokharchyk ae6e8b448f CLOUDSTACK-3085: network implement - deploy internal lb vm for the ip only when:
* the load balancer contains lb rule in state "Active"
* when lb rule has at least one vm assigned to it
2013-06-20 13:01:32 -07:00
Edison Su 205722aabf fix nonoss build 2013-06-20 10:47:19 -07:00
Edison Su 733ed3622d fix compile 2013-06-20 00:57:06 -07:00
Edison Su 97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Harikrishna Patnala 7b6b8d7a07 CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:08:38 +05:30
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Kelven Yang 0bfc817bc6 Handle transitional states across management server restart 2013-06-19 17:47:14 -07:00
Alena Prokharchyk d66e9c7b51 CLOUDSTACK-2843: Provideded an ability to turn off the synchronization being done on the CS agent side,
for number of commands participating in Vm deployment process, as parallel deployment is supported on the hypervisor side.
The behavior is controlled by global config varirables:

"execute.in.sequence.hypervisor.commands" (false by default) sets/resets the synchronization for commands:
=========================
StartCommand
StopCommand
CreateCommand
CopyVolumeCommand

"execute.in.sequence.network.element.commands" (false by default) sets/resets the synchronization for commands:
==========================
DhcpEntryCommand
SavePasswordCommand
UserDataCommand
VmDataCommand

As a part of the fix, increased the global lock timeout to 30 mins in several VR scripts:
===========================
edithosts.sh
savepassword.sh
userdata.sh

to support situations when multiple concurrent calls to the script are being made.
2013-06-19 10:12:13 -07:00
Wei Zhou 10e80afdeb remove duplicated VPC router in return value of functions in DomainRouterDaoImpl 2013-06-18 15:29:46 +02:00
Wei Zhou 882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02:00
Alex Huang e2edae1711 Merge from master 2013-06-17 19:00:44 -07:00
Alex Huang 309f8da6de Finally starting vm again 2013-06-17 17:25:04 -07:00
Alex Huang fa525a7d38 Added outcome 2013-06-17 17:25:01 -07:00
Alex Huang 3a074f31ae Removed a bunch of useless classes. Move configuration into utils package 2013-06-17 17:04:04 -07:00
Alex Huang aad2bc78c1 Completely Isolated job manager from user 2013-06-17 17:04:03 -07:00