* reworked construction of export-URI to be delegated into the respective

  exporter module, as a result, the NBD-URLs are now correct
* added 'nbd' as an alias for the 'nbd-squash' export type


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1024 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 49 insertions, 3 deletions

diff --git a/installer/OpenSLX/OSExport/Engine.pm b/installer/OpenSLX/OSExport/Engine.pm
index 77b21eaa..4ffae1a8 100644
--- a/installer/OpenSLX/OSExport/Engine.pm
+++ b/installer/OpenSLX/OSExport/Engine.pm
@@ -39,6 +39,10 @@ use vars qw(%supportedExportTypes %supportedDistros);
 		=> { module => 'NBD_Squash' },
 );
 
+my %aliasedExportTypes = (
+	'nbd' => 'nbd-squash',
+);
+
 %supportedDistros = (
 	'<any>'
 		=> { module => 'Any' },
@@ -158,6 +162,14 @@ sub purgeExport
 	$self->removeExportFromConfigDB();
 }
 
+sub generateExportURI
+{
+	my $self = shift;
+	my $export = shift;
+
+	return $self->{exporter}->generateExportURI($export);
+}
+
 sub requiredFSMods
 {
 	my $self = shift;
@@ -176,6 +188,9 @@ sub _initialize
 	my $exportName = shift;
 	my $exportType = lc(shift);
 
+	if (exists $aliasedExportTypes{lc($exportType)}) {
+		$exportType = $aliasedExportTypes{lc($exportType)};
+	}
 	if (!exists $supportedExportTypes{lc($exportType)}) {
 		print _tr("Sorry, export type '%s' is unsupported.\n", $exportType);
 		print _tr("List of supported export types:\n\t");
diff --git a/installer/OpenSLX/OSExport/ExportType/Base.pm b/installer/OpenSLX/OSExport/ExportType/Base.pm
index ccf21826..a21d5499 100644
--- a/installer/OpenSLX/OSExport/ExportType/Base.pm
+++ b/installer/OpenSLX/OSExport/ExportType/Base.pm
@@ -60,11 +60,12 @@ sub addExportToConfigDB
 	return $openslxDB->addExport($export);
 }
 
-sub requiredFSMods
+sub generateExportURI
 {
-	my $self = shift;
+}
 
-	return '';
+sub requiredFSMods
+{
 }
 
 ################################################################################
diff --git a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
index ec25d067..d5782b59 100644
--- a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
+++ b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
@@ -21,6 +21,7 @@ use strict;
 use Carp;
 use File::Basename;
 use OpenSLX::Basics;
+use OpenSLX::ConfigDB qw(:support);
 use OpenSLX::OSExport::ExportType::Base 1.01;
 
 ################################################################################
@@ -111,6 +112,20 @@ sub addExportToConfigDB
 	return $res;
 }
 
+sub generateExportURI
+{
+	my $self = shift;
+	my $export = shift;
+
+	my $server
+		= length($export->{server_ip})
+			? $export->{server_ip}
+			: generatePlaceholderFor('serverip');
+	$server .= ":$export->{port}"		if length($export->{port});
+
+	return "nbd://$server/squashfs";
+}
+
 sub requiredFSMods
 {
 	my $self = shift;
diff --git a/installer/OpenSLX/OSExport/ExportType/NFS.pm b/installer/OpenSLX/OSExport/ExportType/NFS.pm
index dad07b57..fa1d73b3 100644
--- a/installer/OpenSLX/OSExport/ExportType/NFS.pm
+++ b/installer/OpenSLX/OSExport/ExportType/NFS.pm
@@ -21,6 +21,7 @@ use strict;
 use Carp;
 use File::Basename;
 use OpenSLX::Basics;
+use OpenSLX::ConfigDB qw(:support);
 use OpenSLX::Utils;
 use OpenSLX::OSExport::ExportType::Base 1.01;
 
@@ -58,6 +59,20 @@ sub purgeExport
 	1;
 }
 
+sub generateExportURI
+{
+	my $self = shift;
+	my $export = shift;
+
+	my $server
+		= length($export->{server_ip})
+			? $export->{server_ip}
+			: generatePlaceholderFor('serverip');
+	$server .= ":$export->{port}"		if length($export->{port});
+
+	return "nfs://$server$openslxConfig{'export-path'}/nfs/$export->{name}"
+}
+
 sub requiredFSMods
 {
 	my $self = shift;