Commit Graph

1663 Commits

Author SHA1 Message Date
Jayapal Uradi aedb8c478e CLOUDSTACK-24: mipn feature for isolated and vpc networks
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
 https://issues.apache.org/jira/browse/CLOUDSTACK-24
2013-03-04 11:02:09 +05:30
Min Chen 8b9c45b96d Merge branch 'master' into vim51_win8
Conflicts:
	setup/db/db/schema-40to410.sql
2013-03-01 16:46:58 -08:00
Abhinandan Prateek 14791a9d8f Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes."
This reverts commit f9d96c9169.
2013-03-01 22:29:47 +05:30
Jayapal Uradi f9d96c9169 CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes. 2013-03-01 16:40:26 +05:30
frank bd0fc2f354 CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh

Conflicts:

	client/pom.xml
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
2013-02-28 15:42:48 -08:00
Min Chen 801e5269ea Merge branch 'master' into vim51_win8 2013-02-28 14:25:26 -08:00
Kishan Kavala 1d31c3ecaf CLOUDSTACK-241: Moved regions upgrade changes to Upgrade40to41.jav from schema file. Sets the right regins_id from db.properties instead of using default 1.
Conflicts:
	setup/db/db/schema-40to410.sql
2013-02-28 14:35:23 +05:30
Min Chen 93f14e7c65 Merge branch 'master' into vim51_win8
Conflicts:
	client/tomcatconf/componentContext.xml.in
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/test/com/cloud/vmware/TestVMWare.java
2013-02-27 17:47:10 -08:00
Rohit Yadav e2bd88b2a1 db: Give option to specify region id while setting up database
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-27 15:03:14 +05:30
Min Chen 8aba25f18d Merge branch 'master' into vim51_win8
Conflicts:
	setup/db/db/schema-410to420.sql
2013-02-26 14:12:36 -08:00
Kishan Kavala e37fdce125 CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil.
Converted tabs to spaces in the related files.
Verified account, user and domain APIs.
2013-02-26 14:21:21 +05:30
Rohit Yadav 755ddc52d1 db: Re-enable db foreign key checking at the end of the upgrade path
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 12:32:21 +05:30
Sheng Yang cf90b6cd10 CLOUDSTACK-1332: Add ip6dns to zone and domainrouter response 2013-02-25 19:12:09 -08:00
Sheng Yang 1b408509d6 CLOUDSTACK-1332: Add IPv6 DNS for Zone 2013-02-25 16:08:10 -08:00
frank cd291f6b4b From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001
From: Vijayendra <vijayendra.bhamidipati@citrix.com>
Date: Mon, 25 Feb 2013 14:37:27 -0800
Subject: [PATCH] CS-670: Configurable setting to use linked clones or not on
 VMware

Description:

  Providing support for creation of user VMs as full clones on ESX.
  Putting in unit tests for VO and Dao classes introduced in this commit.

Signed-off-by: Vijayendra <vijayendra.bhamidipati@citrix.com>
---
 core/src/com/cloud/vm/UserVmCloneSettingVO.java    |  50 ++++++
 .../hypervisor/vmware/manager/VmwareManager.java   |   3 +
 .../vmware/manager/VmwareManagerImpl.java          |  18 +-
 .../hypervisor/vmware/resource/VmwareResource.java | 117 +++++++++----
 server/conf/migration-components.xml               |   1 +
 server/src/com/cloud/configuration/Config.java     |   1 +
 server/src/com/cloud/vm/UserVmManagerImpl.java     | 184 ++++++++++-----------
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java    |  37 +++++
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |  74 +++++++++
 .../vm/dao/UserVmCloneSettingDaoImplTest.java      |  62 +++++++
 .../UserVmCloneSettingDaoTestConfiguration.java    |  52 ++++++
 .../test/resources/CloneSettingDaoTestContext.xml  |  42 +++++
 setup/db/db/schema-410to420.sql                    |   9 +
 13 files changed, 527 insertions(+), 123 deletions(-)
 create mode 100755 core/src/com/cloud/vm/UserVmCloneSettingVO.java
 create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDao.java
 create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
 create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java
 create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java
 create mode 100644 server/test/resources/CloneSettingDaoTestContext.xml
2013-02-25 14:57:57 -08:00
Min Chen fbfc5c6894 Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
Vijayendra Bhamidipati 6675d2c1a3 CLOUDSTACK-778: user provided hostname to be specified in vCenter instead of CloudStack generated name
Introducing flag to allow display name to be appended to internal instance name.
2013-02-25 18:57:18 +05:30
Kishan Kavala 836ce6c11a CLOUDSTACK-749: External device support for VPC. VPC offering can be created with providers other than VPCVirtualRouter 2013-02-25 18:32:23 +05:30
Hugo Trippaers 8761a1d0db CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges
Missed a few lines, did someone mention something about testing
recently?
2013-02-22 22:30:28 +01:00
Hugo Trippaers 1ad363e44a CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges
related to commit 5f8a2ee9be. The field image_data_store_id should not be used in templates.sql as  it does not exist yet. Should be filled during the upgrade from 4.1 to 4.2, but i'm leaving that to Edison.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-22 16:22:17 +01:00
Rohit Yadav 54f7933f11 CLOUDSTACK-1355: Don't check foreign key constraint during db upgrades
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-22 19:28:07 +05:30
Rohit Yadav 5f8a2ee9be CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-22 19:15:01 +05:30
Saksham Srivastava ea3db2f073 CLOUDSTACK-705 IP Address reservation for Isolated Guest Networks
CloudStack uses Guest CIDR for dhcp-range for the Guest VMs. The entire
CIDR is used by CloudStack for assigning IPs to Guest VMs. IP Address
Reservation will allow part of address space to be used fornon CloudStack
hosts/physical servers also, by restricting the address space of CloudStack
Guest VMs. Reservation can be configured using update Network API by specifying
guestvmCidr as an additional parameter. Reservation will be applicable for
Isolated Guest Networks including VPC. reservediprange in the response
will return the IP range that can be used for non Cloudstack hosts.

Tested manually the following scenarios:
Applying reservation when there are running VMs inside the
guest_vm_cidr.
Applying reservation when there are running VMs outside the
guest_vm_cidr.(not allowed)
Applying reservation when external device like Netscaler is configured
in the guest_cidr.
Applying reservation in VPC tiers.
Applying reservation outside the range of guest_cidr.(not allowed)
2013-02-22 15:50:33 +05:30
frank 8a523476ec CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

remove workaround for unable to deploydb
remove wrongly added region upgrade entries
2013-02-21 15:48:26 -08:00
frank 15ead099a1 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

able to start vm

Conflicts:

	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
	server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-21 15:48:08 -08:00
Edison Su 18e496b057 rebase to master 2013-02-21 11:22:50 -08:00
Edison Su a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Rohit Yadav 59db01ce6e CLOUDSTACK-1347: Don't enforce not null rule on queue_proc_time of sync_item_queue
In c63dbb8804 I removed the rule from create-schema:
-  `queue_proc_time` datetime COMMENT 'when processing started for the item',

But, upgrade path schema-40to410.sql had a different rule which caused the bug:
+ALTER TABLE `cloud`.`sync_queue_item` ADD `queue_proc_time` DATETIME NOT NULL
COMMENT 'when processing started for the item' AFTER `queue_proc_number`;

In this fix we just revert to whatever rule was defined in create-schema as the
developer may have forgetten to fix same rule in create-schema and upgrade path.
This commit can be reverted or the code be fixed if we want that queue_proc_time
cannot be null.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-21 15:01:00 +05:30
Harikrishna Patnala 7a3f072a50 CLOUDSTACK-745: Reset a VM on reboot. On every reboot of VM, the root disk state is reset. This is for the VMs created using service offering where an optional parameter isvolatile is set true.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-02-21 14:59:35 +05:30
Rohit Yadav c8a2eb5387 CLOUDSTACK-1312: Remove remaining db schema diversions since 4.0
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 15:52:44 +05:30
Sheng Yang 483a11ce95 IPv6: Fix build of master
All the table column should be modified before view was added
2013-02-19 21:13:12 -08:00
Sheng Yang 4d80b71ec0 IPv6: Revoke the change of create-schema.sql
The change is in scheme-40to410.sql now.
2013-02-19 16:46:03 -08:00
Sheng Yang 817548bac1 IPv6: Add ipv6 for user vm view 2013-02-19 15:50:55 -08:00
Sheng Yang da75e4ac8a IPv6: Add IPv6 for domain router view 2013-02-19 15:50:23 -08:00
Sheng Yang 05069bb4d9 Add db upgrade path for ipv6 2013-02-19 12:10:09 -08:00
Kishan Kavala cc2a3c5498 CLOUDSTACK-651: Removed 7 nics limitation for VR on XenServer
# of nics can be configured using global param xen.nics.max. Param defaults to 7
Added new param to upgrade schema.
2013-02-18 20:30:03 +05:30
Koushik Das ed757f24ae As part of the upgrade changes, some db changes got removed from create-schema.sql.
Moved the changes to the corresponding upgrade sql.
2013-02-18 15:25:09 +05:30
Rohit Yadav 31d6f03308 db: Remove create-schema-view.sql, views are created using schema-40to410.sql
- Remove create-schema-view.sql, views are created when mgmt server does rolling
  upgrade from 4.0.0 to 4.1.0
