22058 Commits

Author SHA1 Message Date
Girish Shilamkar
226df296d0 CLOUDSTACK-5674: Some fixes to marvin and resultant changes to tests. 2014-01-28 02:11:24 -05:00
Girish Shilamkar
6c5b1670b2 CLOUDSTACK-5925: Removed incorrect import 2014-01-27 19:14:45 -05:00
Girish Shilamkar
7305063fb4 CLOUDSTACK-5925: get_*() functionality changed in marvin, changed BVT too. 2014-01-28 11:12:24 +05:30
Santhosh Edukulla
edfd2b6799 CLOUDSTACK-5764: Some fixes to marvin 2014-01-22 18:34:10 +05:30
Girish Shilamkar
6a2cc9fbd0 CLOUDSTACK-5925: Moved test data from testsuites to marvin/config
Also merged redundant testdata as they were found.
2014-01-22 12:21:07 +05:30
Santhosh Edukulla
9393275611 CLOUDSTACK-5674: Added Fix for CLOUDSTACK-5674,5498,5500 and other issues as
part of cleanup
2014-01-22 12:19:20 +05:30
Sebastien Goasguen
99b9198de1 Remove Travis info 2014-01-14 10:25:58 +01:00
Sebastien Goasguen
1577c0a0dc Merge remote-tracking branch 'upstream/master' 2014-01-14 10:21:11 +01:00
Ashutosh K
c108d7f0d0 CLOUDSTACK-2237: Automation-Adding next set of test cases for feature - SG in advanced zone ovm3 2014-01-14 14:34:21 +05:30
Likitha Shetty
16d36dd75f Fix checkstyle 2014-01-14 14:04:57 +05:30
Hugo Trippaers
b61f0a74ca Centralize all eclipse m2e excludes in the main pom.xml 2014-01-14 09:39:42 +01:00
Likitha Shetty
e5512960af CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not uuid 2014-01-14 13:47:27 +05:30
Girish Shilamkar
842b58d6ee CLOUDTACK-5626: Made few changes to test_vpc_vm_life_cycle.py 2014-01-14 11:19:22 +05:30
Likitha Shetty
a957d52a3c CLOUDSTACK-5707. Hitting multiple 'User unauthenticated' exceptions when vCenter is upgraded to 5.5 from 5.1.
We hit these excptions whenever a management server held session that was with the old 5.1 vCenter server
is used to make resource calls to the new 5.5 vCenter.
Validate a vCenter session context before it is being used to make a resource call.
And if the context is invalid then discard the context and retrieve a new one.
During the invalidation of an old context handle the context disconnect better
by catching the appropriate exception and returning a newly created context.

Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
2014-01-14 09:38:50 +05:30
Murali Reddy
af657b3d71 CLOUDSTACK-5861: networks that failed to implement can not be destroyed
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
Sebastien Goasguen
3be221c452 Merge remote-tracking branch 'upstream/master' 2014-01-13 13:53:32 +01:00
Murali Reddy
470f251cbb CLOUDSTACK-5849: Failed shutdown of the network causes network state to
be changed to 'Implemented'

Wrong network state transition

s_fsm.addTransition(State.Shutdown, Event.OperationFailed,State.Implemented

fix keeps state as Shutdown
2014-01-13 17:47:47 +05:30
Hugo Trippaers
3bea60435e Remove commented elements 2014-01-13 12:16:37 +01:00
Hugo Trippaers
16d333f06d Fix coverity issue 606007, 606008 2014-01-13 12:16:37 +01:00
Hugo Trippaers
044a2078a1 Fix coverity issue 573580 2014-01-13 12:16:37 +01:00
Hugo Trippaers
15a08107d8 Fix coverity issue 600070 2014-01-13 12:16:37 +01:00
Hugo Trippaers
4683de5a92 Fix coverity issues 569415, 569416, 569417 2014-01-13 12:16:36 +01:00
Gaurav Aradhye
1760de47e5 CLOUDSTACK-5748: Refactored code related to executing script 2014-01-13 13:00:50 +05:30
Marcus Sorensen
6e902f8354 Fix Null pointer in CreateVlanIpRangeCmd 2014-01-11 10:09:52 -07:00
Marcus Sorensen
effa4c75b4 CLOUDSTACK-5843
For some reason the mgmt server is required to have access to the template
being registered in order to check its size against resource limits
during registration. This is bad, but worse, it's a sync call, so this
call can hang for up to the default HTTP connection timeout.

Reducing http timeout as a quick workaround, but this check needs to
1) be removed or 2) done later or 3)registerTemplate needs to be async
and 4) moved off the mgmt server (ssvm is the only thing that needs access to
template url).
2014-01-10 18:12:46 -07:00
Jessica Wang
5adc778d88 CLOUDSTACK-5831: UI > Volumes > take snapshot > get "quiescevm" property from listVolumes API instead of listStoragePools API since regular-user/domain-admin don't have access to listStoragePools API. 2014-01-10 16:27:37 -08:00
Marcus Sorensen
8ee61f3a57 CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
equate empty string to untagged in api parameter input
2014-01-10 17:09:41 -07:00
Jessica Wang
d76fccd8c9 CLOUDSTACK-5492: UI > Routers > Group by zone/pod/cluster/account > (1) fix a bug that requiresUpgrade wrongly showed"No" when it should show "Yes".
(2) detailView > add new field "Total of Virtual Routers that require upgrade".
2014-01-10 16:03:19 -08:00
Prachi Damle
42e53702a2 CLOUDSTACK-5732 [UI] Search is not working in Affinity Groups panel
- Added keyword support

