Commit Graph

1569 Commits

Author SHA1 Message Date
Wido den Hollander ce06d6542a CLOUDSTACK-3951: Don't require SSH access to KVM nodes when cancelling maintenance 2013-07-31 15:07:32 +02:00
Alena Prokharchyk 95fde83815 CLOUDSTACK-3936: db upgrade - added upgrade path from CCP 2.2.15,2.2.16 to CS 4.2 2013-07-30 10:53:23 -07:00
Edison Su d64c318f57 CLOUDSTACK-3510
Persist the download url in the db for volume download.
Signed off by : nitin mehta<nitin.mehta@citrix.com>

Conflicts:

	server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-29 11:50:15 -07:00
Alena Prokharchyk 399c37345d CLOUDSTACK-3898: fixed 303-42 db upgrade - handle situation when the field is already inserted, when try to insert it again with 41-42 upgrade 2013-07-29 10:43:04 -07:00
Harikrishna Patnala 2f369973e2 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 15:25:07 +05:30
Min Chen 1fb513e783 CLOUDSTACK-3861: Remove s3.enable and swift.enable from global setting. 2013-07-27 21:56:46 -07:00
Murali Reddy 171128054c CLOUDSTACK-3834: 3.0.6 to ASF 4.2 Upgrade: "cloud" Database Schema
Inconsistencies on the Upgraded Setup - Table "netscaler_pod_ref"

adding netscaler_pod_ref table 3.0.7 to 4.1 upgrade path
2013-07-27 17:19:56 +05:30
Abhinandan Prateek cf6e125d81 CLOUDSTACK-3480: updated md5 checksum 2013-07-27 17:09:40 +05:30
Sanjay Tripathi f33c887b03 CLOUDSTACK-3544: Patch to support upgrade to Xenserver 6.2
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-27 15:36:01 +05:30
Abhinandan Prateek f177f733f1 CLOUDSTACK-3480: updated the 4.2 templates download location 2013-07-27 11:41:47 +05:30
Sanjay Tripathi d6368872a7 CLOUDSTACK-3723: System VM Template for XenServer has wrong guest OS type Information on the Database.
This commit also contains the guestOS addition of new CentOS releases
supported by XenServer 6.2

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-27 11:11:59 +05:30
Alena Prokharchyk 8cac1e0443 DB upgrade: upgraded the bunch of db upgrade files with Apache license header 2013-07-26 15:37:07 -07:00
Alena Prokharchyk 6a916b9e82 DB upgrade: added db upgrade paths for CloudPlatform (Citrix) releases 303,304,305,306,307 to 4.2 2013-07-25 16:39:16 -07:00
Ian Duffy eaa4143371 Merge LDAPPlugin
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-25 17:54:52 +05:30
Edison Su fa358cf01f CLOUDSTACK-2630: fix delta snashpt 2013-07-24 09:48:41 -07:00
Edison Su be3883b678 fix create template from snapshot if it's swift 2013-07-24 09:48:07 -07:00
Saksham Srivastava 2b9d9cf036 CLOUDSTACK-3612: DB changes for template virtual size usage
Conflicts:
	setup/db/db/schema-410to420.sql
2013-07-24 18:19:39 +05:30
Likitha Shetty 7e87221372 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:44:39 +05:30
Min Chen ad269304f6 CLOUDSTACK-3684:Failed to start MS due to missing UCS configuration
values in DB.
2013-07-20 12:26:31 -07:00
Min Chen 24fc147ee8 System Template shows twice in listTemplates with S3 as secondary
storage.
2013-07-19 16:47:08 -07:00
Harikrishna Patnala 499b78bf09 CLOUDSTACK-3601: Adding router.template.xen/vmware/kvm/lxc/hyperv parameters in upgrade setup
Signed-off-by: Jayapal <jayapal@apache.org>
2013-07-19 14:40:13 +05:30
Koushik Das d7a7c09055 CLOUDSTACK-3648: 3.0.6 to ASF 4.2 Upgrade: "hypervisor_capabilites" table has duplicate VMware 5.1 entries on the Upgraded Setup
Added a unique constraint on "hypervisor_capabilities" table based on hypervisor type and version
2013-07-19 12:12:51 +05:30
Alena Prokharchyk ca1f8a6632 CLOUDSTACK-3612: fixed missing indexes in some cloud tables. In the bug those tables are addressed as table #4, table #5, and table #6
Conflicts:
	setup/db/db/schema-410to420.sql
