mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-17 04:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added the ability to specify options for -assigndev and -replacedev,

Browse Source 
mainly READ_ONLY for now.
- Updated module to accept more than one option for assignDeviceToGroup() and
  replaceDeviceInGroup().
- Incremented module version number and renamed module directory to reflect it.



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1103 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2009-09-17 16:33:24 +00:00
parent c4061f22e2
commit 788c769a65
7 changed files with 78 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scstadmin/ChangeLog
+8
View File
@@ -1,3 +1,11 @@
Changes for 1.0.8
- Added the ability to specify options for -assigndev and -replacedev,
mainly READ_ONLY for now.
- Updated module to accept more than one option for assignDeviceToGroup() and
replaceDeviceInGroup().
- Incremented module version number and renamed module directory to reflect it.
Changes for 1.0.7
- Added -moveuser, -renamegroup and -ReplaceDev options and necessary -to argument.
scstadmin/Makefile
+1 -1
View File
@@ -1,4 +1,4 @@
MODULE_VERSION = 0.7.4
MODULE_VERSION = 0.8.21
TOOL = scstadmin
SBINDIR := $(PREFIX)/usr/local/sbin
scstadmin/scst-0.7.4/MANIFEST → scstadmin/scst-0.8.21/MANIFEST
View File
scstadmin/scst-0.7.4/Makefile.PL → scstadmin/scst-0.8.21/Makefile.PL
View File
scstadmin/scst-0.7.4/README → scstadmin/scst-0.8.21/README
View File
scstadmin/scst-0.7.4/lib/SCST/SCST.pm → scstadmin/scst-0.8.21/lib/SCST/SCST.pm
+57 -29
View File
@@ -52,7 +52,7 @@ $IOTYPE_PHYSICAL = 100;
$IOTYPE_VIRTUAL = 101;
$IOTYPE_PERFORMANCE = 102;
$VERSION = 0.8.2;
$VERSION = 0.8.21;
my $_SCST_MIN_MAJOR_ = 1;
my $_SCST_MIN_MINOR_ = 0;
@@ -108,20 +108,26 @@ my %_IO_TYPES_ = ($CDROM_TYPE => $IOTYPE_PHYSICAL,
my %_HANDLER_ALIASES_ = ('vdisk_blk' => 'vdisk');
my %_AVAILABLE_OPTIONS_ = ('WRITE_THROUGH' => 'WRITE_THROUGH',
'WT' => 'WRITE_THROUGH',
'O_DIRECT' => 'O_DIRECT',
'DR' => 'O_DIRECT',
'READ_ONLY' => 'READ_ONLY',
'RO' => 'READ_ONLY',
'NULLIO' => 'NULLIO',
'NIO' => 'NULLIO',
'NV_CACHE' => 'NV_CACHE',
'NV' => 'NV_CACHE',
'BLOCKIO' => 'BLOCKIO',
'BIO' => 'BLOCKIO',
'REMOVABLE' => 'REMOVABLE',
'RM' => 'REMOVABLE');
my %_OPEN_OPTIONS_ = ('WRITE_THROUGH' => 'WRITE_THROUGH',
'WT' => 'WRITE_THROUGH',
'O_DIRECT' => 'O_DIRECT',
'DR' => 'O_DIRECT',
'READ_ONLY' => 'READ_ONLY',
'RO' => 'READ_ONLY',
'NULLIO' => 'NULLIO',
'NIO' => 'NULLIO',
'NV_CACHE' => 'NV_CACHE',
'NV' => 'NV_CACHE',
'BLOCKIO' => 'BLOCKIO',
'BIO' => 'BLOCKIO',
'REMOVABLE' => 'REMOVABLE',
'RM' => 'REMOVABLE');
my %_ASSIGN_OPTIONS_ = ('READ_ONLY' => 'READ_ONLY',
'RO' => 'READ_ONLY');
my %_OPTIONS_BY_TYPE_ = ('OPEN', => \%_OPEN_OPTIONS_,
'ASSIGN' => \%_ASSIGN_OPTIONS_);
sub new {
my $this = shift;
@@ -428,10 +434,10 @@ sub handlerDevices {
my $options_t;
foreach my $option (split(/\s/, cleanupString($options))) {
if (defined($_AVAILABLE_OPTIONS_{$option})) {
$options_t .= $_AVAILABLE_OPTIONS_{$option}.',';
if (defined($_OPEN_OPTIONS_{$option})) {
$options_t .= $_OPEN_OPTIONS_{$option}.',';
} else {
cluck("WARNING: Unknown option '$option', please update your SCST module");
cluck("WARNING: Unknown option '$option', please update your SCST version");
}
}
@@ -487,7 +493,7 @@ sub openDevice {
my $handler_name = $_REVERSE_MAP_{$handler};
my $valid_opts;
($options, $valid_opts) = $self->checkOptions($options);
($options, $valid_opts) = $self->checkOptions($options, 'OPEN');
if (!$valid_opts) {
$self->{'error'} = "openDevice(): Invalid option(s) '$options' given for device '$device'";
@@ -874,9 +880,15 @@ sub assignDeviceToGroup {
my $device = shift;
my $group = shift;
my $lun = shift;
my $readOnly = shift;
my $options = shift;
my $valid_opts;
$readOnly = 'READ_ONLY' if (defined($readOnly) && $readOnly);
($options, $valid_opts) = $self->checkOptions($options, 'ASSIGN');
if (!$valid_opts) {
$self->{'error'} = "assignDeviceToGroup(): Invalid option(s) '$options' given for device '$device'";
return 1;
}
if (!$self->groupExists($group)) {
$self->{'error'} = "assignDeviceToGroup(): Group '$group' does not exist";
@@ -889,7 +901,10 @@ sub assignDeviceToGroup {
return 2;
}
my $cmd = "add $device $lun $readOnly\n";
$options = cleanupString($options);
$options =~ s/,/ /g;
my $cmd = "add $device $lun $options\n";
my $rc = $self->group_private($group, $_SCST_DEVICES_IO_, $cmd);
@@ -911,9 +926,16 @@ sub replaceDeviceInGroup {
my $newDevice = shift;
my $group = shift;
my $lun = shift;
my $readOnly = shift;
my $options = shift;
my $valid_opts;
$readOnly = 'READ_ONLY' if (defined($readOnly) && $readOnly);
($options, $valid_opts) = $self->checkOptions($options, 'ASSIGN');
if (!$valid_opts) {
$self->{'error'} = "assignDeviceToGroup(): Invalid option(s) '$options' given for ".
"device '$newDevice'";
return 1;
}
if (!$self->groupExists($group)) {
$self->{'error'} = "replaceDeviceInGroup(): Group '$group' does not exist";
@@ -926,7 +948,10 @@ sub replaceDeviceInGroup {
return 2;
}
my $cmd = "replace $newDevice $lun $readOnly\n";
$options = cleanupString($options);
$options =~ s/,/ /g;
my $cmd = "replace $newDevice $lun $options\n";
my $rc = $self->group_private($group, $_SCST_DEVICES_IO_, $cmd);
@@ -1111,14 +1136,17 @@ sub group_private {
sub checkOptions {
my $self = shift;
my $options = shift;
my $type = shift;
my $o_string;
my $b_string;
my $bad = 0;
return undef, 1 if (!$options);
return undef, 1 if (!$options || !$type);
my $_options_ = $_OPTIONS_BY_TYPE_{$type};
foreach my $option (split(/[\s+|\,]/, $options)) {
my $map = $_AVAILABLE_OPTIONS_{$option};
my $map = $$_options_{$option};
if (!$map) {
$bad = 1;
@@ -1419,7 +1447,7 @@ Assigns the specified device to the specified security group. Returns
0 upon success, 1 if unsuccessfull and 2 if the device has already
been assigned to the specified security group.
Arguments: (string) $device, (string) $group, (int) $lun [, (bool) $rd_only]
Arguments: (string) $device, (string) $group, (int) $lun [, (string) $options]
Returns: (int) $success
@@ -1430,7 +1458,7 @@ specified security group with $newDevice. Returns 0 upon success, 1
if unsuccessfull and 2 if the device has already been assigned to
the specified security group.
Arguments: (string) $newDevice, (string) $group, (int) $lun [, (bool) $rd_only]
Arguments: (string) $newDevice, (string) $group, (int) $lun [, (string) $options]
Returns (int) $success
scstadmin/scstadmin
+12 -5
View File
@@ -1,5 +1,5 @@
#!/usr/bin/perl
$Version = 'SCST Configurator v1.0.7';
$Version = 'SCST Configurator v1.0.8';
# Configures SCST
#
@@ -56,9 +56,11 @@ Assignment Operations
-assigndev <device> : Assign a given device to a security group.
-group <group>
-lun <lun>
-options <options>
-ReplaceDev <new dev>: Replaces a device assigned to a give LUN and group.
-group <group>
-lun <lun>
-options <options>
-ReleaseDev <device> : Remove a given device from a security group.
-group <group>
-ClearDevs : Clear all device assignments for a security group.
@@ -76,6 +78,9 @@ Available Handlers:
Available Options for create and open:
WRITE_THROUGH, READ_ONLY, O_DIRECT, NULLIO, NV_CACHE, BLOCK_IO, REMOVABLE
Available Options for assign and replace:
READ_ONLY
Examples:
Enable target mode for fibre card specifying its WWN
scstadmin -enable 50:06:0B:00:00:39:71:78
@@ -448,11 +453,11 @@ sub main {
last SWITCH;
};
$assignDev && do {
$rc = assignDevice($group, $assignDev, $devLun);
$rc = assignDevice($group, $assignDev, $devLun, $options);
last SWITCH;
};
$replaceDev && do {
$rc = replaceDevice($group, $replaceDev, $devLun);
$rc = replaceDevice($group, $replaceDev, $devLun, $options);
last SWITCH;
};
$releaseDev && do {
@@ -1337,6 +1342,7 @@ sub assignDevice {
my $group = shift;
my $device = shift;
my $lun = shift;
my $options = shift;
my %allLuns;
# Put luns into something easier to parse..
@@ -1376,7 +1382,7 @@ sub assignDevice {
print "\t-> Assign virtual device '$device' to group '$group' at LUN '$lun'..\n";
if ($SCST->assignDeviceToGroup($device, $group, $lun)) {
if ($SCST->assignDeviceToGroup($device, $group, $lun, $options)) {
print "WARNING: Failed to assign device '$device' to group '$group': ".
$SCST->errorString()."\n";
return $TRUE;
@@ -1398,6 +1404,7 @@ sub replaceDevice {
my $group = shift;
my $newDevice = shift;
my $lun = shift;
my $options = shift;
my %allLuns;
# Put luns into something easier to parse..
@@ -1421,7 +1428,7 @@ sub replaceDevice {
print "\t-> Replace device at LUN '$lun' in group '$group' with new device '$newDevice'..\n";
if ($SCST->replaceDeviceInGroup($newDevice, $group, $lun)) {
if ($SCST->replaceDeviceInGroup($newDevice, $group, $lun, $options)) {
print "WARNING: Failed to replace LUN '$lun' in group '$group' with new device '$newDevice': ".
$SCST->errorString()."\n";
return $TRUE;