Skip to content

Commit 638fdca

Browse files
edisonSuedisonSu
committed
add db schema
1 parent da8ffe2 commit 638fdca

2 files changed

Lines changed: 47 additions & 12 deletions

File tree

‎cloud-cli/bindir/cloudvoladm‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def createvol(options):
271271

272272

273273
try:
274-
output = cloudtool.main(['cloud-tool', 'cloud', 'createVolumeOnFiler', '--ipaddress=' + NetAppServerIP , '--aggregatename=' + options.aggregate_name,
274+
output = cloudtool.main(['cloud-tool', 'createVolumeOnFiler', '--ipaddress=' + NetAppServerIP , '--aggregatename=' + options.aggregate_name,
275275
'--poolname=' + options.pool_name, '--volumename=' + options.vol_name,
276276
'--size=' + options.size,
277277
'--username=' + NetAppUserName, '--password=' + NetAppPassword, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)] + args)
@@ -298,7 +298,7 @@ def deletevol(options):
298298
validate_parameter(options, delvolParser)
299299

300300
try:
301-
output = cloudtool.main(['cloud-tool', 'cloud', 'destroyVolumeOnFiler', '--ipaddress=' + NetAppServerIP, '--aggregatename=' + options.aggregate_name,
301+
output = cloudtool.main(['cloud-tool', 'destroyVolumeOnFiler', '--ipaddress=' + NetAppServerIP, '--aggregatename=' + options.aggregate_name,
302302
'--volumename=' + options.vol_name, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
303303
except urllib2.HTTPError, err:
304304
code = err.code
@@ -322,7 +322,7 @@ def listvol(options):
322322
validate_parameter(options, listvolParser)
323323

324324
try:
325-
output = cloudtool.main(['cloud-tool', 'cloud', 'listVolumesOnFiler', '--poolname=' + options.pool_name, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
325+
output = cloudtool.main(['cloud-tool', 'listVolumesOnFiler', '--poolname=' + options.pool_name, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
326326
except urllib2.HTTPError, err:
327327
code = err.code
328328
msg = err.read()
@@ -353,7 +353,7 @@ def createlun(options):
353353
validate_parameter(options, createlunParser)
354354

355355
try:
356-
output = cloudtool.main(['cloud-tool', 'cloud', 'createLunOnFiler', '--poolname=' + options.pool_name,
356+
output = cloudtool.main(['cloud-tool', 'createLunOnFiler', '--poolname=' + options.pool_name,
357357
'--size=' + options.size, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
358358
except urllib2.HTTPError, err:
359359
code = err.code
@@ -382,7 +382,7 @@ def listlun(options):
382382

383383
args = ["--poolname=" + options.pool_name, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)]
384384
try:
385-
output = cloudtool.main(['cloud-tool', 'cloud', 'listLunsOnFiler'] + args)
385+
output = cloudtool.main(['cloud-tool', 'listLunsOnFiler'] + args)
386386
except urllib2.HTTPError, err:
387387
code = err.code
388388
msg = err.read()
@@ -412,7 +412,7 @@ def destroylun(options):
412412
validate_parameter(options, destroylunParser)
413413

414414
try:
415-
output = cloudtool.main(['cloud-tool', 'cloud', 'destroyLunOnFiler', '--path=' + options.lun_name,
415+
output = cloudtool.main(['cloud-tool', 'destroyLunOnFiler', '--path=' + options.lun_name,
416416
"--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
417417
except urllib2.HTTPError, err:
418418
code = err.code
@@ -436,7 +436,7 @@ def assoclun(options):
436436
validate_parameter(options, assocLunParser)
437437

438438
try:
439-
output = cloudtool.main(['cloud-tool', 'cloud', 'associateLun', '--name=' + options.lun_name,
439+
output = cloudtool.main(['cloud-tool', 'associateLun', '--name=' + options.lun_name,
440440
'--iqn=' + options.guest_iqn, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
441441
except urllib2.HTTPError, err:
442442
code = err.code
@@ -464,7 +464,7 @@ def disassoclun(options):
464464
validate_parameter(options, disassocLunParser)
465465

466466
try:
467-
output = cloudtool.main(['cloud-tool', 'cloud', 'dissociateLun', '--path=' + options.lun_name,
467+
output = cloudtool.main(['cloud-tool', 'dissociateLun', '--path=' + options.lun_name,
468468
'--iqn=' + options.guest_iqn, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
469469
except urllib2.HTTPError, err:
470470
code = err.code
@@ -491,7 +491,7 @@ def createpool(options):
491491
print "Only roundrobin or leastfull algorithm is supported"
492492
sys.exit(1)
493493
try:
494-
output = cloudtool.main(['cloud-tool', 'cloud', 'createPool', '--poolname=' + options.pool_name,
494+
output = cloudtool.main(['cloud-tool', 'createPool', '--poolname=' + options.pool_name,
495495
'--algorithm=' + options.algorithm, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
496496
except urllib2.HTTPError, err:
497497
code = err.code
@@ -513,7 +513,7 @@ def createpool(options):
513513

514514
def listpools(options):
515515
try:
516-
output = cloudtool.main(['cloud-tool', 'cloud', 'listPools',
516+
output = cloudtool.main(['cloud-tool', 'listPools',
517517
"--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
518518
except urllib2.HTTPError, err:
519519
code = err.code
@@ -544,7 +544,7 @@ def modifypool(options):
544544
validate_parameter(options, modifyPoolParser)
545545

546546
try:
547-
output = cloudtool.main(['cloud-tool', 'cloud', 'modifyPool', '--poolname=' + options.pool_name,
547+
output = cloudtool.main(['cloud-tool', 'modifyPool', '--poolname=' + options.pool_name,
548548
'--algorithm=' + options.algorithm, "--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
549549
except urllib2.HTTPError, err:
550550
code = err.code
@@ -568,7 +568,7 @@ def destroypool(options):
568568
validate_parameter(options, destroyPoolParser)
569569

570570
try:
571-
output = cloudtool.main(['cloud-tool', 'cloud', 'deletePool', '--poolname=' + options.pool_name,
571+
output = cloudtool.main(['cloud-tool', 'deletePool', '--poolname=' + options.pool_name,
572572
"--server=" + CloudStackSvrIP + ":" + str(CloudStackSvrPort)])
573573
except urllib2.HTTPError, err:
574574
code = err.code

‎setup/db/create-schema.sql‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,4 +1533,39 @@ CREATE TABLE `cloud`.`op_host_transfer` (
15331533
CONSTRAINT `fk_op_host_transfer__future_mgmt_server_id` FOREIGN KEY `fk_op_host_transfer__future_mgmt_server_id`(`future_mgmt_server_id`) REFERENCES `mshost`(`msid`)
15341534
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
15351535

1536+
1537+
CREATE TABLE `cloud`.`netapp_volume` (
1538+
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
1539+
`ip_address` varchar(255) NOT NULL COMMENT 'ip address/fqdn of the volume',
1540+
`pool_id` bigint unsigned NOT NULL COMMENT 'id for the pool',
1541+
`pool_name` varchar(255) NOT NULL COMMENT 'name for the pool',
1542+
`aggregate_name` varchar(255) NOT NULL COMMENT 'name for the aggregate',
1543+
`volume_name` varchar(255) NOT NULL COMMENT 'name for the volume',
1544+
`volume_size` varchar(255) NOT NULL COMMENT 'volume size',
1545+
`snapshot_policy` varchar(255) NOT NULL COMMENT 'snapshot policy',
1546+
`snapshot_reservation` int NOT NULL COMMENT 'snapshot reservation',
1547+
`username` varchar(255) NOT NULL COMMENT 'username',
1548+
`password` varchar(200) COMMENT 'password',
1549+
`round_robin_marker` int COMMENT 'This marks the volume to be picked up for lun creation, RR fashion',
1550+
PRIMARY KEY (`ip_address`,`aggregate_name`,`volume_name`)
1551+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1552+
1553+
CREATE TABLE `cloud`.`netapp_pool` (
1554+
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
1555+
`name` varchar(255) NOT NULL UNIQUE COMMENT 'name for the pool',
1556+
`algorithm` varchar(255) NOT NULL COMMENT 'algorithm',
1557+
PRIMARY KEY (`id`)
1558+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1559+
1560+
CREATE TABLE `cloud`.`netapp_lun` (
1561+
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
1562+
`lun_name` varchar(255) NOT NULL COMMENT 'lun name',
1563+
`target_iqn` varchar(255) NOT NULL COMMENT 'target iqn',
1564+
`path` varchar(255) NOT NULL COMMENT 'lun path',
1565+
`size` bigint NOT NULL COMMENT 'lun size',
1566+
`volume_id` bigint unsigned NOT NULL COMMENT 'parent volume id',
1567+
PRIMARY KEY (`id`)
1568+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1569+
1570+
15361571
SET foreign_key_checks = 1;

0 commit comments

Comments
 (0)