Commit Graph

22557 Commits

Author SHA1 Message Date
Sudhansu 7d17e95991 CLOUDSTACK-7986 [F5 LB] Failed to execute IPAssocCommand due to com.cloud.utils.exception.ExecutionException: Exception caught in Networking::urn:iControl:Networking/VLAN::create()
added 3 new method to strip partition information from VirtualServer, LBPool, VLAN api response.

With BigIP V11.x VirtualServer, LBPool, VLAN api response has been modified.
Now BigIP returns resource  name with user partition information
ex: if vlanname is vlan-100 then the get_list() will return /Common/vlan-100 (/Common -> Suer portition)
This method will strip the partition information and only returns a list with vlan name (vlan-100)

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-12-08 16:41:19 +05:30
Rohit Yadav 14287f7d36 CHANGES: update changes file
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-05 17:35:39 +05:30
Rohit Yadav 16f50c2862 Revert "CLOUDSTACK-7959: fixed 'qemu-img convert' compat issue"
This reverts commit f412e07d71.

Until we decide, we should keep the same 4.3 systemvm build scripts to avoid
changes in the qemu image conversion logic.
2014-12-05 17:33:54 +05:30
Rohit Yadav 48377a3f12 Fix build regression from 08e5993a45
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-05 17:33:31 +05:30
Rohit Yadav f412e07d71 CLOUDSTACK-7959: fixed 'qemu-img convert' compat issue
Backported using fix 03daae571b by
Will Stevens <wstevens@cloudops.com>

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-04 19:28:43 +05:30
Saksham Srivastava 82efb047c8 CLOUDSTACK-7950: AttachIsoCmd shoud give correct messge when trying to attach vmwaretools installer iso on non supported guestvm deployed by ISO
(cherry picked from commit 4ff3130bec)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-04 19:23:11 +05:30
Anshul Gangwar 08e5993a45 CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots.
Now they are informed that they cannot perform the operation.
 To perform operation they have to remove VM snapshots of VM.

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

Conflicts:
	server/src/com/cloud/storage/VolumeApiServiceImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
