Commit Graph

23822 Commits

Author SHA1 Message Date
Rohit Yadav a52bbfb2cc CLOUDSTACK-8166: add boundary checks in various usage parsers
- Add boundary condition to continue looping if creation data is after end date
- Add null pointer fix for create snapshot bug

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 065c556cf5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-18 17:15:48 +05:30
Pierre-Yves Ritschard 7cb19f5aa4 move ConstantTimeComparator to utils
(cherry picked from commit b2393c31ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServer.java
2015-01-14 20:42:17 +05:30
Pierre-Yves Ritschard 7f45df3593 Use constant-time comparison functions when checking signatures
This limits the likeliness of timing attacks against the API.
See http://codahale.com/a-lesson-in-timing-attacks/ for the
full rationale.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/user/AccountManagerImpl.java

(cherry picked from commit 9b4e39e837)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 20:40:30 +05:30
Erik Weber 7019253125 Add absolute schema references to support MySQL 5.6 better
(cherry picked from commit 396936ea5e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 20:34:01 +05:30
Sateesh Chodapuneedi f642b19354 CLOUDSTACK-6652 CLONE - [Automation] Vmware- System's StartCommand failed with "NumberFormatException" while using VMware DVS
vlan id format was like "vlan://<id>" instead of just "<id>". This causes numberformatexception while converting the vlan id to integer form from string form. this was fixed for standard vswitch in bug Cloudstack-5046. now fixed for other 2 cases of dvswitch as well as pvlan.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2015-01-12 21:40:34 +01:00
Daan Hoogland 1c78d5acc5 upgrade path 2015-01-09 16:10:06 +01:00
Daan Hoogland 4ade3fbeb4 serialization issue in json/gson 2015-01-05 12:57:09 +01:00
Daan Hoogland 8cf67c0bf7 logging in clustering code, to find faulty vif plug on xenserver from clustered ms on nic orchestration for start command 2015-01-05 12:57:00 +01:00
Likitha Shetty 4807fa7de6 CLOUDSTACK-8112. CS allows creation of VM's with the same Display name when vm.instancename.flag is set to true.
Before registering a VM check if a different CS VM with same name exists in vCenter.

(cherry picked from commit 33179cce56)
2014-12-23 21:52:23 +01:00
Likitha Shetty 53fbe84014 CLOUDSTACK-8109. Extract Template is failing.
Fix the OVA path that is returned once an OVA is packaged using a META file.

(cherry picked from commit 507d9d337d)
2014-12-23 16:29:09 +01:00
Likitha Shetty 9be404a93e CLOUDSTACK-8107. Failed to create snapshot from volume when the task is performed repeatedly in zone wide primary Storage.
While taking a snapshot of a volume, CS chooses the endpoint to perform backup snapshot operation by selecting any host that has the storage containing the volume mounted on it.
Instead, if the volume is attached to a VM, the endpoint chosen by CS should be the host that contains the VM.

(cherry picked from commit a75a431373)
2014-12-23 16:25:00 +01:00
Koushik Das 145b4a1f2c CLOUDSTACK-8103: Vmsync marks VM as stopped even after failing to stop it in HV
During vmsync if StopCommand (issued as part of PowerOff/PowerMissing report) fails to stop VM (since VM is running on HV),
don't transition VM state to "Stopped" in CS db. Also added a check to throw ConcurrentOperationException if vm state is not
"Running" after start operation.

(cherry picked from commit 788fe5a273)
2014-12-23 16:04:46 +01:00
Daan Hoogland 79fc9d2687 CLOUDSTACK-7184 fieldname typo 2014-12-19 14:49:39 +01:00
Edison Su 0e312a7a77 CLOUDSTACK-7301, CLOUDSTACK-7947: double check if parent snapshot is removed or not
when creating new snapshot, check if parent snapshot is removed or not

Reviewed-by: Min
(cherry picked from commit bd79965329)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java

(cherry picked from commit ebf9897293)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
2014-12-18 18:27:56 +05:30
Daan Hoogland 86c425ec83 CLOUDSTACK-7184 c&p feature fix in conf-value-description 2014-12-18 12:23:53 +01:00
Daan Hoogland 8dfcd51beb CLOUDSTACK-7184 new config var is not available when not in the db 2014-12-18 11:51:54 +01:00
Remi Bergsma 49cf2ac916 use directIO flags when dd'ing template
This makes sure dom0 in xenserver doesn't get hammered
when copying templates. It doesn't make sense to use
the cache of dom0 as the template does not fit in
memory. The directIO flags prevent it from trying.

(cherry picked from commit 4e1527e87a)
2014-12-16 10:51:18 +01:00
Daan Hoogland 02feb0180a CLOUDSTACK-8073 load cidrs on create response 2014-12-15 15:58:42 +01:00
Rohit Yadav 2f2ff4bfc0 engine: Fix build regression
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-12 21:49:11 +05:30
Rohit Yadav 94cad49e07 CLOUDSTACK-8070: during 4.4.2 to 4.4.3 upgrade encrypt config that are hidden
In case there is an encryption key/password is provided the value, specifically
for router.ram.size will be encrypted otherwise it will remain plain text.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-12 20:43:53 +05:30
Joris van Lieshout 28ff60e74a volume /usr was sized to small and ends up being 100% full on SSVMs and CVMs. By juggling some partman-auto numbers the space gets devided more evenly. After this patch /usr should be around 80% full. I've also reduced the swap space because this makes no sense on virtual instances.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-12-12 11:37:16 +01:00
Wei Zhou 10248515d7 CLOUDSTACK-255: fix NPE in createPortForwardingRule due to no PortForwarding provider
(cherry picked from commit c9d492d714)
2014-12-12 11:15:44 +01:00
Rohit Yadav 010a217ead ldap: fix redundant import
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 22:18:59 +05:30
Rohit Yadav 030a1c5edd CHANGES: update list of bugs fixed on 4.4 since 4.4.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 22:18:55 +05:30
Rohit Yadav 1971b432c3 Revert "CLOUDSTACK-7766: Field Validations Missing for Ingress and Egress Rules"
This breaks validations such as ingress/egress rules on Security Group on the
UI so reverting this.

This reverts commit ca8ecc0470.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 21:59:14 +05:30
Saksham Srivastava 2e76d318ae CLOUDSTACK-7950: AttachIsoCmd shoud give correct messge when trying to attach vmwaretools installer iso on non supported guestvm deployed by ISO
(cherry picked from commit 4ff3130bec)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 21:59:14 +05:30
Edison Su 40bc5df0b1 CLOUDSTACK-5446:
delete all the leftover snapshots on primary storage in case of snapshot
errors, after a new backup snapshot is finished

(cherry picked from commit 2667855ccb)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:52:06 +05:30
Jessica Wang 5e5d830635 CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.
(cherry picked from commit e796d418b4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/network.js

Conflicts:
	ui/scripts/network.js
2014-12-11 20:51:56 +05:30
Jessica Wang 7da55df56b CLOUDSTACK-5719: UI > Network > Add Guest Network > when Physical Network dropdown is changed, refresh Network Offering dropdown (because each physical network has its own tags which maps to different network offerings)
(cherry picked from commit 0af0c041e9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:51:33 +05:30
Rajesh Battala 73895a5bb6 CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv
(cherry picked from commit 7ac48934f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:51:18 +05:30
sanjeev 1b135af814 CLOUDSTACK-6172: Adding new test case to verify this fix
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:

	test/integration/component/test_volumes.py

Signed-off-by: sanjeev <sanjeev@apache.org>

CLOUDSTACK-6172: Fixed review comments provided in RR 25771
(cherry picked from commit 2d19bcb46a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:48:14 +05:30
Rajani Karuturi e3a1288763 CLOUDSTACK-6210: LDAP:listLdapUsers api throws exception when we click on "Add LDAP Account" This occurs when ldap basedn is not configured. Throwing an IAE and a proper message is returned from the api call
Signed-off-by: Ian Duffy <ian@ianduffy.ie>
(cherry picked from commit 4552ec6322)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
2014-12-11 20:48:07 +05:30
Min Chen 2de93881c7 CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in
VolumeDataStoreVO.
(cherry picked from commit 672bb353be)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:48:06 +05:30
Min Chen 38bc20e67f CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range error in Mysql
(cherry picked from commit cd8af6a3e2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
2014-12-11 20:47:57 +05:30
jeff e9d079ace1 CLOUDSTACK-6467: Add pre/post-state transition status to messages published on
... event bus by UserVmStateListener. Allow system VM resource state
post-transitions to be published.

(cherry picked from commit 9c4de764f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/vm/UserVmStateListener.java

Conflicts:
	server/src/com/cloud/vm/UserVmStateListener.java
2014-12-11 20:45:40 +05:30
Murali Reddy 6455a69a4b CLOUDSTACK-7144: No GSLB provider is available during assigning load
balancing rule

this fix ensures any bean implementing GslbProvider interface are injected
into GlobalLoadBalancingRulesServiceImpl.

(cherry picked from commit 9dc322d46f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
	server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java

Conflicts:
	server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
	server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
2014-12-11 20:40:13 +05:30
Murali Reddy 908ee8e01a CLOUDSTACK-7191:On restartNetwork destroy the VR immediatley, instead of
cleanup the rules then destroy

fix adds a provision to specify if cleanup is needed on network on
shutdown. VR is marked as to not to require network rules clean up on
network shutdown as the VR is destroyed and recreated.

ran the simulator tests that test network life cycle

(cherry picked from commit 67876b215e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:39:33 +05:30
Mihaela Stoica 614ce7de96 CLOUDSTACK-7293: UI: Fixed localization issues on the login page
- Reverted the validator.messages to the original values (jquery.validator.js).
- Added a function to localize validator.messages which is called before login.

Signed-off-by: Brian Federle <brian.federle@citrix.com>
(cherry picked from commit f212aa57c3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/cloudStack.js

Conflicts:
	ui/scripts/cloudStack.js
2014-12-11 20:39:12 +05:30
Mihaela Stoica b0e5a303d9 CLOUDSTACK-7302: UI: Remove Hover Interaction from breadcrumbs at top page
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
(cherry picked from commit af37743045)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:38:52 +05:30
Gabor Apati-Nagy 23b3198233 CLOUDSTACK-7463: UI: Domain Admin UI shows 'Add LDAP Users' button (should not be shown)
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c200ada863)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/accounts.js

Conflicts:
	ui/scripts/accounts.js
2014-12-11 20:38:19 +05:30
Min Chen 9bd2749a63 CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after
management server restarts.

(cherry picked from commit 7cdb67dcf1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:36:18 +05:30
Rohit Yadav e850e8e58f CLOUDSTACK-7679: Bump rabbitmq client library to latest 3.4.1
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6ad2f38426)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:36:18 +05:30
Min Chen e9311bf528 CLOUDSTACK-7700: Volume Snapshot Async Job returns Success for a failed
operation.

(cherry picked from commit 1e20600eca)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:36:18 +05:30
Gabor Apati-Nagy 227e76132d CLOUDSTACK-7766: Field Validations Missing for Ingress and Egress Rules
(cherry picked from commit 94b16b3bd5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:36:17 +05:30
Mihaela Stoica 5cce048f24 CLOUDSTACK-7837: [UI] Make the Source CIDR column wide enough to fit the CIDR value without ellipsizing
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 6490694231)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:36:17 +05:30
Daniel Vega e4bf957f94 CLOUDSTACK-7849: Sorting projects alphabetically in drop down menu
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit e03a7e6fea)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:36:17 +05:30
Koushik Das 2320f5e91b CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
(cherry picked from commit 8378485e56)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java

Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
2014-12-11 20:36:11 +05:30
Jayapal c6ef739e25 CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network
(cherry picked from commit 709bf074de)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java

Conflicts:
	engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
2014-12-11 20:35:30 +05:30
Min Chen a2a7e391b0 CLOUDSTACK-7884: Cloudstack MS is not responding (happening randomly) after some restart.
(cherry picked from commit 2ef06e754b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:33:20 +05:30
Damodar ac371070b4 CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if CS fail to contact rabbit mq server. This is happening in case of Async API calls.
Signed-off-by: Koushik Das <koushik@apache.org>
(cherry picked from commit 50a3c0b2e3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:33:20 +05:30