You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/11 23:22:52 UTC
[29/47] git commit: updated refs/heads/internallb to 3795048
Correcting the rebase merge issues.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec3f844e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec3f844e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec3f844e
Branch: refs/heads/internallb
Commit: ec3f844ef1004ae6ecaf8b7150842fcb50759b84
Parents: fd23b36
Author: Prachi Damle <pr...@cloud.com>
Authored: Wed Apr 3 16:23:57 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Thu Apr 11 13:23:15 2013 -0700
----------------------------------------------------------------------
.../api/command/user/vm/DeployVMCmd.java | 8 +-
setup/db/db/schema-410to420.sql | 71 +--------------
2 files changed, 5 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec3f844e/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 22fe1ba..77ba9fe 100755
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -174,15 +174,13 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
private Boolean startVm;
@ACL
- @Parameter(name = ApiConstants.AFFINITY_GROUP_IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups id that are going to be applied to the virtual machine. "
- + "Should be passed only when vm is created from a zone with Basic Network support."
- + " Mutually exclusive with securitygroupnames parameter")
+ @Parameter(name = ApiConstants.AFFINITY_GROUP_IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups id that are going to be applied to the virtual machine."
+ + " Mutually exclusive with affinitygroupnames parameter")
private List<Long> affinityGroupIdList;
@ACL
@Parameter(name = ApiConstants.AFFINITY_GROUP_NAMES, type = CommandType.LIST, collectionType = CommandType.STRING, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups names that are going to be applied to the virtual machine."
- + " Should be passed only when vm is created from a zone with Basic Network support. "
- + "Mutually exclusive with securitygroupids parameter")
+ + "Mutually exclusive with affinitygroupids parameter")
private List<String> affinityGroupNameList;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec3f844e/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 0f6b41e..b4c693a 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -166,77 +166,8 @@ CREATE TABLE `cloud`.`affinity_group_vm_map` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-CREATE TABLE nic_secondary_ips (
- `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT,
- `uuid` varchar(40),
- `vmId` bigint unsigned COMMENT 'vm instance id',
- `nicId` bigint unsigned NOT NULL,
- `ip4_address` char(40) COMMENT 'ip4 address',
- `ip6_address` char(40) COMMENT 'ip6 address',
- `network_id` bigint unsigned NOT NULL COMMENT 'network configuration id',
- `created` datetime NOT NULL COMMENT 'date created',
- `account_id` bigint unsigned NOT NULL COMMENT 'owner. foreign key to account table',
- `domain_id` bigint unsigned NOT NULL COMMENT 'the domain that the owner belongs to',
- PRIMARY KEY (`id`),
- CONSTRAINT `fk_nic_secondary_ip__vmId` FOREIGN KEY `fk_nic_secondary_ip__vmId`(`vmId`) REFERENCES `vm_instance`(`id`) ON DELETE CASCADE,
- CONSTRAINT `fk_nic_secondary_ip__networks_id` FOREIGN KEY `fk_nic_secondary_ip__networks_id`(`network_id`) REFERENCES `networks`(`id`),
- CONSTRAINT `uc_nic_secondary_ip__uuid` UNIQUE (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-ALTER TABLE `cloud`.`nics` ADD COLUMN secondary_ip SMALLINT DEFAULT '0' COMMENT 'secondary ips configured for the nic';
-ALTER TABLE `cloud`.`user_ip_address` ADD COLUMN dnat_vmip VARCHAR(40);
-
-ALTER TABLE `cloud`.`alert` ADD COLUMN `archived` tinyint(1) unsigned NOT NULL DEFAULT 0;
-ALTER TABLE `cloud`.`event` ADD COLUMN `archived` tinyint(1) unsigned NOT NULL DEFAULT 0;
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'alert.purge.interval', '86400', 'The interval (in seconds) to wait before running the alert purge thread');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'alert.purge.delay', '0', 'Alerts older than specified number days will be purged. Set this value to 0 to never delete alerts');
-
-DROP VIEW IF EXISTS `cloud`.`event_view`;
-CREATE VIEW `cloud`.`event_view` AS
- select
- event.id,
- event.uuid,
- event.type,
- event.state,
- event.description,
- event.created,
- event.level,
- event.parameters,
- event.start_id,
- eve.uuid start_uuid,
- event.user_id,
- event.archived,
- user.username user_name,
- account.id account_id,
- account.uuid account_uuid,
- account.account_name account_name,
- account.type account_type,
- domain.id domain_id,
- domain.uuid domain_uuid,
- domain.name domain_name,
- domain.path domain_path,
- projects.id project_id,
- projects.uuid project_uuid,
- projects.name project_name
- from
- `cloud`.`event`
- inner join
- `cloud`.`account` ON event.account_id = account.id
- inner join
- `cloud`.`domain` ON event.domain_id = domain.id
- inner join
- `cloud`.`user` ON event.user_id = user.id
- left join
- `cloud`.`projects` ON projects.project_account_id = event.account_id
- left join
- `cloud`.`event` eve ON event.start_id = eve.id;
-
ALTER TABLE `cloud`.`service_offering` ADD COLUMN `deployment_planner` varchar(255) NOT NULL DEFAULT 'FirstFitPlanner' COMMENT 'Planner heuristics used to deploy a VM of this offering';
--- Re-enable foreign key checking, at the end of the upgrade path
-SET foreign_key_checks = 1;
-
-
CREATE TABLE nic_secondary_ips (
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT,
`uuid` varchar(40),
@@ -539,3 +470,5 @@ CREATE TABLE `cloud`.`vm_snapshots` (
ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `vm_snapshot_enabled` tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Whether VM snapshot is supported by hypervisor';
UPDATE `cloud`.`hypervisor_capabilities` SET `vm_snapshot_enabled`=1 WHERE `hypervisor_type` in ('VMware', 'XenServer');
+-- Re-enable foreign key checking, at the end of the upgrade path
+SET foreign_key_checks = 1;