Skip to content

Commit

Permalink
moved Nfs::Options to NfsOptions
Browse files Browse the repository at this point in the history 
y2r cannot handle it.
I was too clever. Stupid me.
  • Loading branch information
@mvidner
mvidner committed Jul 30, 2013
1 parent 8d7557f commit 4432132
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 68 deletions.
12 changes: 1 addition & 11 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,9 @@ myinclude_DATA = \
include/nfs/wizards.ycp

module_DATA = \
modules/NfsOptions.ycp \
modules/Nfs.ycp

nfs_moduledir = @moduledir@/Nfs
nfs_module_DATA = \
modules/Nfs/Options.ycp

nfs_modulebindir = $(nfs_moduledir)
nfs_modulebin_DATA = $(patsubst %.ycp,%.ybc,$(nfs_module_DATA))

# .dep does not work with subdirs
modules/Nfs.ybc: modules/Nfs/Options.ybc

desktop_DATA = nfs.desktop

rncdir = $(schemadir)/autoyast/rnc
Expand All @@ -48,4 +39,3 @@ check-local: version-check
EXTRA_DIST = $(client_DATA) $(myinclude_DATA) $(module_DATA) $(nfs_module_DATA) $(desktop_DATA) $(rnc_DATA)

include $(top_srcdir)/Makefile.am.common
ybcfiles += $(filter %.ybc,$(nfs_modulebin_DATA))
6 changes: 3 additions & 3 deletions src/clients/nfs.ycp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ y2milestone ("----------------------------------------");
y2milestone ("NFS module started");

