diff options
author | Oliver Tappe | 2008-05-24 13:51:39 +0200 |
---|---|---|
committer | Oliver Tappe | 2008-05-24 13:51:39 +0200 |
commit | d6fd127c1b993eed6e06bed9ec6c5377081d6c8c (patch) | |
tree | 010ac79bba2d10e05fa3b0904d8f7124719f7abb /config-db/slxconfig | |
parent | * artifically bumped the schema version to 0.30 in order to trigger a synchro... (diff) | |
download | core-d6fd127c1b993eed6e06bed9ec6c5377081d6c8c.tar.gz core-d6fd127c1b993eed6e06bed9ec6c5377081d6c8c.tar.xz core-d6fd127c1b993eed6e06bed9ec6c5377081d6c8c.zip |
* implemented checking of attributes for groups and clients in slxconfig
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1789 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db/slxconfig')
-rwxr-xr-x | config-db/slxconfig | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/config-db/slxconfig b/config-db/slxconfig index 5592e06d..d4656e5e 100755 --- a/config-db/slxconfig +++ b/config-db/slxconfig @@ -269,9 +269,13 @@ sub checkGivenStage3Attrs my $stage3Attrs = shift; my $vendorOSID = shift; - my $vendorOS = $openslxDB->fetchVendorOSByID($vendorOSID); - - OpenSLX::AttributeRoster->checkValues($stage3Attrs, $vendorOS->{name}); + if ($vendorOSID) { + my $vendorOS = $openslxDB->fetchVendorOSByID($vendorOSID); + OpenSLX::AttributeRoster->checkValues($stage3Attrs, $vendorOS->{name}); + } + else { + OpenSLX::AttributeRoster->checkValues($stage3Attrs); + } return 1; } @@ -711,6 +715,8 @@ sub addClientToConfigDB ); $clientData->{name} = $clientName; + checkGivenStage3Attrs($clientData->{attrs}); + my @systemIDs; if (exists $clientData->{systems}) { @systemIDs = map { @@ -778,6 +784,8 @@ sub addGroupToConfigDB ); $groupData->{name} = $groupName; + checkGivenStage3Attrs($groupData->{attrs}); + my @systemIDs; if (exists $groupData->{systems}) { @systemIDs = map { @@ -951,6 +959,8 @@ sub changeClientInConfigDB $clientName); } + checkGivenStage3Attrs($clientData->{attrs}); + mergeNonExistingAttributes($clientData, $client); my @systemIDs; @@ -1038,6 +1048,8 @@ sub changeGroupInConfigDB $groupName); } + checkGivenStage3Attrs($groupData->{attrs}); + mergeNonExistingAttributes($groupData, $group); my (@systemIDs, @clientIDs); |