- Fix reference and usage of the sql file in scripts

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-17 23:49:27 +05:30
Rohit Yadav 16e81130cc db: Fix developer's deploydb and cloud-setup-databases for rolling update
- Fix developer prefill to use 4.0's schema
- Fix developer/pom.xml and cloud-setup-databases to not run create-schema-view,
  the upgrade path is configured to do a rolling update and set it up

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 17:18:42 +05:30
Rohit Yadav c63dbb8804 db: Refactor new change in create-schema/premium to schema40-410.sql
- Move changes since 4.0 to schema upgrade path (schema40-410.sql)
- Comment out some table names where we're trying to copy uuid from id, they
  don't exists
- We don't run above step for tables which are newly created for 410 and don't
  exist in 4.0 for example autoscale related ones, code is commented and not removed
- Drop indexes which are removed before dropping the column
- Comment out insertion, as for default region we're inserting the same in
  code, in ConfigurationServerImpl:createDefaultRegion(), fix same in premium

Testing;
Deployed fresh 4.0 database, compiled and ran mgmt server. It did a smooth
rolling upgrade from 4.0 to 4.1.0 with no database exceptions or any other db error.

TODO:
- 4.2.0 relates changes like ipv6 should go into its schema-410to420.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 17:12:26 +05:30
Rohit Yadav 0e354473f7 db: Add stubs for Upgrade410to420, schema-410to420.sql and schema-410to420-cleanup.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 13:31:58 +05:30
Rohit Yadav 44c8a33cf2 db: Fix commas which should be dots in create-schema, fix debug msg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 13:31:46 +05:30
Rohit Yadav f2ae6dcda9 db: Remove and merge 4.1-new-db-schema.sql to schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 12:44:45 +05:30
Rohit Yadav 46ab973143 db: Fix Upgrade40to41 and add cleaning path schema-40to410-cleanup.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 12:28:00 +05:30
Kishan Kavala 7d61ee6e99 CLOUDSTACK-1295 : Added usage unit tests
Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db

Conflicts:
	setup/db/db/schema-40to410.sql
2013-02-15 18:41:28 +05:30
Koushik Das bc493bd39b CLOUDSTACK-672: Set VMware cluster max. limit based on HV version
Max. number of hosts in a Vmware clueter is specific to the version of the HV. This limit is read from the hypervisor_capabilities table
2013-02-15 16:19:40 +05:30
Marcus Sorensen 8652e5f87e Summary: Fix hanging references to /var/lib/cloud, changed to /var/cloudstack
BUG-ID: CLOUDSTACK-1201
BUG-ID: CLOUDSTACK-1196
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360786749 -0700
2013-02-13 13:22:28 -07:00
Mice Xia 9a12756ae4 CLOUDSTACK-684 support vm snapshot 2013-02-14 01:26:30 +08:00
Min Chen c20ea048b4 Add new windows 8 guest os entries to DB. 2013-02-12 16:57:20 -08:00
Sanjay Tripathi 5828e526b3 CLOUDSTACK-713: Limit Resources(CPU and Memory) to domain/accounts
Addition of two new resource types i.e. CPU and Memory in the existing pool of
resource types.
Added some methods to set the limits on these resources using updateResourceLimit
API command and to get a count using updateResourceCount. Also added calls in the
Virtual machine life cycle to check these limits and to increment/decrement the new
resource types

Resource Name  :: Resource type number
    CPU               8
    Memory            9

Also added Unit Tests for the same.
2013-02-12 12:02:07 -08:00
Rohit Yadav 3e613788e9 CLOUDSTACK-1226: Fix 4.1-new-db-schema.sql, use cloud before exec statements
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 16:36:41 +05:30
Rohit Yadav 34cd2d630d CLOUDSTACK-1019: Fix filename from 4201752e
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 15:22:46 +05:30
Rohit Yadav 0895c34002 CLOUDSTACK-1222: Remove double quotes in upgrade script s/"//g
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 14:06:38 +05:30
Hugo Trippaers 4201752eda 4.1-new-db-schema.sql should be loaded when cloud-setup-databases
configures a fresh database.
2013-02-11 09:36:25 +01:00
Min Chen 0b1e3a4af0 Move Api rate limit configurations from xml file to global
configuration, and also modify listCapabilitiesCmd to also return api
limit interval and max for UI consumption.
2013-02-08 00:02:25 -08:00
Hugo Trippaers 798c7c2c18 This database file does not exist anymore 2013-02-04 22:36:59 +01:00
Kelven Yang 296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Likitha Shetty 13ee8d1865 Persistent Networks support
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 15:10:06 +05:30
Kishan Kavala fc925022bd Upgrade changes for Region schema. Made region_id not null 2013-02-01 13:49:57 +05:30
Kanzhe Jiang 736b236eaf bigswitch controller support
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>

Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 12:42:04 +05:30
Kishan Kavala 9ea90c3359 Merge branch 'master' into regions
Conflicts:
	client/tomcatconf/components.xml.in
	server/src/com/cloud/api/ApiResponseHelper.java
2013-02-01 11:38:16 +05:30
Kishan Kavala 33b87d8985 CLOUDSTACK-686: Modified unique constraint to include physical_network_id 2013-02-01 07:54:31 +05:30
Kelven Yang 7bd8bec68a Sync javelin with master up to 894cb8f7d9 2013-01-31 17:20:19 -08:00
Sheng Yang 5cb9df91a1 Merge branch 'ipv6'
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
Kishan Kavala 8b1a5b1de2 - Separated RegionServiceImpl and RegionManagerImpl
- Added comments
- Changed package name to org.apache.cloudstack.region
2013-01-31 18:08:20 +05:30
Sheng Yang ed547d91f7 IPv6: Rename public_ipv6_address to user_ipv6_address 2013-01-30 17:05:47 -08:00
Kishan Kavala d3089ba2a5 Merge branch 'master' into regions 2013-01-29 11:50:49 +05:30
Kishan Kavala 158ee8b2fa Add sync entry to region_sunc table on region api failure 2013-01-29 11:49:23 +05:30
Kishan Kavala def9fd1f2e remove finduser, findaccount, finddomain APIs 2013-01-28 17:04:25 +05:30
Rohit Yadav 2fb346ab62
Merge branch 'master' into javelin 2013-01-27 05:20:49 -08:00
Sheng Yang bd4bc025d1 IPv6: Accept IPv6 parameter for createNetworkCmd
Also ass public_ipv6_address for ipv6 address management.

Extend nics and vlans for ipv6 address.

Add dependency to com.googlecode.ipv6(java-ipv6).

Modify dhcpcommand for ipv6.
2013-01-26 23:14:15 -08:00
Kishan Kavala c6ae19d12f Merge branch 'master' into regions 2013-01-25 18:49:47 +05:30
Kishan Kavala 1f57d925eb Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:41:59 +05:30
Rohit Yadav f56b96ad19 merge: Fast forward merge branch 'javelin'
FF merge commit due to recent merge of master and then Edison's commit.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:30:28 -08:00
Rohit Yadav 356866c72b Merge branch 'master' into javelin
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:18:53 -08:00
Edison Su 6f5655cb03 generalize storage orchestration: DataObjectManager will handle all the object life cycle management 2013-01-24 18:30:08 -08:00
Alex Huang 8e2a96923c delete some old sql files 2013-01-23 17:18:54 -08:00
Min Chen 285e8213fe Add DB index to Alert.last_sent column to speed up listAlertsCmd. 2013-01-23 12:38:37 -08:00
Min Chen 26be5ce2df CLOUDSTACK-355: create DB view for ZoneResponse to fix count for
listZonesByCmd.
2013-01-22 16:39:45 -08:00
Edison Su c921118c58 add image create test case 2013-01-22 13:25:48 -08:00
Prachi Damle 1cb0ce44df Removing BareMetalService referrences. We will load UserVMService by default. 2013-01-22 12:54:20 -08:00
Prachi Damle 3cc9f3ff06 Adding defaults to new columns 2013-01-22 12:54:12 -08:00
Prachi Damle ef4d04f289 Removing the alter table statement - data_center already has a removed column 2013-01-22 12:54:09 -08:00
Prachi Damle e6cd47ddc0 More changes for deployVM flow. 2013-01-22 12:54:07 -08:00
Prachi Damle 94e8090bf3 Deploy, Start, Stop, Destroy VM orchestration service changes 2013-01-22 12:54:04 -08:00
Min Chen 2130a418e0 Formatting db view sql creation, and also addressed FIXME in Hugo's
change.
2013-01-22 10:08:57 -08:00
Hugo Trippaers 3bac7b8c07 Summary: Fix schema-40to410.sql
Applied some formatting

Changed invalid comment

Added workaround for non existing table vm_template_iso

Fix non prefixed table names in views

Removed 'use cloud' statement
2013-01-22 11:01:22 +01:00
Edison Su 4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Min Chen 6e40c33628 CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count
for ListServiceOfferingsCmd.
2013-01-21 15:25:49 -08:00
Min Chen 6db719d58b CLOUDSTACK-355: Create DB view to fix count issue for
listDiskOfferingsCmd.
2013-01-21 10:50:10 -08:00
Kelven Yang 2c5859dbd4 Bring javelin back to the status of being able to start System VMs after another round of master branch merge 2013-01-18 19:15:32 -08:00
Alex Huang 10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Koushik Das cd37e22f9b CLOUDSTACK-810: Make DirectAgent thread pool size configurable Removed hard-coding of directagent thread pool size and now reading it from configuration
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-17 17:21:52 -08:00
Marcus Sorensen 975021dda1 Summary: adding resizeVolume api call
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.

BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
2013-01-16 17:43:35 -07:00
Murali Reddy c7840cf91f reverting the earlier commit 432ea9c7d4
done for bug CLOUDSTACK-265 due to IP clearence issues.
2013-01-16 15:10:27 +05:30
Wido den Hollander 95222cdb6d Templates: Add Ubuntu 12.04 to the templates
Although I still think the templates aren't well maintained, I just
added 12.04 since this is an LTS and people probably want it in the
list of templates.

This system should be more generic I think though.
2013-01-15 13:25:48 +01:00
Rohit Yadav fdc9103fbe create-schema: Fix deploydb, drop existing (new) tables
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 03:43:35 -08:00
Prachi Damle ad2cd775e0 fixing errors 2013-01-09 11:00:18 -08:00
Alex Huang b6c56736e5 merge from master 2013-01-09 05:20:36 -08:00
Alex Huang 14bd345f1f merge compiles 2013-01-09 04:41:27 -08:00
Min Chen d22229eb9d Remove updateUuids code in ConfigurationServerImpl (which is not the
right approach to populate uuid column since it will impact upgrade as
well), and populate UUID column in seed data sql script.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 17:12:14 -08:00
Alex Huang 30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Min Chen 74c15a22a0 Create DB view for ListStoragePools API performance optimization.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 12:33:18 -08:00
Prachi Damle a4f4c98670 OrchestrationService: some changes for DeployVM 2013-01-08 11:53:54 -08:00
Min Chen 0894822651 DB view dao cleanup, and introduce global configuration parameter for
entity detail batch query size to remove hard-coded
VM_DETAILS_BATCH_SIZE.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-07 16:40:31 -08:00
Rohit Yadav b720675bfe Merge branch 'master' into api_refactoring
Getting ready for merge request for master, sync changes

Conflicts:
	client/tomcatconf/commands.properties.in

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 01:11:16 -08:00
Sheng Yang aa9701a10c CLOUDSTACK-799: Redundant router: Speed up RvR status update
The basic idea behind this is, deploy a fix sized threadpool for updating RvR
status, then using producer/consumer model. There is a global configuration
router.check.poolsize(10 by default) to control the pool size.

Using pool size 100 for 1000 RvR is tested with simulator and works well.

Also we can adjust the global configuration option router.check.interval to e.g.
60s from default 30s to mitigate the issue.
2013-01-05 21:02:37 -08:00
Rohit Yadav 5119785cf7 Get latest changes, merge branch 'master' into api_refactoring
Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 22:21:20 -08:00
Sheng Yang 42c8c73ab6 CLOUDSTACK-306: Introducing IpDeployingRequester and implement inline mode
For LB device in inline mode, the ip deployer(the owner of public ip) is the
firewall in front of it, not itself. So check if it's inline or not, if it's
inline, return the firewall as ip deployer
2013-01-04 19:18:03 -08:00
Sheng Yang 177e157cbf CLOUDSTACK-306: Move inline mode parameter from device to network offering
One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base.
2013-01-04 19:17:58 -08:00
Min Chen 32f035c9fa Separate db view creation into create-schema-view.sql. 2013-01-03 18:23:09 -08:00
Min Chen daeb4abcca Create DB views for AsyncJobResponse to speed up listAsyncJobsCmd.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-03 15:35:26 -08:00
Rohit Yadav c0a0318f29 setup/db: Fix missing semicolon in db create view command
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 11:24:12 -08:00
Min Chen ebfb90e217 Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-02 17:38:58 -08:00
Rohit Yadav d8d87adc22 Merge branch 'master' into api_refactoring
Conflicts:
	api/src/com/cloud/api/commands/ListS3sCmd.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 13:57:55 -08:00
Wido den Hollander 3d2fefabdd db / upgrade: Add columns to sync_queue and sync_queue_item
These columns were not added by the upgrade from 4.0 to 4.1 causing SQL-errors

These columns are present in create-schema.sql, so by adding them here the upgrade also works to 4.1
2013-01-02 17:01:23 +01:00
Min Chen 21c1623a03 Create DB view for Volume to speed up ListVolumesCmd.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-25 17:08:50 -08:00
Rohit Yadav 78d70d349b Merge branch 'master' into api_refactoring
- Applies Isaac Chian'gs fix (CLOUDSTACK-648) to allow user change their password
- TODO: Fix response, only partially applied

Conflicts:
	api/src/org/apache/cloudstack/api/response/UserResponse.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-25 09:51:17 -08:00
Prasanna Santhanam 1f1a13448f simulator: resurrect simulator hypervisor as plugin
Multiple fixes:
1. changes to the mvn configuration
    a. include simulator to client.war
    b. activate simulator by profile
2. templates for simulator
3. developer prefill for simulator
    a. Use deplydb-simulator to setup simulator db
4. Inherit components-simulator.xml from components.xml
5. ListVolumesCommand missed for MockStorageManager
6. Include simulator properties into utils/db.properties

TODO:
 Secondary storage VMs don't come up because ComponentLocator doesn't
retain a unique set of adapaters by name. Fix this in subsequent
checkin.
2012-12-23 19:28:57 -08:00
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 13:54:46 -08:00
Min Chen 3aad2ba972 Add DB host view into fresh install schema and upgrade schema. 2012-12-22 21:49:51 -08:00
Prasanna Santhanam f0c3b4c62a simulator:Using the priority to decide b/w MASTER/BACKUP
BootArgs carry router priority for master and backup and simulator will
reuse the priority to decide RvR status. Deprecating the odd/even logic.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-22 14:09:59 -08:00
Kishan Kavala 3ae5986b87 Update DB version during DB deploy
1. Modified create-schema.sql to add version as 4.1.0 instead of 4.0.0
	2. Removed schema-40to41.sql amd moved the content to schema-40to410.sql
	3. Added to schema-40to410.sql Upgrade40to41.java

Conflicts:
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to41.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-21 15:11:05 -08:00
Kishan Kavala 8acc85ca53 Update DB version during DB deploy
1. Modified create-schema.sql to add version as 4.1.0 instead of 4.0.0
	2. Removed schema-40to41.sql amd moved the content to schema-40to410.sql
	3. Added to schema-40to410.sql Upgrade40to41.java
2012-12-21 15:27:00 +05:30
Sheng Yang d72f8a695d Add new global configuration option to enable user specify guest OS DHCP policy
This is improvement of:

commit 1ca493e4fa
Author: Sheng Yang <sheng.yang@cloud.com>
Date:   Wed Feb 29 17:43:50 2012 -0800

    bug 14042: Don't set dhcp:router option on DHCP server for non-default
network on CentOS/RHEL

The old solution only works on CentOS/RHEL, this one would enable the ability to more
guest OS, and enable user to choose what policy should be for each guest os
type.
2012-12-20 19:21:02 -08:00
Min Chen e4dbc2033f Add upgrade script from 4.0 to 4.1.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-20 18:18:06 -08:00
Min Chen b14b39a69f Remove IdentityProxy from BaseResponse, ExtractResponse. Now
IdentityProxy is only referenced in CreateCmdResponse, which involves
some async job logic change. Since it is not impacting list performance,
will leave it there for now.

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-20 16:52:52 -08:00
Edison Su aefb657c41 Finally, get async api call works for storage subsystem 2012-12-17 18:12:46 -08:00
Edison Su b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Min Chen 472f4f91b9 Refactor ListProjectInvitationsCmd and ProjectInvitationResponse. 2012-12-12 09:04:43 -08:00
Min Chen 9c93fee0dc Refactor ListProjectAccountCmd and ProjectAccountResponse. 2012-12-11 15:49:15 -08:00
Min Chen 8735716ba0 Refactor ListProjectsCmd and ProjectResponse. 2012-12-11 12:51:08 -08:00
Murali Reddy 432ea9c7d4 CLOUDSTACK-265: provide option to turn-off automatic public IP association for each VM when using EIP service.
- introduces Capability in the network offering, which
    decides when EIP service is enabled, by defualt public IP
    should be assigned to the VM or not

  - default network offering with EIP/ELB service will still work with old EIP
    semantics, i.e) assign a public IP to each VM on start
2012-12-11 23:06:13 +05:30
Min Chen c83323fea7 api: Refactoring ListUsersCmd and UserResponse.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:45:40 -08:00
Min Chen bba96254f5 Refactoring ListVMGroupsCmd and InstanceGroupResponse. 2012-12-10 13:59:20 -08:00
Kishan Kavala 199806c1be CLOUDSTACK-560 : Add default zone column to account table in cloud_usage table in fresh install and upgrade 2012-12-10 19:37:57 +05:30
Edison Su cdf5511664 finish configurator, the default primary storage provider can cover all the hypervisors and protocols 2012-12-08 03:16:03 -08:00
Min Chen 30941c2d31 api: Refactoring ListEventsCmd and EventResponse, and create Event db view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 16:54:45 -08:00
Min Chen acf7afd7f5 api: Refactor ResourceTagResponse and ListTagsCmd, add db view for ResourceTag.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 09:57:52 -08:00
Min Chen 2bbd023eb6 api: Add SecurityGroup DB view creation into db create_schema and fix a bug in ListSecurityGroupsCmd
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 09:45:16 -08:00
Min Chen b0ce8fd4ff api: Optimize and improve api, db call perfomance
This is part 1 of list API refactoring. Commands covered:
listVmsCmd, listRoutersCmd Response covered:
UserVmResponse, DomainRouterResponse. DB views created:
user_vm_view, domain_router_view.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 20:06:20 -08:00
Edison Su e436d4327f create volume from template unit test is passed 2012-11-26 11:42:34 -08:00
Edison Su 550f4fbcdc create template/primary data store is done 2012-11-20 18:57:19 -08:00
Vijay Venkatachalam 527b5c8ee2 Autoscale: Supporting network element independent counter parameters Reviewed-By:Devdeep 2012-11-16 10:57:00 +05:30
Vijay Vekatachalam 35b0e086d4 enable Autoscale VMs to be named as Autoscale-LB-<lbname> 2012-11-16 10:56:59 +05:30
Vijay Venkatachalam 58db4d0d88 CS-15729:AutoScale. Aligning the NetScaler response time counter, and correcting duration check against interval 2012-11-16 10:56:57 +05:30
Deepak Garg 25b853b7d5 CS-16052 Introducing data-base indexes for autoscale db schema 2012-11-16 10:56:56 +05:30
Vijay f96810b9ae AutoScale. Adding default counters
Conflicts:

	server/src/com/cloud/server/ConfigurationServerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-304to305.sql
