Change in vdsm[master]: Make _upgrade_needed public.

ibarkan at redhat.com ibarkan at redhat.com
Wed Mar 18 11:38:34 UTC 2015


Ido Barkan has uploaded a new change for review.

Change subject: Make _upgrade_needed public.
......................................................................

Make _upgrade_needed public.

It is used from outside of vdsm-restore-net-config. Also removed redundant
parentheses.

Change-Id: I9f116f0b0587382fbbb5194d4375579d3d14ee3c
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M lib/vdsm/tool/upgrade.py
M vdsm/vdsm-restore-net-config
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/38866/1

diff --git a/lib/vdsm/tool/upgrade.py b/lib/vdsm/tool/upgrade.py
index 8447745..b636d2a 100644
--- a/lib/vdsm/tool/upgrade.py
+++ b/lib/vdsm/tool/upgrade.py
@@ -34,7 +34,7 @@
     return os.path.join(P_VDSM_LIB, 'upgrade', upgrade.name)
 
 
-def _upgrade_needed(upgrade):
+def upgrade_needed(upgrade):
     return not os.path.exists(_upgrade_seal_path(upgrade))
 
 
@@ -85,7 +85,7 @@
     if hasattr(upgrade, 'extendArgParser'):
         upgrade.extendArgParser(argparser)
     ns, args = argparser.parse_known_args(args[1:])
-    if (_upgrade_needed(upgrade) or ns.runAgain):
+    if upgrade_needed(upgrade) or ns.runAgain:
         _get_upgrade_log().debug("Running upgrade %s", upgrade.name)
         try:
             upgrade.run(ns, args)
diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index bcd3924..89877ce 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -163,7 +163,7 @@
     """Flush vdsm configurations left-overs from any configurator on the system
     so that changes of configurator and persistence system are smooth. Only
     done if upgrade to unified persistence is not pending"""
-    if (not upgrade._upgrade_needed(
+    if (not upgrade.upgrade_needed(
             unified_persistence.UpgradeUnifiedPersistence)):
         for configurator_cls in _get_all_configurators():
             configurator_cls().flush()


-- 
To view, visit https://gerrit.ovirt.org/38866
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f116f0b0587382fbbb5194d4375579d3d14ee3c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>


More information about the vdsm-patches mailing list