Commit Graph

2774 Commits

Author SHA1 Message Date
Rohit Yadav a15acb8e74 api: Add licenses to getvmuserdata api and response
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-15 13:22:56 +05:30
Rohit Yadav f47e32ec5f
cloudstack: change version to 4.3.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 19:08:36 +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
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
Murali Reddy 816eb63e97 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-11-25 19:46:40 +05:30
Kelven Yang 2aa9bb6896 CLOUDSTACK-6743: Use edge-triggering in MessageDetector to handle bogus wakeup gracefully. Level triggering plus bogus wakeup can cause a tight loop to spin
(cherry picked from commit 09ec127470)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java
	framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java
2014-11-25 00:03:40 +05:30
Harikrishna Patnala e25690ca83 CLOUDSTACK-6463: password is not set for VMs created from password enabled template
(cherry picked from commit 2284a95e4f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 21:13:13 +05:30
Kelven Yang 421137d9f6 NDC.pop() can return empty string, this causes a loop spinning in CallContext.UnregisterAll().
(cherry picked from commit cdf605b2cd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 21:13:13 +05:30
Kelven Yang e4a3ee1526 CLOUDSTACK-6647: appending instance name with custom supplied info that contains - character can break vmsync.
(cherry picked from commit 98307bfcea)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/com/cloud/vm/VirtualMachineName.java
2014-11-24 21:13:13 +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
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
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
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
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
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
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
Wei Zhou ba9ae0c663 [UI] add view instances in template/iso details page 2014-07-01 11:39:38 +02:00
Daan Hoogland 8d0f49addd CLOUDSTACK-6747: call a more forgiving test on the supplied peer
cidr-list
(cherry picked from commit 17850c7aff)

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2014-06-25 17:16:08 +02:00
Edison Su f304df0be9 Merge branch '4.3-forward' into 4.3 2014-06-04 16:25:13 -07:00
Jayapal 2215fbf4c9 CLOUDSTACK-6240 Fixed updating advanced SG rules for vm nic secondary ip 2014-05-05 11:00:53 +05:30
Rajani Karuturi 9303e7016b Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account
Signed-off-by: Koushik Das <koushik@apache.org>
2014-04-29 12:11:08 +05:30
Sebastien Goasguen 7830a0f0f4 CLOUDSTACK-6299: Fixed apidoc info with base64 encoded
Conflicts:
	api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
2014-03-28 09:55:38 -04:00
Alena Prokharchyk 94817c1b4b CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately 2014-03-14 11:43:40 -07:00
Alena Prokharchyk 3b92031de9 CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state
Conflicts:
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
(cherry picked from commit 164ea3e84f)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-10 10:02:19 -07:00
Alena Prokharchyk 164ea3e84f CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state
Conflicts:
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2014-03-07 16:44:39 -08:00
Daan Hoogland 307ad15bb6 check for BroadcastDomainTypes on sourceNatIp(cherry picked from commit
6d0dbf5968)

Conflicts:
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
(cherry picked from commit d38a503431)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-18 14:12:50 -08:00
Marcus Sorensen 0ff152258e CLOUDSTACK-6089: Use resource tag's key to determine match in
equals() method for ResourceTagResponse
(cherry picked from commit ed73e3e1b3)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-13 15:56:08 -08:00
Marcus Sorensen 1c640448df CLOUDSTACK-6089: Implement equals() method for ResourceTagResponse
so that the java Set can properly determine if a ResourceTagResponse
is unique. This ensures we don't get duplicate resource tags showing
up any time a UserVmResponse is crafted (which can be quite often
due to the way the responses are crafted).
(cherry picked from commit 06ae23710d)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-13 15:55:43 -08:00
Marcus Sorensen ed73e3e1b3 CLOUDSTACK-6089: Use resource tag's key to determine match in
equals() method for ResourceTagResponse
2014-02-12 17:01:29 -07:00
Marcus Sorensen 06ae23710d CLOUDSTACK-6089: Implement equals() method for ResourceTagResponse
so that the java Set can properly determine if a ResourceTagResponse
is unique. This ensures we don't get duplicate resource tags showing
up any time a UserVmResponse is crafted (which can be quite often
due to the way the responses are crafted).
2014-02-12 16:07:34 -07:00
Harikrishna Patnala 01289b1647 CLOUDSTACK-6023: Non windows instances are created on XenServer with a vcpu-max above supported xenserver limits
Changed the VCPU max limit to 16 and provided a cluster level configuration parameter for this max limit named xen.vm.vcpu.max
(cherry picked from commit 95e41fdf0d)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:32:01 -08:00
Jayapal 278c54a970 CLOUDSTACK-6040: Updated the ip addr validation in create port forwarding
(cherry picked from commit 7a71cf33ce)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:24:28 -08:00
Devdeep Singh 9536569e1f CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
(cherry picked from commit 96d8e3c945)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:21:18 -08:00
Murali Reddy f93be7b2b6 CLOUDSTACK-5967: GRE tunnel creation is failing
after network orchestrator refactor, only network elements providingg
services as defined by network offering, are invloved network design and
imlement phase. So OVS network element need to be enables as
'Connectivity' service provider to make GRE tunnels work. This fix
introduced 'Ovs' provider as Connectivity service provider.
(cherry picked from commit 2e004878b1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:16:52 -08:00
Harikrishna Patnala 95e41fdf0d CLOUDSTACK-6023: Non windows instances are created on XenServer with a vcpu-max above supported xenserver limits
Changed the VCPU max limit to 16 and provided a cluster level configuration parameter for this max limit named xen.vm.vcpu.max
2014-02-07 12:50:55 -08:00
Jayapal 7a71cf33ce CLOUDSTACK-6040: Updated the ip addr validation in create port forwarding 2014-02-06 18:04:20 +05:30
Devdeep Singh 96d8e3c945 CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db. 2014-02-06 11:17:51 +05:30
Murali Reddy 2e004878b1 CLOUDSTACK-5967: GRE tunnel creation is failing
after network orchestrator refactor, only network elements providingg
services as defined by network offering, are invloved network design and
imlement phase. So OVS network element need to be enables as
'Connectivity' service provider to make GRE tunnels work. This fix
introduced 'Ovs' provider as Connectivity service provider.
2014-02-05 17:15:34 +05:30
Marcus Sorensen 631ea240f4 CLOUDSTACK-6000: When expunging fails, move volume state back to
Destroy, so that the cleanup thread will try again on next run.
(cherry picked from commit 1aa1b3e19c)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:06:36 -08:00
Marcus Sorensen 1aa1b3e19c CLOUDSTACK-6000: When expunging fails, move volume state back to
Destroy, so that the cleanup thread will try again on next run.
2014-01-30 23:34:56 -07:00
Daan Hoogland c3a63b6b5a Findbugs issues in ApiResponseHelper fixes 2014-01-29 21:31:54 +01:00
Alena Prokharchyk 2311528f18 CLOUDSTACK-5983: changed responseName param in assignCertToLoadBalancer and removeCertFromLoadBalancer API commands 2014-01-29 11:45:00 -08:00
Daan Hoogland d38a503431 check for BroadcastDomainTypes on sourceNatIp(cherry picked from commit
6d0dbf5968)

Conflicts:
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
2014-01-29 18:20:16 +01:00
Daan Hoogland 9a1b882d0e Findbugs issues in ApiResponseHelper fixes 2014-01-26 12:25:18 +01:00
Animesh Chaturvedi 70ba92fc14 Updating pom.xml version numbers for release 4.3.0
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-21 17:29:51 -08:00
Kishan Kavala 04492bad43 CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit templates. Changed min required version for VR to 4.3 2014-01-17 12:29:37 +05:30
Kelven Yang 1acdbf8369 CLOUDSTACK-5696: fix a regression caused by out-of-band sync changes 2014-01-15 16:21:29 -08:00