2012-11-16 10:56:44 +05:30
Vijay dda4d39b55 AutoScale changes in Apache master 2012-11-16 10:56:44 +05:30
Alex Huang 50f175e3f9 Finally got rid of create-index-fk.sql. Merged everything into create-schema.sql 2012-11-01 13:40:16 -07:00
Rohit Yadav 6c6d036447 CLOUDSTACK-196: cloud-set-guest-password enhancement to support Debian
(and derivatives)

Synced fix on setup/bindir/cloud-set-guest-password.in too.
Note: we've duplicate files, one in tools

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-28 15:39:42 +05:30
Rohit Yadav 3663af1434 cloud-setup-databases: modify try-except-finally for < python 2.4
Make cloud-setup-databases compatible to python 2.4 and before.

Add code Prasanna Santhanam <tsp@apache.org>
Partially revert a6dcd7af49 which removed
the fix for CLOUDSTACK-199: Fix how cloud-setup-databases parses
  Patch splits by right most @ in supplied argument to get
  user:password and host substrings.

Less than python <2.4 the following is unsupported and produces a
SyntaxError.
    try:
        ...code ...
    except ValueError:
        ...code ...
    finally:
        ...code ...

Workaround is the following
    try:
        try:
            ...code ...
        except ValueError:
            ...code ...
    finally:

Credits to Prasanna Santhanam <tsp@apache.org>

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-26 14:20:37 +05:30
Edison Su ad3e98c1eb @DB works on spring 2012-10-25 10:27:22 -07:00
Rohit Yadav 947d8cc6de CLOUDSTACK-374: Allow users to choose mgmt server host
Users can now explicitly specify cluster management server node IP.
Example:

cloud-setup-database user:passwd@dbhost -i 192.168.1.10, or
cloud-setup-database user:passwd@dbhost --mshost 192.168.1.10

Also, strips off trailing whitespaces.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-22 16:56:50 +05:30
Edison Su b57be3389e add apidocs/devcloud projects 2012-10-21 00:01:47 -07:00
Kishan Kavala f0f33bf4da Added Mock ApiServer, Regions API calls with api keys 2012-10-17 14:16:36 +05:30
Hugo Trippaers c07d6d28ee Merge branch 'nicira-l3support'
This commit merges the nicira-l3support branch with master. This
effectively adds nicira nvp l3 support to master. The NiciraNVP Provider
can support the following services with this modification: Connectivity,
SourceNat, StaticNat and PortForwarding

Testing done:
Create, Delete network offerings with Nicira Element
Use Gui to add, modify, remove Nicira Element and Provider
Provision, deprovision SourceNat networks
Provision, deprovision Portforwarding and StaticNat rules

Tested with Nicira NVP release 2.1.0, 2.2.0 and 2.2.1 (2.2.x recommended)
2012-10-12 14:15:17 +02:00
Kelven Yang 5fee891162 merge from master 2012-10-11 17:42:25 -07:00
Ilya Musayev, CloudSand.com 77ba46e322 CLOUDSTACK-321: Fixed a bug in cloud-set-guest-*.in
Fixed a bug in cloud-set-guest-sshkey.in to properly check the
SSHKEY_SERVER_IP variable
2012-10-12 01:20:15 +05:30
Alena Prokharchyk 339aa41442 CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host.
Conflicts:

	core/src/com/cloud/async/AsyncJobVO.java
	core/src/com/cloud/async/SyncQueueVO.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/SyncQueueManager.java
	server/src/com/cloud/async/SyncQueueManagerImpl.java
	server/src/com/cloud/async/dao/SyncQueueDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
	server/test/com/cloud/async/TestSyncQueueManager.java
	setup/db/create-schema.sql
2012-10-10 13:40:00 -07:00
Hugo Trippaers 4e1a2e4ab3 [CLOUDSTACK-283] Add Nicira NVP calls to the api docs 2012-10-08 23:07:43 +05:30
Alex Huang 13d771e57e it's 1.9.0 not 1.9....duh 2012-10-08 01:52:02 -07:00
Alex Huang 135f5dcfe9 Fixed more problems with aws
Conflicts:

	setup/bindir/cloud-setup-encryption.in
2012-10-08 00:59:47 -07:00
Alex Huang 0ec3422122 Changed the jar file to 1.9 2012-10-08 00:07:19 -07:00
Alex Huang 0827fb7029 Checked in the license 2012-10-08 00:07:10 -07:00
frank a6dcd7af49 CloudStack CLOUDSTACK-257
AWS Api is not correctly deployed

fix cloud-setup-databases for awsapi
2012-10-08 00:06:04 -07:00
John Kinsella a964d7859e Ensuring system user has password set. 2012-10-07 12:51:52 -07:00
frank 7282f4355a port fix for CS-16214 2012-10-05 19:41:51 -07:00
Edison Su 62153bba86 CLOUDSTACK-273: backport fixes from 3.0.x branch: 70d41f103b 2012-10-05 19:21:38 -07:00
Hugo Trippaers f6ab8b4344 [CLOUDSTACK-268] Add quotes to input 2012-10-06 00:00:59 +02:00
Kishan Kavala 89779cceb8 Merge branch 'master' into regions
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/user/UserVO.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/create-schema.sql
2012-10-03 14:09:01 +05:30
Hugo Trippaers dd68a00338 Persist the uuid of the logical router once created 2012-09-27 22:16:11 -07:00
Kishan Kavala 4fcf64dd74 updated regions branch with changes from master 2012-09-27 17:04:59 +05:30
Rohit Yadav f2e0fa230d CLOUDSTACK-199: Fix how cloud-setup-databases parses user:password@host
Patch splits by right most @ in supplied argument to get user:password
and host substrings.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-26 15:40:21 +05:30
Mice Xia 7e75140537 CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start 2012-09-26 14:05:37 +08:00
David Nalley d9757eb45e updating version number in api documentation 2012-09-25 20:21:00 -04:00
Hugo Trippaers 21ee8982a1 Add a proper contraint to the nicira nic map 2012-09-22 11:29:39 +02:00
Alex Huang 387c6fc135 Merge branch 'master' into javelin 2012-09-17 15:31:37 -07:00
Prasanna Santhanam 6e9d7aa45b property files and build file fixes for simulator db changes 2012-09-17 17:33:26 +05:30
Jie Feng c9aa08350a [DOC] docbook conversion - choosing a deployment architecture 2012-09-13 16:12:06 -04:00
Alex Huang db9cc97ab3 Brought over new changes from master 2012-09-13 11:43:22 -07:00
Manikanta Kattamuri cfc2b85651 Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-09-13 14:18:14 -04:00
Saksham Srivastava a56631bc66 bug CS-15278: Added global setting login.attempts.allowed which defines the maximum incorrect password attempts allowed.
Also after the maximum attempts are reached the user account is disabled
2012-09-12 19:35:24 +05:30
Koushik Das 2404d3493d CS-14277
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:38:15 -07:00
Prachi Damle 176259e7d5 deadlock on host_details: Missed adding the unique key constraint needed on host_details table in create_schema 2012-09-11 17:33:01 -07:00
Koushik Das 65eeeaf071 CS-14277
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:22:43 +05:30
Prachi Damle 5629165877 deadlock on host_details: Missed adding the unique key constraint needed on host_details table in create_schema 2012-09-06 16:35:28 -07:00
Alex Huang 1d0a10c69e Merged master over to javelin to get new poms and maven build 2012-09-05 14:31:24 -07:00
Edison Su caebc0ce74 fix rpm installation 2012-09-04 22:30:24 -07:00
Mice Xia dd07d1598f Fix Bug CloudStack-9 can not change OS preference from OS to none 2012-09-04 20:51:03 +08:00
Hugo Trippaers afb05ef3dc Fix the right file 2012-08-31 14:30:25 +02:00
Hugo Trippaers db4a435a84 Add mysql-connector-java to the classpath 2012-08-31 13:26:38 +02:00
Alex Huang 6309253de1 Deleted some useless files 2012-08-30 09:59:25 -07:00
Gavin Lee d3921139ed Patch from Gavin Lee: Change license to ASL2.0 in server and tools
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-08-30 10:36:29 -04:00
Hugo Trippaers 0d7601d2d7 Add a limit statement to the subquery 2012-08-27 09:14:38 +02:00
Kelven Yang 9a51ff3bfc Maven worksplace fixes/patches from Darren 2012-08-23 14:26:27 -07:00
Abhinandan Prateek cebd9444be fixing the xen systemvm template guest os to reflect the right one 2012-08-23 12:25:46 +05:30
Chip Childers e0f505e36f Patch from Greg Burd: Improve portability of the build-apidoc.sh script by replacing readlink
Review: https://reviews.apache.org/r/6733/