2013-07-18 16:00:19 -07:00
Abhinandan Prateek 5f373eb5c1 CLOUDSTACK-3606: adding the new os types from upgrade from 4.1 2013-07-18 15:45:26 +05:30
Min Chen c0db80fa1d CLOUDSTACK-3601:add s3.rrs.enabled config parameter in upgrade setup. 2013-07-17 14:07:35 -07:00
Bharat Kumar dd33abffbe Cloudstack-2997 Make haproxy maxconn configurable
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Prasanna Santhanam c79b8270a8 Adding a sample configuration for the s3 enabled store
This sample marvin configuration can be used to add an s3 backed object
store to cloudstack. You will have to replace the ACCESS_KEY/SECRET_KEY
and bucket endpoint (if not using aws) to match your credentials.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-16 23:01:15 +05:30
Devdeep Singh 322bc9c5d7 CLOUDSTACK-3497: Updated the hypervisor_capabilities table to include capabilities for xenserver 6.2.
Also made a change to update the capabilities for storage motion support based on hypervisor type and
version. It was being done based on 'id'.
2013-07-15 11:55:55 +05:30
Alena Prokharchyk dd91974920 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:44:12 -07:00
Edison Su 7eb3d49e8e fix db upgrade 2013-07-10 14:50:51 -07:00
Jessica Wang ec42d7236c CLOUDSTACK-2988: API - Template Response - add isdynamicallyscalable property. 2013-07-10 13:51:54 -07:00
Sheng Yang da8b1ef81a CLOUDSTACK-3417: Remove baremetal foreign key in upgrade path
They're already handled by java code.
2013-07-10 11:31:24 -07:00
Koushik Das aed49572c7 CLOUDSTACK-2918: In a scaled up environment, hosts fail to come up after Management server restart in clustered set up
Summary of changes in the fix
- Optimized host scan logic, now instead of iterating over each cluster host scan is done for a batch of clusters
- Made host scan task interval configurable
2013-07-10 12:13:24 +05:30
Harikrishna Patnala d249bc7ce6 CLOUDSTACK-3354: The CentOS built-in is dynamically scalable
Marking default CentOS template as dynamically_scalable template. The
PV tools are installed in our CentOS 5.6 template already.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-08 12:24:48 +05:30
Alena Prokharchyk 8a0470ee0f CLOUDSTACK-3207: added resourceLimit/resourceCount to the Project API response
Conflicts:
	setup/db/db/schema-410to420.sql
2013-07-02 15:34:08 -07:00
Min Chen 05f4680735 CLOUDSTACK-3314: ListTemplates only show one entry for cross-zone
templates.
2013-07-02 13:54:40 -07:00
Murali Reddy 2f3764ef94 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:55:58 +05:30
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
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
Hiroaki KAWAI 2d6369c826 CLOUDSTACK-2756: Stratosphere SSP plugin
Stratosphere SSP is an SDN solution which creates virtual L2
networks backed by vxlan and vlan. SSP will ask hypervisor to set a
specific vlan, then SSP will interact with openflow switches and
put vxlan/vlan translation flow rules.

This plugin provides SSP as "connctivity" service provider.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-25 15:31:40 +09:00
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
Abhinandan Prateek 59d7c94247 CLOUDSTACK-3136: added Centsor 6.3 and Ubuntu 11.04 guest OS for Xen 6.1 2013-06-22 16:04:55 +05:30
Sheng Yang 2edfa9a7f2 Baremetal: DB upgrade
Conflicts:
	setup/db/db/schema-410to420.sql
