3da5de545e
create a (mini-)branch instead of creating a commit to revert
2013-12-23 14:35:29 +01:00
dad4249498
SecurityProfile and ACL for NiciraNvpApi, including Unit and Integration tests
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-23 14:30:03 +01:00
a160b46cd4
CLOUDSTACK-4780: Changes related to checking snapshot path
...
on NFS server, also made marvin import paths specific
2013-12-23 17:58:51 +05:30
5d03fa83a2
CLOUDSTACK-5518: Fixing non contiguous vlan test case
2013-12-23 17:56:14 +05:30
cca60cd86d
fix network ACL unit test
2013-12-23 17:27:16 +05:30
0335009a1e
CLOUDSTACK-5300: Catch vpn add error failure, removed failed user and return failure status
2013-12-23 17:15:21 +05:30
55d84bdd5f
CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x routers is null. Added null check when comparing min version
2013-12-23 17:15:03 +05:30
34894f5a9d
CLOUDSTACK-5564: The deployment on other hosts in the cluster used to fail because
...
cloudstack though the storage pool wasn't accessible from the host. Make sure host
to pool mapping is added in the storage_pool_host_ref table when a host is added
to the cluster.
2013-12-23 17:06:11 +05:30
216554d574
CLOUDSTACK-5210: Fix the sockets reported by the hyperv agent.
2013-12-23 13:25:22 +05:30
fde14bcc32
Revert "CLOUDSTACK-4780: Changes related to checking snapshot on NFS server"
...
This reverts commit 33fb241fdf
2013-12-21 12:47:32 +05:30
83bbe682d9
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 17:42:45 -08:00
edc1b78d84
Revert "Revert "CLOUDSTACK-5281:""
...
This reverts commit ab37009e90
2013-12-20 17:30:05 -08:00
ab37009e90
Revert "CLOUDSTACK-5281:"
...
This reverts commit 6b62a04eaf
2013-12-20 17:23:33 -08:00
c2baed665b
Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies
2013-12-20 17:21:34 -08:00
6b62a04eaf
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 16:58:43 -08:00
f083f91b0b
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
08a69b0053
CLOUDSTACK-5544: Snapshot action filter: Remove check on volume state
...
Removes conditional check of volume state for snapshot action filter,
since it causes a null pointer when trying to access view outside the storage
section. Now only '.revertable' attribute is checked. Storage state should now
be verified at the API level only.
2013-12-20 13:48:21 -08:00
1832cf6660
CLOUDSTACK-5597: don't perform data disk allocation on the primary storage when attachVolume calls is made for the vm which ROOT disk hasn't been created yet.
2013-12-20 13:39:13 -08:00
932758e2ef
CLOUDSTACK-5551: Pass search 'name' field to listConfigurations UI
...
Passes search bar value (by 'name') for the settings in the following sections'
detail views:
-Account
-Primary storage
-Cluster
-Zone
2013-12-20 13:38:46 -08:00
9947e688c4
CS-18564: create template from snapshot failed, due to the volume(the
...
snapshot created from) is deleted.
2013-12-20 12:45:02 -08:00
e52a4d9306
CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed
...
Conflicts:
engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
2013-12-20 12:36:30 -08:00
179cdea8e9
CLOUDSTACK-5596: reload vm state after vm been force stopped
...
Conflicts:
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
2013-12-20 11:26:50 -08:00
7b0c85da3c
CLOUDSTACK-5502: interpret vlan='untagged' as vlan == null
2013-12-20 13:46:58 +01:00
50a428c3aa
CLOUDSTACK-4886: printing ****** to stdout instead of db users password
2013-12-20 17:38:39 +05:30
74cb4b1c5a
CLOUDSTACK-5555: Fixing booting a vm on hyperv with data disk. Made
...
changes to attach a data disk on scsi controller when a vm is being
created.
2013-12-20 17:12:59 +05:30
0182a18797
CLOUDSTACK-5311: Fixing the hypervisor version in capabilities table.
2013-12-20 11:26:56 +05:30
7644b92a8b
account for vxlan interfaces named vx<vni>
2013-12-19 17:42:42 -07:00
62bb5d8848
fix checkstyle
2013-12-19 15:05:58 -08:00
0824c78761
CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage)
...
Conflicts:
engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
Conflicts:
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
2013-12-19 14:17:30 -08:00
8caf52c6bc
add xenserver 6.2.0 hotfix support, to optimize vdi copy
...
add xenserver hot fix
Conflicts:
api/src/com/cloud/vm/VirtualMachineName.java
core/src/com/cloud/host/HostInfo.java
core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
deps/XenServerJava/src/com/xensource/xenapi/VDI.java
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
c40d03b417
CS-18582: if EIP is used, extract volume and template returns wrong public ip address. If remote agent is ssvm agent, then looking up public ip address from ssvm table
...
Conflicts:
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java
engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
2013-12-19 14:01:20 -08:00
9c77f68095
Revert "Remove uncessary changes."
...
This reverts commit fcab2b776a
2013-12-19 13:35:52 -08:00
336241be76
Remove uncessary changes.
2013-12-19 13:35:37 -08:00
02ace3442d
0001-Fixed-issue-with-DataStoreDrivers-not-being-able-to-
2013-12-19 13:35:21 -08:00
864c91ba7f
Add AUTO_INCREMENT in details dao
2013-12-19 13:35:15 -08:00
a3fade86b2
Fix snapshot details dao
2013-12-19 13:35:08 -08:00
227567cf6c
CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value
2013-12-19 22:56:34 +05:30
9190b03056
CLOUDSTACK-5457: DBHA features is broken due to RuntimeException thrown from underlying layer. Fixed my catching in ClusterManagerImpl
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-12-19 17:07:13 +05:30
29b90e7a5c
CLOUDSTACK-5208: upgrade from 3.0.6 to 4.3 is not throwing any exception if new System VM template is not registered with proper name Commit ae231444bc Commented the exception.
2013-12-19 16:17:37 +05:30
707da55fe3
CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value Fixed both custom.diskoffering.size.max and custom.diskoffering.size.min to ensure input values while deploying the VM and creating volume APIs.
...
Moved both parameters to VolumeOrchestrationService using ConfigDepot
2013-12-19 16:03:27 +05:30
f2fab9d5b1
CLOUDSTACK-5458: cpu speed is not getting updated in vm_instance table after service offeirngs change
...
Removed cpu, ram and cpu speed fields from the vm_instance table as these are not used
2013-12-19 14:15:39 +05:30
26858c16ee
CLOUDSTACK-4535 Fixed issue in PF in connecting from private nw when public and private ports are different
2013-12-19 10:57:18 +05:30
33fb241fdf
CLOUDSTACK-4780: Changes related to checking snapshot on NFS server
2013-12-19 10:21:33 +05:30
13ba5e45a1
CLOUDSTACK-4941:
...
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 18:56:12 -08:00
1c0b8db01b
CLOUDSTACK-4941:
...
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
3c965d0685
CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations
2013-12-18 16:14:07 -08:00
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2
2013-12-18 16:01:37 -08:00
bb91b739a8
CLOUDSTACK-5541: Template Creation from snapshot failed with S3 store.
2013-12-18 15:44:00 -08:00
231e7c01f2
CLOUDSTACK-4941:
...
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
5fb80f90f0
CLOUDSTACK-4738: UI > VM Wizard > select compute offering step > make Number of CPU Cores/CPU/Memory field required when selected compute offering is customized.
2013-12-18 14:49:24 -08:00
Daan Hoogland
Antonio Fornie
Gaurav Aradhye
Kishan Kavala
Devdeep Singh
Girish Shilamkar
Nitin Mehta
Alex Huang
Brian Federle
Alena Prokharchyk
Edison Su
Daan Hoogland
Rajani Karuturi
Marcus Sorensen
Harikrishna Patnala
Damodar Reddy
Koushik Das
Jayapal
Kelven Yang
Min Chen
Jessica Wang