Commit Graph

7305 Commits

Author SHA1 Message Date
Rajesh Battala deaf10cad2 CLOUDSTACK-3089 [ZWPS] NPE while cancelling the Storage Maintenance
Signed-off-by: Edison Su <sudison@gmail.com>
2013-07-02 11:22:18 -07:00
Alena Prokharchyk 724be3f5f7 CLOUDSTACK-2984: createNetwork call - when vlan is specified, check that its not coming from the physical network vnet range as this range is used for dynamic vlan allocation during the network implementation stage 2013-07-02 10:20:07 -07:00
Alena Prokharchyk cd7e21b6b1 CLOUDSTACK-236: log uuid instead of actual db id, in the updateNetworkOffering method 2013-07-02 10:19:49 -07:00
Murali Reddy 93090aa7c5 CLOUDSTACK-1959: GSLB: add capability to provide weights to the sites
involved in the GSLB

add weights to each site participating in the GSLB. Traffic will be load
balanced across the sites based on the weigths associated with each
site. If not specified weight of site is defaulted to 1.
2013-07-02 17:57:00 +05:30
Sanjay Tripathi af4eb22a65 CLOUDSTACK-3189: Primary storage usage is not getting decremented after deleting the DATA volumes.
When a volume is created the resource usage for it gets incremented. If it is deleted without being
attached to a volume, the decrement doesn't take place. Fixed the delete volume code to decrement
resource usage for a volume in allocated state too.
2013-07-02 00:39:27 +05:30
Murali Reddy 6a7369b20b CLOUDSTACK-3287: [GSLB] API "updateGlobalLoadBalancerRule" is not
recognised by CloudStack

added api to managementServerImpl and ensure glsb config is applied to
gslb service providers
2013-07-01 23:47:33 +05:30
Rajesh Battala 160b493285 CLOUDSTACK-2571 Zone Wide Primary Storage blocker issues while Enabling in Maintenance State
Signed-off-by: Edison Su <sudison@gmail.com>
2013-07-01 10:18:01 -07:00
Daan Hoogland 216e374993 readibilty of log- and exception messages
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 639592f3b7)
2013-07-01 20:18:14 +05:30
Sanjay Tripathi 58e69704ea CLOUDSTACK-2288: NPE while creating volume from snapshot when the primary storage is in maintenance state.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit ffd5f1a777)
2013-07-01 20:18:14 +05:30
Murali Reddy 1032d5c26a CLOUDSTACK-3282:[GSLB] Unable to add multiple LB rules to same GSLB rule
-fixing regression due to adding GSLB monitor for GSLB service

-code to add/delete GSLB monitor and GSLB service-monitor binding is
made idempotenet so as to succeed if the resource exists.
2013-07-01 19:01:48 +05:30
Edison Su 49ded7e4a3 the plugin better not touch database 2013-06-29 15:09:43 +05:30
Prasanna Santhanam de38cd815f Fix typo in class name
AsyncRpcConext -> AsyncRpcContext

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
Min Chen 87c401aaaf CLOUDSTACK-3144: [Automation] Deletion of templates failing. Fails to
find image store housing template.
2013-06-28 17:57:42 -07:00
Min Chen 2c31f38c05 CLOUDSTACK-3145:StorageManager-Scavenger NPEs when cleaning up
templates.
2013-06-28 17:54:48 -07:00
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Prachi Damle 02ab2eb384 Revert "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"
This reverts commit 7f2f25d640.
2013-06-28 14:58:32 -07:00
Vijayendra Bhamidipati 78922589bb CLOUDSTACK-2385: template download fails with Unexpected failure in Vmware.
Description:

    Putting in fix to allow download of guest VM templates that are available
    across zones.
2013-06-28 23:08:36 +05:30
Bharat Kumar 1c924e5ab5 Assertion failure in updatephysicalnetwork Test.
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
Bharat Kumar 974245991c Cloudstack-2732 [Multiple_IP_Ranges] Deleting guest IP range is not throwing any error message to user while the ip addresses are being used
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
Bharat Kumar 6b0df2566d Cloudstack-3106 Delete all ips except ipAlias. Cloudstack-3119 Shared network removal doesn't cleanup corresponding IP ranges
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
Bharat Kumar 7f2f25d640 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: Jayapal <jayapal@apache.org>
2013-06-28 19:05:54 +05:30
Jayapal 3096261c05 Updated to show same value in log msg SetFirewallRulesCommand and accessdetails for egress default policy 2013-06-28 19:05:54 +05:30
Murali Reddy 0f40cfbea8 CLOUDSTACK-2045: [Multiple IPs Per Nic] This feature is not working well
in case of networks with external devices after GC

add an exception for networks that use external networking devices and has
secondary guest IP's allocated. On network GC, when network goes through
implement phase a new vlan is allocated, based on the acquired VLAN id cidr
of the network is decided in case of external networking case. While NIC
uses reservation strategy 'Start' which ensures that new primary ip is
allocated for the NiC from the new CIDR. Secondary IP's have hardcoded
IP's in  network rules. So prevent network GC.
2013-06-28 12:26:20 +05:30
Kishan Kavala 6da29c4cde CLOUDSTACK-650: Rename ExternalLBUsageMgr to more generic ExternalDeviceUsageManager since it contains firewall usage also. Most of the functionality is already fixed in CLOUDSTACK-1289 2013-06-28 12:08:33 +05:30
Kishan Kavala 7713c5cdbc CLOUDSTACK-3239: Delete Traffic Monitor directly without going through maintenance state 2013-06-28 11:12:55 +05:30
Devdeep Singh 4bbc65b34c CLOUDSTACK-3246: Unable to use portable ips if the portable ip range is deleted and readded atleast once. Fixed the query used to look for available portable ips. 2013-06-28 03:32:31 +05:30
Min Chen 3160a0c2da Add template zone related information into TemplateZoneResponse. 2013-06-27 14:34:00 -07:00
Harikrishna Patnala c8692f2e4a CLOUDSTACK-3245: non admin user not able to register template
Reviewed-by: Alena Prokharchyk
2013-06-27 14:09:52 -07:00
Saksham Srivastava 0d78868180 CLOUDSTACK-3064: Able to create an instance from different account of the same domain without
using affinity group even if the zone is dedicated to an account. The check to make sure that
explicit resources are not picked up for non-explicit deployment was present only at the domain
level for zones. Added a check at account level too.
2013-06-28 00:32:17 +05:30
Donal Lafferty 4361418e41 Removed Dead Code from Management Server Hyper-V 2012 Support
Update ImageFormat enum to include VHDX format introduced with Hyper-V
Server 2012.
Remove existing Hyper-V plugin, because it does not work and is dead
code.
Remove references to existing Hyper-V plugin from config files.
Remove Hypervisor.HypervisorType.Hyperv special cases from manager code
that are unused or unsupported.
Specifically, there is no CIFS secondary storage class
"CifsSecondaryStorageResource".  Also, the Hyper-V plugin's
ServerResource is contacted by the management server and not the other
way around.
Add Hyperv-V support to ListHypervisorsCmd API call

Signed-off-by: Edison Su <sudison@gmail.com>
2013-06-27 11:46:02 -07:00
Alena Prokharchyk 77fd76acb4 CLOUDSTACK-3242: fixed updateTemplate and updateTemplate permissions security checks for project based templates 2013-06-27 11:32:41 -07:00
Wei Zhou 181567ba74 CLOUDSTACK-1192: Disk I/O Statistics (vm stats) support KVM and XenServer only util 2013/06/25 2013-06-27 14:25:54 +02:00
Alena Prokharchyk 079f920494 CreateVPC: validate that the zone exists before checking its attributes 2013-06-26 15:26:20 -07:00
Murali Reddy 4bc6294746 CLOUDSTACK-3213: ResourceStateEvents for user VM are generated with
entity type as Network

changing entity type to be VirtualMachine from Network for the events
generated by user vm state transitions
2013-06-26 19:33:24 +05:30
Murali Reddy ff167134e4 CLOUDSTACK-3214: transferring portable IP across zones with enableStatic
NAT does not work

making an exception for portabe IP, so that if the current datacenter with
portable IP is associated is different from destiantion data center

also on transfer on to new zone, transfer the portable ip association to
new data center, physical network id's
2013-06-26 19:29:55 +05:30
Harikrishna Patnala 9385cf0453 CLOUDSTACK-2835: VR Deployement from admin registered template is failing because registered template type is user. Additional parameter "isrouter" in register/update template API for the root admin. True if registered template is of type ROUTING.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 16:00:12 +05:30
Harikrishna Patnala ec2bf09284 CLOUDSTACK-2794: Global parameter "router.template.id" should be removed The parameter was not in use. We use zone/global coonfigutaion parameters router.template.xenserver/vmware/hyperv/kvm/lxc to deploy router
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 15:56:40 +05:30
Likitha Shetty 55f0e167ec CLOUDSTACK-3206. CreateVlanIpRange fails with IndexOutOfBoundsException. 2013-06-26 14:59:36 +05:30
Wei Zhou 3bb4ec9f65 CLOUDSTACK-1192: Disk I/O Statistics support KVM only util 20130625 2013-06-26 11:10:11 +02:00
Jayapal 82958f0d58 CLOUDSTACK-3199 apply acl item to private gateway when added to acl list 2013-06-26 14:31:56 +05:30
Mice Xia 94254e3c2b fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true for non-root-admin user 2013-06-26 15:55:32 +08:00
Likitha Shetty 8a1fefc7aa CLOUDSTACK-3192. When a dedicated public ip range is released, don't generate usage event EVENT_NET_IP_RELEASE
for ips in the range that are in use becauase these ips are not disassociated from the account.
2013-06-26 10:51:39 +05:30
Alena Prokharchyk 1eacd7872e Update resource count for networks only when the network is non system and Isolated. Before we used to update the count only when offering had specifyVlan=false. And in 4.2 even isolated networks can have this attribute set to true, and we have to count them 2013-06-25 13:46:35 -07:00
Hiroaki KAWAI ed5697f3e1 filter out the network providers that does not handle IP address
The elements that deploy IP address are subclass of IpDeployingRequester
CloudRuntimeException will be raised for elements that is not implemeing
the interface at NetworkManagerImpl#applyIpAssociations.
2013-06-25 13:18:06 +09:00
Harikrishna Patnala f7b1d3d8d5 CLOUDSTACK-2916: admin is not able to login through UI after setting GP "cluster.cpu.allocated.capacity.notificationthreshold" to some string
CLOUDSTACK-2457:  No check for input values,special character,-ive values can be assigne to GLobal parameter "cluster.cpu.allocated.capacity.disablethreshold"

