22916 Commits

Author SHA1 Message Date
Prachi Damle
acfdd519be IAMEntityType change in the test after merge 2014-03-19 11:00:25 -07:00
Prachi Damle
c3ee01cca1 More changes to support 'readOnly' access 2014-03-19 11:00:23 -07:00
Prachi Damle
e09f97aa63 Adding support for 'readOnly' access. AccessType.ListEntry introduced. 2014-03-19 11:00:20 -07:00
Jayapal
289ac0465c CLOUDSTACK-6240 Fixed updating advanced SG rules for vm nic secondary ip 2014-03-19 15:46:15 +05:30
John Kinsella
4494cbb4c3 CLOUDSTACK-6156: removing rampart maven dependencies from awsapi
The removed dependencies don't seem to be used in code, and their
presence is causing at least some people to be unable to build awsapi
and RPM packages.

Signed-off-by: John Kinsella <jlk@stratosec.co> 1395207698 -0700
2014-03-18 22:41:38 -07:00
Sheng Yang
1d3a6eaa50 CLOUDSTACK-6047: Fix timeout issue when try to execute aggregated commands
Add executeInVR() with timeout interface to VirtualRouterDeployer

AggregationControlCommand with Action.Finish may take longer than normal command
since it would execute all the commands in one execution, and it may result in
SSH timeout for SshHelper or other mechanism communicate with VR.