2014-12-04 19:18:55 +05:30
Rohit Yadav 6fa3d82554 CHANGES: update list of issues fixed for 4.3.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-04 03:07:28 +05:30
Anthony Xu 305d8aede6 CLOUDSTACK-5923: CS doesn't do master switch for XS any more, CS will depend on XS HA to do master switch, XS HA needs to be enabled.
(cherry picked from commit b79f949e1b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
2014-12-04 02:46:19 +05:30
Rohit Yadav 6cd31d3a9f CHANGES: update list of changes since 4.3.1
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-02 18:38:31 +05:30
Koushik Das 8a91aa9afa 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:35:48 +05:30
Kelven Yang b2c2402789 CLOUDSTACK-5685: reboot VR if a out-of-band power-on event is detected
(cherry picked from commit ee2adab7c7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-02 15:30:24 +05:30
Nitin Mehta e5761cc85f CLOUDSTACK-5997: Template state changes side affects
(cherry picked from commit 0e2e6995b7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/template/HypervisorTemplateAdapter.java

This makes setup/db/db/schema-421to430.sql same as in master branch. The
change is table view related and does not affect db at all. Making it same
as the version on master for sanity purposes.
2014-12-02 15:16:11 +05:30
Alena Prokharchyk 90d6c01e40 CLOUDSTACK-5812: pass podId information when request for secondary ip address in Basic zone guest network
(cherry picked from commit 4dcc5671d1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/components-api/src/com/cloud/network/IpAddressManager.java
	server/src/com/cloud/network/IpAddressManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
2014-12-02 15:03:52 +05:30
Sateesh Chodapuneedi b9d9c2b7fa CLOUDSTACK-7360 [vmware] Add host to existing cluster fails if the cluster is using Nexus 1000v as backend for atleast one traffic type.
While adding host to existing cluster which is using Nexus 1000v as a network backend, skip validation of Nexus VSM as it was already done while adding that cluster.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
(cherry picked from commit a1d0925f90)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
2014-12-01 17:52:54 +05:30
Rohit Yadav e0ea8801fb CLOUDSTACK-7595: Remove unnecessary multiply factor for job expiry
Backported using a6ee4112a5 by
Koushik Das <koushik@apache.org>

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

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 17:48:17 +05:30
Anthony Xu 4e33d359a8 CLOUDSTACK-5834: got VBD statistics from RRD
(cherry picked from commit 0fe1d4bb27)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2014-12-01 17:29:31 +05:30
Rohit Yadav 37058a8e56 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 17:00:51 +05:30
Ilia Shakitko 09ccf5a64b 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
	usage/src/com/cloud/usage/UsageManagerImpl.java
2014-12-01 15:59:02 +05:30
Hiroki Ohashi 0e0827f07c CLOUDSTACK-7412: Can't create proper template from VM on S3 secondary storage environment
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-27 17:03:25 +05:30
David Bierce 0a935a336e CLOUDSTACK-2823: Loop through cmdline when patching routers
Backported from https://reviews.apache.org/r/25585/diff which did not merge
this fix on 4.3 branch. Occasionally the while loop can exit with no data (Probably
 recieving an EOF) before receiveing CMDline data from the certial port.
Continue looping until cmdline is populated

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-27 16:54:34 +05:30
Rohit Yadav 8de4894696 CHANGES: update CHANGES list of issues for 4.3.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-27 00:06:45 +05:30
Edison Su ba7711b066 CLOUDSTACK-5446:
delete all the leftover snapshots on primary storage in case of snapshot
errors, after a new backup snapshot is finished

(cherry picked from commit 2667855ccb)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 23:43:59 +05:30
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
Jessica Wang 6cd4b289b2 CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.
(cherry picked from commit e796d418b4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/network.js
2014-11-26 23:31:25 +05:30
Jessica Wang bce07b68b8 CLOUDSTACK-5719: UI > Network > Add Guest Network > when Physical Network dropdown is changed, refresh Network Offering dropdown (because each physical network has its own tags which maps to different network offerings)
(cherry picked from commit 0af0c041e9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 22:24:52 +05:30
Brian Federle 8784f58ff2 CLOUDSTACK-5762: VM wizard, custom compute offering: Fix error label
(cherry picked from commit 71767cfe81)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/css/cloudstack3.css
2014-11-26 22:23:21 +05:30
Rajesh Battala 3622471099 CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv
(cherry picked from commit 7ac48934f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 22:15:35 +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
Daan Hoogland 2b264e6b57 CLOUDSTACK-6020 ipv4 address can be a larger number then
Interger.MAX_VALUE
(cherry picked from commit b3829e54d6)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:37:18 +05:30
sanjeev 11eab3d285 CLOUDSTACK-6172: Adding new test case to verify this fix
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:

	test/integration/component/test_volumes.py

Signed-off-by: sanjeev <sanjeev@apache.org>

CLOUDSTACK-6172: Fixed review comments provided in RR 25771
(cherry picked from commit 2d19bcb46a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:23:19 +05:30
Sanjay Tripathi 77446d2716 CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.
(cherry picked from commit 624139d8ef)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:23:04 +05:30
Marcus Sorensen a88c3dd8a4 CLOUDSTACK-6192: Return failure on StartCommand and PrepareForMigrationCommand
when connectPhysicalDisk fails, rather than continuing on

(cherry picked from commit fb0b2eb267)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:21:20 +05:30
Rajani Karuturi c2c6ecf828 CLOUDSTACK-6210: LDAP:listLdapUsers api throws exception when we click on "Add LDAP Account" This occurs when ldap basedn is not configured. Throwing an IAE and a proper message is returned from the api call
Signed-off-by: Ian Duffy <ian@ianduffy.ie>
(cherry picked from commit 4552ec6322)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
2014-11-26 18:19:54 +05:30
Min Chen 2534b54853 CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in
VolumeDataStoreVO.
(cherry picked from commit 672bb353be)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:15:05 +05:30
Min Chen 88ec08439d CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range error in Mysql
(cherry picked from commit cd8af6a3e2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-26 18:14:53 +05:30
Santhosh Edukulla 7332ea8a1c CLOUDSTACK-6269: [Simulator] Exception "Unable to send command"
Added fix for CLOUDSTACK-6269.More details inside the bug

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
(cherry picked from commit 3060f884ab)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
2014-11-26 18:13:36 +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
Sachchidanand Vaidya df6172f938 CLOUDSTACK-6322 - Don't allow service instance creation with empty or null service-instance "name".
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 085911f0a6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
2014-11-25 23:42:28 +05:30
Jayapal 192c706164 CLOUDSTACK-6328: added license header and removed white space
(cherry picked from commit d093a8a7b4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:37:28 +05:30
Saurav Lahiri 650464eda0 CLOUDSTACK-6328: run.sh check if an existing java process is running, before spawining new ones
Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit 96b1c6bf3c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:37:13 +05:30
Murali Reddy 62ae768540 CLOUDSTACK-6365: support virtual host and ssl in rabbitMQ event bus
with this fix, virtual host on the AMQP server can be specified. Also
SSL can be used for connection between management server and AMQP
servers.

(cherry picked from commit bc17f17776)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:21:23 +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