Darren Shepherd
e3280bdba2
Merge remote-tracking branch 'origin/spring-modularization'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
client/tomcatconf/nonossComponentContext.xml.in
client/tomcatconf/simulatorComponentContext.xml.in
framework/db/src/com/cloud/utils/db/Transaction.java
plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Anthony Xu
e33ae74067
CLOUDSTACK-4649:
...
xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
this patch tracks PV driver versions in vm details and template details.
Anthony
2013-10-22 17:54:51 -07:00
Sheng Yang
484d6c4eb7
CLOUDSTACK-2792: Call savepassword.sh inside VR
...
Also only set password when password service is running, thus avoid setting for
redundant router BACKUP router.
2013-10-17 20:04:44 -07:00
Chris Suich
aad1cda7e0
Added categorized sorting to SnapshotStrategy and DataMotionStrategy
2013-10-14 15:20:42 -07:00
Mike Tutkowski
bced4c7e8b
Add support for hypervisor snapshots to CloudStack-managed storage (for XenServer and VMware)
2013-10-04 15:41:20 -06:00
Chris Suich
180cfa19e8
Refactor Storage Related Resource Code
...
These changes are a joint effort between Edison and I to refactor some
of the code around snapshotting VM volumes and creating
templates/volumes from VM volume snapshots. In general, we were working
towards allowing PrimaryDataStoreDrivers to create snapshots on primary
storage and not requiring the snapshots to be transferred to secondary
storage.
High level changes:
-Added uuid to NfsTO, SwiftTO & S3TO to cut down on the requirement of
PrimaryDataStoreTO and ImageStoreTO which don't really serve much of a
purpose
-Initial work towards enable reverting VM volume from snapshots
-Added hypervisor commands for introducing and forgetting new hypervisor
objects (snapshots, templates & volumes)
Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-04 13:06:42 -07:00
Darren Shepherd
67186429e1
Spring Modularization
...
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.
Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Alex Huang
b60eef3e82
Added comments and finished off the work
2013-09-28 07:53:28 -07:00
Alex Huang
e8cac2c5d8
Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
2013-09-28 07:53:26 -07:00
Alex Huang
e2988902c9
Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
2013-09-28 07:53:25 -07:00
Alex Huang
af8832f6bd
Unified both the SearchBuilder and SearchCriteriaService
2013-09-28 07:53:24 -07:00
Hugo Trippaers
15a97ec412
Cleanup pom.xml in various projects to properly use managed versions and other defaults
2013-09-21 17:21:06 +08:00
Laszlo Hornyak
3650f12e9b
Do not instantiate long just to generate String
...
Replaced toString call to the static toString method
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-09-19 17:17:54 +02:00
Daan Hoogland
2614b00c51
sdn hosted vpc gateways (using lswitch)
2013-09-18 16:56:56 +02:00
Anthony Xu
1f42153630
Revert "CLOUDSTACK-4649"
...
This reverts commit c82ef422b47fe2909ff79b7f91d2ba76bf007457.
2013-09-12 13:00:42 -07:00
Anthony Xu
1510139f15
CLOUDSTACK-4649
...
use the same virtual hardware platform in XS 6.2 as that in XS 6.0.2
2013-09-12 13:00:42 -07:00
Devdeep Singh
63f8b3f69b
CLOUDSTACK-4617. Add host succeeds but host goes to alert state and comes back to UP state
...
after a short while. Fixed the link local network creation part.
2013-09-12 16:34:55 +05:30
Anthony Xu
4adf13192f
CLOUDSTACK-4643
...
put host maintenance mode will not change XS master,
when you delete a host, and this host is master, master will be designated by CS
2013-09-11 15:52:09 -07:00
Wei Zhou
87d73e227f
CLOUDSTACK-1192: GetVmDiskStatsCommand return null as disk I/O statistics does not support xen/vmware
...
(cherry picked from commit 3121133c03 )
2013-09-02 16:04:59 +02:00
Daan Hoogland
d9c06e538b
CLOUDSTACK-4346 replace URI getHost() and create(String) calls with BroadcastDomainType methods
2013-09-01 22:53:23 +02:00
Min Chen
49dd7289c0
CLOUDSTACK-4468:template created from snapshot is destroyed once we
...
restart management server.
2013-08-26 11:58:53 -07:00
Edison Su
1c96898ae1
CLOUDSTACK-3229: if delete snapshots on staging area failed, still treat backup snapshot as succeed. And modify snapshot delete logic on devcloud
2013-08-19 15:25:11 -07:00
Nitin Mehta
9de7e0af18
CLOUDSTACK-4386
...
XS Creating templates from volume - send the physical size in the copycommand which accordingly will populate template store ref and the usage_event tables with the right physical size
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-08-19 16:04:12 +05:30
Min Chen
8a104b95d5
CLOUDSTACK-2583: [Object_Store_Refactor] Failed to create snapshot from
...
root disk of a guest VM.
2013-08-14 18:02:25 -07:00
Harikrishna Patnala
726114a95d
CLOUDSTACK-3850: CPU cap should be per VM not per VCPU
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-08-12 08:59:18 +05:30
Mike Tutkowski
798d8f1e4b
cloudstack-4235
2013-08-10 17:37:43 -06:00
anthony
4333209af3
CLOUDSTACK-3495
...
CS used to access vnc server in xenserver dom0 to get VM console, now CS moves to use XenServer console API. getvncport plugin is not needed any more.
remove the code related to getvncport in XenServer
2013-08-09 17:22:54 -07:00
Sanjay Tripathi
d95e3dacd6
CLOUDSTACK-2448: XenServer Guest OS Mapping Corrections.
2013-08-09 18:49:02 +05:30
Sanjay Tripathi
d6ebcd1924
CLOUDSTACK-4187: 2.2.1 - 4.2 Upgrade: Few Guest OS Types information is inconsistent on the Upgraded Setup when compared with the fresh 4.2 Installation.
2013-08-09 15:27:56 +05:30
Sanjay Tripathi
0b00e13e24
CLOUDSTACK-3723: System VM Template for XenServer has wrong guest OS type Information on the Database
...
Also added the debian 7 to debian 6 mapping in CitrixHelper file
to support the debian 7 template in XS 6.0, 6.0.2, 6,1 etc.
2013-08-07 12:57:11 +05:30
Anthony Xu
7bf37c1202
CLOUDSTACK-4017:
...
try to remove VDI host lock before start the VM which is using this VDI
2013-08-01 15:33:42 -07:00
Sanjay Tripathi
ec9a797b4c
CLOUDSTACK-4001: Unable to deploy Windows server 2012 64 bit VM on xenserver 6.2
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-01 21:04:52 +05:30
Chip Childers
8225374138
Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
...
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
John Burwell
e25f185e64
- CLOUDSTACK-3229: Attempt to adjust snapshot source path to new cache
...
filesystem layout
2013-08-01 03:55:17 -04:00
John Burwell
6ec9a44429
- CLOUDSTACK-3229: Works around Introspector bug that does not recognize
...
Boolean typed accessor methods by manualy populating the https value.
A generic implementation will be investigated when time permits.
2013-08-01 01:54:54 -04: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
John Burwell
ceed152426
- CLOUDSTACK-3229: Passes the bucket name as "bucket" into the s3xen
...
plugin
2013-07-31 09:58:22 -04:00
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
Edison Su
ae534388c0
CLOUDSTACK-3852: fix upload volume
...
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
server/src/com/cloud/template/TemplateManagerImpl.java
2013-07-29 11:50:16 -07:00
Harikrishna Patnala
2f369973e2
CLOUDSTACK-3779: Support System vm scaling on VMWare
...
Marked the system template new system template as dynamicallyScalable
- handled upgrade case
- moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-29 15:25:07 +05:30
Harikrishna Patnala
8ef097ef6e
CLOUDSTACK-3669: Bringing down the dynamic scalable check (for VM whether it has xstools or vmware tools in it) to the management layer.
...
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-07-29 15:16:21 +05:30
Alex Huang
3f7c558de5
Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project
2013-07-26 16:34:08 -07:00
Sanjay Tripathi
5b46e93d28
CLOUDSTACK-3544: Xen 6.2 hosts are tagged with Xen 6.1.
...
This commit will add the new xenserverresource file to support XenServer 6.2.
Also add the guest OS list supported by xenserver 6.2
2013-07-26 16:00:40 +05:30
Devdeep Singh
c0ea76a77e
CLOUDSTACK-3501. Cannot create instances on XenServer with multiple cores in a socket. If
...
details has information on cores per socket, create an instance accordingly. The vm record
is populated with information on how many cores should be allowed in a socket.
2013-07-26 15:10:43 +05:30
Devdeep Singh
62c8df9dcd
CLOUDSTACK-3590. Adding new xenserver host to cluster fails in first attempt. While adding
...
a host to the pool it may take a little longer to join the pool. Increased the time the
resource waits and checks to make sure the host has joined as slave to the pool.
2013-07-26 11:01:29 +05:30
Edison Su
7f200d966e
CLOUDSTACK-3681: fix bunch of bugs related to vmware, regarding to snapshot
2013-07-24 19:06:30 -07:00
Bharat Kumar
e14f5d0aeb
Cloudstack-3694 Dnsmasq rewrite in bash
...
(Sheng: Fix typo, fix log and error message, remove 'set -x' in script)
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-07-24 14:00:31 -07:00
Edison Su
d22bea6031
CLOUDSTACK-2630: fix delta snashpt
2013-07-24 09:48:59 -07:00
Edison Su
be3883b678
fix create template from snapshot if it's swift
2013-07-24 09:48:07 -07:00
Anthony Xu
089cbb610b
when create local link netowrk fails for xenserver, adding host should fail
2013-07-23 15:19:05 -07:00
Alex Huang
319d91e1c2
Removed the getByTypeAndId() method and replace it with getById method
2013-07-22 20:06:04 -07:00
Anthony Xu
668089d575
correct the log message
2013-07-22 15:56:11 -07:00
Alex Huang
1325014a03
Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms.
2013-07-22 11:48:11 -07:00
Wei Zhou
d2c1ed4865
ui change: Disk I/O polling statistics
2013-07-22 16:06:10 +02:00
Edison Su
c618caf102
fix localendpoint npe
2013-07-17 16:29:52 -07:00
Jayapal
2d6644d961
CLOUDSTACK-2433 Enable rps and rfs in virtual router
2013-07-17 16:59:59 +05:30
Devdeep Singh
033d05fa20
CLOUDSTACK-3443: Timeoffset on windows guest not persisted between VM stop and start on XenServer.
...
The problem was because in cloudstack when a vm is stopped it gets destroyed on the host. For a
windows vm the timeoffset (which can be set by changing the timezone from within the vm) is stored
in the platform:timeoffset attribute of vm record. The information is lost when the vm is destroted.
Made change to read and persist the platform:timeoffset vm attribute when an instance is stopped.
The value is persisted in the user_vm_details table. When the vm is started again the attribute is
set for the vm instance that gets created.
2013-07-10 17:36:06 +05:30
Mike Tutkowski
06f73092fb
Changes related to Review Board comments
2013-07-09 22:50:14 -06:00
Nitin Mehta
bb6cd764c7
CLOUDSTACK-3267
...
Improved logging by logging the memory values when exception is thrown for the constraint
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-04 14:24:41 +05:30
Hugo Trippaers
40f38521c4
It makes more sense to print the task uuid than the task type in the trace message
...
Add retry counter to exiting pong command message
Some additional code cleanup courtesy eclipse save actions, thanks Alex
2013-06-30 12:10:59 +02:00
Prasanna Santhanam
085e8838e4
Fix typo in backupSnapshotCommand
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
Sanjay Tripathi
1659ee225c
CLOUDSTACK-3082: System VMs are failed to start with Xen 6.2.0( Failing to create VIF's)
2013-06-29 05:39:33 +05:30
Hugo Trippaers
ed00427989
Improve logging for CitrixResourceBase by replacing e.printStackTrace
...
with s_Logger.error.
Automatic cleanup using the eclipse settings from Alex
2013-06-28 16:45:31 -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
Hugo Trippaers
329c6eb4d3
Adding tracelogging to CitrixResourceBase xapi task handling.
...
Currently it is very hard to see which tasks are pending in cloudstack
that need to be executed by xapi. Ideally we would like to have a
central overview of all tasks centrally. But for now being able to
enable tracelogging should give some insight in what is going on.
2013-06-27 14:54:31 -07:00
Harikrishna Patnala
0d1f512728
CLOUDSTACK-3208: showing xenhost username and password details in plain text in logs when we pefrom removehost from CS
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 15:57:31 +05:30
Nitin Mehta
ea7b4467d7
CLOUDSTACK-3050
...
XS - Enforce recommended guest OS values for ram
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-26 15:45:57 +05:30
Nitin Mehta
f90279d9bb
CLOUDSTACK-3050
...
XS - Enforce recommended guest OS values for ram
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-26 15:44:48 +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
Abhinandan Prateek
59d7c94247
CLOUDSTACK-3136: added Centsor 6.3 and Ubuntu 11.04 guest OS for Xen 6.1
2013-06-22 16:04:55 +05:30
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
f41c800d88
merge to master
2013-06-14 19:06:33 -07:00
Harikrishna Patnala
b83b8eb838
CLOUDSTACK-2502: Scalevm and over provisioning should respect each other
...
During Scale up of VM, memory/cpu calculations should consider the memory/cpu overprovisioning factors which are set per cluster.
CLOUDSTACK-2939: CPU limit is not getting set for vm after scaleup to a service offering which have cpu cap enabled
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-13 16:30:56 +05:30
Min Chen
18aeef3ef1
Merge branch 'master' (up to commit
...
c30d9be3ce ) into object_store.
2013-06-12 11:20:32 -07:00
venkataswamybabu budumuru
fe506d9b68
CLOUDSTACK-2642: [XenServer] Add support for XenServer 6.2.0
...
Currently XcpServerDiscoverer.java is only allowing till XenServer 6.1.0. Added
code to support XenServer 6.2.0. Also, added support to allow the RC build
of XenSever 6.2.0.
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 15:11:50 +05:30
Prasanna Santhanam
da6f39b782
PlugNic and UnplugNic both call the method getVmName
...
Renaming the method in the command objects to be uniform with
PlugNicCommand/UnplugNicCommand.getVmName
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-05 12:37:42 +05:30
Bharat Kumar
48913679e8
CLOUDSTACK-2648 [Multiple_IP_Ranges] Reboot or start/stop router vm deletes the ip alises created on VR in case of multiple subnets
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-03 19:22:27 +05:30
Wei Zhou
b9b0168da4
CLOUDSTACK-1192: Add Disk I/O Statistics
2013-06-01 08:00:48 +02:00
Nitin Mehta
0a5e3fa607
CLOUDSTACK-2060
...
Global config to turn off dynamically scale vm functionality
2013-05-30 15:11:08 +05:30
Nitin Mehta
8d1189c2ae
CLOUDSTACK-2060
...
Global config to turn off dynamically scale vm functionality
2013-05-29 19:02:06 +05:30
Prasanna Santhanam
5b902c7005
CLOUDSTACK-2683: DevCloud systemVMs fail to launch
...
DevCloud is a XCP Kronos based xen. For this we use the XcpOssResource
whose memory limits were not set explicitly. Instead the base
CitrixResourceBase would set the limits. static_min was set to 128MB
failing the cpvm and ssvm start fails whose offerings have 100MB set to
the max limits.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-26 14:49:52 +05:30
Edison Su
3ec52807f1
CLOUDSTACK-2593: fix migrate volume between pools through secondary storage
2013-05-23 18:26:16 -07:00
Min Chen
98af424053
Merge branch 'master' into object_store.
2013-05-23 18:00:15 -07:00
Devdeep Singh
85ff507094
CLOUDSTACK-2602. XenServer storage motion strategy returns true for canHandle even though hosts are of different hypervisor type. Fixed the canHandle routine to return true only if source and destination hosts are of type XenServer.
2013-05-22 17:47:11 +05:30
Nitin Mehta
a67728b312
CLOUDSTACK-2567 - check for ! dmcEnabled.
2013-05-22 15:31:18 +05:30
Min Chen
01e36538aa
Fix a bug in creating volume path in copy command.
2013-05-21 22:18:35 -07:00
Edison Su
383be568b3
CLOUDSTACK-2527: enable attach/detach xs tool iso
2013-05-21 19:13:29 -07:00
Edison Su
536feab856
when copy volume to secondary storage, need to add full volume path
2013-05-21 17:47:38 -07:00
Nitin Mehta
a58ee74e1c
CLOUDSTACK-2567 - Check whether DMC - dynamic memory control is enabled for the hyervisor before trying to scale the vm. If its not then dont scale and instead throw and exception.
2013-05-21 16:39:25 +05:30
Devdeep Singh
904a2a87f7
CLOUDSTACK-2601 : xen.heartbeat.interval doesn't change the parameter passed to xenheartbeat.sh. Made changes to read the parameter from config and to pass it to the resource.
...
Signed-off-by: Devdeep Singh <devdeep@gmail.com>
2013-05-21 13:33:07 +05:30
Prasanna Santhanam
8da7ec05f1
CLOUDSTACK-2085: DMC enable guest scaling
...
When dmc is enabled allow cloudstack to scale the VM between dynamic
ranges. This requires a further commit where there is enough memory
available between dynamic-max and static-max for the VM to scale under
memory pressure. See the TODO in Xenserver56FP1Resource.java
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 17:51:49 +05:30
Prasanna Santhanam
85d54cd1c0
CLOUDSTACK-2554: Incorrect compute of minmemory and cpu
...
23e54bb0 introduced multiple hypervisors support for cpu and memory
overcommit. Here the HypervisorGuru base which determines the min, max
range for the memory for all hypervisors computes the minCpu using the
MemoryOverCommit ratio and minMemory using the CpuOverCommit ratio.
Minor typo/logic issue but massive damage across all HV if enabled ;)
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:27 +05:30
Prasanna Santhanam
7ea2c950f5
CLOUDSTACK-2554: Ensuring that we honor hypervisor xen's memory constraints
...
When setting memory constraints on Xen guests we should honor:
static-min <= dynamic-min <= dynamic-max <= static-max
Our VmSpec while allows the guests to like between dynamic-min and
dynamic-max the memory set by the resource set the static min to be
equal to the dynamic max. This restricts the hypervisor from ensuring
optimized memory handling of guests.
see: http://wiki.xen.org/wiki/XCP_FAQ_Dynamic_Memory_Control#How_does_XCP_choose_targets_for_guests_in_dynamic_range_mode.3F
Another fix was related the restrict_dmc option. when enabled (true)
this option disallows scaling a vm. The logic was reverse handled
allowing scaling when restrict_dmc was on. This control flow is now
fixed.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:27 +05:30
Prasanna Santhanam
806aeb990d
CLOUDSTACK-2554: CloudStack fails to load XCP 1.6 hypervisors
...
Missing default constructor fails the agent manager reloading the XCP
resource on reboot of management server. This is fixed by using the
default constructor as do other Xen resources and include a new resource
ala XenServers for XCP1.6.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:26 +05:30
Edison Su
f7c1b711ad
merge to master
2013-05-16 23:56:20 -07:00
Harikrishna Patnala
ca0d2ef8c2
CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host
...
Fixed by updating the patch files that has
entries to copy scipts on xenserver. Here we added
Add-To-VCPUs-Params-Live.sh
Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.
Signed Off by - Nitin Mehta <nitin.mehta@citrix.com>
2013-05-15 19:41:48 -07:00
Sheng Yang
2d2c0c48cd
Merge branch 'pvlan'
...
Conflicts:
scripts/vm/hypervisor/xenserver/xenserver60/patch
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/NetworkServiceImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2013-05-15 16:08:08 -07:00
Harikrishna Patnala
ffe90c0059
CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host
...
Fixed by updating the patch files that has
entries to copy scipts on xenserver. Here we added
Add-To-VCPUs-Params-Live.sh
Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.
Signed Off by - Nitin Mehta <nitin.mehta@citrix.com>
2013-05-15 16:17:21 +05:30
Edison Su
a0c3d280b4
merge to master
2013-05-15 00:40:53 -07:00
Edison Su
879a954b98
delete snapshot at the backend
2013-05-14 21:58:07 -07:00
Edison Su
68ffe1c706
fix bug in create volume from snapshot
2013-05-14 16:38:02 -07:00
Jayapal Reddy
2d950e2858
CLOUDSTACK-768: ACL on private gateway
2013-05-13 19:24:23 +05:30
Bharat Kumar
052c24c4d1
CLOUDSTACK-702: Multiple ip ranges in different subnets.
...
This feature enables adding of guest ip ranges (public ips) form different subnets.
In order to provide the dhcp service to a different subnet we create an ipalias on the router. This allows the router to listen to the dhcp request from the guest vms and respond accordingly. Every time a vm is deployed in the new subnet we configure an ip alias on the router. Cloudstack uses dnsmasq to provide dhcp service. We need to configure the dnsmasq to issue ips on the new subnets. Added a new class dnsmasqconfigurator which generates the dnsmasq confg file, this file replaces the old config in the router.
The details of the alias ips are stored in db in the nic_ip_alias table. Every time a new subnet is added one of the ip from the subnet is used to configure the ip alias.
I have pushed the code to https://github.com/bvbharatk/cloud-stack/tree/Cloudstack-702 , also rebased the code with master.
I need to test the code for advanced sg enabled network using kvm.
I have added the unit test
Marvin tests are at https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=53e4965
Also accomodated some of the changes suggested by koushik.
corrected the import statements. renamed the IpAlias command to createIpAlias command.
This feature supports only ipv4
2013-05-13 17:06:44 +05:30
Edison Su
e8259e38c2
integration test is passed again
2013-05-12 14:41:06 -07:00
Edison Su
993187622e
fix compile, after rebase to master
2013-05-10 20:39:02 -07:00
Alex Huang
342624e0eb
Merged with head
2013-05-10 16:33:57 -07:00
Alex Huang
3047929367
Merged
2013-05-10 16:21:43 -07:00
Edison Su
42e25a22fc
refactor kvm/vmware resource code
2013-05-09 23:10:05 -07:00
Edison Su
738d35a61d
CLOUDSTACK-1907: Debian Squeeze 6.0 (64-bit) is not experimental any more
2013-05-08 19:54:54 +01:00
Edison Su
ac7be218d5
creat template from volume/snapshot, and then create vm from template works now
2013-05-07 20:18:19 -07:00
Edison Su
5aeca646ae
make create template from volume/snapshot work
2013-05-07 20:18:19 -07:00
Edison Su
9f7bad2cef
fix creating snapshot
2013-05-06 18:27:15 -07:00
Edison Su
2d544e7127
volume related operation works
2013-05-06 18:27:15 -07:00
Jayapal
1f1467974f
CLOUDSTACK-1828 Source Nat on private gateway feature
2013-05-02 15:40:15 +05:30
Edison Su
4d992fd18f
fix template download to primary storage
2013-05-01 17:51:24 -07:00
Min Chen
8a5bd9e8f8
Fix a sql bug in selecting end point to send message.
2013-05-01 16:04:40 -07:00
Sheng Yang
40386fc4cb
PVLAN: Add network label parameter to PvlanSetupCommand
...
We need it to find the real bridge/switch to program on the OVS.
2013-05-01 13:23:09 -07:00
Sheng Yang
142f3b30f4
PVLAN: Remove bridge parameter in PvlanSetupCommand
...
Bridge is hypervisor dependent, shouldn't appear in PvlanSetupCommand.
2013-05-01 13:23:08 -07:00
Sheng Yang
05885457ec
PVLAN: Simplify OVS policy
...
We can resubmit the packet against the flow table to get simplier result.
Now we don't need to check if VM is in the same host as DHCP server or not.
2013-05-01 13:23:08 -07:00
Sheng Yang
b64039bafd
Implement PVLAN on Xen
...
Start/stop vm/dhcp server are done. Not done with VM migration.
A new command(PvlanSetupCommand) is sent for setting up PVLAN for vms. Currently
it's focus on OVS implementation. Need to be more abstruct and add vSwitch part.
2013-05-01 13:23:08 -07:00
Sheng Yang
9c9e2ec9cc
PVLAN: Add pvlan in createNetworkCommand
2013-05-01 13:23:08 -07:00
Abhinandan Prateek
ac23f7aae6
CLOUDSTACK-2296: Support for Windows 8 and Windows Server 2012 as VM Guest OS on Xenserver
2013-04-30 16:23:41 +05:30
Edison Su
2f689171e0
refactor snapshot
2013-04-29 18:51:14 -07:00
Edison Su
37cbe8890f
refactor snapshot
2013-04-29 18:51:13 -07:00
Edison Su
4029e7af44
refactor data motion service for volumes
2013-04-24 18:53:57 -07:00
Min Chen
7543f314a7
Remove more VMTemplateHostDao references.
2013-04-23 17:12:21 -07:00
Edison Su
b8c5c67fbc
add copycommand at resouce side
2013-04-22 19:12:50 -07:00
Min Chen
29687663e8
Rename SnapshotStrategy to SnapshotService to have consistent naming
...
convention for Template, Snapshot, Volume. Also rename CopyCmd to
CopyCommand to follow internal command naming convention.
2013-04-22 16:15:57 -07:00
Edison Su
abf40435f3
refactor downloadlistener, sync system vm templates when adding a new image store
2013-04-21 22:46:02 -07:00
Devdeep Singh
21ce3befc8
Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api for allowing migrating volumes of running vms. These changes are integrated into the latest storage refactoring changes. 3. Added the implementation for findHostsForMigration api. It lists the hosts to which an instance can be migrated, including hosts from within and across clusters to which an instance may be migrated with storage motion. The work of migrating a volume of a running vm is also done in copyAsync. 4. Updated the listHosts api for backward compatibility. 5. Added the implementation for migrateVirtualMachineWithVolume api. It migrates an instance with its volumes within a cluster and also across clusters. Also introduced a new XenServerStorageMotionStrategy for migrating volumes of a vm. When a vm is being migrated with its volumes, the vm is put in migrating state and a request is send to the volume manager to migrate the vm and its volumes. Volume manager calls into the volume service which forwards the request to data motion service after moving all the volumes to migrating state. Data motion service enumerates the strategies and the request reaches the XenServerStorageMotionStrategy. It calls in to the resource to complete the operation. 6. Resolved an issue where storage xenmotion of 2nd VM created from the same template to a host was failing with duplicate_vm exception. Made changes to remove the mac_seed key value pair from other_config when vms are created. This is was storage motion to fail. 7. Updated the db upgrade schema script. 8. Added the right permissions in commands.properties 9. Marvin tests for testing storage motion. Following scenarios are tested. 9.1. A virtual machine is migrated to another host. Its volumes are also migrated to another storage pool. 9.2. Just the volumes of a vm are migrated to another storage pool while the vm continues to run on the same host. 10. Unit tests for testing migration of a vm with its volumes.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-19 11:36:42 +05:30
Edison Su
1fe5d7c886
need to download image to cache storage from s3/swift on mgt server for default system vm templates
2013-04-18 01:56:34 -07:00
Min Chen
2dd8e2cb97
add getStoreTO into each DataStoreDriver, and add implementation for 3
...
data store plugins.
2013-04-12 18:22:23 -07:00
Min Chen
2ff01a79ca
Rename TemplateTO/VolumeTO in cloud-engine-storage to
...
TemplateObjectTO/VolumeObjectTO to avoid name conflicting with the one
in cloud-api.
2013-04-12 17:10:19 -07:00
Edison Su
b81fa6d9ea
add copy template to cache store
2013-04-12 16:03:30 -07:00
Pascal Borreli
95cbb790f3
Fixed Primary typo
2013-04-12 16:20:11 +01:00
Chip Childers
3b35063adf
Revert "Fixed Primary typo"
...
This reverts commit 4e5a8a0f8a .
2013-04-12 15:18:02 +01:00
Pascal Borreli
4e5a8a0f8a
Fixed Primary typo
...
Conflicts:
client/WEB-INF/classes/resources/messages_de_DE.properties
2013-04-12 14:14:44 +01:00
Min Chen
bb64672715
Refactor DownloadMonitorImpl code, move some functionalities to
...
TemplateServiceImpl and VolumeServiceImpl.
2013-04-11 18:09:42 -07:00
Mice Xia
bd7a38957a
1)use vmsnapshot.create.wait to control vmsnapshot timeout 2)remove global configuration vmsnapshot.expunge.interval and vmsnapshot.expunge.workers since vmsnapshot expunge is synchronous
2013-04-10 11:35:58 +08:00
Mice Xia
4edef1fd30
fix CLOUDSTACK-1700
2013-04-02 17:36:51 +08:00
Nitin Mehta
3e4430d811
CLOUDSTACK-658 - Scaleup vm support for Xenserver
...
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.
2013-03-28 16:43:37 +05:30
Deepti Dohare
d5cb32f159
Multiple Secondary Storage Issue
2013-03-14 21:08:27 -04:00
Jayapal Uradi
a49261c3b1
CLOUDSTACK-24: mipn feature for basiczone
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 10:24:22 +05:30
Dennis Lawler
e173aa16f6
CLOUDSTACK-1620: getXenServer602GuestOsType -> getXenServer610GuestOsType Fixing XenServer 6.1 OS types incompatible with XS6.0
2013-03-11 10:01:46 -04:00
Sheng Yang
e35ce6587a
CLOUDSTACK-1461: Don't set dns server for non-default ipv6 network
...
The non-default parameter can be used by ipv4 as well in the future.
2013-03-08 17:43:23 -08:00
Nitin Mehta
b12aebefee
Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"
...
This reverts commit e0019eccd9 .
2013-03-04 23:32:52 +05:30
Nitin Mehta
e0019eccd9
CLOUDSTACK-658 - Adding Scalevm command and XS related changes
2013-03-04 14:47:55 +05:30
Edison Su
cc81413931
CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more
2013-02-26 23:16:17 -08:00
Edison Su
8e360f342d
CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support
2013-02-26 18:39:23 -08:00
Rohit Yadav
8cb5c00c26
CLOUDSTACK-416: Add XCP 1.6.x in XcpServerDiscoverer.java processConnect
...
Thanks to Devdeep for pointing this out.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c7935a9ab6 )
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 15:37:58 +05:30
Rohit Yadav
43183893bd
CLOUDSTACK-416: Add XCP 1.6.x as supported hypervisor
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 13:55:43 +05:30
Bharat Kumar
23e54bb0f4
Cloudstack-711: Cpu and Ram Overcommit Ratio.
2013-02-22 17:31:06 +05:30
Edison Su
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
Rohit Yadav
80d58b6c73
CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Kishan Kavala
c94a75c0a6
CLOUDSTACK-752: Removed 1 private gateway for VPC limitation.
...
Verified that more than 8 private gateways can be created.
2013-02-19 14:15:02 +05:30
Kishan Kavala
cc2a3c5498
CLOUDSTACK-651: Removed 7 nics limitation for VR on XenServer
...
# of nics can be configured using global param xen.nics.max. Param defaults to 7
Added new param to upgrade schema.
2013-02-18 20:30:03 +05:30
Mice Xia
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
Rohit Yadav
3a0c99b0a4
CLOUDSTACK-710: CitrixResourceBase, if dest dir is not found, mkdir -m 700 -p
...
This is a security failsafe, so even if destination does not exist we mkdir the path
with 0700 permission. If path exists mkdir -m 700 -p won't do anything.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 22:45:32 +05:30
Rohit Yadav
770860aee4
CLOUDSTACK-710: mkdir -p destination before scp-ing file in CitrixResourceBase
...
- Assumption is that mkdir is available on xen host
- We don't know what kind of file we're copying, dirs would have 0777 permission
by default
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 16:39:16 +05:30
Kelven Yang
7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -08:00
Sheng Yang
5cb9df91a1
Merge branch 'ipv6'
...
Conflicts:
api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
Kelven Yang
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
Jayapal
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
Kelven Yang
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
Sheng Yang
8f66d266b3
IPv6: Enable VR's ability to provide DHCPv6 service
2013-01-26 23:14:42 -08:00
Edison Su
a18baf8c83
fix compile
2013-01-25 10:24:25 -08:00
Edison Su
6f5655cb03
generalize storage orchestration: DataObjectManager will handle all the object life cycle management
2013-01-24 18:30:08 -08:00
Edison Su
c921118c58
add image create test case
2013-01-22 13:25:48 -08:00
Edison Su
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
Edison Su
b4988e86ab
add backedn code
2013-01-21 16:59:50 -08:00
Alex Huang
4a9cf4b4a8
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-18 15:59:24 -08:00
Edison Su
1283712d93
replace spring injection in nfssecondarystorage
2013-01-18 15:10:08 -08:00
Alex Huang
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
Marcus Sorensen
975021dda1
Summary: adding resizeVolume api call
...
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.
BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
2013-01-16 17:43:35 -07:00
Kelven Yang
2be270de89
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
2013-01-16 16:33:59 -08:00
anthony
a6b9027630
default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set
...
use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC
CLOUDSTACK-983: default Security rule doesn't apply to system VMs
2013-01-15 11:15:42 -08:00
Edison Su
8af85b04d0
refactor api, based on suggestion from community
2013-01-14 18:52:39 -08:00
Edison Su
a03d83bba9
refactor the motion service api
2013-01-10 10:27:05 -08:00
Alex Huang
cf8de7ee17
Removed all the .project files
2013-01-08 14:11:00 -08:00
Alex Huang
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
Edison Su
9410cd1f3c
add deletevolume and createdata disk
2013-01-03 18:56:18 -08:00
Edison Su
9de3a1fae4
add create volume from base image command
2012-12-27 16:31:59 -08:00
Edison Su
d99161399e
so many traps in rpc call: you can't use aop in a thread, you need to intercept finalize call etc
2012-12-24 02:37:32 -08:00
Devdeep Singh
8f6fdc3efc
CLOUDSTACK-227: Fix NPE and throw an exception if the network is not found in Xen
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 19:03:03 -08:00
Edison Su
4b2d9f4415
refactor test cases: use testNG instead of junit, as testNG can group test cases and pass parameter to test case
2012-12-22 22:10:39 -08:00
Edison Su
ac88c16be6
finaly, finish download template to primary storage
2012-12-20 19:06:02 -08:00
Edison Su
c216990e1c
trying to add code to download url into devcloud
2012-12-19 18:43:04 -08:00
Edison Su
8214f18897
fix build, due to refactor rpc
2012-12-19 12:02:11 -08:00
Edison Su
0581ea763a
add xenserver backend code: download template from http directly
2012-12-18 18:34:13 -08:00
Edison Su
b70c1a5a84
Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones.
2012-12-13 23:18:37 -08:00
Devdeep Singh
5405242674
master - Bug ID: CLOUDSTACK-369. Unable to add XenServer 6.1 to cloudstack. Created a new resource for XS 6.1. Also introduced a guest map for the list of supported os.
...
Signed-off-by: Devdeep Singh <devdeep.singh@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-12-10 15:17:07 +05:30
Hugo Trippaers
2b74b6e827
Start removing the old ant build files
...
Removed all build.xml files from the plugins
2012-12-07 15:58:56 +01:00
anthony
40682fc43d
CLOUDSTACK-587:
...
use setMemoryLimits instead
2012-12-05 05:24:46 -08:00
Kelven Yang
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
Kelven Yang
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00