2013-06-21 09:47:45 -07:00
Prasanna Santhanam 694391ad04 add required provider for NFS storage
Changing the sandbox scripts and the marvin-checkin-test configurations
to include the required 'provider' argument when adding an image store
(secondary storage)

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-20 16:44:49 +05:30
Prasanna Santhanam c295341cbd image_data_store is not part of vm_template anymore
Revert "CLOUDSTACK-1744: It's due to db upgrade issue. On master,
deploydb will upgrade db to 4.2, which will update vm_template's
image_data_store_id, while deploydb-simulator adds a new column in
vm_template table, which doesn't set image_data_store_id, thus causing
NPE."

This reverts commit 33937c980e.

Conflicts:
	setup/db/templates.simulator.sql

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-20 16:44:49 +05:30
Edison Su 97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
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
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
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Min Chen 5cd6d6944a CLOUDSTACK-3015: VPC virtual router lists deleted nics 2013-06-19 14:12:39 -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
Ian Service 779763fdfd CLOUDSTACK-3054 - Have ssh key initscript handle SELinux permissions 2013-06-18 10:39:31 -04:00
Wei Zhou 882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02: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
Prasanna Santhanam 28b598b4ac Fix VPC tests related to user roles
Many vpc tests fail because of incorrect apiClient passed in to create
the VPC, network etc. The exact method used is getUserApiClient to fetch
the apiclient for a specific user.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-17 17:32:05 +05:30
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -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
Wei Zhou 8b4d853091 CLOUDSTACK-3005: fix template_spool_ref.local_patch error after upgrade from 2.2.14 to 3.X 2013-06-14 10:32:47 +02:00
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3ce) into object_store.
2013-06-12 11:20:32 -07:00
Prasanna Santhanam ef0e0f36b2 deployment planners plan per clusters not hosts
Concentration or Dispersion granularity is at the Cluster level and not
at the host level. So correcting the test to ensure

a. concentrated planner puts the VMs in same cluster
b. dispersed planner puts the Vms in diff't clusters

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-10 20:40:07 +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
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 2705f01651 CLOUDSTACK-2029 zone wide primary storage support for cloudstack over vmware deployments
Added new column 'hypervisor' to table storage_pool to associate a identify a pool at zone level by hypervisor type.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-01 00:05:27 +05:30
Sateesh Chodapuneedi 5c523eb892 Add hypervisor capability storage_motion_supported for VMware 5.0 and 5.1
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 21:19:27 +05:30
Sateesh Chodapuneedi 3696605ad6 CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter
DB schema changes to support this feature.
Added 3 new tables.
'vmware_data_center' to persist information about each Vmware datacenter known to cloudstack.
'vmware_data_center_zone_map' to persist mapping information of a Vmware datacenter & cloudstack zone.
'legacy_zones' to persist the known legacy zones in the deployment.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:46 +05:30
Min Chen 9378820b9e Revert 285e8213fe, since it is already
covered by recent commit 08ac8fb468 in a
more robust way to handle upgrade.
2013-05-30 09:54:42 -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
Nitin Mehta 8d1189c2ae CLOUDSTACK-2060
Global config to turn off dynamically scale vm functionality
2013-05-29 19:02:06 +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
Anthony Xu 19a1116df2 Merge branch '4-2-advanced-zone-security-group' 2013-05-28 11:03:56 -07:00
Alena Prokharchyk b0a9adeffe Advance SG enabled zone. Moved following db upgrade change from 40-41 to 41-42 db upgrade path:
Adnvace Zone with SG enabled: DB upgrade for Advance SG enabled zone - setup name/displayText for Guest Shared SG enabled network (it used to be system network, and name was never set for it in 2.2.x)
2013-05-28 10:51:12 -07:00
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
Nitin Mehta a688d63104 CLOUDSTACK-2689
Create volume after upgrade from snapshot taken in 2.2.14 deletes the snapshot physically from sec. storage. Added DB upgrade sql to make swift_id NULL if they are set to 0
2013-05-27 14:16:16 +05:30
Chip Childers 09d2fe6a7d CLOUDSTACK-528: Adding a corrective update to remove the extra space characters that exist after running older versions of schema-302to40.sql
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-24 17:07:01 +01:00
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
Kishan Kavala 3e02a76f00 CLOUDSTACK-528: Config value has to be encrypted for Hidden category configs 2013-05-24 12:37:18 +05:30
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Min Chen cf8ff0cc65 Populate UUID column for new data introduced in 4.2.0. 2013-05-23 15:43:14 -07:00
Min Chen a46b4d8273 CLOUDSTACK-2656: UUID column for all 4.0 schema entities should be
populated when they are upgraded to 4.1
2013-05-23 15:15:13 -07:00
Anthony Xu e8fbee0e18 firewall service is not supported in shared SG enabled network offering , remove it 2013-05-23 14:19:43 -07:00
Murali Reddy 623a26e469 CLOUDSTACK-2587: netscaler_pod_ref DB upgrade is missing from 3.0.2 to
4.x

