Commit Graph

8362 Commits

Author SHA1 Message Date
Daan Hoogland e9441d4786 Updating pom.xml version numbers for release 4.4.3
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2015-04-15 17:00:24 -05:00
Daan Hoogland f9dce0bf23 missed code in merge of Avoid distributing private key for realhostip.com 2015-03-19 08:34:36 +01:00
Nitin Mehta c2dc53c2a1 Avoid distributing private key for realhostip.com
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/consoleproxy/AgentHookBase.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
2015-03-18 20:35:18 +01:00
Rohit Yadav d3122a1b8c api: avoid sending sensitive data in api response
- UI: use post when updating user
- S3: don't send s3 key in the response
- VPN: don't send preshared key in remoteaccessvpn api response
- Snapshot response should set zone id not volume's device id

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

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
2015-03-17 13:16:22 +01:00
Bharat Kumar 75c17a31e7 CLOUDSTACK-7348 InvalidParameter Exception while executing scale vm.
We do not throw the exceptions any more, so added info in the logs to say
what happend to this command.

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 659edb4d9b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-16 15:52:40 +05:30
Min Chen c698af221b Error message exposes domain Id when deployVirtualMachine() is attempted on a shared network to which the user doesnot have access to.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0d36f2e4b5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-16 15:49:21 +05:30
Harikrishna Patnala a3069ac02a CLOUDSTACK-7534: ResetVM for VM with attached datadisk fails when enable.ha.storage.migration is false
Separate global config to enable/disable Storage Migration during normal deployment
Introduced a configuration parameter named enable.storage.migration
2015-03-12 14:54:02 +01:00
Rohit Yadav 258058772e server: remove unused import in ImageStoreJoinDaoImpl
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-11 17:25:37 +05:30
Rohit Yadav c620a0640a api: avoid sending sensitive data in api response
- UI: use post when updating user
- S3: don't send s3 key in the response
- VPN: don't send preshared key in remoteaccessvpn api response
- Snapshot response should set zone id not volume's device id

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

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
2015-03-11 16:35:55 +05:30
Rohit Yadav 9ea3bd23ec CLOUDSTACK-8248: loadCidrs before sending response
Fixes regression from CLOUDSTACK-6582

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f9090eacd6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-06 21:44:08 +05:30
Bharat Kumar 10bb8af343 CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check 2015-02-26 17:30:27 +01:00
Rohit Yadav 72d78e57c8 CLOUDSTACK-7089: don't log VNC password
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e287de9fd9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-26 18:11:28 +05:30
Rohit Yadav 14a00679bd CLOUDSTACK-8285: check and update IP capacity states based on allocation state
- Backend should update if state was diabled and now has changed
- UI's fetch latest does not actually fetch latest

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

Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java
2015-02-25 16:48:54 +05:30
Rohit Yadav 0208de721e CLOUDSTACK-8282: startSystemVM should override consoleproxy.start setting
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b462a56f27)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
2015-02-25 14:31:57 +05:30
Anthony Xu df92a45b05 fixed NPE
This closes #70

(cherry picked from commit 98b416b7f0)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 12:12:59 +05:30
Daan Hoogland 1f209ff226 CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network 2015-01-26 16:59:40 +01:00
Abhinandan Prateek 7699c70ade CLOUDSTACK-8164: Look for all host to avoid NPE
(cherry picked from commit d8def3dc0b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-19 11:32:52 +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
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
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 02feb0180a CLOUDSTACK-8073 load cidrs on create response 2014-12-15 15:58:42 +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
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
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
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
Daniel Vega 07172c8a99 CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c919ff83d8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java

Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2014-12-11 20:29:08 +05:30
Edison Su 3006f5cc83 CLOUDSTACK-7966:
remove snapshot_store_ref entry, in which role is Primary, during
storage GC

(cherry picked from commit 7175247c5e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:28:15 +05:30
Min Chen f9ae3bbc98 CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying
all the tags of all resources.

(cherry picked from commit 5fa7801b20)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:19:22 +05:30
Kishan Kavala 8b787850cf CLOUDSTACK-2625, CLOUDSTACK-3401: Usage records are ordered by start_date which is not unique. While listing large datasets or when page size is small this will result in duplicates. Order records by id instead
(cherry picked from commit 63109a97b1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java

Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java
2014-12-11 19:58:23 +05:30
Rohit Yadav 3b286d77ca CLOUDSTACK-8014: Fix NPE searching including removed templates
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE

Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f189c105d8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-10 19:27:20 +05:30
Rohit Yadav 2803cac06b CLOUDSTACK-6075: Increase the ram size for router service offering
Increased the ram size of Internal load balancer vm service offering also
Backported from fix by Harikrishna Patnala <harikrishna.patnala@citrix.com>
https://reviews.apache.org/r/17941/

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-02 20:16:45 +05:30
Koushik Das 291a34aac1 CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules

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

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-02 15:48:44 +05:30
Koushik Das c44262bfc2 CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required

(cherry picked from commit a6ee4112a5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 17:50:32 +05:30
Rohit Yadav d1f008e2f2 CLOUDSTACK-7903: Fix build regression from previous fix
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.

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

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 16:46:56 +05:30
Ilia Shakitko 342b73d37a CLOUDSTACK-7903: Decreased minimal usage aggregation range value
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9b907902d2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 15:56:46 +05:30
Daan Hoogland 7e409ea300 Updating pom.xml version numbers for release 4.4.3-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-25 15:36:02 +01:00
Daan Hoogland e0420a6fec Updating pom.xml version numbers for release 4.4.2
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-21 03:41:26 +01:00
Syed 9f83a4d43b CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts)
Signed-off-by: Will Stevens <wstevens@cloudops.com>
2014-11-20 09:46:55 -05:00
Anshul Gangwar 5b620951a3 CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop. If we create VM with shared service offering and attach disk with local disk offering, and one of storage pool is full(cannot be allocated) and other is not full then we are not putting the cluster in avoid list which is causing this infinite loop.
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-19 12:03:30 +01:00
Will Stevens 9c0c4f713f CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation
(cherry picked from commit 92d4a41a69)

Conflicts:
	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
	server/test/resources/certs/root_chain.crt
	server/test/resources/certs/root_chain.key
	server/test/resources/certs/rsa_ca_signed2.crt
2014-11-13 16:50:51 +01:00
Daan Hoogland 8de7f84ad5 reenable tests for certs as far as working 2014-11-11 15:47:35 +01:00
Rohit Yadav 5e57eeefd9 CLOUDSTACK-7871: allow VM and template details update using update APIs
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

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

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2014-11-10 17:59:54 +05:30
Frank Zhang 1d92eebbe5 fix expried certificate in unit test
(cherry picked from commit 88561e154f)
2014-11-10 10:21:15 +01:00
Daan Hoogland b9620c2cbe Updating pom.xml version numbers for release 4.4.2-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-10-19 20:46:15 +02:00
Daan Hoogland d8359211f1 CLOUDSTACK-7702 added keytool to sudoers modification specs 2014-10-14 10:05:43 +02:00
Daan Hoogland 63fbd16dd1 CLOUDSTACK-7219 log warning when config item is missing from scope 2014-10-02 11:58:20 +02:00
Daan Hoogland 08b9a96b7c CLOUDSTACK-7219 added nullcheck to config retrieval 2014-10-02 11:12:55 +02:00