Nitin Mehta
35b4ab460c
CLOUDSTACK-4270
...
ASF 4.1 to 4.2 Upgrade: Missing Global Configuration parameters on the Upgraded Setup related to "storage.cache". Adding them
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-08-13 12:14:27 +05:30
Likitha Shetty
15b40e5cf2
CLOUDSTACK-4273.
2013-08-13 11:14:32 +05:30
Likitha Shetty
dbb49ab1e0
CLOUDSTACK-4273. Volume test cases fails from BVT, test cases failed during attachment.
2013-08-13 10:26:18 +05:30
Mike Tutkowski
b04a2b561b
CLOUDSTACK-4264
2013-08-12 21:57:55 -06:00
Jessica Wang
63b37214c3
CLOUDSTACK-4142: listNetworkOfferings API has been changed to not return system-owned network offerings to regular-user. So, add networkofferingconservemode property to listNetworks API response.
2013-08-12 17:49:13 -07:00
Prachi Damle
3ad0008c89
CLOUDSTACK-4276 Dedicated Resources: Private Zone functionality issues
...
Changes:
createZone API:
- This API takes in domainid, set it to the zone record in the data_center table
updateZone API:
- This API uses 'isPublic' flag to set a private zone to public - if this flag is set and the zone is dedicated, release the dedication and remove the domainid from the data_center table
listZone API:
- This API already has 'domainid' parameter. We should allow list zones by domain for Root admin.
DedicateZone API:
- set domainid in the data_center table
ReleaseDedicatedZone API:
- remove zoneid from the data_center table
2013-08-12 17:34:38 -07:00
Prachi Damle
12b05cfbc3
CLOUDSTACK-4259 Dedicated Resources: createAffinityGroup API should not allow admin to create the group of this type through API
...
Changes:
- Block API from creating this type of group
2013-08-12 12:06:06 -07:00
Min Chen
0c706876bf
CLOUDSTACK-4250: [Object_store_refactor] Register ISO fails in multizone
...
environment if downloading to one of the zone fails.
2013-08-12 11:18:47 -07:00
Saksham Srivastava
2eceb7dcbe
CLOUDSTACK-4189: [UI] In multi zone setup, dedicating a single zone to a domain, shows other zones dedicated as well
2013-08-12 18:24:40 +05:30
Murali Reddy
9895d01a53
CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard
...
only when there is portable IP range added at region level.
region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
2013-08-12 18:11:13 +05:30
Likitha Shetty
32b33bea0f
CLOUDSTACK-4244. Unable to attach a volume to a VM deployed in Stopped (startvm=false) state.
...
While attaching a volume to a VM, create volume on the hypervisor only if the VM has been started on the it.
2013-08-12 15:45:02 +05:30
Rajesh Battala
4c193a1b69
CLOUDSTACK-3946 [KVM] [Zone Wide Primary Storages] migrateVolume is deleting the volume if the source and destination pool are same
2013-08-12 13:29:10 +05:30
Devdeep Singh
47499db17b
CLOUDSTACK-3893: Removed Hyper-V from the list of supported hypervisor list.
2013-08-12 13:23:29 +05:30
Harikrishna Patnala
97b8f123a0
CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm;Zone host is ready, but secondary storage vm template: 3 is not ready on secondary storage: 2
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-12 08:19:37 +05:30
Murali Reddy
ba22daa5c9
CLOUDSTACK-4206: [EIP/ELB] Failed to disableStaticNAT when the userVM is
...
in destroyed state.
ignore VM state when system is enabling static NAT on the system IP to
VM in EIP enable network
2013-08-12 04:46:29 +05:30
Mike Tutkowski
8f503c7ff6
CLOUDSTACK-4227
2013-08-10 17:03:35 -06:00
Prachi Damle
941c12dcd7
CLOUDSTACK-4234 Dedicated Resources: When multiple dedication groups are chosen for VM deployment, dedicated resources belonging to both groups should be considered
...
- Override the equals method
2013-08-10 12:14:12 -07:00
Prachi Damle
fac54d2334
CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
...
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.
2013-08-10 11:02:57 -07:00
Prachi Damle
b965032b57
CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain
...
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.
2013-08-10 11:02:42 -07:00
Harikrishna Patnala
48c8e64ae9
CLOUDSTACK-4123: 3.0.6 to ASF 4.2 Upgrade: On Adding VMWare Cluster to the Setup, 3.0.6 System VM Template for VMWare is downloaded instead of 4.2
...
Updating the new system template URLs for the existing templates during upgrade to 4.2.
If new 4.2 system template is registered before upgrade then marking the old templates as removed during upgrade.
2013-08-10 17:43:53 +05:30
Anthony Xu
e547b9f4cc
CLOUDSTACK-4210
...
delete templateVO entry when there is no image store having this template
2013-08-09 12:02:17 -07:00
Likitha Shetty
92f578df7d
CLOUDSTACK-3786. Snapshots removed field is not set after successful deletion of the snapshot.
...
Set the removed field for snapshot when the storage gc removes the snapshot
2013-08-09 18:23:35 +05:30
Koushik Das
21c74c6453
CLOUDSTACK-4179: [Performance Testing] Time taken for Deploy VM async job to complete is considerably higher
...
The time increased due to the newly added dedicated resources feature. During regular VM deployment, all dedicated resources are put in avoid list so that they are not considered for deployment.
Now the way to compute the list of dedicated resources is not optimal and performance deteriorates in an environment having lot of pods, clusters and hosts as the logic is to query db. for each suc resource.
The fix is to optimize the logic not to loop through all resources but get the list of each resource type in a single query.
2013-08-09 16:03:17 +05:30
Devdeep Singh
653e2e54a2
CLOUDSTACK-2670. Migrate volume doesn't allow migration of volumes of a stopped vm.
...
The findStoragePoolsForMigration and migrateVolume api were explicitly blocking moving
a volume if the instance to which it was attached was stopped. Updated the check for
the same.
2013-08-09 12:18:38 +05:30
Min Chen
848abfd384
CLOUDSTACK-4190: Add endpoint selector implementation for ImageCache
...
data store and also delete object from staging area for volume copy from
primary to secondary or vice versa.
2013-08-08 16:08:50 -07:00
Alena Prokharchyk
cf62be6571
CLOUDSTACK-4141: resizeVolume - read the result of AsyncCallFuture execution. If false, return null to the API caller
2013-08-08 14:01:11 -07:00
Edison Su
784a9d45d0
CLOUDSTACK-4106: fix volume related operations on vmware&s3
2013-08-08 12:34:54 -07:00
Alena Prokharchyk
6999fca4d7
CLOUDSTACK-4193: don't let privateGateway to be created with NULL networkId
2013-08-08 10:49:25 -07:00
Min Chen
420b4ab402
CLOUDSTACK-1405:ZWPS: listStoragePool API doesn't accept scope parameter
...
.
2013-08-08 10:08:07 -07:00
Likitha Shetty
be5d076964
CLOUDSTACK-4186. Signature computed while accessing VM's console is not aligned with how signature is computed for other APIs
2013-08-08 16:17:51 +05:30
Likitha Shetty
815d51e581
CLOUDSTACK-4153. Guest vlan dedication is not working as expected in case of multiple physical networks.
2013-08-08 10:53:01 +05:30
Edison Su
6766c01fc6
CLOUDSTACK-3535: still maintain stop agent wont trigger HA
2013-08-07 14:42:04 -07:00
Bharat Kumar
c498d2d786
CLOUDSTACK-4083 if a failure occurs while adding VM to another network (this should be the first vm in the subnet). The ip alias created as a part of this process is not removed.
...
(Sheng: remove the unnecessary import, remove blank line, upper case the bug id)
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-08-07 13:52:33 -07:00
Kelven Yang
059e4b2ae0
CLOUDSTACK-3886: check in for review request https://reviews.apache.org/r/13008/
2013-08-07 10:29:18 -07:00
Saksham Srivastava
a3ba198e5a
CLOUDSTACK-4104: VM Creation should fail if a zone is dedicated to a domain and user of the same domain deploys vm without using affinity group "Explicit Dedication".
2013-08-07 16:58:51 +05:30
Likitha Shetty
74293f77e0
CLOUDSTACK-4025. NPE observed during VM start.
...
NPE was hit during VM start because the network it was to be deployed in didn't get implemented - Handling this failure.
2013-08-07 13:24:50 +05:30
Edison Su
33d06d25b8
CLOUDSTACK-3535: add kvminvestigator to investirage kvm host
2013-08-06 18:50:33 -07:00
Sateesh Chodapuneedi
38a3da8974
CLOUDSTACK-4047 [sM][VMWare][ZWPS]: no need of storage migration while migrating VM when the root volume is on zone wide primary storage
...
Introduced check for zone wide pools while listing hosts for migration.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-08-07 01:06:38 +05:30
Wido den Hollander
9e1c0ddaec
config: Fix a typo in the configuration option
...
Conflicts:
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-08-06 15:31:12 +02:00
Bharat Kumar
5dcded229f
Cloudstack-4015 No error logged when deleteing all the valns when there are allocateed vnets. Alos not updating the vnet range in physicalnetworks table in the above case.
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-08-06 17:29:07 +05:30
Murali Reddy
86e4d6f80c
CLOUDSTACK-4013: [PortableIP] [MultiplePhysicalNetworks] Associate
...
portable IP is trying to insert network id as physical network id
ensuring network id, physical network id, source network id are properly
set for portable ip in user_ip_address and vlan tables
2013-08-06 17:15:50 +05:30
Jayapal
ff7527fc87
CLOUDSTACK-4084 Fixed the static nat vm ip address in public ip address table in external network gc
...
In external network after network GC the network n/w cidr changes.
In this case the static nat enable vm ip also chagnes. So updated the new
vm ip address in user_ip_address table.
2013-08-06 16:34:33 +05:30
Likitha Shetty
fd7b9c44bc
CLOUDSTACK-4038. State of the DATA volumes remains in Allocated state if they are deleted before using them.
...
If a volume is in Allocated state i.e. not present in primary or secondary mark the volume as removed.
2013-08-06 16:00:48 +05:30
Murali Reddy
8447b66b38
CLOUDSTACK-2955: [PortableIPrange deletePortableIpRange fails because of
...
UI firing an incorrect API
adding 'portableiprange' tag to the job result of
CreatePortableIpRangeCmd api job response
2013-08-06 15:59:22 +05:30
Prasanna Santhanam
3a41c53bd3
CLOUDSTACK-4064: Missed renaming the config for KVM snapshots
...
KVM.snapshot.enabled is lowercased by f025db95 to keep the configs
uniformly lower-case. But it missed the upgrade script and the
references in SnapshotManagerImpl. This commit will fix the issue in all
locations
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-06 10:39:26 +05:30
Alena Prokharchyk
8813e5f790
CLOUDSTACK-4080: don't GC the network when it has vms in Starting state even when the nics are not allocated for them yet (can happen when vm is being created)
2013-08-05 14:14:44 -07:00
Daan Hoogland
ff803f4131
fix warnings in NetworkServiceImpl: removed unused code and add cases to switches
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-08-05 11:33:50 -07:00
Alena Prokharchyk
fda366f8d6
CLOUDSTACK-4087: updateTemplatePermissions - derive domainId from the template owner, not from the operation caller
2013-08-05 10:22:00 -07:00
Wido den Hollander
f025db9582
config: Only user low-case names for variables
2013-08-05 17:38:24 +02:00
Sanjay Tripathi
e0c6073a80
CLOUDSTACK-4075: User unable to archive events
2013-08-05 19:47:36 +05:30
Harikrishna Patnala
40e7502bcb
CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm CLOUDSTACK-3631: Enhance System vm deployment retry mechanism
...
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-08-05 18:21:23 +05:30
Nitin Mehta
ddf91226ea
CLOUDSTACK-3913
...
Private templates would now get copied to only one of image storage chosen randamly as was the case earlier. Dont throw an exception for uploading volumes when there are multiple image stores, instead choose one of them randomly
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-08-05 17:32:21 +05:30
Min Chen
a4e256b311
CLOUDSTACK-4040: [Object_store_refactor] System VMs are not spinning up
...
if S3 storage configuration is not part of zone creation wizard.
2013-08-02 17:59:24 -07:00
Min Chen
13d44fd7a6
CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes.
2013-08-02 16:05:53 -07:00
Alena Prokharchyk
8fe4c240bf
CLOUDSTACK-4023: lock the network during the shutdownNetwork (just the way we do when implement network)
2013-08-02 13:15:07 -07:00
Alena Prokharchyk
ed08f0f551
CLOUDSTACK-4022: listProjects - do searchIncludingRemoved when getting info of corresponding projectAccount because when the project is being removed, its account is marked as Removed first, but we might still want to retrieve its info
2013-08-02 09:04:05 -07:00
Bharat Kumar
0951739e32
fix to add the the overcommit details of the vms in uservm details table when decreasing the overcommit to one.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 19:17:51 +05:30
Kishan Kavala
aead26f769
CLOUDSTACK-4005: Do not allow snapshot on zone wide primary storage when KVM.snapshot.enabled is set to false
2013-08-02 18:08:30 +05:30
Bharat Kumar
60585b5181
[PATCH] upgrade to ASF 4.2 cloud Database Schema Inconsistencies
2013-08-02 17:22:31 +05:30
Kishan Kavala
7eb20b8500
CLOUDSTACK-4032: Added KVM.snapshot.enabled config to 41to42 upgrade
2013-08-02 11:58:48 +05:30
Fang Wang
1294a13f43
CLOUDSTACK-3759 [Automation] Failed to attach volume to VM, while vm are in stopped state Fix the null pointer.
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-08-01 17:45:37 -07:00
Alena Prokharchyk
59fedb1bdc
CLOUDSTACK-4020: lock nic entry in releaseNic method. Otherwise multiple threads can try to release the same nic at the same time, and it will lead to NPEs and backend failures
2013-08-01 16:02:35 -07:00
Bharat Kumar
4fb4afb88a
Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command
...
Reviewed-by: Alena Prokharchyk
2013-08-01 10:40:56 -07:00
Nitin Mehta
22a3ba18c3
=CLOUDSTACK-3102 ResourceDetail API - If you add detail for any resource other than volume and nic then throw an exception
2013-08-01 17:37:00 +05:30
Likitha Shetty
f744614769
CLOUDSTACK-3981. ListAccounts always sets 'networkTotal' to 0.
...
Add vpc resource count to the response. And set the right values for network resource count.
2013-08-01 14:15:31 +05:30
Harikrishna Patnala
b4fe025223
CLOUDSTACK-3351: Fix add cluster API to set right hypervisor type
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-01 13:52:20 +05:30
Harikrishna Patnala
3813189283
CLOUDSTACK-3042: handle System VM Scaling up of memory/CPU based on the presence of tools in the template
...
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-08-01 12:16:44 +05:30
Kelven Yang
dbc46d0677
Fix problems found in local test when JVM assertion is turned on
2013-07-31 16:25:56 -07:00
Edison Su
e3295a6af0
CLOUDSTACK-3950: the issue can be reproduced by: copy iso failed during the first time, for some reason, then copy the same iso again, the issue be triggered.
2013-07-31 15:46:37 -07:00
Wido den Hollander
79af8b16b2
CLOUDSTACK-3951: Don't require SSH access to KVM nodes when cancelling maintenance
...
Conflicts:
setup/db/db/schema-410to420.sql
2013-07-31 15:22:53 +02:00
Bharat Kumar
ba619ec112
recalculate the capacity after overcomit change.
2013-07-31 18:28:42 +05:30
Harikrishna Patnala
798c507c7d
CLOUDSTACK-2717: listCapabilities API to return
...
allow.public.user.templates configuration parameter value
defined at account level.
Signed by - Nitin Mehta<nitin.mehta@citrix.com>
2013-07-31 16:56:59 +05:30
Bharat Kumar
5c18483d81
Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-31 15:32:28 +05:30
Kelven Yang
065ae7a497
Correct DAO usage in VmwareDatacenterVO, relax assertion conditions to work with stack calling frame that is not wrapped with @DB injection
2013-07-30 18:05:38 -07:00
Min Chen
a9efec6403
CLOUDSTACK-3949:[Object_Store_Refactor][Usage] No usage event is
...
generated for registered ISO.
2013-07-30 18:05:34 -07:00
Min Chen
20831d00fb
CLOUDSTACK-3686: Registering a template does not generate a usage event.
2013-07-30 17:33:18 -07:00
Prachi Damle
af95cfe98e
CLOUDSTACK-3942 NPE from findStoragePool method
...
Changes:
- Added null checks for podId
2013-07-30 16:56:21 -07:00
Alena Prokharchyk
026cca46c6
CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id
2013-07-30 14:31:22 -07:00
Min Chen
4527227360
CLOUDSTACK-3857: create VOLUME_CREATE event at CreateVolumeCmd instead
...
of at AttachVolumeCmd.
2013-07-30 14:24:12 -07:00
Alena Prokharchyk
de1865ae5a
CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command
2013-07-30 11:17:25 -07:00
Marcus Sorensen
f91c0f3cb2
Summary: Fix null pointer and op_networks blocker to account cleanup
...
Detail: Accounts can fail in cleanup/gc process due to inconsistent op_networks
table and null pointer in looking up account for event publishing.
BUG-ID: CLOUDSTACK-3957
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1375204815 -0600
2013-07-30 11:20:15 -06:00
Alena Prokharchyk
155b9df8ee
CLOUDSTACK-3902: createVpcOffering - throw an excpetion when sourceNat service is not passed in
2013-07-30 10:09:03 -07:00
Bharat Kumar
6e9bf56cf1
Fix for incorect capacity displayed at the db.
...
Conflicts:
engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/api/ApiResponseHelper.java
2013-07-30 22:13:44 +05:30
Harikrishna Patnala
a5054c1cde
CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM
2013-07-30 22:04:12 +05:30
Murali Reddy
4653cff88b
CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events
...
for portable IPs
generating usage event for acquire and release
2013-07-30 19:00:13 +05:30
Kishan Kavala
1550f5e26c
CLOUDSTACK-3439: Include dynamically created nics in Prepare for migration command in KVM
2013-07-30 18:23:56 +05:30
Murali Reddy
b5f33ae0d8
CLOUDSTACK-2991: [PortableIPRange] CS should not allow portable IP with
...
sourceNAT service on it
if a portable ip is first IP associated with a non-VPC network, then its
being considered as source nat IP. This fix adds exemption for portable
IP not to be considred for source nat.
2013-07-30 15:34:04 +05:30
Prasanna Santhanam
3d4d350dbe
simulator supports migration
...
Add simultor to the seemingly strict filter which should happen within
the hypervisor resource and not the virtualmachine :/
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-30 11:16:04 +05:30
Thomas O'Dowd
c78ed39b2f
Fix a few typos in ConfigurationManager.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-30 11:15:23 +05:30
Edison Su
734aa1d510
CLOUDSTACK-3908: fix extract path
2013-07-29 16:57:44 -07:00
Min Chen
140dfaaa5b
CLOUDSTACK-3862: Remove S3/Swift-backed Secondary Storage Code.
2013-07-29 14:04:52 -07:00
Alena Prokharchyk
3e9740c793
CLOUDSTACK-3914: assignToLoadBalancer - return false, when empty vmIds list is passed in
2013-07-29 13:56:29 -07:00
Alena Prokharchyk
31c425208a
CLOUDSTACK-3909: deployVM API - validate hypervisorType parameter when the vm is being deployed from ISO
2013-07-29 11:16:05 -07:00
Nitin Mehta
1bfe9eb0a4
CLOUDSTACK-3892
...
Implement the download url expiration functionality for templates. Also persist the template download urls after their creation
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-29 19:47:45 +05:30
Bharat Kumar
03176e2859
Cloudstack-2622 createipAlias.sh/deleteipAliash.sh should not be allowed with Isolated Guest Networks
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-29 18:26:19 +05:30
Rajesh Battala
c5a95184cb
CLOUDSTACK-3846 usage event is not generated for volume resize
2013-07-29 17:57:24 +05:30
Mice Xia
acd2396660
fix CLOUDSTACK-3591 add usage recording for VM snapshots
2013-07-29 17:57:20 +08:00
Harikrishna Patnala
4d35d92208
CLOUDSTACK-3779: Support System vm scaling on VMWare
...
Marked the system template new system template as dynamicallyScalable
- handled upgrade case
- moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-29 14:12:24 +05:30
Harikrishna Patnala
2b42a27177
CLOUDSTACK-3669: Bringing down the dynamic scalable check (for VM whether it has xstools or vmware tools in it) to the management layer.
2013-07-29 14:07:06 +05:30
Sateesh Chodapuneedi
460fe86eb5
CLOUDSTACK-3870 [VMware] Management traffic network over a VLAN is not working
...
CLOUDSTACK-3437 In case of multiple physical network setup we see log message "can't get physical network"
CloudStack's control network is management network in case of VMware.
Processing management VLAN id provided in zone traffic label for management traffic.`
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-29 08:16:58 +05:30
Prasanna Santhanam
de1dd52a4a
Fix wildcard imports from faeddc15ff
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-29 11:46:20 +05:30
Prachi Damle
027d4873b4
CLOUDSTACK-3343 UI/API should also return the mode(Strict/Preferred) when listing the ServiceOffering that uses ImplicitDedicationPlanner
...
Changes:
- API is fixed to return the service_offering details
2013-07-28 22:10:37 -07:00
Bharat Kumar
6f9c26ea49
Cloudstack-2997 Make haproxy maxconn configurable
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
Conflicts:
api/src/org/apache/cloudstack/api/ApiConstants.java
engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
setup/db/db/schema-410to420.sql
2013-07-29 10:07:15 +05:30
Nitin Mehta
faeddc15ff
CLOUDSTACK-3659
...
Implement the download url expiration functionality for volumes
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-28 17:40:26 +05:30
Murali Reddy
e3a35e42b8
CLOUDSTACK-3881: deleteZone fails with java.lang.IndexOutOfBoundsException
...
fixing regression due to commit c236645d9a
2013-07-28 13:01:22 +05:30
Min Chen
d6faf7b586
CLOUDSTACK-3861: Remove s3.enable and swift.enable from global setting.
2013-07-27 21:48:54 -07:00
Prachi Damle
bfd32ca8ff
CLOUDSTACK-3814 Duplicate entry for CPU, Public ip address in dashboard
...
Changes:
- ListCapacity API was searching the capacities per zone, pod and cluster causing duplicates to end up in th result.
- Instead we should group by zone if zone and pod both are null. Group by pod if zone is provided but no pod. Or group by cluster when zone and pod both are provided.
2013-07-27 15:53:20 -07:00
Harikrishna Patnala
b21de4006a
CLOUDSTACK-3703: change service offering of stopped vm on
2013-07-27 19:57:59 +05:30
Edison Su
ed46a64add
CLOUDSTACK-3852: fix upload volume
2013-07-26 18:05:10 -07:00
Min Chen
a2e2ef6a76
CLOUDSTACK-3857:[Object_Store_Refactor][Usage] Two VOLUME_CREATE usage
...
events are generated for one data disk after creating and attaching to
VM.
2013-07-26 17:34:06 -07:00
Alena Prokharchyk
07bf2b2227
CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page
2013-07-26 15:37:20 -07:00
Min Chen
1305697eaa
CLOUDSTACK-3818: NFS Cache Improperly Named.
2013-07-26 14:36:00 -07:00
Rajesh Battala
7b728cdb71
CLOUDSTACK-62 [AWS Style Health Checks] Response of the API listLoadBalancerRuleInstances should show the service state of a VM if health check is configured for it
...
Conflicts:
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/response/UserVmResponse.java
2013-07-26 16:27:16 +05:30
Sanjay Tripathi
f4eab352e0
CLOUDSTACK-3488: listStoragePools throws NPE if any of the storage pools are not in the right state.
...
This issue is reporducible if user adds a primary storage and quickly fires
listStoragePool API command without waiting for the responce of previous
createStoragePool API command. So during this period
(before receiving createStoragePool API resonce), the primary srorage is in
initialized status and the "scope" of storage is not set.
2013-07-26 15:33:02 +05:30
Min Chen
e23e6b02db
CLOUDSTACK-3709:[Object_Store_Refactor][UI] Can't delete NFS Cache
...
storage through UI. Fixed at API side.
2013-07-25 17:02:30 -07:00
Alena Prokharchyk
a337cae7ca
CLOUDSTACK-3232: InternalLB system vm - allocate control ip address from the private range when vm's hypervisor is vmWare
2013-07-25 16:39:04 -07:00
Edison Su
7ee655f5cd
CLOUDSTACK-2536: fix the regression introduced by 4c81ea69c4
2013-07-25 16:35:09 -07:00
Prachi Damle
f59947c322
CLOUDSTACK-3821 RegisterTemplate URL validation issue
...
Changes:
- Added validation for the url path
2013-07-25 15:31:16 -07:00
Min Chen
35dcc4d6f9
Fix an incomplete logging message.
2013-07-25 15:22:36 -07:00
Edison Su
784bef766c
CLOUDSTACK-2536: fix the regression introduced by 4c81ea69c4
2013-07-25 15:11:17 -07:00
Koushik Das
f062fd4fc1
CLOUDSTACK-3493: [storage ref] Attach volume to VM is failing in case of Primary-Localstorage .
...
Some existing scenarios for root and data volume combination was not working. These are
a. Local root + Shared data
b. Shared root + Local data
Enabled these scenarios as part of this fix
Conflicts:
server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-25 17:23:21 +05:30
Nitin Mehta
0d862a9247
CLOUDSTACK-3712
...
Use Vminstance instead of user vm for scaling stopped vms.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-25 14:38:29 +05:30
Harikrishna Patnala
4c81ea69c4
Fix for CLOUDSTACK-2536
...
Removing memoryovercommitratio and cpuovercommitratio parameters from addCluster and updateCluster APIs,
since these can be configurable using updateConfiguration API at cluster level.
By default while creating cluster these values are taken from global configuration parameters.
Conflicts:
server/src/com/cloud/resource/ResourceManagerImpl.java
2013-07-25 13:56:59 +05:30
Edison Su
bfe30cd2e3
CLOUDSTACK-3681: fix bunch of bugs related to vmware, regarding to snapshot
2013-07-24 15:54:36 -07:00
Bharat Kumar
42346cdf47
Cloudstack-3694 Dnsmasq rewrite in bash
...
(Sheng: Fix typo, fix log and error message, remove 'set -x' in script)
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-07-24 13:59:58 -07:00
Likitha Shetty
a71810f705
CLOUDSTACK-3735. Domain deletion fails even when the networks within the domain have been destroyed.
...
When a network is destroyed remove the corresponding network entry from domain_network_ref and account_network_ref table
2013-07-24 20:02:15 +05:30
Saksham Srivastava
d89115b5cf
CLOUDSTACK-2508: Template usage should report both physical and virtual sizes
2013-07-24 18:20:37 +05:30
Sateesh Chodapuneedi
c5131af658
CLOUDSTACK-3758 [Vmware][ZWPS] Failed to create volume from snapshot
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-24 03:57:05 +05:30
Min Chen
ae248afc57
CLOUDSTACK-3639:Unable to create template from snapshot when there are
...
multiple secondary storages in the zone.
2013-07-23 16:55:26 -07:00
Sheng Yang
e06f867bdd
CLOUDSTACK-3250: Add PvlanSetupCommand into maintenance mode allowed command list
...
Then the rule in the old host can be cleared.
2013-07-23 15:18:55 -07:00
Min Chen
e13959afc3
CLOUDSTACK-3716: State of expunged volumes are not consistent in volumes
...
table and volume_store_ref.
2013-07-23 14:56:15 -07:00
Alena Prokharchyk
8d1a670026
CLOUDSTACK-3478: fixed volume destroy. #1 - don't call destroy() when the volume is in Expunged/Expunging/Destroy state. #2 - added state transition for Expunged state
2013-07-23 14:40:30 -07:00
Alena Prokharchyk
682652865e
CLOUDSTACK-3733: fixed migrateVm - no need to cast vm to user vm to retrieve the iso information. Extract iso information from VirtualMachineProfile object passed to the method.
2013-07-23 10:56:39 -07:00
Sanjay Tripathi
e2e3b9a288
CLOUDSTACK-3727: Resource Count calculation happens for deleted accounts on restart of managment server.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit a7084b2dac )
2013-07-23 20:25:41 +05:30
Likitha Shetty
79209c1330
CLOUDSTACK-3526. When volume upload is in progress the state of the volume is UploadError.
...
Update volume_view to join volumes table with volume_store_ref table instead of volume_host_ref table.
2013-07-23 18:41:20 +05:30
Saksham Srivastava
e2f2bc5f0b
CLOUDSTACK-3382. Alert should be raised if a vm is migrated from dedicated to non-dedicated resource and vice versa.
...
Alerts are generated for VM migration between:
1) Source host is dedicated and destination host is not.
2) Source host is not dedicated and destination host is dedicated.
3) Both hosts are dedicated to different accounts/domains
2013-07-23 13:22:44 +05:30
Anthony Xu
5d9fa5d42e
throw exception if stopping VM fails, then UI can show the error message in stead of fails silently
2013-07-22 16:17:41 -07:00
Min Chen
9f9f7d3ffd
Remove CLOUDSTACK-3513 debugging messages.
2013-07-22 16:15:45 -07:00
Min Chen
5ccfc9df5a
CLOUDSTACK-3513:[Automation] Failed to copy iso and template between
...
zones. Failed to pass generated copy url to DownloadCommand.
2013-07-22 16:15:45 -07:00
Anthony Xu
bdac0f8ebc
in one zone, Admin should not be allowed to add a Shared Network with a subnet that is already associated with another Vlan.
2013-07-22 14:23:11 -07:00
Alena Prokharchyk
f328c7b1aa
CLOUDSTACK-3711: return descriptive error message to the regular user when his resource limit has exceed. No harm in returning this info as the user aware of the resource limits/number of resources available for allocation, for his account
2013-07-22 10:25:39 -07:00
Nitin Mehta
c09d76077e
CLOUDSTACK-3510
...
Persist the download url in the db for volume download.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-22 17:57:57 +05:30
Sheng Yang
3de4390395
Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm"
...
This reverts commit f99d599930 .
Due to it break vpc function and block regression test.
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java
2013-07-21 22:21:17 -07:00
Min Chen
ce6a5d7183
CLOUDSTACK-3274: API Refactoring: secretkey and accesskey of the backing
...
store is found in plaintext in the logs.
2013-07-20 17:30:53 -07:00
Min Chen
2bbf63bc7a
CLOUDSTACK-3513: ListIsos/ListTemplates does not return correct results
...
when id and zoneid are passed.
2013-07-20 15:16:49 -07:00
Harikrishna Patnala
f604e3d9cc
CLOUDSTACK-3365: cluster level parameters cluster.(cpu/memory).allocated.capacity.notificationthreshold is not considering overcommit value
2013-07-20 17:03:05 +05:30
Edison Su
e659328ff5
fix create template from snapshot if it's swift
2013-07-19 18:18:02 -07:00
frank
a5ee39a54a
CLOUDSTACK-3453
...
UCS:API: List Blades after decommissioning a blade, listUcsBlades API returns wrong number of total blades
fixed resolved
2013-07-19 16:15:46 -07:00
Fang Wang
2b254186b2
CLOUDSTACK-732 Add disk snapshot for KVM 6.3, add the flag in CS.
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-07-19 13:22:26 -07:00
Alena Prokharchyk
242f46118b
InternalLb: fixed creation for default network offering with internal lb support - public lb support should be disbaled on it
...
Conflicts:
engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
2013-07-19 13:20:46 -07:00
Murali Reddy
2b82c3e1db
CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events
...
for portable IPs
generating usage events for acquire/release of portable IP
2013-07-19 18:42:52 +05:30
Sanjay Tripathi
a98c0f5b89
CLOUDSTACK-3496: [Regression]Primary Storage resource usage is not getting updated if detached volume is deleted
2013-07-19 16:19:41 +05:30
Sanjay Tripathi
5de96db81d
CLOUDSTACK-3492: [Regression]Update Resource Count for an account is updating the primary storage incorretly.
...
The issue is that while calculating the used primary storage size, the updateResourceCount
API is also calculating the disk size of virtual router VM, created for that account and
because of this, the API is returning the incorrect result.
2013-07-19 16:19:23 +05:30
Harikrishna Patnala
12c711cef7
CLOUDSTACK-3358: create template from a volume/snapshot should also take input from User/Admin whether xstools / vmware tools installed in the VM
...
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-19 11:54:36 +05:30
Mike Tutkowski
8f1799b71f
Changes related to Review Board comments
2013-07-18 19:46:42 -06:00
Min Chen
c236645d9a
CLOUDSTACK-3498:[Object_Store_Refactor] Deleting and adding back the
...
zone does not create NFS Cache store and Failure in Sytem VMs Start Up
2013-07-18 16:28:56 -07:00
Min Chen
251efff69c
CLOUDSTACK-3513: add debug message to diagnose copyIso issue on
...
automation setup where DownloadCommand is never sent.
2013-07-18 16:01:55 -07:00
Prachi Damle
3fc43cf281
CLOUDSTACK-3451 Parallel deployment - Xenserver - When deploying 30 Vms in parallel, some of the Vm deployment fails when “applying dhcp entry/applying userdata and password entry on router” and retry eventually happens when they succeed.
...
Changes:
- Passing the avoid set generated by the first pass of deployment to the second try.
- The second try is done, when the first pass that uses a reserved plan fails to deploy on the reserved host, to search over the entire zone again
2013-07-18 15:57:13 -07:00
Min Chen
9a1cd1ac53
ListIsos only shows cross-zone ISO in one zone.
2013-07-18 10:55:02 -07:00
Prasanna Santhanam
fbf38a35d2
CLOUDSTACK-3633: AffinityGroupResponse does not include uuid
...
The uuid->id of the affinity group created is not included as part of
the response. Included the uuid.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-18 18:13:58 +05:30
Sanjay Tripathi
c9548e3788
CLOUDSTACK-3376: NPE: resource count calculation from the account manager on account cleanup
...
This issue is happing because of the steps the code follow to cleanup the account.
The cleanupAccount was deleting the entries from the resource_limit and
resource_count table and performing further cleaning afterwards. Ideally, deletion
of entries from resourceLimit and resourceCount should be the last step in
cleanupAccount process.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 21b1c9449a )
2013-07-18 15:08:44 +05:30
Harikrishna Patnala
f1a6de5eed
CLOUDSTACK-3551: scaling up VM to service offering with 2gbram
...
Fixed the type overflow of Ram value.
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-18 11:42:03 +05:30
Min Chen
c443115a48
CLOUDSTACK-3513: [Automation] Failed to copy iso and template between
...
zones.
2013-07-17 17:24:23 -07:00
Saksham Srivastava
1933960dda
CLOUDSTACK-3476:deleteDomain api should fail when release dedicated resource to that domain fails
2013-07-17 11:18:24 -07:00
Bharat Kumar
779bfd460b
Fixed the conditon which checks for the provider's capabilty and reapply ipaliases on virtual router restart.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 17:31:34 +05:30
Bharat Kumar
956a2a68ce
Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 16:53:11 +05:30
Bharat Kumar
4fdb177bb6
Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 15:10:52 +05:30
Bharat Kumar
664d479f8f
Cloudstack-3313 Cannot deploy vm in ipv6 network
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:07:57 +05:30
Sheng Yang
882982605a
CLOUDSTACK-494: Loose the limition of same ip used by site-to-site vpn
...
Different account can have same remote side IP now. Of course the remote side need
to identify them and configured properly to handle it.
2013-07-16 17:16:58 -07:00
Vijayendra Bhamidipati
e18ca0117d
CLOUDSTACK-3514: [Automation] Vmware - Failed to download default template for first zone
...
Description:
Fixing reference to null object.
2013-07-16 16:14:10 -07:00
Sheng Yang
13c1c6291c
CLOUDSTACK-1670: Fix the order of user vm's multiple nics
...
They should follow the order of networkIds parameter of deployVMCmd(). And eth0
would be always on default network.
2013-07-16 16:07:05 -07:00
Prachi Damle
9a9d277884
CLOUDSTACK-2159 Anti-Affinity - When "HostAntiAffinityProcessor" plugin is not included in the deployment , deployVirtualMachine() command does not error out when passing the affiitygroupnames parameter.
...
Changes:
- Added a check during vm deployment to see if a processor for the affinity group type is available
2013-07-16 15:23:08 -07:00
Prachi Damle
d70076e6a5
CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
...
Changes:
- Locking the group and save reservation mechanism done by DPM
- Added admin operation to cleanup VM reservations
- DPM will also cleanup VM reservations on startup
2013-07-16 13:41:16 -07:00
Prachi Damle
9cb91ba58c
CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
...
Changes to check if the destination found does not conflict with any vm reservation
2013-07-16 13:41:12 -07:00
Likitha Shetty
e15876944b
CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref.
2013-07-16 14:36:57 +05:30
Likitha Shetty
4c924bb83d
Revert "CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref."
...
This reverts commit d0955663cf .
2013-07-16 14:09:43 +05:30
Likitha Shetty
d0955663cf
CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref.
2013-07-16 13:42:27 +05:30
Devdeep Singh
c59c736f98
CLOUDSTACK-3545: NPE in listStoragePoolsForMigration api. The volume table no longer holds
...
the pod id, the column is null now. Made a change to get the pod id from the storage pool
on which the volume resides.
2013-07-16 12:04:36 +05:30
Sheng Yang
2f85c80655
CLOUDSTACK-3539: Fix wrong management ip when server start up
...
The value "localhost" for mgmt server should be over-written anyway.
2013-07-15 18:26:41 -07:00
Min Chen
dabedd0848
CLOUDSTACK-2595: [Automation] Failed download default template for
...
second zone. Actually it is a listTemplate issue.
2013-07-15 17:36:42 -07:00
Alena Prokharchyk
48e030589e
CLOUDSTACK-3346: Fixed setting up resourceTags for network ACL - added missing @Inject when load NetworkACLItemDao
2013-07-15 10:19:55 -07:00
Murali Reddy
5e0a61d57c
CLOUDSTACK-2960: [portableIPrange] CS should check the portable ip range, vlan with
...
existing public ip ranges and vlans
adds a validation check to ensure there is no VLAN in the zones with
same id
2013-07-15 16:17:47 +05:30
Murali Reddy
feeffeaf10
CLOUDSTACK-3463: [Portable IP] [EIP/ELB Zone] EIP semantics are not
...
intact with portable IP
fix ensures that, on release of portable IP associated with 'EIP
enabled' basic zone vm, a new system public IP is allocated and
associated with the VM
2013-07-15 09:50:41 +05:30
Murali Reddy
8de3b4f461
CLOUDSTACK-3444: Unable to transfer portalbe IP between ISOLATED network and VPC
...
Tiered Network
When portable IP is transferred across the zones, we emulate portable IP
as provisioned in new zone's physical network carrying public traffic
and logical public network. network Id, and physical network id both
were bieng set to same physical network id resulting in IP association
to fail. This fix ensures both network and physcial network are set
appropriatley.
2013-07-15 09:04:24 +05:30
Edison Su
7e6c1a0bf7
CLOUDSTACK-3400: add swift support
2013-07-13 01:52:03 -07:00
Edison Su
c888fc6b75
add inital swift support
2013-07-13 01:52:03 -07:00
Vijayendra Bhamidipati
8439209ba6
CLOUDSTACK-3509: Put in missing code to kick off non root volume resize operations in vmware deployments
...
Description:
Include vmware in list of hypervisors supporting volume resize.
2013-07-12 15:21:52 -07:00
Vijayendra Bhamidipati
cb96d70967
CLOUDSTACK-3264: [ZWPS]NPE while finding storage pools for migration
...
Description:
Filter primary storage pools based on zonewide/clusterwide configuration
when considering pools to list for storage migration of volumes.
2013-07-12 15:21:40 -07:00
Mike Tutkowski
13ec10caa6
Changes related to Review Board comments
...
Changes related to Review Board comments
2013-07-12 14:26:11 -06:00
Hugo Trippaers
55c0616d90
CLOUDSTACK-728 Get the framework in place the support the removal of the portgroup that is created for a nic connected to an lswitch.
...
Add a command to tell a hypervisor guru to take some action when
expunging a nic
2013-07-12 14:23:13 +02:00
Harikrishna Patnala
8816d41d3b
CLOUDSTACK-2987: Fixing dynamicallyScalable flag in register and update template API Previuos commit: 7b6b8d7a07 This fix is due to some changes made by the merges after this commit.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-12 15:27:25 +05:30
Wei Zhou
b3ac91ef63
CLOUDSTACK-3368: clear download URLs when create SSVM and validate download URLs
2013-07-12 10:43:49 +02:00
Wei Zhou
838cfa2bb6
CLOUDSTACK-3362: use POST instead of GET and encode/decode cert/key in uploadCustomCertificate
2013-07-12 10:43:38 +02:00
Murali Reddy
f3a2fc22bf
CLOUDSTACK-3485: NPE while getting instance ID from Asyn Job when
...
publishing async job events on eventbus
handing case where instance id is null in the asyn job, while publishing
asyn job events on to event bus
2013-07-12 13:57:53 +05:30
Saksham Srivastava
87a2a95445
CLOUDSTACK-3094: Adding a shared network to already deployed VM is failing.
...
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-07-12 14:30:40 +08:00
Alena Prokharchyk
52d3e1190f
CLOUDSTACK-2843: added CopyCommand to the list of the commands controlled by execute.in.sequence.hypervisor.commands global config. This command was introduced by the Storage refactoring, and used for volume creation on the primary storage
2013-07-11 17:43:33 -07:00
Min Chen
45cf96afb7
CLOUDSTACK-3335:[Object_Store_Refactor][Automation]CopyTemplate failed
...
with Unexpected exception.
2013-07-11 16:01:42 -07:00
Alena Prokharchyk
cce2dad2e4
CLOUDSTACK-3458: network GC thread - acquire global lock to prevent multiple MS from running the GC thread on the network at the same time
2013-07-11 09:37:39 -07:00
Daan Hoogland
f99d599930
CLOUDSTACK-3357: dnsmasq on vpc-routervm
2013-07-11 14:34:51 +01:00
Murali Reddy
0c97cd271a
CLOUDSTACK-1673: AWS Regions - Events - User disable / Domain Delete event does not
...
include the UUID of the user/domain that was disabled.
- added enity type and enity UUID details to UserContext
- publish the entity type and UUID details for the action events
generated for accout/user/domain
2013-07-11 17:53:13 +05:30