etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.x

This commit is contained in:
will 2010-10-07 16:41:27 -07:00
parent 3aaa5b7556 537c42be47
commit 7662b26159
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/api/BaseCmd.java
View File

@ -252,6 +252,7 @@ public abstract class BaseCmd {
PERCENT_USED("percentused", BaseCmd.TYPE_STRING, "percentused"),
POD_ID("podid", BaseCmd.TYPE_LONG, "podId"),
POD_NAME("podname", BaseCmd.TYPE_STRING, "podName"),
POOL_ID("poolid", BaseCmd.TYPE_LONG, "poolId"),
POOL_NAME("poolname", BaseCmd.TYPE_STRING, "poolName"),
PRIVATE_IP("privateip", BaseCmd.TYPE_STRING, "privateIp"),
PRIVATE_MAC_ADDRESS("privatemacaddress", BaseCmd.TYPE_STRING, "privatemacaddress"),
@ -286,11 +287,13 @@ public abstract class BaseCmd {
START_VLAN("startvlan", BaseCmd.TYPE_LONG, "startvlan"),
END_VLAN("endvlan", BaseCmd.TYPE_LONG, "endvlan"),
SIZE("size", BaseCmd.TYPE_LONG, "size"),
SIZE_NETAPP_VOL("netappvolsize", BaseCmd.TYPE_STRING, "netappvolsize"),
VOL_SIZE("volsize", BaseCmd.TYPE_STRING, "volsize"),
STATE("state", BaseCmd.TYPE_STRING, "state"),
STORAGE("storage", BaseCmd.TYPE_LONG, "storage"),
SUCCESS("success", BaseCmd.TYPE_BOOLEAN, "success"),
SNAPSHOT_ID("snapshotid", BaseCmd.TYPE_LONG, "snapshotid"),
SNAPSHOT_POLICY("snapshotpolicy", BaseCmd.TYPE_STRING, "snapshotPolicy"),
SNAPSHOT_RESERVATION("snapshotreservation", BaseCmd.TYPE_STRING, "snapshotReservation"),
SNAPSHOT_POLICY_ID("snapshotpolicyid", BaseCmd.TYPE_LONG, "snapshotPolicyId"),
SNAPSHOT_TYPE("snapshottype", BaseCmd.TYPE_STRING, "snapshotType"),
SNAPSHOT_STRING("snapshotstring", BaseCmd.TYPE_STRING, "snapshotString"),

17
setup/db/create-schema.sql
View File

@ -77,24 +77,19 @@ DROP TABLE IF EXISTS `cloud`.`cluster`;
/*DO NOT DELETE*/
/*
DROP TABLE IF EXISTS `cloud`.`netapp_storage_pool`;
DROP TABLE IF EXISTS `cloud`.`netapp_volume`;
CREATE TABLE `cloud`.`netapp_storage_pool` (
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
`ip_address` varchar(15) NOT NULL COMMENT 'ip address of the pool/volume',
`aggregate_name` varchar(255) NOT NULL COMMENT 'name for the aggregate',
`pool_name` varchar(255) NOT NULL COMMENT 'name for the pool/volume',
`aggregate_name` varchar(255) NOT NULL COMMENT 'name for the aggregate',
`volume_name` varchar(255) NOT NULL COMMENT 'name for the volume',
`volume_size` varchar(255) NOT NULL COMMENT 'volume size',
`snapshot_policy` varchar(255) NOT NULL COMMENT 'snapshot policy',
`snapshot_reservation` varchar(255) NOT NULL COMMENT 'snapshot reservation',
`username` varchar(255) NOT NULL COMMENT 'username',
`password` varchar(200) COMMENT 'password',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `cloud`.`netapp_volume` (
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
`pool_id` bigint unsigned NOT NULL COMMENT 'pool id',
`volume_name` varchar(255) NOT NULL COMMENT 'name for the volume',
`aggregate_name` varchar(255) NOT NULL COMMENT 'name for the aggregate',
`size` varchar(255) NOT NULL COMMENT 'volume size',
`round_robin_marker` int COMMENT 'This marks the volume to be picked up for lun creation, RR fashion',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
*/