Commit Graph

1135 Commits

Author SHA1 Message Date
Marcus Sorensen 71a5bd29ea Merge branch '4.4' into resize-root 2014-03-14 03:38:07 -06:00
Mike Tutkowski 709d2a096d CLOUDSTACK-6170 2014-03-14 23:44:50 -06:00
Kelven Yang 1db329f0f9 Fix the missing java imports from automatic merge 2014-03-14 15:08:32 -07:00
Kelven Yang ba56210127 Deal with concurrent state update for VM and Host objects. 2014-03-14 15:08:04 -07:00
Jayapal 14a4dd116f CLOUDSTACK-2692 Assigning LB rule for vm nic secondary ips
Conflicts:
	setup/db/db/schema-430to440.sql
2014-03-14 22:48:51 +05:30
Murali Reddy 7a929d1a0e region level VPC support
introduce 'RegionLevelVpc' as capability of 'Connectivity' service. Add
support for CreateVPCOffering to take the 'regionlevelvpc' as capability
of service 'connectivity'.

introduces new capability 'StretchedL2Subnet' for 'Connectivity'
service. Also add support to createNetworkOffering api to allow
StretchedL2Subnet capablity for the connectivity service.

adds check to ensure 'Connectivity' service provider supports
'StretchedL2Subnet' and 'RegionLevelVpc' capabilities when specified in
createNetworkOffering and createVpcOffering respectivley

enable ovs plug-in to support both StretchedL2Subnet and RegionLevelVpc
capabilities

make zone id optional parameter in createVpc, zone id can be null only
if vpc offfering supports region level VPC

in region level vpc, let the network/tier to be created in any zone of
the region

keep zoneid as required param for createVpc

skip external guest network guru if 'Connectivy' service is present in
network offering

fix build break in contrail manager

permit VM's to be created in different zone that in which network is
created if the network support streched L2 subnet

add integration tests for region level VPC

rebase to master

Conflicts:
	setup/db/db/schema-430to440.sql
2014-03-14 21:54:47 +05:30
Marcus Sorensen c02c634945 Merge branch '4.4' into resize-root 2014-03-14 02:27:26 -06:00
Saksham Srivastava 48f8a95b06 CLOUDSTACK-6092: Storage OverProvisioning as a Per Primary Basis Allow storage.overprovisioning.factor to be specified at storape pool level.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-03-14 12:16:46 +05:30
Murali Reddy e487b24bb6 couple of bug fixes 2014-03-14 16:56:38 +05:30
Murali Reddy 3139b35518 mark VPC to be using distributed router if VPC offerign supports
distributedrouter capability.
2014-03-14 16:56:35 +05:30
Murali Reddy 7c4443e233 -introduces 'DistributedRouter' as capability to 'Connectivity' service.
-create VPC offering to permit 'DistributedRouter' as capability to
connectivity service
2014-03-14 16:56:35 +05:30
Devdeep Singh 2aff39f8c7 CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared
storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively.
2014-03-14 16:27:58 +05:30
Koushik Das f293c94bc0 CLOUDSTACK-6090: Virtual Router Service Failure Alerting
Fixed a missing license header
2014-03-14 15:45:54 +05:30
Harikrishna Patnala f7337527cf CLOUDSTACK-6090: Virtual Router Service Failure Alerting
Signed-off-by: Koushik Das <koushik@apache.org>
2014-03-14 15:14:15 +05:30
Marcus Sorensen f52c7430f6 Merge branch 'master' into resize-root 2014-03-13 23:32:05 -06:00
Kelven Yang 4399e245f4 A typo that leads to opposite decision on determine whether or not to notify out-of-band VM state changes. 2014-03-13 17:17:15 -07:00
Kelven Yang 5a75a3e1f9 Give graceful state transition period to live with race-condition on VM startup time 2014-03-13 16:59:56 -07:00
Kelven Yang 6ad245e675 Restore to old HA logic, but suppress VM state change on resource state report to avoid interferring HA. 2014-03-13 16:59:56 -07:00
Kelven Yang 53f306e8e2 Send StopCommand(Cleanup) if out-of-band power-off VM is detected. 2014-03-13 16:59:56 -07:00
Min Chen 8ff94601f1 Merge branch 'rbac' to master 2014-03-13 16:42:22 -07:00
Alena Prokharchyk 6c23e201ad 1) More fixes for the problems found by findBugs
2) Corrected some logging in  MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
2014-03-13 16:05:45 -07:00
Min Chen 84a528fad6 Merge branch 'master' into rbac 2014-03-13 14:52:37 -07:00
Alena Prokharchyk 90c485e5d6 Fixed some problems reported by FindBugs 2014-03-13 13:45:30 -07:00
Min Chen 99bdc8d875 Merge branch 'master' into rbac. 2014-03-13 11:05:03 -07:00
Alena Prokharchyk 1b83698dac deployVm/startVm APIs: ability to define deploymentPlanner for VmToStart in the api call (available to ROOT admin only) 2014-03-13 10:23:34 -07:00
amogh.vasekar 3ee1fc28de CLOUDSTACK-6217:
Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same

