etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,536 Commits 324 Branches 325 Tags 838 MiB
Commit Graph

7942 Commits

Author SHA1 Message Date
Sheng Yang e9c5a03fb0 CLOUDSTACK-5501: Allow one vpn customer gateway with multiple connections 
This restriction was purposely avoid confusion of VPN setup, but later found too
strictly and cause troubles for deployment. Removed after testing one customer
gateway with multiple connections.

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

Conflicts:
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2014-11-26 23:36:47 +05:30
Alena Prokharchyk 4d24452334 CLOUDSTACK-5839: fixed xml serializer to process collection field when its elements are of String type 
(cherry picked from commit c3680cc111)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/response/ApiResponseSerializer.java
 2014-11-26 22:13:28 +05:30
Alena Prokharchyk 4fdfd8f913 CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse 
(cherry picked from commit 07557eb570)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-26 22:11:23 +05:30
Likitha Shetty 6609191133 CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not uuid 
(cherry picked from commit e5512960af)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-26 22:07:51 +05:30
Alena Prokharchyk 1e63d0b134 CLOUDSTACK-5870: API support for retrieving user data 
(cherry picked from commit bd79fb33a6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
 2014-11-26 22:06:44 +05:30
Gabor Apati-Nagy 17c3e83cae CLOUDSTACK-5962: Value of Global parameter "custom.diskoffering.size.min" is not reflected in UI during new instance creation. 
Added fields to /api and /server classes for CustomDiskOfferingMinSize
to be available in CapabilitiesResponse. Fixed UI code in Instance
Wizard to have this config value as the minimum selectable option when
we are in custom disk size mode.

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

Conflicts:
	api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2014-11-26 21:59:16 +05:30
Rohit Yadav 67df5b9dad CHANGES: updates changes files, fix cherry-picked commits that break semantics 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-26 00:34:14 +05:30
Kishan Kavala 473cd6f09a CLOUDSTACK-6374: Remove entries from lb vm map when lb rule apply fails 
(cherry picked from commit 16ab5ce76c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2014-11-25 23:19:14 +05:30
Kishan Kavala 7b7eb48281 CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated. 
(cherry picked from commit 26746feb39)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-25 23:17:58 +05:30
Tanner Danzey 5ac44896c8 CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting 
modified:   server/src/com/cloud/api/ApiDBUtils.java

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 601827e6b3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-25 23:17:09 +05:30
jeff af79d6aaf7 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
 2014-11-25 23:16:01 +05:30
Amogh Vasekar 7e5c7d488a CLOUDSTACK-6516: In 4.3, SSL was turned off by default. 
However, for SSVM, the value from configuration server overrides the default in Config.java. Work around is to change in global properties.

Local testing, checking a fresh install has the above property false by default.

Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
(cherry picked from commit 05802004e2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-25 23:12:59 +05:30
Jayapal fac57a0a83 CLOUDSTACK-6577: Disable service monitoring in RVR 
(cherry picked from commit b9b623bccc)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-11-25 23:10:27 +05:30
Jayapal dddc6488d4 CLOUDSTACK-6578: Fixed issue in delete remote access vpn command 
(cherry picked from commit 40836344de)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
 2014-11-25 23:08:44 +05:30
Harikrishna Patnala 8992e18836 CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance 
(cherry picked from commit 522208dec2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/template/TemplateManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2014-11-25 22:50:03 +05:30
Murali Reddy 30dd76fc65 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)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-25 22:36:55 +05:30
Murali Reddy b8a28dfae3 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
 2014-11-25 19:50:37 +05:30
Rohit Yadav dc80b25361 CLOUDSTACK-7581: Empty 'ID' parameters allowed in API calls 
Fix is to fail API calls with empty 'id' parameter value upfront rather than
going ahead and failing with NPE later on.

Backported using fix 4e07dd1dc4 by
Koushik Das <koushik@apache.org>

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-25 19:24:29 +05:30
Koushik Das f0a81edb5b 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
 2014-11-25 18:31:37 +05:30
Jayapal 1e475892d5 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
 2014-11-25 18:28:20 +05:30
Damodar 23a03ac1b0 CLOUDSTACK-7877: The NET.IPRELEASE events are not added to usage_event on IP range deletion from Physical Networks. 
Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit 7e6ec2ce82)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
 2014-11-25 18:24:33 +05:30
Damodar 12d1c945f2 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-11-25 18:11:22 +05:30
Daniel Vega c2f367982e 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
 2014-11-25 14:19:16 +05:30
Edison Su a62fa62fc6 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-11-25 14:14:31 +05:30
Rohit Yadav 6d31aca25c 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-11-25 14:08:25 +05:30
Rohit Yadav 11d446a0d8 Fix build failure from cherry-picked commits 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-24 23:47:04 +05:30
Kelven Yang 839ef94ce9 CLOUDSTACK-6970: Protect event interpretion from causing NPE exception 
(cherry picked from commit 06d8d3a03f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-24 23:47:03 +05:30
Kelven Yang b716444b84 Move EventBus hookup on job framework to ApiServer to decouple job framework away from business logic related hookups. The decoupling is done through internal messaging facility provided inside management server. 
(cherry picked from commit 521ac796dd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServer.java
 2014-11-24 21:13:14 +05:30
Harikrishna Patnala 122332b326 CLOUDSTACK-5992: default values of configuraiton parameters in configuration table are set NULL on fresh setup Some configuration parameters have Component names different from fresh and upgrade setup 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 5d389b1a71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java
 2014-11-24 21:13:14 +05:30
Min Chen eaaac81870 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-11-21 18:52:28 +05:30
Rohit Yadav 2a72afdc48 Revert "Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path"" 
The revert was an error, sorry about that.
  - Rohit

This reverts commit 0aba9654f8.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-21 18:04:33 +05:30
Rohit Yadav 0aba9654f8 Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path" 
This reverts commit c3c3bab41a.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-20 20:35:45 +05:30
Syed 56d8b173a0 CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts) 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
(cherry picked from commit 8ea7902075)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-20 19:38:47 +05:30
Will Stevens 9258b8350e CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation 
(cherry picked from commit 92d4a41a69)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

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

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

Conflicts:
	server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
	server/test/resources/certs/rsa_ca_signed.crt
	server/test/resources/certs/rsa_ca_signed.key
	server/test/resources/certs/rsa_self_signed.crt
	server/test/resources/certs/rsa_self_signed.key
	server/test/resources/certs/rsa_self_signed_with_pwd.crt
	server/test/resources/certs/rsa_self_signed_with_pwd.key
 2014-11-20 19:33:16 +05:30
Rohit Yadav c3c3bab41a Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path 
This reverts commit e6d00bcc66.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-20 14:04:43 +05:30
Anshul Gangwar 14e048dada 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:21:02 +01:00
Rohit Yadav e6d00bcc66 Revert "Updating pom.xml version numbers for release 4.3.2-SNAPSHOT" 
This reverts commit 063bb8f5b4.
 2014-11-18 16:04:33 +05:30
Likitha Shetty e2fd4ef42c CLOUDSTACK-6011 . When detach is called on a deleted volume, avoid the NPE and throw an appropriate exception instead 
(cherry picked from commit f4a96d4c85)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-14 17:32:41 +05:30
Sheng Yang 76f5f3048e CLOUDSTACK-6432: Blocking DHCP server to service DNS outside network 
This would cover only DHCP only network since in basic and shared network, the
private IP used by VR and network may expose to outside.

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

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-11-14 00:19:31 +05:30
Rohit Yadav c8929dfd10 CLOUDSTACK-7871: allow VM and template details update using update APIs 
Allows updating details (key/value) pair which updates entries in
vm_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>
 2014-11-10 18:12:37 +05:30
Kishan Kavala 7a86dc516d 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
 2014-10-09 10:56:10 +05:30
Sebastien Goasguen 063bb8f5b4 Updating pom.xml version numbers for release 4.3.2-SNAPSHOT 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-16 09:16:47 -04:00
Rohit Yadav 885c02dbd8 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).

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-10 11:34:58 +02:00
Sebastien Goasguen 41c0eaa14d Updating pom.xml version numbers for release 4.3.1 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-04 16:47:57 +02:00
Rajani Karuturi ab8fcd0b22 CLOUDSTACK-6531: stopping the router in case of command failures. Also added alerts for failures. 
Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit 59bf355919)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-09-02 14:33:31 +02:00
Sebastien Goasguen a654894dbd Updating pom.xml version numbers for release 4.3.1-SNAPSHOT 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-08-25 09:16:27 -04:00
Luis Henrique Okama e7ef14abae bugfix CLOUDSTACK-7309 using findProjectByProjectAccountIdIncludingRemoved 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-12 23:57:49 +02:00
Saksham Srivastava 19b72d6cf5 CLOUDSTACK-6508: impossible to list projects from API with domainid set 2014-07-22 13:36:42 -04:00
Edison Su 720315b8d1 CLOUDSTACK-4725: if storage pool has different path, but the uuid is the same, then treat them as the same storage pool 2014-07-16 16:30:15 -07:00
Wei Zhou 9b7ac9dfac [UI] show all secondary ips in VM NIC page 2014-07-03 11:20:22 +02:00