import "Nfs";
import "Nfs::Options";
import "NfsOptions";
import "Progress";
import "Report";
import "String";
Expand Down Expand Up @@ -87,7 +87,7 @@ boolean NfsAddHandler (map options) {
if (! haskey (options, "mntops"))
options["mntops"] = "defaults";

string options_error = Nfs::Options::validate (options["mntops"]:"");
string options_error = NfsOptions::validate (options["mntops"]:"");
if (size (options_error) > 0)
{
Report::Error (options_error);
Expand Down Expand Up @@ -185,7 +185,7 @@ boolean NfsEditHandler (map options) {
!CheckPath (mount) || IsMpInFstab (existing, mount))
return false;

string options_error = Nfs::Options::validate (entry["mntops"]:"");
string options_error = NfsOptions::validate (entry["mntops"]:"");
if (size (options_error) > 0)
{
Report::Error (options_error);
Expand Down
8 changes: 4 additions & 4 deletions src/include/nfs/ui.ycp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import "FileUtils";
import "Label";
import "Nfs";
import "Nfs::Options";
import "NfsOptions";
import "Popup";
import "SuSEFirewall";
import "Wizard";
Expand Down Expand Up @@ -211,7 +211,7 @@
mount = fstab_ent["file"]:"";
nfs4 = fstab_ent["vfstype"]:"" == "nfs4";
options = fstab_ent["mntops"]:"";
nfs41 = nfs4 && Nfs::Options::get_nfs41 (options);
nfs41 = nfs4 && NfsOptions::get_nfs41 (options);
servers = [ server ];
old = fstab_ent["spec"]:"";
}
Expand Down Expand Up @@ -385,10 +385,10 @@ which probably blocks the network scanning.");
nfs4 = (boolean) UI::QueryWidget(`id(`nfs4), `Value);
nfs41 = (boolean) UI::QueryWidget(`id(`nfs41), `Value);
options = deletechars ((string) UI::QueryWidget(`id(`optionsent), `Value), " ");
options = Nfs::Options::set_nfs41(options, nfs41);
options = NfsOptions::set_nfs41(options, nfs41);

ret = nil;
string options_error = Nfs::Options::validate (options);
string options_error = NfsOptions::validate (options);
if (!CheckHostName (server))
{
UI::SetFocus (`id (`serverent));
Expand Down
4 changes: 2 additions & 2 deletions src/modules/Nfs.ycp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import "FileUtils";
import "Mode";
import "Nfs::Options";
import "NfsOptions";
import "Report";
import "Service";
import "Summary";
Expand Down Expand Up @@ -552,7 +552,7 @@ the NFS client configuration.\n"));
// check if options are valid
if (size(options) > 0)
{
if (Nfs::Options::validate(options) != "")
if (NfsOptions::validate(options) != "")
{
y2warning("invalid mount options: %1", options);
return nil;
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Nfs/Options.ycp → src/modules/NfsOptions.ycp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{

module "Nfs::Options";
module "NfsOptions";
textdomain "nfs";

/**
Expand Down
6 changes: 3 additions & 3 deletions testsuite/tests/nfs-options.out
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Dump Nfs::Options::validate
Dump NfsOptions::validate
Return Empty option strings are not allowed.
Return
Return
Expand All @@ -11,5 +11,5 @@ Return Empty value for option: 'rsize'
Return Unknown option: 'two'
Return Invalid option: 'retrans=trans=trans'
Return Unknown option: 'intr'
Dump Nfs::Options::get_nfs41
Dump Nfs::Options::set_nfs41
Dump NfsOptions::get_nfs41
Dump NfsOptions::set_nfs41
82 changes: 41 additions & 41 deletions testsuite/tests/nfs-options.ycp
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
{
include "testsuite.ycp";
import "Nfs::Options";
import "NfsOptions";
import "Assert";

DUMP ("Nfs::Options::validate");
TEST (``(Nfs::Options::validate ("")), [], nil);
TEST (``(Nfs::Options::validate ("defaults")), [], nil);
TEST (``(Nfs::Options::validate ("nolock,bg")), [], nil);
TEST (``(Nfs::Options::validate ("nolock,nobg")), [], nil);
TEST (``(Nfs::Options::validate ("nolock,rsize=8192")), [], nil);
TEST (``(Nfs::Options::validate ("nolock, bg")), [], nil);
TEST (``(Nfs::Options::validate ("nolock,unknownoption")), [], nil);
TEST (``(Nfs::Options::validate ("nolock,unknownassignment=true")), [], nil);
TEST (``(Nfs::Options::validate ("nolock,rsize=")), [], nil);
TEST (``(Nfs::Options::validate ("nolock,two=equal=signs")), [], nil);
TEST (``(Nfs::Options::validate ("nolock,retrans=trans=trans")), [], nil);
TEST (``(Nfs::Options::validate ("nolock,intr=bogus")), [], nil);
DUMP ("NfsOptions::validate");
TEST (``(NfsOptions::validate ("")), [], nil);
TEST (``(NfsOptions::validate ("defaults")), [], nil);
TEST (``(NfsOptions::validate ("nolock,bg")), [], nil);
TEST (``(NfsOptions::validate ("nolock,nobg")), [], nil);
TEST (``(NfsOptions::validate ("nolock,rsize=8192")), [], nil);
TEST (``(NfsOptions::validate ("nolock, bg")), [], nil);
TEST (``(NfsOptions::validate ("nolock,unknownoption")), [], nil);
TEST (``(NfsOptions::validate ("nolock,unknownassignment=true")), [], nil);
TEST (``(NfsOptions::validate ("nolock,rsize=")), [], nil);
TEST (``(NfsOptions::validate ("nolock,two=equal=signs")), [], nil);
TEST (``(NfsOptions::validate ("nolock,retrans=trans=trans")), [], nil);
TEST (``(NfsOptions::validate ("nolock,intr=bogus")), [], nil);

DUMP ("Nfs::Options::get_nfs41");
Assert::Equal(false, Nfs::Options::get_nfs41(""));
Assert::Equal(false, Nfs::Options::get_nfs41("defaults"));
Assert::Equal(false, Nfs::Options::get_nfs41("ro,sync"));
Assert::Equal(false, Nfs::Options::get_nfs41("minorversion=0"));
Assert::Equal(true, Nfs::Options::get_nfs41("minorversion=1"));
DUMP ("NfsOptions::get_nfs41");
Assert::Equal(false, NfsOptions::get_nfs41(""));
Assert::Equal(false, NfsOptions::get_nfs41("defaults"));
Assert::Equal(false, NfsOptions::get_nfs41("ro,sync"));
Assert::Equal(false, NfsOptions::get_nfs41("minorversion=0"));
Assert::Equal(true, NfsOptions::get_nfs41("minorversion=1"));
// "minorversion=2" does not exist yet, YAGNI
Assert::Equal(false, Nfs::Options::get_nfs41("subminorversion=1")); // substring must not match
// Assert::Equal(?, Nfs::Options::get_nfs41("minorversion=1,minorversion=0")); // don't care
Assert::Equal(false, Nfs::Options::get_nfs41("ro,minorversion=0,sync"));
Assert::Equal(true, Nfs::Options::get_nfs41("ro,minorversion=1,sync"));
Assert::Equal(false, NfsOptions::get_nfs41("subminorversion=1")); // substring must not match
// Assert::Equal(?, NfsOptions::get_nfs41("minorversion=1,minorversion=0")); // don't care
Assert::Equal(false, NfsOptions::get_nfs41("ro,minorversion=0,sync"));
Assert::Equal(true, NfsOptions::get_nfs41("ro,minorversion=1,sync"));

DUMP ("Nfs::Options::set_nfs41");
DUMP ("NfsOptions::set_nfs41");
Assert::Equal( "",
Nfs::Options::set_nfs41("", false));
NfsOptions::set_nfs41("", false));
Assert::Equal( "minorversion=1",
Nfs::Options::set_nfs41("", true));
NfsOptions::set_nfs41("", true));

Assert::Equal( "defaults",
Nfs::Options::set_nfs41("defaults", false));
NfsOptions::set_nfs41("defaults", false));
Assert::Equal( "minorversion=1",
Nfs::Options::set_nfs41("defaults", true));
NfsOptions::set_nfs41("defaults", true));

Assert::Equal( "ro,sync",
Nfs::Options::set_nfs41("ro,sync", false));
NfsOptions::set_nfs41("ro,sync", false));
Assert::Equal( "ro,sync,minorversion=1",
Nfs::Options::set_nfs41("ro,sync", true));
NfsOptions::set_nfs41("ro,sync", true));

Assert::Equal( "minorversion=0",
Nfs::Options::set_nfs41("minorversion=0", false));
NfsOptions::set_nfs41("minorversion=0", false));
Assert::Equal( "minorversion=1",
Nfs::Options::set_nfs41("minorversion=0", true));
NfsOptions::set_nfs41("minorversion=0", true));

Assert::Equal( "defaults",
Nfs::Options::set_nfs41("minorversion=1", false));
NfsOptions::set_nfs41("minorversion=1", false));
Assert::Equal( "minorversion=1",
Nfs::Options::set_nfs41("minorversion=1", true));
NfsOptions::set_nfs41("minorversion=1", true));

Assert::Equal( "subminorversion=1",
Nfs::Options::set_nfs41("subminorversion=1", false));
NfsOptions::set_nfs41("subminorversion=1", false));
Assert::Equal( "subminorversion=1,minorversion=1",
Nfs::Options::set_nfs41("subminorversion=1", true));
NfsOptions::set_nfs41("subminorversion=1", true));

Assert::Equal( "ro,minorversion=0,sync",
Nfs::Options::set_nfs41("ro,minorversion=0,sync", false));
NfsOptions::set_nfs41("ro,minorversion=0,sync", false));
Assert::Equal( "ro,sync,minorversion=1",
Nfs::Options::set_nfs41("ro,minorversion=0,sync", true));
NfsOptions::set_nfs41("ro,minorversion=0,sync", true));

Assert::Equal( "ro,sync",
Nfs::Options::set_nfs41("ro,minorversion=1,sync", false));
NfsOptions::set_nfs41("ro,minorversion=1,sync", false));
Assert::Equal( "ro,minorversion=1,sync",
Nfs::Options::set_nfs41("ro,minorversion=1,sync", true));
NfsOptions::set_nfs41("ro,minorversion=1,sync", true));

}
5 changes: 2 additions & 3 deletions yast2-nfs-client.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ file system access. It allows access to files on remote machines.
%dir @moduledir@
@moduledir@/Nfs.ycp
@moduledir@/Nfs.ybc
%dir @moduledir@/Nfs
@moduledir@/Nfs/Options.ycp
@moduledir@/Nfs/Options.ybc
@moduledir@/NfsOptions.ycp
@moduledir@/NfsOptions.ybc
%dir @desktopdir@
@desktopdir@/nfs.desktop
%doc @docdir@
Expand Down

0 comments on commit 4432132

Please sign in to comment.