added missing schema as part of 4.0 to 4.1 upgrade
2013-05-23 22:28:17 +05:30
Chip Childers cc492305ce CLOUDSTACK-2612: Correcting missing db qualifiers in schema-302to40.sql
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-23 17:50:47 +01:00
Koushik Das 4e7f87681c CLOUDSTACK-1396: uuid field is NULL in hypervisore_capability table for Vmware ESXI 5.1
Adding uuid at the time of inserting new entry in hypervisor_capabilities table
2013-05-23 16:07:26 +05:30
Wei Zhou e6863c612b Integration test for advanced zone with security groups
Description:
This patch includes three parts for advancedsg:
(1) Marvin support.
(2) devcloud support.
(3) integration test scripts

Testing Done:
devcloud testing ok.

Signed-off-by: Anthony Xu <anthony.xu@citrix.com>
2013-05-22 15:39:22 -07:00
Min Chen 8a956203d1 ListImageStores still show those deleted image stores. 2013-05-22 14:33:40 -07:00
Edison Su eb0a7489b4 remove format from volume_store table 2013-05-22 13:47:09 -07:00
Edison Su 5af888c67a add image format in volumevo 2013-05-22 13:38:11 -07:00
Edison Su 383be568b3 CLOUDSTACK-2527: enable attach/detach xs tool iso 2013-05-21 19:13:29 -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
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
Alena Prokharchyk 7cae8ca231 CLOUDSTACK-751: 41-42 DB upgrade - insert new global config blacklisted.routes 2013-05-17 15:07:21 -07:00
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
Alena Prokharchyk 35de50debf cloud-sysvmadm: 1) added -z paramters. If specified, restrict system vm restarts to specific zone. If not specified, the intances will be restarted in all zones. 2) Fixed the help for restartNetwork option. It gets triggered by -n, not -e parameter 2013-05-16 17:05:38 -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
Joe Mills 21cb2c67b2 Midonet Plugin bugfixes
* Updated SQL upgrade scripts to include midonet configs.
* Fixed bug where default ICMP allow rule was missing
  on static NAT creation, keeping VMs from being able
  to ping the gateway.
* Changed the filter in the MidoNetElement callbacks to allow
  calls when Midonet is configured.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-05-15 19:41:49 -07:00
Alena Prokharchyk 3bb81313ad Adnvace Zone with SG enabled: DB upgrade for Advance SG enabled zone - setup name/displayText for Guest Shared SG enabled network (it used to be system network, and name was never set for it in 2.2.x) 2013-05-15 13:59:37 -07:00
Joe Mills 987c3427dd Midonet Plugin bugfixes
* Updated SQL upgrade scripts to include midonet configs.
* Fixed bug where default ICMP allow rule was missing
  on static NAT creation, keeping VMs from being able
  to ping the gateway.
* Changed the filter in the MidoNetElement callbacks to allow
  calls when Midonet is configured.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-05-15 17:06:00 +02:00