Conflicts:

	api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
	api/src/org/apache/cloudstack/query/QueryService.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
2014-01-10 14:45:08 -08:00
Nitin Mehta
2571dd7713 CLOUDSTACK-5829:
listvms should return the diskoffering id when deployed with an iso
2014-01-10 14:19:36 -08:00
Jessica Wang
96c6f6d15d CLOUDSTACK-5614: UI > Infrastructure > Sockets > show "N/A" in Socketes column for hypervisors that don't support socket info. 2014-01-10 14:18:46 -08:00
rayeesn
0d24d323c0 Fix for defect CLOUDSTACK-5053, QEMU should be installed in KVM agent hosts 2014-01-10 14:03:17 -08:00
Mike Tutkowski
21a44934b4 Removed a duplicate method 2014-01-10 13:36:04 -07:00
Jessica Wang
70180d99dd CLOUDSTACK-5614: UI > Hosts > detailView > add new field "The Number of CPU Sockets". 2014-01-10 11:27:37 -08:00
Marcus Sorensen
fc082832d3 CLOUDSTACK-5853
Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.

Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.

First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.

Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).

Need to remove matching pool from the avoid set during each select phase.
2014-01-10 11:55:54 -07:00
Jessica Wang
6fdebe592a CLOUDSTACK-5656: UI > network > IP Address > configuration tab > Port Forwarding > add "State" column. 2014-01-10 10:50:28 -08:00
Jessica Wang
b090acacfa CLOUDSTACK-5557: UI > Network > Guest Network > IP Address > fix a bug that SourceNAT IP, VPC tier IP wrongly showed Configuration tab(firewall/portforwarding/loadbalancing).
SourceNAT IP, VPC tier IP should not show Configuration tab(firewall/portforwarding/loadbalancing).
2014-01-10 10:49:56 -08:00
Jessica Wang
598628f517 CLOUDSTACK-5840: UI > Snapshots > create volume from snapshot dialog > add zone dropdown if region-wide secondary storage exists. 2014-01-10 10:49:18 -08:00
Jessica Wang
a2b3e3a60d CLOUDSTACK-5840: UI > Secondary Storages > remove "prepareObjectStoreMigration" action (since prepareSecondaryStorageForMigration API has been removed from server-side). 2014-01-10 10:45:19 -08:00
Harikrishna Patnala
5bf78b82c0 CLOUDSTACK-4904: Unable to see a derieved template if the
parent template is deleted. Modified template_view so that removed(or InActive) templates also be there in the view.
Previous behavior of listing templates and state column in vm_templates will be the same.
2014-01-10 10:26:10 -08:00
Bharat Kumar
7053c222f9 CLOUDSTACK-5651 deployVm: customparameters param name has to be changed
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2014-01-10 10:01:43 -08:00
Murali Reddy
be49a2fa6d CLOUDSTACK-5647 Adding F5 device to network service provider fails with
NoClassDefFoundError

adding back missing (removed from 4.3) dependency 'commons-discovery'
2014-01-10 22:05:22 +05:30
Kishan Kavala
9486a9652e CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters.
Conflicts:
	engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
2014-01-10 19:58:59 +05:30
SrikanteswaraRao Talluri
c98ac9aae0 CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template in ready state with
matching given ostype
2014-01-10 19:56:38 +05:30
Devdeep Singh
641f85cf6f CLOUDSTACK-5657: Run the service as an account (hyper-v admin on host) so
that migration can work across hosts.
2014-01-10 17:08:01 +05:30
Devdeep Singh
db2b025608 CLOUDSTACK-5639: If path field in the TO already has the complete path, do
not try to generate the path.
2014-01-10 16:37:43 +05:30
Mike Tutkowski
68fda5a8dd Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 23:36:36 -07:00
Mike Tutkowski
a354d969ce Merge from 4.3: CLOUDSTACK-5823: Taking a VMware snapshot doesn't work 2014-01-09 23:10:40 -07:00
Mike Tutkowski
929838c8eb Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 22:42:14 -07:00
Mike Tutkowski
7ef78aac40 Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 22:37:39 -07:00