Testing: Applied patch, and ran 'ant clean-all build-apidocs'
on both OSX and Ubuntu 12. Initial testing confirmed the issue
that Greg discovered on OSX.  After the patch, the docs built
correctly.
2012-08-22 15:33:17 -04:00
Sheng Yang 6ec5bdbab6 S2S VPN: CS-16035: Add missing global configuration items 2012-08-17 16:52:06 -07:00
Edison Su 87378c3f3a add db upgrade for ha.workers 2012-08-17 13:15:49 -07:00
Alena Prokharchyk 0c0165e19b CS-16037: db upgrade - fixed component/category/description fields for several global configs 2012-08-16 15:03:16 -07:00
Sheng Yang cbcd5cace1 S2S VPN: Add db upgrade 2012-08-13 17:37:51 -07:00
Alena Prokharchyk 7120ce0717 Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2) 2012-08-13 16:50:06 -07:00
Alena Prokharchyk 4433c5a51a Database upgrade from 302 to 40 2012-08-13 16:20:09 -07:00
Sheng Yang 48b46fce5c S2S VPN: Fix db schema issue 2012-08-13 10:26:34 -07:00
Alena Prokharchyk 32f55f3e3c Merge branch 'master' into vpc 2012-08-12 10:22:54 -07:00
Koushik Das 9adf91f7b9 CS-15879 Removed safe update flag as it is a client only setting 2012-08-12 16:34:02 +05:30
Alena Prokharchyk ccac505944 Merge branch 'master' into vpc 2012-08-10 10:47:49 -07:00
Chip Childers 0ad8118562 Fixed three .classpath license header issues 2012-08-09 14:21:06 -04:00
Kelven Yang 3a6d890741 Commit for review-request: https://reviews.apache.org/r/6458/ 2012-08-08 17:18:31 -07:00
Alena Prokharchyk 048c5e50cf Merge branch 'master' into vpc
Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Mice Xia a74c6e3104 fix CS-15814 Description of global configuration 'encode.api.response' is incorrect 2012-08-08 16:29:53 +08:00
Chip Childers cc46d1cf3b Adding setup/.classpath 2012-08-07 14:52:20 -04:00
Alena Prokharchyk 5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
Chip Childers 2930eef00c License header updates for the setup folder. 2012-08-03 09:49:02 -04:00
Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
mice xia 895b6a3e4b CS-15780 Global configuration 'account.cleanup.interval' is used by event purge thread
changes:
add a new global configuration event.purge.interval for event purge thread
leave account.cleanup.interval only for account cleanup thread.
2012-08-02 21:50:44 +05:30
Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
Koushik Das 3f571684aa CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.

Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
2012-08-01 19:39:30 +05:30
Nitin Mehta 85398bb2e0 bug CS-13935: correcting description for create.volume.from.snapshot.wait global setting
Reviewed-by: Kishan
2012-08-01 18:16:01 +05:30
Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
Prasanna Santhanam 3610401edc Fail with non-zero exit code when toc category missing 2012-07-31 17:23:41 +05:30
Prasanna Santhanam 911261a2ce Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-31 16:40:04 +05:30
Rohit Yadav b4b1a38f7e Fix typo in create-schema.sql. comma at EOL 2012-07-31 16:39:50 +05:30
Hugo Trippaers 420f08ab4a Add changes in rrq 5839 to the update script 2012-07-31 09:41:14 +02:00
David Nalley 0829ee164a removing lots of web tracking stuff from apidocs stylesheets 2012-07-30 10:42:53 -04:00
David Nalley 048bd2e498 fixing copyright notices on apidocs 2012-07-30 10:32:07 -04:00
Hugo Trippaers 894407caa9 rrq 5839: This table should not have a contraint on device and physical network id. This is dealt with in the code and by using the removed field. 2012-07-30 08:46:56 +02:00
Wido den Hollander 5789cd94a5 setup: Update 3.0.3 to 4.0.0 SQL update file
I noticed that we have pending changes for the resource tags and Nicira integration.

Adding them as a precaution, so they don't get lost.
2012-07-27 23:37:45 -04:00
Sheng Yang 72a4b2f410 S2S VPN: Add name field for customer gateway
Easier for user to identify the correct gateway
2012-07-27 16:27:36 -07:00
Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
Wido den Hollander 38a140ecb4 setup: Update 3.0.3 to 4.0.0 SQL update file
I noticed that we have pending changes for the resource tags and Nicira integration.

Adding them as a precaution, so they don't get lost.
2012-07-27 08:53:44 +02:00
Wido den Hollander bf2e3d6ae1 setup: Initiate SQL upgrade file from 3.0.3 to 4.0.0
This only adds the user_info column to the storage_pool table, but we'll probably have more SQL changes coming up.

They can all go into this file.
2012-07-26 23:03:34 +02:00
Wido den Hollander 406fd95d87 Add RBD support for primary storage
This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.

To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)

The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.

Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.

NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.

Other then these points you can run instances with RBD backed disks.
2012-07-26 22:22:26 +02:00
Sheng Yang 7d68e33323 S2S VPN: Use source NAT ip address for VPN gateway
Conflicts:

	api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:44:05 -07:00
Sheng Yang 671475242c S2S VPN: Add domain and account for VPN
Admin can add VPN connection for others

Conflicts:

	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	setup/db/create-schema.sql
2012-07-23 14:40:26 -07:00
Sheng Yang 52c145dc46 CS-15470: Remove UNIQUE keyword for some fields
User can create/delete/create gateway again and again, then it would no longer
be unique. The unique should be guaranteed by API level.
2012-07-23 14:36:22 -07:00
Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
Hugo Trippaers 79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Alena Prokharchyk 7cb4ab5e60 VPC: added State to vpc_gateways 2012-07-11 12:05:42 -07:00
Alena Prokharchyk 911ed25fbc Merge branch 'master' into vpc 2012-07-09 18:31:28 -07:00
Alena Prokharchyk 21519070fc VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManager.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-09 18:23:35 -07:00
Edison Su fa414bbf0a It's due to replace.properties is missing, by default the password is cloud for user cloud
Revert "removing unneeded password from cloud-dev setup-script"

This reverts commit f157b702e4.
2012-07-09 11:48:43 -07:00
David Nalley f157b702e4 removing unneeded password from cloud-dev setup-script 2012-07-08 22:14:20 -04:00
Alena Prokharchyk 63d6941bdc ResourceTags: respect tag parameter in listTemplates/listIsos commands
Conflicts:

	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
2012-07-06 16:59:14 -07:00
Alena Prokharchyk 353423acec Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
Alena Prokharchyk 85677b71fe Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
Conflicts:

	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -07:00
Alena Prokharchyk d33429783f Fixed deploydb 2012-07-06 11:18:16 -07:00
Alena Prokharchyk 234ae447ee VPC: added field networkacl_service_provided to physical_network_service_providers table 2012-07-06 11:08:39 -07:00
Edison Su 27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -07:00
Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
Edison Su 57927c9f23 From: jason.bausewein@tier3.com
Updated script to create cloud_usage database similar to deploy-db-dev.sh.
2012-07-03 15:16:51 -07:00
kishan 6a1b0f3ecf Add Region APIs 2012-07-03 13:05:19 -07:00
Alena Prokharchyk b565f63e42 VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation)
Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
2012-07-02 17:44:28 -07:00
Sheng Yang 78b31bb7db CS-6840: Add tables for site to site VPN use. 2012-07-02 16:20:53 -07:00
Alena Prokharchyk 1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Alena Prokharchyk 634cd78baa Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
2012-06-28 17:41:40 -07:00
Alena Prokharchyk c19639e4a2 Static route can be created for generic VpcGateway now, not just Private gateway 2012-06-28 17:17:44 -07:00
Edison Su 5f6387e113 add clouddev 2012-06-27 23:28:34 -07:00
David Nalley fc3ac862dc applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
Alena Prokharchyk ce876e24de VPC: intermidiate checkin to Static Routes
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
2012-06-25 21:00:57 -07:00
Alena Prokharchyk d35eb73c9b VPC: initial checkin for Static Routes
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-25 20:59:33 -07:00
Alena Prokharchyk 11de5d4fbe Fixed apidoc build
Conflicts:

	setup/apidoc/gen_toc.py
2012-06-25 20:56:45 -07:00
Alena Prokharchyk 030458a37b VPC: implemented add/delete Private gateway
Conflicts:

	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/dc/DataCenterVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-25 20:54:14 -07:00
Vijayendra Bhamidipati 5697ff2baf CS-15181: Remove stale global config parameters from upgrade script
Description:
    Removing stale global config params.
2012-06-21 13:55:52 -07:00
Alena Prokharchyk ccec9192a2 VPC: implemented delete and list Network ACL(s) 2012-06-20 17:20:04 -07:00
Alena Prokharchyk 374a600746 VPC: initial checkin for network ACLs
Conflicts:

	client/tomcatconf/commands.properties.in
2012-06-20 17:19:49 -07:00
Alena Prokharchyk c653b22d94 Api docs: added category for resource tags commands 2012-06-20 15:45:08 -07:00
Alena Prokharchyk 62d45b9670 Initial checkin for resource tags feature
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
	setup/db/create-schema.sql