Added validation for float values and checking limit for weight based parameters by creating a set of parameters.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-24 20:00:09 +05:30
Kishan Kavala da0006618f CLOUDSTACK-3124: Deletion of ACL associated with a tier/ pvt gateway should not be allowed. Check for associated tiers/gateways before deletion 2013-06-24 17:58:29 +05:30
Sateesh Chodapuneedi e9df9c29bd CLOUDSTACK-3155 [VMware] Deletion of zone should not be allowed if VMware DC is still associated with that zone.
Check if there exists any VMware DC already associated with this zone. Deny zone deletion if true.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-24 12:11:31 +05:30
Kishan Kavala bd5ad442d0 CLOUDSTACK-3084: Added check to disallow -ve number for ACL rule 2013-06-24 17:20:29 +05:30
Kishan Kavala 7c46cc9580 CLOUDSTACK-3149: Allow default ACLs when creating tier with ACL 2013-06-24 16:22:02 +05:30
Jayapal bb50c0d2d6 CLOUDSTACK-3148 failed to create private gw with default acl id 2013-06-24 13:37:01 +05:30
Jayapal c22e7d0052 CLOUDSTACK-1578 SRX: Egress default policy configurable using network offering on SRX firewall 2013-06-24 13:37:01 +05:30
Jayapal 6a7ae637dd CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider 2013-06-24 13:37:00 +05:30
Harikrishna Patnala 1eb744fa16 CLOUDSTACK-2181: Scale down is allowed when one resource(say cpu) is being scale up and other resource (say ram) is
being scale down ;but not allowed when both resources are being scaledown
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-06-24 12:09:55 +05:30
Sheng Yang fe32dc7665 Baremetal: Add BaremetalDhcp Server and BaremetalPxe server to avoid list of stats collector 2013-06-21 17:36:21 -07:00
Sheng Yang db97bb8e89 Fix NPE when using baremetal template
Template size is NULL for baremetal, which caused NPE when unboxing
2013-06-21 17:16:33 -07:00
Min Chen 64c5266ec5 CLOUDSTACK-3120: ListTemplates didn't return Baremetal templates after
storage refactor.
2013-06-21 16:10:39 -07:00
Alena Prokharchyk 22232f2baf CLOUDSTACK-2698: always generate new id when create VirtualRouter. Don't try to re-use the id of the VR that failed to deploy and was expunged as a result of this failure 2013-06-21 15:29:00 -07:00
Sheng Yang 041303cc67 Baremetal: Fix typo of BaremetaUserdataProvider
Should be "Baremetal" rather than "Baremeta"
2013-06-21 09:48:25 -07:00
Sheng Yang 2edfa9a7f2 Baremetal: DB upgrade
Conflicts:
	setup/db/db/schema-410to420.sql
2013-06-21 09:47:45 -07:00
Sheng Yang f37b089fce Revert "Removing baremetal related references"
This reverts commit 99ea4011b1.

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
2013-06-21 09:46:56 -07:00
Min Chen 2f9ba709a5 Add listCacheStoresCmd api for UI to list cache stores. 2013-06-20 18:06:30 -07:00
Edison Su 6b9ea1761a CLOUDSTACK-2947: fix create template from snapshot, in case of mix zone-wide/cluster wide primary storage 2013-06-20 17:51:11 -07:00
Min Chen 2fe732b354 CLOUDSTACK-3080: listVirtualMachines tag search refinement no longer
working.
2013-06-20 15:44:01 -07:00
Alena Prokharchyk 2072026340 CLOUDSTACK-3088: fixed listRouters/listInternalLbVms by name 2013-06-20 10:37:59 -07:00
Alena Prokharchyk bf331064a2 CLOUDSTACK-3091: expect UUID instead of actual DB id, when read internallbvm.service.offering global config 2013-06-20 10:37:59 -07:00
Kishan Kavala b422d8ddd9 CLOUDSTACK-2819: Revoke existing ACL items if the new ACL is empty 2013-06-20 17:06:06 +05:30
Jayapal 2e0abccd3b CLOUDSTACK-2952 Fixed configuring private gateway with another vpc acl id 2013-06-20 16:11:20 +05:30
Kishan Kavala 03d1346dc3 CLOUDSTACK-2915: Create network ACL when adding ACL item to a tier without ACL for backward compatibility 2013-06-20 15:36:58 +05:30
Likitha Shetty 9df45065d0 CLOUDSTACK-3078 2013-06-20 14:34:33 +05:30
Edison Su 733ed3622d fix compile 2013-06-20 00:57:06 -07:00
Edison Su 97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Likitha Shetty 4a260672e0 CLOUDSTACK-3078. Since no default value is set for the isolation type during the physical network creation,
modify guest vlan range dedication to check if the isolation type is VLAN only when an isolation type has been set
2013-06-20 12:09:32 +05:30
Bharat Kumar f9e7094282 Cloudstack-2644 [Multiple_IP_Ranges] user data service on VR does not work in case of multiple subnets Cloudstack-2953 [Multiple_IP_Ranges] VM does not get the public key from VR incase of multiple subnets per vlan Also removed some unused code and fixed the an error in the dnsmasq config function
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:15:15 +05:30
Edison Su 5f28dcc6bb merge to master 2013-06-19 22:41:13 -07:00
Harikrishna Patnala 7b6b8d7a07 CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:08:38 +05:30
Saksham Srivastava e420c3be8c CLOUDSTACK-2167: The Vlan ranges displayed are not in ascending order 2013-06-20 10:58:50 +05:30
Abhinandan Prateek febe7d9cff Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a subnet 2013-06-20 10:44:48 +05:30
Bharat Kumar 4d5c6c8381 Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a new subnet
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 10:40:23 +05:30
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Sheng Yang b3fb4851ee Fix regression of return Userdata provider when caller asked for DHCP
It's introduced by:

commit 052c24c4d1
Author: Bharat Kumar <bharat.kumar@citrix.com>
Date:   Mon May 13 17:02:27 2013 +0530

    CLOUDSTACK-702: Multiple ip ranges in different subnets.

This commit get userdata provider when caller asked for dhcp provider, thus
result in trouble e.g.

ERROR [cloud.async.AsyncJobManagerImpl] (Job-Executor-11:job-10) Unexpected
exception while executing
org.apache.cloudstack.api.command.user.network.DeleteNetworkCmd
java.lang.ClassCastException:
com.cloud.baremetal.networkservice.BaremetalUserdataElement_EnhancerByCloudStack_5dee69d2
cannot be cast to com.cloud.network.element.DhcpServiceProvider
        at
com.cloud.network.NetworkManagerImpl.getDhcpServiceProvider(NetworkManagerImpl.java:3309)
...
2013-06-19 17:06:06 -07:00
Alena Prokharchyk 0a4e65126f CLOUDSTACK-3079: Use global var "ping.timeout" as a multiplier to ping.interval before announcing an agent has timed out. The multiplier used to be hardcoded to 3 2013-06-19 15:11:53 -07:00
Edison Su 11b9d5ff64 CLOUDSTACK-1405: add scope type in liststoragepoolcmd 2013-06-19 14:09:49 -07:00
Alena Prokharchyk 928d94265b Added more logging to the place where VR investigates whether the user vm is alive, by executing PingCommand 2013-06-19 10:53:56 -07:00
Jessica Wang d5d0142ed4 CLOUDSTACK-3016: listZones API - take in networktype instead of zonetype parameter to be consistent with networktype property in ZoneResponse. 2013-06-19 10:22:14 -07:00
Alena Prokharchyk d66e9c7b51 CLOUDSTACK-2843: Provideded an ability to turn off the synchronization being done on the CS agent side,
for number of commands participating in Vm deployment process, as parallel deployment is supported on the hypervisor side.
The behavior is controlled by global config varirables:

"execute.in.sequence.hypervisor.commands" (false by default) sets/resets the synchronization for commands:
=========================
StartCommand
StopCommand
CreateCommand
CopyVolumeCommand

"execute.in.sequence.network.element.commands" (false by default) sets/resets the synchronization for commands:
==========================
DhcpEntryCommand
SavePasswordCommand
UserDataCommand
VmDataCommand

As a part of the fix, increased the global lock timeout to 30 mins in several VR scripts:
===========================
edithosts.sh
savepassword.sh
userdata.sh