Signed off by: Nitin Mehta <nitin.mehta@citrix.com>
2014-03-12 17:03:38 -07:00
Min Chen cd8af6a3e2 CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range error in Mysql 2014-03-12 16:17:53 -07:00
Daan Hoogland 1dc2bbdc37 CLOUDSTACK-6231 allow for cidr list entry of more than 256 chars 2014-03-12 15:50:43 +01:00
Sheng Yang f45de30d1b CLOUDSTACK-6047: Enable VR aggregation commands for VR start/reboot 2014-03-11 13:04:26 -07:00
Sanjay Tripathi c7d31fe288 CLOUDSTACK-4760 : Enabling GPU support for XenServer.
CLOUDSTACK-4762 : Enabling VGPU support for XenServer.

This feature is to enable the GPU-passthrough and vGPU functionality,
with the help of this feature, admins/users will be able to leverage
the GPU graphics unit power by deploying a virtul machine with GPU or
vGPU support or by changing the service offering of an existing VM
at any later point of time. There GPU/vGPU enabled VMs are able to run
graphical applications.
For now, this feature is only supported with XenServer hypervisor but
can be extended to add the support of other hypervisors.
2014-03-11 15:44:51 +05:30
Mike Tutkowski 1d74daf6fe CLOUDSTACK-6170 2014-03-10 11:43:54 -06:00
John Kinsella 09c375379d CLOUDSTACK-6204: removing realhostip dependency
Moving default transport for console proxy, SSVM to http.

See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.

jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.

Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
2014-03-09 13:46:57 -07:00
Mike Tutkowski c427e8db1c CLOUDSTACK-6170 2014-03-07 15:38:50 -07:00
Min Chen 48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
miguelaferreira ea0dec77d9 Refactor DbUpgradeUtils
- Move database access code to new class DatabaseAccessObject.
    This was done to ease the effort of testing, since
    DbUpgradeUtils has a static API and it is harder to mock
    static things with Mockito.
  - Log exceptions even if ignored
  - Add unit tests for both DbUpgradeUtils and DatabaseAccessObject
  - DbUpgradeUtils.dropTableColumnsIfExist(...) no longer throws
CloudRuntimeException to make it consistent with the other methods in
the class

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-03-06 14:48:35 +01:00
Anthony Xu 370554e9d9 only ping timeout trigger host HA, otherwise there may be two threads try to HA the same VM 2014-03-05 16:50:33 -08:00
Nitin Mehta 830328b63d CLOUDSTACK-6199: Hide action events for Vm/Volume commands when the resources have display flag=0.
Introduce generic BaseAsync(Vm/Volume)Cmd to make get the flag value for logging action events.
Rename the db field as display rather than display_event in keeping with the convention
2014-03-05 16:40:44 -08:00
Anthony Xu ad88bbb684 Use seperate path to sync VM metadata for XS
VM status sync only does VM status sync
2014-03-05 15:44:50 -08:00
Anthony Xu ab1d3af460 Use seperate path to sync VM metadata for XS
VM status sync only does VM status sync
2014-03-05 15:44:50 -08:00
Mike Tutkowski b06e66c50a CLOUDSTACK-6170 2014-03-05 13:55:12 -07:00
Min Chen 793becf524 CLOUDSTACK-5920: Add some interface methods and constants required by
IAM.
2014-03-05 09:40:55 -08:00
Min Chen d0ae4d9a9f CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM
entity type.
2014-03-05 09:40:55 -08:00
Alena Prokharchyk 5a8d165afa CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic
Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java
	engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
2014-03-04 15:37:52 -08:00
Nitin Mehta 339c4f4c3f CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature.
For root admin - s/he should be able to see all the events despite the value of the flag.
2014-03-04 14:59:30 -08:00
Alena Prokharchyk bbf5a912c6 list* APIs - added parameter helping to filter by "display" flag (available to ROOT admin only) 2014-03-03 14:37:46 -08:00
Kelven Yang 90262a81ec Do not do investigation for SSVM/CPVM agent host upon disconnect. 2014-02-28 15:36:00 -08:00
Kelven Yang b21662f890 make sure XS report VM state even if there is no running VM on the host. 2014-02-28 15:35:59 -08:00
Kelven Yang 7c7bd0934a pass InsufficientCapacityException across job boundary since some HA logic relies on it. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Kelven Yang 537bf7ced1 add job path to help associate an API job to related internal job. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Kelven Yang fed85813e9 use lock table for locking 2014-02-28 15:35:58 -08:00