2012-06-20 15:45:08 -07:00
Alena Prokharchyk c6364dfdf0 Fixed create-schema.sql 2012-06-15 14:27:14 -07:00
Alena Prokharchyk aa84256542 1) Added VpcVirtualNetworkApplianceService interface
2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one
2012-06-15 14:27:00 -07:00
Alena Prokharchyk 0a7faa9838 Support for adding private network
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-15 14:20:34 -07:00
Alena Prokharchyk 9ec8526281 1) Added VPC restart support - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc
2) Only networks created from offerings with conserveMode=false, can participate in VPC
2012-06-15 14:10:09 -07:00
Alena Prokharchyk f4060c3c1d 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support
2) Added services api support for plugging/unplugging the nics to VpcElement

Conflicts:

	api/src/com/cloud/network/NetworkService.java
	core/src/com/cloud/vm/VMInstanceVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:04:09 -07:00
Alena Prokharchyk 9debd3a5df 1) Added start logic to the VPC
2) VirtualRouterManagerImpl - refactored deployVirtualRouter method
3) Added vpcId to domain_router/user_ip_address tables and corresponding vo objects

Conflicts:

	server/src/com/cloud/network/IPAddressVO.java
2012-06-15 13:56:05 -07:00
Alena Prokharchyk afd2d0331f Set networkId as a join parameter in DomainRouterDaoImpl as networkId was moved to the helper table 2012-06-15 13:55:01 -07:00
Alena Prokharchyk 998cf66e6c Removed network_id reference from domain_router table as now VirtualRouter can be associated with multiple networks (VPC case). Code modifications were done accordingly to the places where this field was used.
Router->Networks (one to many) are held in router_network_ref table now
2012-06-15 13:54:48 -07:00
Alena Prokharchyk 60b52f90dd Initial checkin for VPC feature:
1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd

2) New db tables:

* `cloud`.`vpc`
* `cloud`.`vpc_offerings`
* `cloud`.`vpc_offering_service_map`

and corresponding VO/Dao objects.