to support situations when multiple concurrent calls to the script are being made.
2013-06-19 10:12:13 -07:00
Likitha Shetty 1af928570c CLOUDSTACK-3062. Dedication of a guest vlan range that extends 2 ranges dedicated to different accounts removes an old dedication 2013-06-19 16:59:14 +05:30
Jessica Wang 2f2bb6b316 CLOUDSTACK-3016: remove zonetype property from API response (userVM) 2013-06-18 14:55:56 -07:00
Jessica Wang 759eeca651 CLOUDSTACK-3016: remove zonetype property from API response (snapshot, ISO, template, network, volume) 2013-06-18 14:42:38 -07:00
Jessica Wang 0a8343e750 CLOUDSTACK-3016: remove zonetype property from API response (cluster, domainRouter, host, pod, storagePool, systemVM) 2013-06-18 13:54:37 -07:00
Jessica Wang b5abc0862b CLOUDSTACK-3016: remove zonetype parameter from listRouters API, listInternalLbVms API. 2013-06-18 10:41:37 -07:00
Wei Zhou 0dd45513e3 CLOUDSTACK-2885: show cpuNumber and cpuSpeed on VM Statistics page 2013-06-18 17:00:44 +02:00
Wei Zhou 9d7c7c14c7 CLOUDSTACK-1866: create iptables rules for network usage in finalizeSshAndVersionAndNetworkUsageOnStart only for non-Vpc network 2013-06-18 12:56:19 +02:00
Wei Zhou 882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02:00
Prachi Damle fb31a39efe CLOUDSTACK-2900: Ubuntu 13.04 - Migrate Virtual Router fail - Unable to find the VM by id=
Changes:
- Have to search the vm_instance table to find the instance
2013-06-17 16:59:32 -07:00
Jessica Wang 3e852cc29b CLOUDSTACK-3016: remove zonetype parameter from listNetworks API. 2013-06-17 16:26:09 -07:00
Alena Prokharchyk 5d0a1cee13 CLOUDSTACK-2883: create default network offering with internal lb support (if doesn't exist already) 2013-06-17 16:13:19 -07:00
Jessica Wang 880029844b CLOUDSTACK-3016: remove zonetype parameter from listTemplates, listIsos API. 2013-06-17 16:08:38 -07:00
Jessica Wang cb35ec6f4d CLOUDSTACK-3016: remove zonetype parameter from listSystemVMs API. 2013-06-17 15:58:33 -07:00
Min Chen 4c26dd6ae5 CLOUDSTACK-2956:createStoragePools API should ignore passed clusterId
and podId parameters in creating zone scoped primary storage
2013-06-17 15:57:52 -07:00
Jessica Wang 56d390d54e CLOUDSTACK-3016: remove zonetype parameter from listPods API. 2013-06-17 15:51:07 -07:00
Jessica Wang 9d0d02222b CLOUDSTACK-3016: remove zonetype parameter from listClusters API. 2013-06-17 15:28:39 -07:00
Jessica Wang 9e7356c686 CLOUDSTACK-3016: remove zonetype parameter from listSnapshots API. 2013-06-17 15:00:44 -07:00
Min Chen 1df4cf839e CLOUDSTACK-3028: Object_Store_Refactor - S3 reduced redundancy storage
should be an option.
2013-06-17 11:49:33 -07:00
Laszlo Hornyak 202cd15290 NPE fix
- fixes an NPE in case the pool.scope = null
- replaces null checks around toString with ObjectUtils.toString call

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:19:43 +01:00
Laszlo Hornyak c88d8fb3a2 use commons-lang StringUtils
commons-lang is already a transitive dependency of the utils project, which allows removing some duplicated functionality.
This patch replaces StringUtils.join(String, Object...) with it's commons-lang counterpart.
It also replaces calls to String join(Iterable<? extends Object>, String) in cases where an array is already exist and it is only wrapped into a List.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:17:22 +01:00
Alena Prokharchyk 952fa2464d LOUDSTACK-2914: handle situation when serviceProvider map is empty 2013-06-17 10:55:33 -07:00
Alena Prokharchyk fc16e29f99 CLOUDSTACK-2914: default lb scheme to Public when the service LB is enabled, and scheme is not specified explicitly 2013-06-17 10:10:43 -07:00
Hugo Trippaers b0ea02e65a Allow DSA public keys.
DSA can't be used for encryption with the bouncycastle library, so make
sure this situation is properly handled.
2013-06-17 10:04:59 -07:00
Likitha Shetty 770cf02ccf Global config to disable an account from acquiring public ips and guest vlans from the system if the account
has dedicated resources and the dedicated resources have all been consumed - use.system.public.ips and use.system.guest.vlans
Both configs are configurable at the account level too.
2013-06-17 17:54:36 +05:30
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Edison Su c2da4eac89 fix NPE for cache ref cnt 2013-06-14 17:24:31 -07:00
Jessica Wang 8925d39b78 CLOUDSTACK-3016: remove zonetype parameter from listVirtualMachines API. 2013-06-14 16:51:20 -07:00
Jessica Wang b4a692d80f CLOUDSTACK-3016: remove zonetype parameter from listVolumes API. 2013-06-14 16:39:04 -07:00
Jessica Wang ea0de9eaf4 CLOUDSTACK-3016: remove zonetype parameter from listStoragePools API. 2013-06-14 16:33:27 -07:00
Jessica Wang cb37d4cb63 CLOUDSTACK-3016: remove zonetype parameter from listHosts API. 2013-06-14 16:14:45 -07:00
Edison Su a715eb8121 clean up storage related code, and add lru replacement algorithm for cache storage 2013-06-14 15:55:59 -07:00
Min Chen bb85a564da Remove state from vm_template table, we should use template_store_ref
state column to represent the state of a template in each zone.
2013-06-14 15:14:09 -07:00
Mice Xia 7663684981 fix CLOUDSTACK-2989 normal user are allowed to create isolated network offerings with vlan assignments
1) only root admin can list network offering with specifyVlan=true
2) only root admin can create network with specifyVlan=true
2013-06-14 14:58:24 +08:00
Mice Xia 5e56e43e31 fix CLOUDSTACK-2930, exception while applying ACL rule with protocol as ALL.
1) change UI, disable startport and endport when protocol=All
2) validate parameters for API createNetworkACL
2013-06-14 13:19:07 +08:00
Sheng Yang 5a8a2a259e CLOUDSTACK-2792: Send "saved_password" to BACKUP router when reset password for user VM
Otherwise when MASTER failed, the user VM would get password reset again after
reboot.

But this fix still have issues if MASTER is failure before VM boot up, but in
that case, password of user VM won't change and user would request password
change again, then it would be fine.
2013-06-13 16:05:15 -07:00
Sheng Yang fbe6b273e3 CLOUDSTACK-1170: Redundant Router: Ensure MACs are same on other than first public nic 2013-06-13 16:05:15 -07:00
Harikrishna Patnala b83b8eb838 CLOUDSTACK-2502: Scalevm and over provisioning should respect each other
During Scale up of VM, memory/cpu calculations should consider the memory/cpu overprovisioning factors which are set per cluster.

CLOUDSTACK-2939:  CPU limit is not getting set for vm after scaleup to a service offering which have cpu cap enabled

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-13 16:30:56 +05:30
Jayapal b72c79b370 CLOUDSTACK-2934 Fixed not showing uuid in list firewall rules response
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-13 14:37:34 +05:30
Vijayendra Bhamidipati ff0a524bd6 CLOUDSTACK-2969: Exception when creating vlan ip range
Description:

	Putting in null pointer check when creating ip range.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-13 11:07:12 +05:30
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3ce) into object_store.
2013-06-12 11:20:32 -07:00
Bharat Kumar 31f0e34539 CLOUDSTACK-2963 Build failure due to validateIpRange test failure
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 18:48:46 +05:30
Nitin Mehta 2aafc39f3d CLOUDSTACK-2957
deployVm API size attribute should be capped by the storage.max.volume.size as it is in createVolume.
2013-06-12 17:01:41 +05:30
Bharat Kumar ca13586331 Cloudstack-2511 Multiple_Ip_Ranges: Adding guest ip range in subset/superset to existing CIDR is allowed Cloudstack-2651 [Shared n/w]Add IP range should ask for gateway and netmask
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 16:27:56 +05:30
Wei Zhou 51a3a5a9b5 CLOUDSTACK-2945: ignore collect disk statistics if vm is not running on KVM or XenServer 2013-06-12 11:57:17 +02:00
Nitin Mehta 83fcba9ee6 CLOUDSTACK-2946
CS-15158: Correcting the allocated size for local storage in listStoragePools
2013-06-12 14:58:54 +05:30
Harikrishna Patnala 215b638e8e CLOUDSTACK-2347: Zone filter for listSnapshots API
Added new optional parameter zone id in listSnapshots API which allows to list snapshots with additional criteria.
   Signed off by :- Nitin Mehta <nitin.mehta@citrix.com>
2013-06-12 13:35:58 +05:30
Nitin Mehta e73aafc09a CLOUDSTACK-2940
Allowing Replacement of realhostip.com with a customized domain for SSVM. Though the config variable was there we were always hardcoding to realhostip.com
Reviewed-by: Abhi
2013-06-12 11:51:45 +05:30
Nitin Mehta d21e064724 CLOUDSTACK-2937
Scheduled snapshot events should be shown to users
2013-06-12 11:42:10 +05:30
Jayapal 358f3edc57 CLOUDSTACK-2609 Fixed accoundId, domainId for the secondary ip address for shared networks
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 10:32:04 +05:30
Min Chen ec55c2e909 CS-17842: java.lang.NullPointerException seen when using
"updateTemplatePermission" with projectids parameter.
2013-06-11 17:07:26 -07:00
Likitha Shetty 7b63894a0a CLOUDSTACK-2891. While adding a new vlan range if the new range extends an existing range then CS extends the existing range to include the new range.
This is done by checking if the last vlan in the new range is same as the start vlan of any existing range.
Since for a single vlan the start and the end vlan are the same the check goes to an infinite loop resulting in a java.lang.OutOfMemoryError: Java heap space error.
Remove the check for a single vlan because if an existing range starts with the single vlan then it implies that the range already exists
2013-06-11 12:08:05 +05:30
Min Chen cc0de88088 Remove old DeleteTemplateCommand, DeleteVolumeCommand,
DeleteSnapshotBackupCommand, replaced by DeleteCommand.
2013-06-10 17:55:30 -07:00
Kelven Yang 923deba89b Wire CreateSnapshotCmd with @Inject support in SnapshotSchedulerImpl 2013-06-10 17:52:14 -07:00
Wei Zhou 76ce304411 CLOUDSTACK-2707: use executeBatch instead of persist in Usage Server 2013-06-10 15:00:08 +02:00
Nitin Mehta d8a235ee31 CLOUDSTACK-2923: Delete Secondary storage of a Zone was giving NPE bcz we were still refering to the object. Instead log that the cpvm and ssvm cant be created bcz sec storage is not available 2013-06-10 16:48:50 +05:30
Jayapal c1ad3b7974 CLOUDSTACK-2604 Fixed deleting secondary ip when no PF rules set
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-10 12:13:08 +05:30
Likitha Shetty 22a8508280 CLOUDSTACK-2894. Removing all vlan ranges should update the vnet column to NULL. 2013-06-10 10:39:55 +05:30
Prachi Damle 8c9f681f9e CLOUDSTACK-2350: Anti-Affinity - As admin user, when tryinto update the affinity group for a Vm that is deployed by a regular user , he is presented with admin's affinity groups.
Changes:
- listAffinityGroups API takes in accountname and domainId parameter
- For admin, listall=true should return all affinity groups of all users
2013-06-07 15:28:28 -07:00
Saksham Srivastava 5dc7387d3b CLOUDSTACK-1647: IP Reservation should not happen if the guest-vm cidr and network cidr is not same but their start ip and end ip are same.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-07 16:54:40 +05:30
Likitha Shetty e7d5ccaada Fix DB warnings - txn: Commit called when it is not a transaction: -NetworkServiceImpl.dedicateGuestVlanRange:3050 2013-06-07 12:12:18 +05:30
Sheng Yang 4a14ea8a4d CLOUDSTACK-1771: Fix ipv6 address for router
Now it won't change(as ipv4 address) after router is destroyed.
2013-06-06 18:04:35 -07:00
Min Chen 66e702222d Simplify various DeleteTemplateCommnad, DeleteVolumeCommand and
DeleteSnapshotBackupCommand to use one DeleteCommand, also provide
BaseImageStoreDriverImpl class for plugin to inherit to avoid code
duplication.
2013-06-06 18:00:38 -07:00
Alena Prokharchyk f4a1a2ff38 Allow account to have multiple networks with customer defined cidrs as we already let it happen when the cidr is taken from the physical network config 2013-06-06 11:52:15 -07:00
Kishan Kavala 62e125c081 check for null ACL before creating ACL commands 2013-06-06 19:02:44 +05:30
Kishan Kavala aa2fb31112 check for null protocol while validating ACL item 2013-06-06 19:02:44 +05:30
Wei Zhou d2e6bf5fa4 CLOUDSTACK-2865: fix error in prepareStop 2013-06-05 16:43:31 +02:00
Alena Prokharchyk 54481d0b7b listLoadBalancingRules: when list by networkId, no need to pass the dataCenterId to the call 2013-06-05 10:25:25 -07:00
Wei Zhou 1696e8cb16 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-06-05 14:29:06 +02:00
Wei Zhou 15265479f6 CLOUDSTACK-2856: collectVmDiskStatistics before reboot/stop/migrate 2013-06-05 14:28:43 +02:00
Devdeep Singh 5af702dd90 CLOUDSTACK-2737: findHostsForMigration is resulting in an exception when there are no suitable tagged storage pools. Instead of a foreach made changes to use a iterator in the loop to avoid ConcurrentModificationException as the host list is being updated inside the loop. 2013-06-05 17:41:01 +05:30
Murali Reddy 91b15711b6 CLOUDSTACK-2343: listGlobalLoadBalancerRules shouldn't list the
globalGSLBRules of other accounts

