From e6d1557b65b948f46110ff1d108d11dfcd1edaf4 Mon Sep 17 00:00:00 2001 From: bjormel Date: Tue, 13 Dec 2022 17:24:33 +0100 Subject: Change order of enable and disable --- .../hosted/node/admin/task/util/yum/YumCommand.java | 12 ++++++------ .../vespa/hosted/node/admin/task/util/yum/YumTester.java | 12 ++++++------ .../hosted/node/admin/task/util/yum/YumTesterTest.java | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'node-admin/src') diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java index 10397cba05e..ead99b106c2 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java @@ -42,15 +42,15 @@ public abstract class YumCommand> { this.terminal = terminal; } - /** Enables the given repos for this command */ - public T enableRepo(String... repo) { - enabledRepos = List.of(repo); + /** Disables the given repos for this command */ + public T disableRepo(String... repo) { + disabledRepos = List.of(repo); return getThis(); } /** Enables the given repos for this command */ - public T disableRepo(String... repo) { - disabledRepos = List.of(repo); + public T enableRepo(String... repo) { + enabledRepos = List.of(repo); return getThis(); } @@ -58,8 +58,8 @@ public abstract class YumCommand> { protected void addParametersToCommandLine(CommandLine commandLine) { commandLine.add("--assumeyes"); - enabledRepos.forEach(repo -> commandLine.add("--enablerepo=" + repo)); disabledRepos.forEach(repo -> commandLine.add("--disablerepo=" + repo)); + enabledRepos.forEach(repo -> commandLine.add("--enablerepo=" + repo)); } public abstract boolean converge(TaskContext context); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java index cfe2b8f8b98..c5ea2dd7f41 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java @@ -50,21 +50,21 @@ public class YumTester extends Yum { public class GenericYumCommandExpectation { private final CommandType commandType; protected final List packages; - private List enableRepos = List.of(); private List disableRepos = List.of(); + private List enableRepos = List.of(); private GenericYumCommandExpectation(CommandType commandType, String... packages) { this.commandType = commandType; this.packages = Stream.of(packages).map(YumPackageName::fromString).toList(); } - public GenericYumCommandExpectation withEnableRepo(String... repo) { - this.enableRepos = List.of(repo); + public GenericYumCommandExpectation withDisableRepo(String... repo) { + this.disableRepos = List.of(repo); return this; } - public GenericYumCommandExpectation withDisableRepo(String... repo) { - this.disableRepos = List.of(repo); + public GenericYumCommandExpectation withEnableRepo(String... repo) { + this.enableRepos = List.of(repo); return this; } @@ -96,8 +96,8 @@ public class YumTester extends Yum { cmd.append("yum ").append(commandType.command); if (commandType != CommandType.deleteVersionLock) { cmd.append(" --assumeyes"); - enableRepos.forEach(repo -> cmd.append(" --enablerepo=").append(repo)); disableRepos.forEach(repo -> cmd.append(" --disablerepo=").append(repo)); + enableRepos.forEach(repo -> cmd.append(" --enablerepo=").append(repo)); } if (commandType == CommandType.install && packages.size() > 1) cmd.append(" --setopt skip_missing_names_on_install=False"); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java index e46788397dc..9533c555860 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java @@ -28,17 +28,17 @@ public class YumTesterTest { @Test void generic_yum_methods() { - assertYumMethod(yum -> yum.expectInstall(packages).withEnableRepo(repos).withDisableRepo(disablerepos), - yum -> yum.install(List.of(packages)).enableRepo(repos).disableRepo(disablerepos).converge(context)); + assertYumMethod(yum -> yum.expectInstall(packages).withDisableRepo(disablerepos).withEnableRepo(repos), + yum -> yum.install(List.of(packages)).disableRepo(disablerepos).enableRepo(repos).converge(context)); - assertYumMethod(yum -> yum.expectUpdate(packages).withEnableRepo(repos).withDisableRepo(disablerepos), - yum -> yum.upgrade(List.of(packages)).enableRepo(repos).disableRepo(disablerepos).converge(context)); + assertYumMethod(yum -> yum.expectUpdate(packages).withDisableRepo(disablerepos).withEnableRepo(repos), + yum -> yum.upgrade(List.of(packages)).disableRepo(disablerepos).enableRepo(repos).converge(context)); - assertYumMethod(yum -> yum.expectRemove(packages).withEnableRepo(repos).withDisableRepo(disablerepos), - yum -> yum.remove(List.of(packages)).enableRepo(repos).disableRepo(disablerepos).converge(context)); + assertYumMethod(yum -> yum.expectRemove(packages).withDisableRepo(disablerepos).withEnableRepo(repos), + yum -> yum.remove(List.of(packages)).disableRepo(disablerepos).enableRepo(repos).converge(context)); - assertYumMethod(yum -> yum.expectInstallFixedVersion(minimalPackage.toName()).withEnableRepo(repos).withDisableRepo(disablerepos), - yum -> yum.installFixedVersion(minimalPackage).enableRepo(repos).disableRepo(disablerepos).converge(context)); + assertYumMethod(yum -> yum.expectInstallFixedVersion(minimalPackage.toName()).withDisableRepo(disablerepos).withEnableRepo(repos), + yum -> yum.installFixedVersion(minimalPackage).disableRepo(disablerepos).enableRepo(repos).converge(context)); // versionlock always returns success assertYumMethodAlwaysSuccess(yum -> yum.expectDeleteVersionLock(minimalPackage.toName()), -- cgit v1.2.3