Introduce an new executeInVR() interface with added timeout period for waiting
FinishAggregationCommand to complete execution.
2014-03-18 17:43:59 -07:00
Min Chen
6e034cad03 Refactor listNetworks logic to use new IAM model. 2014-03-18 17:02:22 -07:00
Kelven Yang
ce1e53f451 Fix style-check issue after cherry-picks 2014-03-18 17:00:08 -07:00
Kelven Yang
d9506d2a05 Let VMSync be aware of HA take-over on VM state management. 2014-03-18 16:45:45 -07:00
Kelven Yang
de252adadf avoid mysql lock-promotion situation. 2014-03-18 16:45:02 -07:00
Edison Su
0c1b6b44a8 add apache licence header for cloudbyte 2014-03-18 15:02:02 -07:00
Brian Federle
f34f001371 Fix incorrect context being passed to hosts->instances section
Fixes issue where, if an action is being performed from the quick view in the
'Instances' section, the old context will be passed when viewing instances in
the 'hosts' section, causing all instances to be displayed. This was caused
by the quickview tooltip still being in the DOM, even after closing it by
clicking an action.
2014-03-18 14:31:28 -07:00
Nitin Mehta
5d19a936a2 CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
Work done for network offering.
2014-03-18 14:00:55 -07:00
Nitin Mehta
7442b56fa8 CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
And when the flag is updated on the resource accordingly generate usage events again.
Also when display flag is false in deployvm cmd it should be false for the volumes associated with the vm as well
2014-03-18 14:00:25 -07:00
Edison Su
0288a87045 pump the version 2014-03-18 11:14:23 -07:00
punith-cloudbyte
f3c7c607bd cloudbyte storage plugin for master commit 2014-03-18 11:14:23 -07:00
sbalineni
c56df036e8 Per contrail implementation, CS ingress policy mapping: rule cidr should be mapped to src net, dst net is 'local' i.e same as 'guest network' on which rule is applied
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-03-18 11:04:19 -07:00
Min Chen
22eb5eb2d6 Fix a regression caused by IAM search criteria refactor on VPC. 2014-03-18 10:41:55 -07:00
Daan Hoogland
8b510d2481 checkstyle: unused import 2014-03-18 13:18:57 +01:00
Daan Hoogland
e7e4753979 checkstyle: trailing spaces 2014-03-18 12:35:10 +01:00
edison
ed9ed446c2 CLOUDSTACK-5432: potential bugs in case of stop mgt server while
template is downloading, template_store_ref has leftover not in ready
state, when create vm from that template, the code doesn't check either
zone id, nor template_store_ref state.

Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
2014-03-18 12:20:14 +01:00
Marcus Sorensen
8fc6e263b3 now fix MY root resize test, which passes 0 in one test... 2014-03-14 07:40:12 -06:00
Marcus Sorensen
345fc3c8ec Change newly added details map for deployVirtualMachine to an empty
map, instead of passing all possible keys as empty values
2014-03-14 07:18:06 -06:00
Marcus Sorensen
d638d04cbf CLOUDSTACK-6181: Merge of resize root feature (resize-root branch) 2014-03-14 07:17:33 -06:00
Min Chen
ae1d6a771b Remove IAMEntityType to use existing VO interface class to annotate
entityType.
2014-03-17 17:19:55 -07:00
Jessica Wang
dadaf85860 CLOUDSTACK-6246: UI > Infrastructure > SSL Certificate > update (1) mouse-over hint of SSL Certificate button. (2) description in SSL Certificate dialog. 2014-03-17 15:41:48 -07:00
David Nalley
3869bb6e9b updating copyright notice date 2014-03-17 13:10:28 -04:00
Alena Prokharchyk
479986e52b Fixed compilation error in StorageAllocatorTest.java 2014-03-17 09:58:44 -07:00
Alena Prokharchyk
78a04c5315 CLOUDSTACK-6235: listSystemVms - retrieve vlan info of EIP address only when ip address can be found in the DB 2014-03-16 16:29:56 -07:00
Mike Tutkowski
d55c4dd804 CLOUDSTACK-6170 2014-03-14 23:47:20 -06:00
Kelven Yang
5e4a4e8b34 Fix a regression that caused API job to return prematurely. 2014-03-14 17:31:16 -07:00
Kelven Yang
ec01791936 Fix the missing java imports from automatic merge 2014-03-14 14:22:23 -07:00
Kelven Yang
12f7cbcb76 Deal with concurrent state update for VM and Host objects. 2014-03-14 14:07:39 -07:00
Sheng Yang
d3973ed081 CLOUDSTACK-6241: Fix default route for IPv6 network when IPv4 not used 2014-03-14 13:36:43 -07:00
Alena Prokharchyk
d9e1c9c502 CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately
Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2014-03-14 11:57:58 -07:00
Daan Hoogland
3aee404a49 findbugs: removed unused variable 2014-03-14 18:50:43 +01:00
Jayapal
384eeaf792 CLOUDSTACK-2692 Assigning LB rule for vm nic secondary ips 2014-03-14 22:47:17 +05:30
Alena Prokharchyk
ee99d5ee8d NescalerResource - added missing "return" statement 2014-03-14 09:45:27 -07:00
Hugo Trippaers
774739fb97 Fix database upgrade from 4.4.0 to 4.5.0 2014-03-14 17:14:57 +01:00
Hugo Trippaers
15b6860c68 Fix pom relative path 2014-03-14 14:55:26 +01:00
Hugo Trippaers
4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01: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
Rajesh Battala
6a4927f660 Fixed all findbugs in hyperv plugin code 2014-03-14 17:36:43 +05:30
Rajesh Battala
4523f5d8de CLOUDSTACK-6106 Agent side changes for VPC on Hyper-V 2014-03-14 17:36:43 +05:30
Rajesh Battala
1b4325d2c8 CLOUDSTACK-6106 supporting VPC VR on Hyper-V 2014-03-14 17:36:43 +05:30
Murali Reddy
794b38a789 fix unit-test failure 2014-03-14 17:19:27 +05:30
Murali Reddy
7d20b08aa9 findbug fixes 2014-03-14 16:56:39 +05:30
Murali Reddy
81f6e66808 fix RAT check failure 2014-03-14 16:56:39 +05:30
Murali Reddy
9a97ba76d3 findbug fixes, added some comments, bug fixes 2014-03-14 16:56:39 +05:30
Murali Reddy
e487b24bb6 couple of bug fixes 2014-03-14 16:56:38 +05:30