imposing ACL checks
2013-06-05 15:02:03 +05:30
SrikanteswaraRao Talluri 4da995238b CLOUDSTACK-2783: FIXED listHypervisorCapabilities API response to include the following fields: 1. maxdatavolumes 2. maxhostspercluster 3. storagemotionenabled 2013-06-05 13:50:41 +05:30
Prasanna Santhanam 956a5967dd Pulling out Network operations into a separate manager
Network operations like VM, host and storage are pulled into a separate
managaer for simulator.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-05 12:23:07 +05:30
Min Chen e92cd6d632 Move data store specific extract volume logic from VolumeManager to data
store driver.
2013-06-04 13:54:14 -07:00
Alena Prokharchyk 95c9835f69 CLOUDSTACK-2817: set SearchBuilder with the "scheme" attribute 2013-06-04 13:45:54 -07:00
Min Chen ef03d5a122 Move data store specific extract template/iso logic from
TemplateManager to data store driver.
2013-06-04 11:50:43 -07:00
Kishan Kavala b5148af0c6 CLOUDSTACK-2809: Assign acl_id to VPC tier only when NetworkACL service is supported 2013-06-04 20:08:26 +05:30
Murali Reddy cb595cafc7 CLOUDSTACK-2390:[GSLB] After removeFromGSLBRule, still CloudStack things
that lb rule is active

removing the GSLB rule to Lb rule mapping once rules are applied on the
GSLB service provider
2013-06-04 18:53:17 +05:30
Abhinandan Prateek c8f143e3a7 bug CLOUDSTACK-2445: removed vm id from exception message 2013-06-04 16:11:40 +05:30
Prasanna Santhanam 0401774a09 StoragePoolForMigrationResponse -> StoragePoolResponse
The additional response type is basically the same as
StoragePoolResponse. Only additional state reported is whether the
storage pool is suitable for migration. Since this is fetched from
hypervisor capabilities there is no need for a new response type.

Tested with the simulator and I can see the response format correctly.

mysql> select * from hypervisor_capabilities where id=18\G
*************************** 1. row ***************************
                      id: 18
                    uuid: 98b88e6e-ccf1-11e2-bd2a-af89de8bd27e
         hypervisor_type: Simulator
      hypervisor_version: NULL
        max_guests_limit: 100
  security_group_enabled: 1
  max_data_volumes_limit: 100
   max_hosts_per_cluster: 100
storage_motion_supported: 1
     vm_snapshot_enabled: 1
1 row in set (0.00 sec)

CloudMonkey output as below:
> find storagepoolsformigration id=0a644f79-53dd-4eb6-a871-64679a47cfc6
count = 1
storagepool:
name = PS0
id = 7c07ec9b-a3c6-3466-ab5a-f5669ead0b22
clusterid = 71fb5c34-4852-46e6-bb8f-c9da4e8f827c
clustername = C0
created = 2013-06-04T14:06:55+0530
disksizeallocated = 0
disksizetotal = 1099511627776
disksizeused = 0
ipaddress = 10.147.28.6
jobstatus = 0
path = /export/home/sandbox/primary0
podid = 560d9600-35dd-4a50-addd-81d5618536e9
podname = POD0
scope = CLUSTER
state = Up
suitableformigration = True
type = NetworkFilesystem
zoneid = 3108f711-0db6-4dad-a0d0-2fd7d413e5ef
zonename = Sandbox-simulator

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-04 14:26:40 +05:30
Bharat Kumar d58c0c4d11 Cloudstack-2736 [Multiple_IP_Ranges] Failed to deploy vm with IP address from new CIDR
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-04 14:19:57 +05:30
Prasanna Santhanam 767ed065c5 CLOUDSTACK-2815: Include dedication in simulator context
SimulatoComponentContext need sto include the dedicated resource manager
to see the commands/apis exposed by it.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 21:51:18 +05:30
Bharat Kumar 48913679e8 CLOUDSTACK-2648 [Multiple_IP_Ranges] Reboot or start/stop router vm deletes the ip alises created on VR in case of multiple subnets
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-03 19:22:27 +05:30
Bharat Kumar 0a69b82899 CLOUDSTACK-2620 [Multiple_IP_Ranges] Guest vm's nameserver is not set to VRs guest IP address in case of multiple subnets
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-03 19:09:01 +05:30
Nitin Mehta 68b8da0df7 CLOUDSTACK-2765
Dashboard is showing invalid value for storage
Fixed it by using the right storage method for sending the stats command
2013-06-03 15:35:47 +05:30
Kishan Kavala 6cc9162e76 CLOUDSTACK-2781: Fixed incorrect vpcId set in search criteria while listing network acls 2013-06-03 14:58:05 +05:30
Prasanna Santhanam 22bda5c3c9 ConfigurationServerImplTest: remove long running test
The getBase64KeystoreZillionTimes is not required for the current
implementation that closes the file descriptor cleanly.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 14:48:29 +05:30
Wei Zhou f714d26039 Revert "CLOUDSTACK-1301: Add VM Disk I/O Throttling"
This reverts commit 6dad8adf8f.
2013-06-03 07:48:03 +02:00
Sateesh Chodapuneedi b4969c4af5 CLOUDSTACK-2796
Hypervisor type validation would be applicable only for zone wide primary storage pool.
2013-06-03 10:10:03 +05:30
Wei Zhou 6dad8adf8f CLOUDSTACK-1301: Add VM Disk I/O Throttling 2013-06-01 08:03:02 +02:00
Wei Zhou b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
Sateesh Chodapuneedi 7998413f48 CLOUDSTACK-2029 zone wide primary storage support for cloudstack over vmware deployments
Added hypervisor type to CreateStoragePoolCmd & Storage pool responses.
DatastoreLifeCycle would consider hypervisor type while attaching datastore to zone.
ZoneWideStoragePoolAllocator would filter zone wide primary storage pools by hypervisor type along with tags in disk profile.
hypervisor type is mandatory parameter if scope is specified as ZONE while creating primary storage pool.
As of now KVM, VMware are allowed to use ZoneWideStoragePoolAllocator.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-01 00:05:27 +05:30
Sateesh Chodapuneedi e7d468e221 CLOUDSTACK-2029 zone wide primary storage support for cloudstack over vmware deployments
DB changes to support hypervisor specific zone wide storage pool.
Added method findZoneWideStoragePoolsByHypervisor to PrimaryStorageDaoImpl to find suitable zone wide storage pool of specific hypervisor type.
Added column 'hypervisor' to table storage_pool. This column can be NULL. Used/populated only for zone wide primary storage pools.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-01 00:05:27 +05:30
Sateesh Chodapuneedi f24e81fe0d CLOUDSTACK-659 Support for storage migration in Cloudstack deployment over VMware Added VmwareStorageMotionStrategy to deal with storage motion tasks. Added target host parameter to MigrateWithStorageCommand.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware

Added VmwareStorageMotionStrategy to application context.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Unit tests for vmware storage motion. These test the VmwareStorageMotionStrategy.

CLOUDSTACK-659

Fixing migrate volume.

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Added vm type to prepareNetworkFromNicInfo in MigrateWithStorageCommand implementation.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Fixing attach volume and delete volume cases for volumes that are moved off original path in datastore when created.
If volume is not found in root directory or datastore, do search in sub folders.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Sending command MigrateWithStorageCommand to source host instead of target host for the case of migration of VM within cluster.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Searching for virtual disk during device tear down.

Adding dependency of 'cloud-engine-storage' to vmware hypervisor plugin.

Add hypervisor capability storage_motion_supported for VMware 5.0 and 5.1

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware
Added VmwareStorageMotionStrategy to deal with storage motion tasks.
Added target host parameter to MigrateWithStorageCommand.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware

