Commit Graph

2718 Commits

Author SHA1 Message Date
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
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
9a1b882d0e Findbugs issues in ApiResponseHelper fixes 2014-01-26 12:25:18 +01: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
Sachchidanand Vaidya
8b9f7afc92 Add L3VPN isolation method for contrail plugin
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-14 13:52:40 -08:00
Murali Reddy
b6698f354c CLOUDSTACK-5861: networks that failed to implement can not be destroyed
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
2014-01-13 23:24:12 +05:30
Murali Reddy
e1a15ea15b CLOUDSTACK-5849: Failed shutdown of the network causes network state to
be changed to 'Implemented'

Wrong network state transition

s_fsm.addTransition(State.Shutdown, Event.OperationFailed,State.Implemented

fix keeps state as Shutdown
2014-01-13 23:24:12 +05:30
Marcus Sorensen
2db6c10c07 Fix Null pointer in CreateVlanIpRangeCmd 2014-01-11 10:10:33 -07:00
sbalineni
343b6acae2 Contrail plugin 4.3 fixes
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-10 17:14:01 -08:00
Sheng Yang
de262ac168 Revert "Contrail VRouter plugin major bug fixes for CS 4.3"
This reverts commit dc511dd95b.
2014-01-10 16:22:40 -08:00
sbalineni
dc511dd95b Contrail VRouter plugin major bug fixes for CS 4.3
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-10 16:03:12 -08:00
Marcus Sorensen
1f9ad23ba0 CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
equate empty string to untagged in api parameter input
2014-01-10 16:30:43 -07:00
Marcus Sorensen
a80debbddf CLOUDSTACK-5853
Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.

Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.

First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.

Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).

Need to remove matching pool from the avoid set during each select phase.
2014-01-10 11:34:17 -07:00
Harikrishna Patnala
7a39b0a2e1 CLOUDSTACK-4904: Unable to see a derieved template if the
parent template is deleted. Modified template_view so that removed(or InActive) templates also be there in the view.
Previous behavior of listing templates and state column in vm_templates will be the same.
2014-01-10 10:24:35 -08:00
Bharat Kumar
35e09c81e6 CLOUDSTACK-5651 deployVm: customparameters param name has to be changed
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
2014-01-10 09:42:33 -08:00
Prachi Damle
ce9760f4ce CLOUDSTACK-5732 [UI] Search is not working in Affinity Groups panel
- Added keyword support
2014-01-08 17:59:23 -08:00
Min Chen
02f6e02a73 CLOUDSTACK-5840:Remove old API method. 2014-01-08 17:57:15 -08:00
Min Chen
62aa14771c CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API
(updateCloudToUseObjectStore) instead of two APIs.
2014-01-08 16:33:37 -08:00
edison
086475647c CLOUDSTACK-5831: return quiescevm field in volumeresponse 2014-01-08 16:04:21 -08:00
Kelven Yang
c75b0044ef CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues 2014-01-07 17:12:06 -08:00
Marcus Sorensen
5a8ea8ae71 CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-07 17:03:36 -07:00
Kelven Yang
22a1b8c3fc CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic 2014-01-03 17:20:24 -08:00
edison
db25228b23 CLOUDSTACK-5329: fix NPE in storage migration for zone-wide primary storage, and also the serization error. 2014-01-03 16:44:21 -08:00
Sanjay Tripathi
ce48b0bd55 Revert "CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage"
This reverts commit 23841e3369.
2014-01-01 11:23:57 +05:30
edison
23841e3369 CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage 2013-12-31 14:03:44 -08:00
Mike Tutkowski
8eb430f602 CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2013-12-28 00:12:11 -07:00