etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,805 Commits 323 Branches 325 Tags 951 MiB
Commit Graph

8341 Commits

Author SHA1 Message Date
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
Daan Hoogland 4d065b9a3a CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval 2014-09-16 12:25:07 +02:00
Upendra Moturi 213bdbde35 CLOUDSTACK-6223. removeNicFromVirtualMachine fails if another instance in another domain has a nic with the same ip and a forwarding rule configured on it 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit e9af5f44ae)
 2014-09-12 12:07:04 +02:00
Rohit Yadav f4f5ea3cc0 CLOUDSTACK-7528: More verbose logging when sending alert fails 
When sendAlert is called on an AlertManager impl, if it fails it logs that
something was wrong but does not log the body of the issue/error. This means
we tell the user/admin that there was an issue but don't share the "issue"
with them at all as the email alert fail (or that they were not initialized).

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

Conflicts:
	server/src/com/cloud/alert/AlertManagerImpl.java
 2014-09-10 11:45:02 +02:00
Daan Hoogland 61892bb28a CID 1237195: null deref when no project found 2014-09-05 14:37:37 +02:00
Will Stevens 6c501dba45 CLOUDSTACK-7418 and CLOUDSTACK-7488 - Fixed LB removal if cert is associated 2014-09-04 12:49:23 -04:00
Daan Hoogland eaf3ad1db4 Merge remote-tracking branch 'origin/hotfix/4.4-7405' into 4.4 2014-09-04 11:05:58 +02:00
Fred Clift 54e9a92d24 make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-04 04:24:16 -04:00
Will Stevens 92339bca0b CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects 2014-09-02 15:25:41 -04:00
Saksham Srivastava 6e20058fb7 CLOUDSTACK-6508: impossible to list projects from API with domainid set 
(cherry picked from commit 19b72d6cf5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-21 03:17:32 +02:00
Daan Hoogland ca6d0a3cef Merge remote-tracking branch 'origin/hotfix/4.4-6905' into 4.4 2014-08-18 20:23:00 +02:00
Wei Zhou 838a1a8476 CLOUDSTACK-7362: fix wrong uuid issue for resource tags 2014-08-18 16:00:22 +02:00
Wei Zhou ae1b87ca23 CLOUDSTACK-7308: add tags to all security group rules 2014-08-18 14:41:53 +02:00
Wei Zhou b55c114932 CLOUDSTACK-7308: tags for security group rules (additional commit for 4.4) 2014-08-15 09:51:39 +02:00
Stephen Hoogendijk f41019d5b2 CLOUDSTACK-7308 - Adds tagging support for security group rules 
(cherry picked from commit 6978c18c3a)
 2014-08-15 09:41:15 +02:00
Luis Henrique Okama 260e694e89 bugfix CLOUDSTACK-7309 using findProjectByProjectAccountIdIncludingRemoved 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-13 00:06:17 +02:00
amoghvk 9800b9f07a CLOUDSTACK-7295: VMs is Stopped state have no host ID, resulting in NPE 2014-08-11 14:56:07 -07:00
Murali Reddy de85c4d555 CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared 
networks

fix ensures only admin users can delete shared network

(cherry picked from commit 2f293f42d5)
 2014-08-08 12:15:40 +02:00
Rohit Yadav d79251853b CLOUDSTACK-7211: Add Guest OS mapping before returning VirtualMachineTO object 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 89fabe82b9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-31 19:04:22 +02:00
Kishan Kavala ccee282a74 CLOUDSTACK-6931: Set hypervisor.type in agent.properties using cloudstack-setup -t option. Default is kvm. 
(cherry picked from commit 89854de18d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-31 18:50:43 +02:00
Jayapal 865cdc08e5 CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate 
(cherry picked from commit 252e58381a)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 13:36:22 +02:00
Nitin Mehta 6d0e43d36b CLOUDSTACK-7000: Fix bugs in ListSnapshotPolicy and updateSnapshotPolicy command 
(cherry picked from commit 63c4f02897)
 2014-07-30 13:33:22 +02:00