Added VmwareStorageMotionStrategy to application context.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Unit tests for vmware storage motion. These test the VmwareStorageMotionStrategy.

CLOUDSTACK-659

Fixing migrate volume.

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Added vm type to prepareNetworkFromNicInfo in MigrateWithStorageCommand implementation.

Adding dependency of 'cloud-engine-storage' to vmware hypervisor plugin.

Add hypervisor capability storage_motion_supported for VMware 5.0 and 5.1

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware
Added VmwareStorageMotionStrategy to deal with storage motion tasks.
Added target host parameter to MigrateWithStorageCommand.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware

Added VmwareStorageMotionStrategy to application context.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Unit tests for vmware storage motion. These test the VmwareStorageMotionStrategy.

CLOUDSTACK-659

Fixing migrate volume.

Adding dependency of 'cloud-engine-storage' to vmware hypervisor plugin.

Add hypervisor capability storage_motion_supported for VMware 5.0 and 5.1

Adding dependency of 'cloud-engine-storage' to vmware hypervisor plugin.

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware
Added VmwareStorageMotionStrategy to deal with storage motion tasks.
Added target host parameter to MigrateWithStorageCommand.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware

Added VmwareStorageMotionStrategy to application context.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

CLOUDSTACK-659

Fixing migrate volume.

Unit tests for vmware storage motion. These test the VmwareStorageMotionStrategy.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Sending command MigrateWithStorageCommand to source host instead of target host for the case of migration of VM within cluster.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Moved 2 methods that are not specific to VMware but Volume are moved to VolumeManager from VmwareManager.
Moved datastore volume path constructing code to separate method.
Added check for source and target host, if they are from different DCs/vCenter instances.

Updated error message & removed stale comment

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Injecting component VolumeManager into VmwareResource.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 21:19:28 +05:30
Murali Reddy 9c0f9aceb8 CLOUDSTACK-2332:[GSLB] deleteAccount is not cleaning the gslb rules
created by the account

revoking GSLB rules of account on delete
2013-05-31 19:08:40 +05:30
Murali Reddy 470995b1c4 CLOUDSTACK-2192: [EIP/Optonal PublicIP] listNetworkOfferings is not
returning info about the capability "AssociatePublicIP"

added eip and associateEip capability details to the StaticNat service
response
2013-05-31 19:08:39 +05:30
Murali Reddy f84a27324d CLOUDSTACK-2285:[GSLB] addNetscalerLoadBalancer with GSLB functionality
shouldn't be exposed in basic zone

reverting the original fix for this bug. When you add network service
provider instance into a physical network in a basic zone, its not
necessary that a network has been provisioned into zone. So its no
straight-forward to know if the basic zone network has EIP/ELB services enabled.
2013-05-31 19:08:38 +05:30
Rajesh Battala af4177b86c Fixed CLOUDSTACK-2662 Preferred implicit dedication fails with insufficient capacity even if shared hosts are available.
Issues:
In Implicit planner resource usage is fixed to "Dedicated". It should be Dedicated/Shared depending upon the Implict Planner strict/preferred modes and hosts availability.

Fixed:
Issue is fixed by determining the resource usage to be "Dedicated/Shared" depending upon the Implicit strict/preferred mode and the hosts availability for the planner.
2013-05-31 00:28:56 -07:00
Laszlo Hornyak 4894187991 test and cleanup for getBase64Keystore
ConfigurationServerImpl.getBase64Keystore did not close the file input stream correctly. This patch adds test and replaces the file read with commons-io FileUtils call.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-31 11:26:33 +05:30
Alena Prokharchyk da53ef1aed ApiServer: fixed non primitive Long "snapshotLimit" comparsion 2013-05-30 15:21:31 -07:00
Alena Prokharchyk 62ad6c4519 ApiServer: replaced hardcoded value of the integration.api.port paramter with the reference to the actual paramter name 2013-05-30 15:21:31 -07:00
Prachi Damle 7296cca9ac CLOUDSTACK-2771: Unable to create guest VM in basic zone: Zone is dedicated
Changes:
- Check the domain of the dedicated zone
2013-05-30 14:50:55 -07:00
Sheng Yang 70ca581499 CLOUDSTACK-2772: Programming firewall rules to VR when recovering redundant network 2013-05-30 14:10:18 -07:00
Alena Prokharchyk 1300fc8128 AccountManager/Service: reduced visibility for methods that are called only from AccountManagerImpl itself 2013-05-30 11:18:32 -07:00
Alena Prokharchyk 973fc84d6c AccountManager: fixed unchecked conversion warning 2013-05-30 11:18:32 -07:00
Alena Prokharchyk 4701dd760b Removed unused code from ManagementServerImpl 2013-05-30 11:18:31 -07:00
Alena Prokharchyk 0ea409546e RulesManager interface: changed visibility for methods that are being called only from RulesManagerImpl class, from public and defined in the interface, to private/protected 2013-05-30 11:18:31 -07:00
Koushik Das fd79f6b602 CLOUDSTACK-2276: NPE while attaching the volume to the instance which is created from ROOT Disk Snapshot
The NPE comes as the storage pool id is set to null in the in-memory volume object which is not in sync with the db. entry. Reloading the volume from db. fixes the issue
2013-05-30 17:20:44 +05:30
Kishan Kavala 3115ddf007 Added networkAclId to listNetworkResponse. Log ACL provider while applying network ACLs 2013-05-30 16:36:21 +05:30
Saksham Srivastava 965c7b9c35 Patch 2: CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster or host
Patch 2 for https://reviews.apache.org/r/11379/
Created for files server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java, server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java, server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
2013-05-30 01:07:07 -07:00
Saksham Srivastava 17267794ad CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster or host. <Patch1>
This feature allows a user to deploy VMs only in the resources dedicated to his account or domain.

1. Resources(Zones, Pods, Clusters or hosts) can be dedicated to an account or domain.
   Implemented 12 new APIs to dedicate/list/release resources:
   - dedicateZone, listDedicatedZones, releaseDedicatedZone for a Zone.
   - dedicatePod, listDedicatedPods, releaseDedicatedPod for a Pod.
   - dedicateCluster, listDedicatedClusters, releaseDedicatedCluster for a Cluster
   - dedicateHost, listDedicatedHosts, releaseDedicatedHost for a Host.
2. Once a resource(eg. pod) is dedicated to an account, other resources(eg. clusters/hosts) inside that cannot be further dedicated.
3. Once a resource is dedicated to a domain, other resources inside that can be further dedicated to its sub-domain or account.
4. If any resource (eg.cluster) is dedicated to a account/domain, then resources(eg. Pod) above that cannot be dedicated to different accounts/domain (not belonging to the same domain)
5. To use Explicit dedication, user needs to create an Affinity Group of type 'ExplicitDedication'
6. A VM can be deployed with the above affinity group parameter as an input.
7. A new ExplicitDedicationProcessor has been added which will process the affinity group of type 'Explicit Dedication' for a deployment of a VM that demands dedicated resources.
   This processor implements the AffinityGroupProcessor adapter. This processor will update the avoid list.
8. A VM requesting dedication will be deployed on dedicatd resources if available with the user account.
9. A VM requesting dedication can also be deployed on the dedicated resources available with the parent domains iff no dedicated resources are available with the current user's account or
   domain.
10. A VM (without dedication) can be deployed on shared host but not on dedicated hosts.
11. To modify the dedication, the resource has to be released first.
12. Existing Private zone functionality has been redirected to Explicit dedication of zones.
13. Updated the db upgrade schema script. A new table "dedicated_resources" has been added.
14. Added the right permissions in commands.properties
15. Unit tests:  For the new APIs and Service, added unit tests under : plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/DedicatedApiUnitTest.java
16. Marvin Test: To dedicate host, create affinity group, deploy-vm, check if vm is deployed on the dedicated host.
2013-05-30 01:07:01 -07:00
Mice Xia 4989f73fda fix CLOUDSTACK-2128, should save network offering id into usage event 2013-05-30 15:26:39 +08:00
Saksham Srivastava 62413eec10 CLOUDSTACK-2130: Fix resource_name for old NIC ID
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-05-30 15:24:33 +08:00
Min Chen efbf9c8635 Move ExtractVolumeCmd from ManagementServerImpl to VolumeManagerImpl,
also add support for S3 for ExtractVolumeCmd.
2013-05-29 22:27:07 -07:00
Prachi Damle 34943adfc6 CLOUDSTACK-2366: Anti-Affinity - DeleteAffinityGroup API should allow for deletion of Afffinity group even when VMs are associated with it.
Changes:
- Allowing group to be deleted even when VMs are associated to it.
2013-05-29 17:59:32 -07:00
Anthony Xu 68275fbd6b only basic zone is pod based network 2013-05-29 17:47:51 -07:00
Min Chen 2616115ff9 Still add system vm template to template_store_ref in adding image
store, otherwise systemvm cannot come up.
2013-05-29 17:27:24 -07:00
Anthony Xu 51930405d9 Don't need to handle dhcp entry differently for different guest OS 2013-05-29 16:51:42 -07:00
Anthony Xu 271cf92ab7 allow subdomain access parent domain's network 2013-05-29 16:27:08 -07:00
Anthony Xu a8bb62c35c lockRow doesn't work without transaction, start transaction before lockRow 2013-05-29 15:48:23 -07:00
Min Chen e51adc3b7d CLOUDSTACK-2673: Failed to deploy guest vm using ISO with S3 being the
storage provider.
2013-05-29 15:47:39 -07:00
Anthony Xu 354d259d55 volume size is virtual disk size not physical size, so uploaded volume should use virtual size 2013-05-29 15:37:13 -07:00
Anthony Xu a4d428434d Don't use volume name as snapshot name because volume name may incude space, \ and other special character, which cannot be part of path name in vmware
after this commit, snapshot name is volumeUuid_timestring.
2013-05-29 15:10:49 -07:00
Anthony Xu 3ae00f4b2f update volume API needs to respect the account and domain 2013-05-29 14:45:15 -07:00
Anthony Xu 9905f656a5 only check hypervisor type for security enabled advanced zone 2013-05-29 11:32:15 -07:00
Nitin Mehta 8d1189c2ae CLOUDSTACK-2060
Global config to turn off dynamically scale vm functionality
2013-05-29 19:02:06 +05:30
Murali Reddy cea9e3919a fixing unit tests to comply with bug "CLOUDSTACK-2477: [GSLB]
CloudStack currently allows admin to map LB rule of one account to GSLB
rule of a different account"
2013-05-29 18:54:36 +05:30
Murali Reddy ee317287b3 CLOUDSTACK-2285: [GSLB] addNetscalerLoadBalancer with GSLB functionality shouldn't be
exposed in basic zone