Added vpc_id field to `cloud.`networks` table - not null when network belongs to VPC

3) New Manager and Service interfaces- VpcManager/VpcService

4) Automatically create new VpcOffering (if doesn't exist) on system start

5) New Action events:

* VPC.CREATE
* VPC.UPDATE
* VPC.DELETE

* VPC.OFFERING.CREATE
* VPC.OFFERING.UPDATE
* VPC.OFFERING.DELETE

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	setup/db/create-schema.sql
2012-06-15 13:53:59 -07:00
Alena Prokharchyk d390261710 CS-15197: correct default value for service_offering.nw_rate
Reviewed-by: Will Chan

Conflicts:

	setup/db/db/schema-302to303.sql
2012-06-05 15:09:46 -07:00
Vijayendra Bhamidipati 15d0cf782a CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Removed the vcenter_dc_name and vcenter_ipaddr
	fields from the virtual_supervisor_module
	table, the CiscoNexusVSMDeviceVO, addClusterCmd,
	and all other references to these two fields.

	Fixing null pointer exceptions when checking
	for nexus related global parameter values in
	addClusterCmd.

Conflicts:

	api/src/com/cloud/api/commands/AddClusterCmd.java
2012-05-25 18:37:20 -07:00
Devdeep Singh 1593900402 CS-9919: Changes to integrate UI changes for nexus feature.
Reviewed by: Sateesh, Pranav.

Conflicts:

	ui/scripts/system.js
2012-05-25 18:33:53 -07:00
Vijayendra Bhamidipati 63de97e63c CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Modifying column names in db tables to
	adhere to naming conventions.
2012-05-25 18:28:34 -07:00
Vijayendra Bhamidipati a31aa29423 Bug CS-15020: DB inconsistencies after upgrade from Acton to Bonita
Description:

	Putting in table creation DMLs in upgrade script
	when upgrading from Acton (3.0.2) to Bonita (3.0.3).
	Please note that the field names in the tables need
	to be changed as per naming conventions. Those changes
	will be checked in in an upcoming commit.

Conflicts:

	setup/db/db/schema-302to303.sql
2012-05-25 18:22:41 -07:00
Sateesh Chodapuneedi 04898a0bf9 CS-9919 Support for Nexus Swiches (Cisco Vswitches)
Description:

	Cleanup upgrade script.
2012-05-25 17:29:44 -07:00
Sateesh Chodapuneedi 8ba1d62b50 CS-9919 Support for Nexus Swiches (Cisco Vswitches)
Description:

	Modified upgrade script to include new global
	configuration parameters.
2012-05-25 17:29:28 -07:00
Vijayendra Bhamidipati 781f0b4966 Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	1. Added the PortProfile infrastructure:

	    a. PortProfileVO : The VO class to represent a db
	    record of the table port_profile. Each db record
	    represents one port profile.

	    b. PortProfileDao: The interface that declares search
	    functions on the port_profile table.

	    c. PortProfileDaoImpl: The class that defines the
	    interfaces declared in PortProfileDao.

	    d. PortProfileManagerImpl: The class that contains
	    routines that will add or delete db records from
	    the port_profile table. If you want to create/delete
	    a portprofile, call functions from this class.

	    e. Changes to create-schema.sql to create the port_profile
	    table.

	2. Cleaned up code:

	    a. Removed a number of unused Dao and Manager objects in
	    CiscoNexusVSMDeviceManagerImpl.

	    b. Removed the ListCiscoNexusVSMNetworksCmd command.

	    c. Removed a bunch of import statements in a few files.
2012-05-25 17:17:56 -07:00
Vijayendra Bhamidipati 0f28222cce Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	1. Modify addCiscoNexusVSMCmd to enable a VSM
           by default, when it is added to a cluster.

	2. Put in two new APIs exposed to the user -
                a. EnableCiscoNexusVSMCmd
                b. DisableCiscoNexusVSMCmd

        Disabling a VSM does not delete it. It only
        prevents the Management Server from using that
        VSM. This is useful if the VSM is in
        maintenance mode.
2012-05-25 17:17:37 -07:00
Vijayendra Bhamidipati 037ac6592e Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

        1. Changed AddCiscoNexusVSMCmd to:
             a. Extend BaseCmd instead of BaseAsyncCmd.
             b. Take in more required parameters (viz
                vCenterDCName and vCenterIpAddress)

        1a. Changed DeleteCiscoNexusVSMCmd to also
            extend BaseCmd.

        2. Put in changes that will ensure that
           When a VSM is added, it is disabled by default.

        3. Fixed code that was leading to exceptions
           related to DB reads/writes to VSM related tables.

        4. Added new API Constants in ApiConstants.java.
           NOTE - Always initialize new attributes in
           ApiConstants.java to values in small case.
           Never put in upper case there. Also regardless
           of what names you give attributes in the
           *Cmd.java's class, you pass in parameters via
           API calls by specifying <key>=<value> where the
           <key> is taken from the value you specified in
           ApiConstants.java.

        5. Modified the addCiscoNexusVSM() function in
           CiscoNexusVSMDeviceManagerImpl.java to write VSM
           records to the db.
2012-05-25 17:17:18 -07:00
Vijayendra Bhamidipati 5109902c9f CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Update create-schema.sql to create tables for
	VSM and VSM-Cluster mapping.

	Fixed an incorrect exception path in
	CSExceptionErrorCode.

Conflicts:

	utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java
2012-05-25 17:11:49 -07:00
prachi 49cdc2317b merge awsapi build script changes to master 2012-05-25 14:40:56 -07:00
Alena Prokharchyk 4b67937556 CS-15089: cloud-sysvmadm - fixed broken parsing in queryAsyncJobResult part of the code
reviewed-by: Frank Zhang
2012-05-25 10:15:51 -07:00
Alena Prokharchyk 96d7dca68b CS-15070: remove invalid refs from storage_pool_host_ref
Conflicts:

	setup/db/db/schema-302to303.sql
2012-05-23 14:50:48 -07:00
Ewan Mellor 93ce302db3 Added a category declaration for CiscoNexus (I put it in the Network category)
and improved the exception.
2012-05-23 12:06:45 -07:00
Nitin Mehta 09b711b131 bug CS-14931: Put in 'Disk' during upgrade for putting in disk offerring 2012-05-16 18:48:42 +05:30
Nitin Mehta c01d03e53f bug CS-14249: cluster.localStorage.capacity.notificationthreshold text is incorrect 2012-05-15 19:58:30 +05:30
kishan d82158d0ae bug CS-14890: Set vnc password for removed Vms as empty. vnc_password is not null column.
status CS-14890: resolved fixed
reviewed-by: Nitin
2012-05-15 15:27:42 +05:30
Murali reddy 3b1aca19b3 bug CS-14291: support EIP with multiple NetScalers in basic zone
This fix will enable support for multiple NetScaler devices providing EIP service in same zone.

    - Introduced global setting "eip.use.multiple.netscalers" to turn multiple netscaler support
    - Enhanced configureNetscalerLoadBalancer API to take the PBR setup between the POD's subnet
      and NetScaler device
    - logic to pick a NetScaler (based on the guest IP and corresponding pod) while configuring INAT rule
2012-05-15 14:00:32 +05:30
kishan ca5683e29d bug CS-14890: Set vnc password for removed Vms as null. vnc_password is not used once the Vm is removed.
status CS-14890: resolved fixed
reviewed-by: Nitin

Conflicts:

	setup/db/db/schema-2214to30.sql
2012-05-15 12:05:25 +05:30
Sheng Yang ccc737e8c0 Remove the extra drop sql line
This would result in 3.0.1 to 3.0.2 upgrade failed, due to index not found.
2012-05-10 14:44:01 -07:00
Abhi 69c4438df3 bug CS-14515: adding centos 5.7 to supported os, supported in xen 6.0.2 2012-05-03 12:32:17 +05:30
Nitin Mehta f49628df1d bug CS-10789: Some upgerade change that tdidnt get merged. 2012-05-03 10:50:59 +05:30
Nitin Mehta 688f715b2c bug CS-10789: Some upgerade change that tdidnt get merged. 2012-05-03 10:50:46 +05:30
Nitin Mehta 9097b53eab bug CS-10789: Put zone id in the volumehost ref table. make list volume to show the percent uploaded. 2012-05-03 10:46:02 +05:30
Salvatore Orlando a794e49545 CS-14724 : Making the default network label configurable, improving exception management
Please also see notes added to wiki.cloudstack.org/display/QA/Open+vSwitch+Tunnel+Manager
2012-05-02 15:16:10 +01:00
Alena Prokharchyk 6165f89a13 Mark local storages as removed when they have no ref in storage_pool_host_ref
Conflicts:

	setup/db/db/schema-301to302.sql
2012-04-27 13:17:01 -07:00
Salvatore Orlando 469ed78a58 CS-14606: Restoring config parameter which was accidentally removed 2012-04-27 17:17:49 +01:00
Salvatore Orlando 8080bc2d26 CS-14606: Change name for config parameter 2012-04-27 17:17:34 +01:00
Alena Prokharchyk 4cbc148a52 CS-14633: db upgrade - remove config values that no longer exist on fresh setup 2012-04-26 11:06:40 -07:00
Alena Prokharchyk 5da0fdaecb CS-14637: db upgrade - fixed inconsistencies in category/component fields for a bunch of global config variables 2012-04-26 10:10:05 -07:00
Alena Prokharchyk 83eae0c4bf CS-14629: added missing global config variables
Conflicts:

	setup/db/db/schema-301to302.sql
2012-04-25 13:44:07 -07:00
Salvatore Orlando 1b42828f1a CS-14605: OVS cleanup
DB scripts cleanup
2012-04-25 11:42:50 +01:00
Alena Prokharchyk eaf9d3d820 Catch all exceptions when change engine and row_format - can fail when table is full. Just skip as its not a critical fix 2012-04-24 15:49:28 -07:00
Salvatore Orlando bbd2e06366 CS-14619: Add missing INSERT statements 2012-04-24 15:56:23 +01:00
Salvatore Orlando f5952ef685 Adding ovs_tunnel_interface to schema;
adding new tables to update script (3.0.2 to 3.0.3)
2012-04-23 22:34:38 +01:00
root 3513551ae3 Hacking for demo 2012-04-23 22:33:19 +01:00
Abhi b62c26c606 bug 14218: fixing category for redhat 2012-04-23 22:32:16 +01:00
Salvatore Orlando 9f321ffeac Open vSwitch tunnel manager
Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master
2012-04-23 22:32:16 +01:00
Alena Prokharchyk 61a10de627 CS-14591: added XenServer 6.0.2 and VmWare 5.0 as supported hypervisors to fresh 3.0.2 and to the 3.0.1-3.0.2 db upgrade
Conflicts:

	setup/db/db/schema-301to302.sql
2012-04-23 11:19:58 -07:00
Alena Prokharchyk 051416ec5a CS-14589: change engine and row_format for op_lock op_nwgrp_work during the db upgrade 2012-04-23 10:55:08 -07:00
Nitin Mehta 6fd42b831d bug CS-10789: upgrade changes for the new table and custome disk offering. 2012-04-23 21:10:36 +05:30
Nitin Mehta 4434aa0d2d bug CS-10789: More changes for the imageformat, introdueced new column in db for the format, created scripts for doffernt hypervisors ...and the list goes on. 2012-04-23 13:44:34 +05:30
Nitin Mehta 564cef8ddf More changes for uploadVolume. Create framework for upload volume progress communication between MS and SSVM. 2012-04-23 12:14:35 +05:30
Alena Prokharchyk e4e0fff2eb Fixed db upgrade for 2.1-3.0 2012-04-20 12:00:37 -07:00
Alena Prokharchyk d7f4d5d4ec CS-14553: db upgrade - for default network offerings:
1) Change display text to match fresh 3.0.2
2) Delete lb service for the offerings using VR as a provider and not having source nat service
2012-04-18 17:10:52 -07:00
Alena Prokharchyk 92c8c80978 Fixed spelling mistake in db upgrade script 2012-04-18 14:28:16 -07:00
Alena Prokharchyk 0508090090 CS-14558: db upgrade - fixed inconsistencies fresh vs upgraded 3.0.2 build 2012-04-18 13:28:09 -07:00
Alena Prokharchyk 01274e3af4 CS-14480: db upgrade 3.0.1-3.0.2 - fixed upgrade inconsistencies in default fields values 2012-04-16 16:04:45 -07:00
kishan 35c8c01e9c bug CS-14431: query to drop event table already exists. reverting earlier commit
status CS-14431: resolved fixed
reviewed-by: Nitin
2012-04-16 17:15:08 +05:30
Alena Prokharchyk b2be0039cb Usage db upgrade from 2.2.14 to 3.0 - don't drop the same fields twice from network_usage table 2012-04-13 13:59:01 -07:00
kishan 7e186fefb6 bug CS-14430, CS-14431: Dropped unused columns in usage_network table, drop event table in cloud_usage db
status CS-14430, CS-14431: resolved fixed
reviewed-by: Nitin
2012-04-13 12:05:20 +05:30
Alena Prokharchyk 14f973ba8c Fixed 2.2.14 to 3.0. upgrade
Conflicts:

	setup/db/db/schema-30to301.sql
2012-04-11 18:01:37 -07:00
frank 726aac5161 set resource_state = allocation_state when doing DB upgrade 2012-04-11 17:47:20 -07:00
Sheng Yang eb20d63f12 Revert "Fix foreign key "fk_domain_router__element_id" in the upgrade"
This reverts commit 52e334cefc.

Conflicts:

	setup/db/db/schema-301to302.sql
2012-04-11 17:37:46 -07:00
frank 9684ea7397 CS-14429 Cloud db schema differences between fresh installed 3.0.2 & upgraded 3.0.2
do check befor droping index i_host__allocation_state`(`allocation_state`)
2012-04-11 17:25:35 -07:00
Sheng Yang 6c9fd606ab Fix foreign key "fk_domain_router__element_id" in the upgrade 2012-04-11 16:51:18 -07:00
frank d91fbab9cf CS-14429 Cloud db schema differences between fresh installed 3.0.2 & upgraded 3.0.2
drop index i_host__allocation_state`(`allocation_state`)
2012-04-11 16:42:12 -07:00
Alena Prokharchyk 8084318e5e Remove obsolete network_tags table as a part of db upgrade cleanup 2012-04-11 16:23:51 -07:00
Alena Prokharchyk 85b35978de Db upgrade path for 3.0.2 to 3.0.3 2012-04-09 15:50:10 -07:00
Alena Prokharchyk 98fd5cf959 bug 14622: introduced ha tagging for host
status 14622: resolved fixed

Conflicts:

	server/src/com/cloud/host/dao/HostDao.java
2012-04-09 15:18:01 -07:00
Alena Prokharchyk 2d1a6b0b35 bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts
status 14615: resolved fixed
2012-04-06 11:30:48 -07:00
Alena Prokharchyk b14bac0977 bug 14539: 1) introduced 2 new config parameters defining default offerings for ssvm and cpvm - consoleproxy.service.offering and secstorage.service.offering
2) Added new api - changeServiceForSystemVm - to support service offering upgrade for system vms
3) Removed global config parameters that are not in use anymore: consoleproxy.ram.size, consoleproxy.cpu.mhz, secstorage.vm.ram.size, secstorage.vm.cpu.mhz
2012-04-03 10:52:32 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
prachi 23915b7481 Bug 14536 - DB exception while trying to delete physical network
Reviewed-By: Sheng Yang

Changes:
Added 'removed' column to physical_network_service_providers to avoid the Foreign Key constraint error.

Conflicts:

	setup/db/db/schema-30to301.sql
2012-03-29 10:15:30 -07:00
Alena Prokharchyk ca981e209a bug 14169: show error on the console in addition to logging it when restart operation fails for ssvm/consoleProxy/domR
status 14169: resolved fixed
2012-03-28 16:17:24 -07:00
frank eb8975670f Bug 14497 - 3.0->3.0.1Upgrade: Defualt value for "resource_state" field in host table differs from upgraded to fresh installed 3.0.1 schema.
status 14497: resolved fixed
reviewed-by: edison

Conflicts:

	setup/db/db/schema-30to301.sql
2012-03-26 14:55:27 -07:00
Alena Prokharchyk ce8e9a9f51 bug 14500: set default value for is_system field as a part of 3.0 to 3.0.1 upgrade
status 14500: resolved fixed
reviwed-by: Frank Zhang

Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
	setup/db/db/schema-30to301.sql
2012-03-26 10:27:15 -07:00
Nitin Mehta 2a837c3ebd Bug 14345: DB discrepecy for capacity.check.period, cluster.memory.allocated.capacity.disablethreshold, pool.storage.allocated.capacity.disablethreshold, pool.storage.capacity.disablethreshold.
Reviewed-By: Kishan
2012-03-22 10:01:49 +05:30
kishan e84f29e37b bug 14290: in 3.0 upgrade insert CentOS 5.6 template with ID 5
status 14290: resolved fixed
2012-03-21 17:25:38 +05:30
Alena Prokharchyk 81d7f9bdbf bug 14407: update network count for account/domain as a part of 3.0 to 3.0.1 upgrade
status 14407: resolved fixed
2012-03-20 10:40:32 -07:00
Alena Prokharchyk 8dafe972fe bug 14341: fixed issue #3
status 14341: resolved fixed
2012-03-19 16:41:12 -07:00
Sheng Yang 32c0068ae3 bug 14341: Fix #2 2012-03-19 15:18:31 -07:00
Alena Prokharchyk c01ed2f754 Added upgrade path from 3.0.x to 3.0.1 2012-03-19 13:38:38 -07:00
Alena bb5a99f017 bug 14345: fixed #1,8,14 and 15 2012-03-19 10:56:13 -07:00
Alena Prokharchyk 167b0367b3 bug 14305: set name for the guest network in basic zone
status 14305: resolved fixed
2012-03-15 11:57:13 -07:00
Edison Su a1e85cdd6d bug 14201: delete duplicate guest os type. status 14201: resolved fixed 2012-03-14 11:49:15 -07:00
Abhi d71ab32900 bug 14218: fixing category for redhat 2012-03-14 17:22:49 +05:30
Abhi 0c180a2cf6 bug 14217: added the missing guest oses 2012-03-14 15:15:53 +05:30
U-aprateek-PC\aprateek 52c3d5c792 bug 14219: 6.0 is now not in beta 2012-03-14 15:06:12 +05:30
Alena Prokharchyk ad1192e264 bug 14239: limit number of Isolated account specific networks per account
status 14239: resolved fixed

Conflicts:

	api/src/com/cloud/api/commands/CreateNetworkCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-03-12 15:53:30 -07:00
kishan 14e2dd67bc Bug 14195: Changed category of Usage and Secure configs 2012-03-12 16:10:05 +05:30
Alena Prokharchyk 681f80cc4d bug 14221: fixed description for default network offering
status 14221: resolved fixed
2012-03-09 11:38:06 -08:00
Alena Prokharchyk 2fb4a97837 bug 14195: fixed category for Project related global config values 2012-03-09 11:19:08 -08:00
Nitin Mehta ce8787ec80 Bug 14199: Add allocated workd to the config values.
Reviewed-By: Kishan
2012-03-09 12:19:36 +05:30
Alena Prokharchyk 8155b63c88 bug 14199: added missing config values during the db upgrade 2012-03-08 14:29:39 -08:00
Alena Prokharchyk 69d269df08 bug 14200: remove skip.steps config param as a part of 2.2.x-3.0 upgrade. Fixed the name for vm.destroy.forcestop config as well 2012-03-08 14:12:24 -08:00
frank e358c45e8a Bug 14170 - 2.2.14(KVM) - 3.0.1 Upgrade: DB inconsistencies after Upgrade
default resource_state should be Enabled
2012-03-08 10:25:34 -08:00
Sheng Yang 5f387762ed bug 14170: Fix issue #7 2012-03-07 16:54:12 -08:00
Alena Prokharchyk 686761686f bug 14170: fixed #4-6 and #9-13 2012-03-07 16:37:24 -08:00
Alena Prokharchyk 4f741c833c bug 14170: issues #1-#3 are fixed 2012-03-07 13:37:16 -08:00
frank 4ff6fdf05f 2214to30 DB upgrade:
directly put simulator_network_label, ovm_network_label when creating physical_network_traffic_types
table
2012-03-06 11:11:48 -08:00
frank a1e0771616 set xen.storage.network.device1 xen.storage.network.device2 to null when upgrade 2012-03-05 15:38:13 -08:00
frank 8890fbd1f8 Bug 14068 - Db upgrade: resource_state is incorrect for the host in UP state after the db upgrade from 2.2.x to 3.0
fix typo
2012-03-05 15:37:53 -08:00
frank 77ba5d0f8e Bug 14068 - Db upgrade: resource_state is incorrect for the host in UP state after the db upgrade from 2.2.x to 3.0
Bug 14099 - Db upgrade for storage network

status 14068: resovled fixed
status 14099: resovled fixed
2012-03-05 15:37:46 -08:00
kishan de997c1e45 Bug 13952: Changed category of Usage configs
Status 13952: resolved fixed
Reviewed-By: Abhi
2012-03-05 18:58:49 +05:30
Alena Prokharchyk 6a1d7e309d More fixes to 2.2.x - 3.0 db upgrade 2012-03-01 18:31:50 -08:00
Sheng Yang 6e95f8a4a0 bug 14085: Upgrade: Update domain_router's Role
status 14085: resolved fixed
2012-03-01 14:58:40 -08:00
kishan 3bf242c664 Drop security group usage table and add again for upgrade 2012-02-29 14:44:58 +05:30
Alena Prokharchyk e01088f4a6 DB upgrade: added missing account_details table 2012-02-28 17:19:17 -08:00
Edison Su 8fb378ac53 fix db upgrade 2012-02-28 17:03:18 -08:00
Edison Su 215bcb1ce6 fix db upgrade 2012-02-28 16:38:53 -08:00
Alena Prokharchyk 6ac729e294 Add is_system field to user_ip_address table during the db upgrade 2012-02-28 16:30:56 -08:00
Sheng Yang 0d2693c1c4 Add element_id for 3.0 upgrade 2012-02-28 16:19:38 -08:00
Edison Su 66b4351caf fix db upgrade 2012-02-28 15:39:32 -08:00
Alena Prokharchyk 9b6c3867c7 Updated test data for db upgrade unittest 2012-02-28 15:27:03 -08:00
Alena Prokharchyk 2eaefc4aa8 Fixed unittest and some issues with 2.2.14-3.0 upgrade 2012-02-28 15:17:14 -08:00
anthony b16eb44a9c bug 13975: use correct hypervsor_version
status 13975: resolved fixed

reviewed-by : edison
2012-02-23 17:05:44 -08:00
Alena Prokharchyk 80a48e7a1a 2.2.x-3.0 upgrade - column name change 2012-02-22 16:38:52 -08:00
Alena Prokharchyk 2e9511e2ae Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network
Reviewed-by: Chiradeep
2012-02-21 15:39:49 -08:00
Sheng Yang 2c27de0042 bug 12974: Update system template info in templates.sql
status 12974: resolved fixed

Reviewed-by: Frank Zhang
2012-02-21 13:50:17 -08:00
frank e7d51ed5b6 Bug 13568 - secondary storage VM's static route for nfs server breaks things!
add DB upgrade script.
Now storage network requires gateway when adding range

reviewed-by: Sheng Yang
2012-02-17 16:24:47 -08:00
frank a1fa313902 Bug 13568 - secondary storage VM's static route for nfs server breaks things!
status 13568: resolved fixed
reviewed-by: Sheng Yang
2012-02-17 16:24:32 -08:00
kishan ced6fd46b8 Bug 12954: Added usage for security groups. Usage will be generated for each security group that is assigned to a Vm.
Status 12954: resolved fixed
Reviewed-By: Nitin
2012-02-17 13:50:18 +05:30
Jessica Tomechak 4d517435b8 Update documentation headers for v3.0 in API Reference. 2012-02-16 02:04:30 -08:00
frank ede4c502f2 Bug 13662 - OVM host remain in Alert state, Unable to create deployment for OVM instance
Bug 13641 - OVM add host to OVM cluster results in host remaining in state: Alert
Bug 13652 - OVM add primary storage to OVM cluster FAIL

making Ovm work on Acton

status 13662: resolved fixed
status 13641: resolved fixed
status 13652: resolved fixed

reviewed-by: edison
2012-02-14 15:12:46 -08:00
Edison Su 1ab89dd436 add cert chain in db, and also open the api to upload a cert chain 2012-02-09 14:56:40 -08:00
Ewan Mellor 22119a33b5 Added build-apidocs-zip build target that generates HTML versions of the
API docs.  Uses XML/XSLT generation system originally by Abhinandan Prateek
(I think).  CSS updates from Jessica Tomechak.  gen_toc.py and build script
changes by me.
2012-02-08 20:40:29 -08:00
prachi 05af078358 Bug 8791 - user dispersing allocator
Changes:
To migrate systems using 'use.user.concentrated.pod.allocation' as true and 'vm.allocation.algorithm' as true, we need to
add following changes:

- There will be 5 values to 'vm.allocation.algorithm': 'random', 'firstfit', 'userdispersing', 'userconcentratedpod_random', 'userconcentratedpod_firstfit'
- 'userconcentratedpod_random' means we apply user concentration to pods and clusters. To hosts and pools we use random ordering.
- 'userconcentratedpod_firstfit' means we apply user concentration to pods and clusters. To hosts and pools we use firstfit ordering.
2012-02-08 17:03:38 -08:00
frank 2b9fe25fcd Bug 13529 - Multiple Management Servers: cloud-setup-databases script fails to execute
status 13529: resolved fixed
2012-02-08 16:58:17 -08:00
Sheng Yang 9317eb6bc3 Revert dynamic cidr change 2012-02-08 15:54:22 -08:00