imposing restriction that NetScaler can only be added when EIP/ELB
service are available in basic zone.
2013-05-29 18:54:36 +05:30
Murali Reddy c8a0c40a2f CLOUDSTACK-2477: [GSLB] CloudStack currently allows admin to map LB rule
of one account to GSLB rule of a different account

ensuring account id of GSLB rule and LB rule are same
2013-05-29 18:54:35 +05:30
Murali Reddy 2b93969823 add upgrade path to "cloud.dns.name" global config value.
fail creating GSLB rule if DNS name is not confiugred
2013-05-29 18:54:35 +05:30
Kishan Kavala e3a104aa58 fix networkAclServiceTest failure 2013-05-29 17:14:36 +05:30
Chiradeep Vittal ccac84c469 Workaround for broken bvt/ simulator tests
Actually this check makes no sense since it breaks basic zone for all hypervisors except KVM, XS
Will revisit later
2013-05-28 17:05:51 -07:00
Min Chen 6e55776795 CLOUDSTACK-2331: Failed to display exception object information in case of CloudRuntimeException. 2013-05-28 16:01:33 -07:00
Alena Prokharchyk f2c468d00c Removed unused imports and obsolete methods from ConfigurationManager/ConfigurationServer, NetworkManager/NetworkService 2013-05-28 15:40:44 -07:00
Min Chen 8a1a51c6fc Clean up deleteSnapshot agent command, since snapshot path is already
stored in snapshot_store_ref, no need to construct path in resource
side.
2013-05-28 13:36:54 -07:00
Anthony Xu 19a1116df2 Merge branch '4-2-advanced-zone-security-group' 2013-05-28 11:03:56 -07:00
Murali Reddy 883333c214 CLOUDSTACK-2700:on network/vpc delete, portable IP should be still
associated with account

Unlike public ip which gets dis-associated (released) with the account
on network/VPC delete, portable IP should continue to be associated with
the account even when the network/VPC with which it is currently
associated in deleted. This fix ensures portable IP are associated to
account even after network/vpc is deleted.
2013-05-27 18:44:41 +05:30
Murali Reddy ad48c83808 generate an action event when portable IP association is transferred
from a network to different network
2013-05-27 18:44:41 +05:30
Harikrishna Patnala 82974458a6 CLOUDSTACK-2672: Adding isVolatile parameter in service offering response object
Signed off by :- Nitin Mehta <nitin.mehta@citrix.com>
2013-05-27 18:25:29 +05:30
Min Chen 27133fba7d Simplify clean up snapshots logic in secondary storage and consolidate
to use one agent command DeleteSnapshotBackupCommand for snapshot
deletion task by removing CleanupSnapshotBackupCommand.
2013-05-25 20:48:15 -07:00
Edison Su 0ed441c690 CLOUDSTACK-2637: fix upload volume 2013-05-24 19:00:52 -07:00
Alena Prokharchyk 2ecf9e3293 CLOUDSTACK-2680: Async job expunge thread - expunge only:
1) Unfinished jobs that are yet to be processed.
2) Completed jobs

The jobs that are in process, will be skipped by the expunge thread

Conflicts:
	server/src/com/cloud/async/dao/AsyncJobDao.java
	server/src/com/cloud/async/dao/AsyncJobDaoImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-05-24 15:01:12 -07:00
Min Chen c609bc0541 Not reuse already destroyed entries in template_store_ref to make code
cleaner.
2013-05-24 14:34:56 -07:00
Min Chen 9e1a9bfd4b Fix a bug in attachIsoToVM for S3. 2013-05-24 14:24:23 -07:00
Min Chen 863b534066 Copy iso from S3 to Cache in attach iso to VM. 2013-05-24 13:56:08 -07:00
Min Chen 89f351c2e5 Clean up template sync code, and update template state in template sync
phase instead of doing it in adding image store.
2013-05-24 11:56:36 -07:00
Min Chen c614c6a424 CLOUDSTACK-2674: Secondary Storage garbage collector failed with NPE in
case of S3 storage provider.
2013-05-24 11:10:45 -07:00
Min Chen 3c7fb2f790 Use template_view.state column to indicate readiness of a template. 2013-05-24 09:50:40 -07:00
Harikrishna Patnala a34e577d1b CLOUDSTACK-1453: support restore for VM created from ISO
This is to support restore a vm to a new/currently_attached ISO.
In the restorevm API we have an optional parameter templateId to restore the vm to the new template/ISO ID.
2013-05-24 16:41:03 +05:30
Nitin Mehta 23baacba62 CLOUDSTACK-2669 - Adding resource limit and count logic for scale vm 2013-05-24 16:06:26 +05:30
Kishan Kavala ba67e5d56e CLOUDSTACK-2452: Fixed account upgrade for usage. Added cloumn default. Updated usage response for PF , LB and VPN to return UUID instead of Id 2013-05-24 16:00:49 +05:30
Bharat Kumar 47a562a2c0 Cloudstack-2548: Failed to delete public IP range
Public IP range deletion after it is dedicated fails with IP range being
used for DHCP offers.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-24 14:28:46 +05:30
Prachi Damle 51cf797d5e CLOUDSTACK-2659 Advanced Zone - during VM deployment need to check network permissions for shared account-specific guest networks too
Changes:
- Check network permissions for account specific shared networks as well
- Changes to error to include network uuid instead of id
2013-05-23 22:57:49 -07:00
Jayapal 704471e6de CLOUDSTACK-2386 Fixed srx firewall icmp rule
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-24 10:30:12 +05:30
Mice Xia 2276760b3b fix CLOUDSTACK-2649 createLoadBalancerRule API:both ports getting same value(public port value assigned to private port) 2013-05-24 11:27:16 +08:00
Edison Su 3ec52807f1 CLOUDSTACK-2593: fix migrate volume between pools through secondary storage 2013-05-23 18:26:16 -07:00
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Min Chen 913e2b38bf CLOUDSTACK-2523: Recurring snapshot failed with NPE. 2013-05-23 17:23:25 -07:00
Min Chen d1704a389a Exclude removed template from template sync. 2013-05-23 17:23:25 -07:00
Prachi Damle 780b45e245 CLOUDSTACK-2657: listTemplatePermissions API should also include the owner of the template to the list of users having permission to launch
Changes:
- Add template owner to the list of users
2013-05-23 16:33:07 -07:00
Alena Prokharchyk 7e6f3f94ba CLOUDSTACK-2628: added networkId parameter to the list of request parameters in listLoadBalancerRules API 2013-05-23 16:06:57 -07:00
Wido den Hollander b1f4c8e89a Fix a small typo in a log line 2013-05-23 23:46:55 +02:00
Edison Su 8f6eb26e38 fix suffix for extratemplate for kvm 2013-05-23 14:35:19 -07:00
Edison Su 4e4112fcec fix attach volume for kvm 2013-05-23 13:51:46 -07:00
Min Chen 8d08f9b74b CLOUDSTACK-2655: use ssvm public IP to construct extract url. 2013-05-23 12:05:58 -07:00
Min Chen 4611b515db Not passing format to VolumeDataStore due to removal of format column
from volume_store_ref.
2013-05-23 11:02:49 -07:00
Min Chen b4a996dd42 CLOUDSTACK-2635: destroyed snapshots are still showing up from UI. 2013-05-22 17:50:50 -07:00
Prachi Damle a69101dceb - To check if a host is in avoid set, DPM should check the zones/pods/cluster/hosts in teh avoid list - not just the hosts in avoid list. 2013-05-22 17:06:49 -07:00
Alena Prokharchyk f41d398cf7 Remote access vpn: method name change 2013-05-22 16:05:03 -07:00
Min Chen 19321d4eeb CLOUDSTACK-2629: ListRouters with networkid throws exception. 2013-05-22 15:27:04 -07:00
Min Chen 8a956203d1 ListImageStores still show those deleted image stores. 2013-05-22 14:33:40 -07:00
Min Chen 039098469a CLOUDSTACK-2584: set Format value in CopyCommand. 2013-05-22 14:33:40 -07:00
Edison Su 5af888c67a add image format in volumevo 2013-05-22 13:38:11 -07:00
Hugo Trippaers 4e09079640 Update the Logical Router NatRules to be compatible with the NVP 3.x.x
platform

Use the Gson adapters to serialize/deserialize the NatRules

Switch the NiciraNvpApi to a single gson Object with the proper adapters

Fix missing order setting for static nat rules and portforwarding rules

Return an error when a port range is passed in a portforwarding rule

The serializer is not required

Fix a bug where an ip address could be released even if it was still in
use for SourceNat

Throw a json parse exception when the type is unknown to the adapter
2013-05-22 11:32:16 +02:00
Edison Su 383be568b3 CLOUDSTACK-2527: enable attach/detach xs tool iso 2013-05-21 19:13:29 -07:00
Min Chen f5732fe3bf Consolidate code to use UriUtils.validateUrl instead of repeating code
several places.
2013-05-21 16:50:02 -07:00
Min Chen 2aab3c8849 CLOUDSTACK-2594: Failed to add Secondary storage for second zone through
old addSecondaryStorage api.
2013-05-21 14:55:07 -07:00
Sheng Yang 92ad6abab0 PVLAN: Fix NPE when VM are in allocated state
If vlan is not assigned for VM, nic.getBroadcastUri() would be null. Then just
ignore it.
2013-05-21 14:51:35 -07:00
Min Chen cb0659ab33 CLOUDSTACK-2590: we should only search for active user templates when
deleting an image store.
2013-05-21 12:01:53 -07:00
Min Chen 2af36aa87b Clean up template_zone_ref entries in case of create template failure. 2013-05-21 12:00:59 -07:00
Devdeep Singh 904a2a87f7 CLOUDSTACK-2601 : xen.heartbeat.interval doesn't change the parameter passed to xenheartbeat.sh. Made changes to read the parameter from config and to pass it to the resource.
Signed-off-by: Devdeep Singh <devdeep@gmail.com>
2013-05-21 13:33:07 +05:30
Sanjay Tripathi 55c384651a CLOUDSTACK-2305: [Automation] NPE: not able to create volume from snapshot
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-05-21 12:00:49 +05:30
Sheng Yang eb7c321426 PVLAN: CLOUDSTACK-2401: VM Migration support 2013-05-20 16:43:24 -07:00
Hiroaki Kawai 7260e8d83f CLOUDSTACK-1638: Introduce NetworkMigrationResponder
The location of the virtual machine is provided by DeployDestination, which will
be passed in NetworkGuru#reserve and NetworkElement#prepare.

During the virtual machine migration, it actually changes DeployDestination and
it looks like that it will tell that event to network components as it has
NetworkManager#prepareNicForMigration. The problem is that althogh the interface
has that method, NetworkManagerImpl does not tell the DeployDestination changes
to network components.

So IMHO, we need to add calls of NetworkGuru#reserve and NetworkElement#prepare
in NetworkManagerImpl#prepareNicForMigration . And then, we also need to add
calls NetworkGuru#release and NetworkElement#release after the migration,
otherwise the network resources that plugin reserved will be kept even when the
vm leaves off.

(Sheng Yang: rebase code, add license header)

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-05-20 16:43:18 -07:00
Min Chen 565bdfb27b Fix CLOUDSTACK-2525: clean up db entries in vm_template and
template_store_ref in case of template creation failure.
2013-05-20 16:21:45 -07:00
Min Chen ef541a2a7b Fix CLOUDSTACK-2538: Add name as an optional parameter for addImageStore
api.
2013-05-20 13:39:43 -07:00
Min Chen 255d08ae7c Fix CLOUDSTACK-2586: ExtractTemplate for S3 template should give URL
directly from S3.
2013-05-20 12:06:36 -07:00
Murali Reddy d6452be861 CLOUDSTACK-652: meging 'portable public ip' feature
Squashed commit of the following:

commit f244f9ce7982db16984dd87c31545f1c0240c704
Merge: 993cbb0 f5c8e38
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:54:05 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java

commit 993cbb0df9fa6e64b96b18ed775b73cdf4a8f5d7
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:49:54 2013 +0530

    introduce 'transferPortableIP' interface method in network manger. This
    method will transfer association of portable ip from one network to
    another network.

commit 0c1c2652c1b39e9a81ca35464360e11ed9ef23f1
Merge: a718d35 a29e393
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Fri May 17 02:48:54 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	utils/src/com/cloud/utils/net/NetUtils.java

commit a718d353f7
Merge: ecca117 c211818
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 21:22:19 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/network/addr/PublicIp.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit ecca117e34
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 20:05:29 2013 +0530

    added integration tests for testing portable ip ranges

commit 895a27c277
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 15:12:19 2013 +0530

    - establish model for transferring portable IP association from a network
      with which it is associated to another network.

    - enabling static nat api, extended to transfer potrtable IP across the
      networks if the VM/network is different from the current associate
      network of the portable ip

commit 51509751b2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 12:05:33 2013 +0530

    seperate out associate/disassociate with guest network operations from
    alloc and release of portable ip

commit bd058f58c2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 21:14:48 2013 +0530

    enhance disasociateIPAddr API to release protable IP associated with a
    guest network or VPC

commit 27504d9098
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 16:53:45 2013 +0530

    enhance asociateIPAddr API to acquire a protable IP and associate with a
    guest network or VPC

commit f82c6a8431
Merge: 3dbfb44 0749013
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 23:32:13 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/com/cloud/network/IpAddress.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
    	setup/db/db/schema-410to420.sql

commit 3dbfb44eb5
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 20:33:19 2013 +0530

    - add 'portable' boolean as property of IpAddress, persist the property in
    IPAddressVO, return the property in IpAddressResponse

    - add ability to request portable IP in associateIpAddress api

commit bf3cb274cf
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 16:08:40 2013 +0530

    add the status of each portable IP (its state, details of associated data
    center/VPC/guest network etc) in the PortableIpRangeResponse returned by
    listPortableIpRanges API

commit e7b2fb2255
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 14:36:01 2013 +0530

    Introdcues notion of 'portable IP' pool at region level.

    Introduces root admin only API's to provision portable ip to a region
       - createPortableIpRange
       - deletePortableIpRange
       - listPortableIpRanges
2013-05-20 20:05:47 +05:30
Devdeep Singh f5c8e386e5 CLOUDSTACK-2379: Fix for issue destroy vm causing NPE. Made the following changes.
1. Made a fix to make sure a null object is added to the exception.
2. Also fixed the marvin test cases for the feature. Account cleanup will remove the vms deployed for the account. There is no need to explicitly delete the vms for the account.
3. Fixed the assertion checks for the vm created for an account. If there are multiple vms for an account, the test script needs to compare the ids with the correct instance.
2013-05-20 18:26:50 +05:30
Kishan Kavala 612afbd179 CLOUDSTACK-2553: Made ACL item action case-insensitive 2013-05-20 18:06:12 +05:30
Sanjay Tripathi a2fea4d449 CLOUDSTACK-2297 : Delete Account/Domain is not updating the resources usage of the parent domain 2013-05-20 14:08:31 +05:30
Isaac Chiang 63e92a4ea6 CLOUDSTACK-1871 : domainId parameter to uploadVolume not working
1. Remove duplicated lines for setting domainId.
2. Set domainId with owner's domain if the owner is specified.
2013-05-20 08:54:13 +08:00
Prasanna Santhanam 85d54cd1c0 CLOUDSTACK-2554: Incorrect compute of minmemory and cpu
23e54bb0 introduced multiple hypervisors support for cpu and memory
overcommit. Here the HypervisorGuru base which determines the min, max
range for the memory for all hypervisors computes the minCpu using the
MemoryOverCommit ratio and minMemory using the CpuOverCommit ratio.

Minor typo/logic issue but massive damage across all HV if enabled ;)

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:27 +05:30
Prasanna Santhanam 6ea2b06aab Fixing multiple minor annoyances:
1. Keeping the description consistent - Memory not RAM when referring to
overcommit
2. getters And setters grouped, provided right casing.
3. Removed wildcard imports

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:26 +05:30
Prachi Damle 1851f7f7f6 CLOUDSTACK-2365: Anti-Affinity - As admin , we are allowed to deploy a Vm in an affinity group that belongs to different user.
CLOUDSTACK-2349: Anti-Affinity - As admin user , using updateVMAffinityGroup() , we are allowed to update the affinity group of a Vm (that belongs to a regular user) to be set to admin's affinity group.

Changes:
- Even for root-admin make sure that the affinity group and the VM belong to same account
2013-05-17 15:33:01 -07:00
Prachi Damle 31a67706e4 CLOUDSTACK-2070: Anti-Affinity - When Vm deployment fails because of not being able to satisfy the anti-affinity rule , user should be provided with more informative message.
Changes:
- There is no good mechanism currently to figure out if the  deployment failed due to affinity groups only
- We can just hint the user that the deployment might have failed due to the affinity groups and ask to review the input
2013-05-17 14:36:23 -07:00
Nitin Mehta 4eb310e926 iCLOUDSTACK-2321
Fix the response of scaleVMCmd
Add Scale System vm command
2013-05-17 17:43:43 +05:30
Devdeep Singh e520ff4568 CLOUDSTACK-2122. Virtual machine id should be a required parameter for findHostsForMigration api. Fixing it. 2013-05-17 17:01:17 +05:30
Edison Su f7c1b711ad merge to master 2013-05-16 23:56:20 -07:00
Devdeep Singh adbebc1892 Changes for implicitly dedicating a resource. It includes a following:
1. A new implicit planner which extends the functionality provided by FirstFitPlanner.
2. Implicit planner can be used in either strict or preferred mode. In strict mode it tries to deploy a vm of a given account on a host on which vms of the account are already running. If no such host is found it'll search for an empty host to service the request. Otherwise the deploy vm request fails.
3. In preferred mode, if a host which is running vms of the account or an empty host isn't found, the planner then tries to deploy on any other host provided it isn't running implicitly dedicated strict vms of any other account.
4. Updated the createServiceOffering api to configure the details for the planner that the service offering is using.
5. Made db changes to store the service offering details for the planner.
6. Unit tests for testing the implicit planner functionality.
7. Marvin test for validating the functionality.
2013-05-17 11:40:31 +05:30
Likitha Shetty caf0dd22b7 Dedicate Public IP range - If every public ip range in the system is dedicated when an account with no dedicate ranges
acquires a new public ip the request should fail
2013-05-17 09:51:10 +05:30
Mice Xia 3ed9e42dd2 fix null pointer dereference in cloud-server 2013-05-17 09:44:01 +08:00
Prachi Damle 890603be37 Unit test does not use this file anymore. 2013-05-16 15:28:02 -07:00
Prachi Damle a2eb7bab1e CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
- Changes merged from planner_reserve branch
- Exposing deploymentplanner as an optional parameter while creating a service offering
- changes to DeploymentPlanningManagerImpl to make sure host reserve-release happens between conflicting planner usages.
2013-05-16 15:02:17 -07:00
Vijayendra Bhamidipati 15be97772e PVLAN : Implementing PVLAN deployment capability for VMware deployments in cloudstack. 2013-05-16 14:50:16 -07:00
Kishan Kavala d078f92167 CLOUDSTACK-2544: Fix NPE while comparing lastHostId during capacity calculation 2013-05-16 19:14:41 +05:30
Murali Reddy f441582e1b CLOUDSTACK-2378: assignToGSLBRule or removeFromGlobalLoadBalancerRule APIs are failing when there are multiple physical network in a zone
adding support for deployments where multiple physical networks are configured for guest traffic in a zone
2013-05-16 18:26:14 +05:30
Murali Reddy d2d0398e33 CLOUDSTACK-2529: GlobalLoadBalancerResponse should have the full FQDN
for the global load balanced service
2013-05-16 15:19:41 +05:30
Mice Xia e26442f7d0 instead of '==', use equals() to compare two strings in cloud-server 2013-05-16 16:18:53 +08:00
Mice Xia 6d57393629 instead of using '==', use equals() to test Long value equality 2013-05-16 16:00:02 +08:00
Saksham Srivastava e260817318 CLOUDSTACK-2130: UpdateDefaultNicForVirtualMachine api should also create usage events for updating new default network
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-05-16 14:22:36 +08:00
Wei Zhou 3fa8fda37c CLOUDSTACK-962: Because of the same reason to this (CLOUDSTACK-685)
https://reviews.apache.org/r/11157/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-15 19:41:49 -07:00
Jayapal 56e8da7890 CLOUDSTACK-2134 updated acl checks for aquiring nic secondary ip 2013-05-15 19:41:49 -07:00
Likitha Shetty fd354dbd7c CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 19:41:49 -07:00
Jayapal 85789534f0 CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 19:41:49 -07:00
Wei Zhou 1f5ae4bae3 CLOUDSTACK:685 Fix user stat collection in PrepareStop part of VirtualNetworkApplianceImpl 2013-05-15 19:41:48 -07:00
Sanjay Tripathi 88422248cc CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 19:41:48 -07:00
Nitin Mehta 4c9ca2b502 CLOUDSTACK-2459 Fix the scale vm tests 2013-05-15 19:41:47 -07:00
Kishan Kavala c75b1894bc Updated network acl service test to avoid default ACL modification 2013-05-15 19:41:47 -07:00
Kishan Kavala 2dc076f232 CLOUDSTACK-2487: Show error while adding acl_item to default ACL 2013-05-15 19:41:47 -07:00
Min Chen b66c484905 Fix size issue in copying template from S3 to cache storage to make
system vm up.
2013-05-15 18:54:55 -07:00
Min Chen d5050d3157 Fix ExtractVolume bug in generating URL. 2013-05-15 18:53:22 -07:00
Sheng Yang 2d2c0c48cd Merge branch 'pvlan'
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2013-05-15 16:08:08 -07:00
anthony 297115cac5 CLOUDSTACK-737
add xenserver support in UI
     only XenServer and KVM clusters are allowed in security enabled zone.
     only shared security enabled networks are allowed in security enabled zone.
2013-05-15 14:53:48 -07:00
anthony b32d7c026c CLOUDSTACK-737,
allow to add security group enabled networks in security group enabled zone
2013-05-15 14:53:48 -07:00
Prachi Damle ddd7cfd71c CLOUDSTACK-2519: VMs on local storage incorrectly destroyed when removing another host using deleteHost API
- For DeleteHost API: Search for Volumes in READY state on the local storage of the host to find VM's in 'Running' State
- For PrepareForMaintenance API: Search for Volumes not in Destroy or Expunging state to check if the Local Storage on the host is being used.
2013-05-15 13:28:41 -07:00
Alena Prokharchyk 9f59c618e2 CLOUDSTACK-2517: fixed private gateway creation. Following fixes went in:
1) Only PrivateNetworkGuru handles network creation for the private gateway. Exluded Guest Network Guru from this list (was mistakenly included as a part of merge for Nicira integration)
2) Pass vpc_id to createNetwork call when the network is created as a part of private gateway creation
3) Fixed VPC restart when there are multiple private gateways present (have to grab all the private gateways when creating nic profiles for the VPC router that is being re-created)
4) 41-42 db upgarde: set vpc_id for the private networks of the existing VPCs
2013-05-15 13:12:51 -07:00
Wei Zhou 8f7a51ee5f CLOUDSTACK-962: Because of the same reason to this (CLOUDSTACK-685)
https://reviews.apache.org/r/11157/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-15 16:39:22 +01:00
Jayapal 36a312d4b2 CLOUDSTACK-2134 updated acl checks for aquiring nic secondary ip 2013-05-15 18:08:15 +05:30
Likitha Shetty f893aa8a78 CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 18:05:01 +05:30
Jayapal 9b6513466f CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 16:45:52 +05:30
Wei Zhou 7370638915 CLOUDSTACK:685 Fix user stat collection in PrepareStop part of VirtualNetworkApplianceImpl 2013-05-15 16:45:52 +05:30
Sanjay Tripathi 9542f10592 CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 15:28:37 +05:30
Nitin Mehta 24cdddbf5e CLOUDSTACK-2459 Fix the scale vm tests 2013-05-15 14:25:39 +05:30
Kishan Kavala 39caa0ebdd Updated network acl service test to avoid default ACL modification 2013-05-15 14:20:29 +05:30
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Kishan Kavala 3388b77156 CLOUDSTACK-2487: Show error while adding acl_item to default ACL 2013-05-15 12:51:08 +05:30
Edison Su 879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Min Chen c6a5a7ee00 Fix CLOUDSTACK-2495: public templates are not visible to non-root users. 2013-05-14 21:52:29 -07:00
Min Chen 564d3d6fa0 Fix CLOUDSTACK-2488: Delete iso async job is running forever. 2013-05-14 16:12:49 -07:00
Alena Prokharchyk 26cefdcfac When UUID field is null for existing records, set it to id
Conflicts:
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
2013-05-14 15:11:41 -07:00
Min Chen 252f384e89 Fix CLOUDSTACK-2485: ClassCastException in extracting ISO. 2013-05-14 14:57:02 -07:00
Min Chen 03c255068b Fix CLOUDSTACK-2484: not able to deploy VM from registered ISO. 2013-05-14 14:57:02 -07:00
Min Chen 2102ede2e7 Fix CLOUDSTACK-2469: default template is not downloaded. 2013-05-14 11:42:24 -07:00
Jayapal 46f8b6f34a CLOUDSTACK-2400 updated the error message and replacenetworkacl on private gateway 2013-05-14 16:11:33 +05:30
Jayapal c94c71b4ce CLOUDSTACK-2441: Fix deleting private gateways while deleting vpc in case multiple private gateways 2013-05-14 16:10:38 +05:30
Alena Prokharchyk dfdc089668 CLOUDSTACK-2465: fixed network creation in VPC - removed extra call to createGuestNetwork introduced by the NetworkACL feature merge 2013-05-13 15:28:08 -07:00
Sheng Yang 065d2561b9 CLOUDSTACK-2392: Not allow create pvlan network with ipv6 2013-05-13 11:40:40 -07:00
Min Chen e6faa47a4b Remove unnecessary state machine entry after refactoring
sendMessageAsyncWithListener to use sendMessageAsync.
2013-05-13 11:36:44 -07:00
Jayapal Reddy 2d950e2858 CLOUDSTACK-768: ACL on private gateway 2013-05-13 19:24:23 +05:30
Nitin Mehta bcc320f8b0 Scale vm test failing..commented for now to unblock all. Will open a bug for the same 2013-05-13 18:32:01 +05:30
Nitin Mehta 573f529ea0 mvn install didnt point me the compilation errors...fixing them 2013-05-13 18:18:56 +05:30
Nitin Mehta f84b6abde0 merge with master 2013-05-13 17:30:42 +05:30
Bharat Kumar 052c24c4d1 CLOUDSTACK-702: Multiple ip ranges in different subnets.
This feature enables adding of guest ip ranges (public ips)  form different subnets.

In order to provide the dhcp service to a different subnet we create an ipalias on the router. This allows the router to listen to the dhcp request from the guest vms and respond accordingly. Every time a vm is deployed in the new subnet we configure an ip alias on the router. Cloudstack uses dnsmasq to provide dhcp service. We need to configure the dnsmasq to issue ips on the new subnets. Added a new class dnsmasqconfigurator which generates the dnsmasq confg file, this file replaces the old config in the router.

The details of the alias ips are stored in db in the nic_ip_alias table. Every time a new subnet is added one of the ip from the subnet is used to configure the ip alias.

I have pushed the code to  https://github.com/bvbharatk/cloud-stack/tree/Cloudstack-702 , also rebased the code with master.
I need to test the code for advanced sg enabled network using kvm.

I have added the unit test
Marvin tests are at https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=53e4965

Also accomodated some of the changes suggested by koushik.
corrected the import statements. renamed the IpAlias command to createIpAlias command.

This feature supports only ipv4
2013-05-13 17:06:44 +05:30
Nitin Mehta 8d53b1ef05 merge with master 2013-05-13 16:36:41 +05:30
Kishan Kavala 595f78f0f7 update APICmd imports 2013-05-13 12:03:39 +05:30
Kishan Kavala 5e009c4bcd CLOUDSTACK-763: Added comments and removed unused imports 2013-05-13 12:03:39 +05:30
Kishan Kavala 5e1d216197 CLOUDSTACK-763: Added unit tests and integration test 2013-05-13 12:03:39 +05:30
Kishan Kavala 14e992e953 CLOUDSTACK-763: Removed unused methods 2013-05-13 12:03:39 +05:30
Kishan Kavala 49fbff21fa CLOUDSTACK-763: Added API updateNetworkACLItem to update an existing ACL Item 2013-05-13 12:03:39 +05:30
Kishan Kavala b30a01a705 CLOUDSTACK-763: Added acl_id param to createNetwork API. Backend changes for acl_deny. Support for all protocol and protocol number 2013-05-13 12:03:38 +05:30
Kishan Kavala 750bfe76ca CLOUDSTACK-763: Added filters to list APIs. Seperated service interface implementation to NetworkACLServiceImpl. Added default ACL to upgrade schema 2013-05-13 12:03:38 +05:30
Kishan Kavala 3322063067 CLOUDSTACK-763: Fixed source CIDR and apply ACL items 2013-05-13 12:03:38 +05:30
Kishan Kavala e2449cfcf0 CLOUDSTACK-763: Added replaceNetworkACLList API. Added support for ACL action allow/deny and also number 2013-05-13 12:03:38 +05:30
Kishan Kavala ebf8a7fd1e CLOUDSTACK-763: Added APIs to create, delete and list NetworkACLlist. 2013-05-13 12:03:38 +05:30