Ryan Barry has uploaded a new change for review. Change subject: Use RHNSM instead of RHN on EL7 ......................................................................
Use RHNSM instead of RHN on EL7 RHN classic is dead on EL7, and we use RHNSM in the background anyway. The TUI should reflect that. Change-Id: I9527d78b2d0a05b86576aec6f55aea995e07f51c Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1255277 Signed-off-by: Ryan Barry <[email protected]> --- M src/ovirt/node/setup/rhn/rhn_page.py 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/89/46989/1 diff --git a/src/ovirt/node/setup/rhn/rhn_page.py b/src/ovirt/node/setup/rhn/rhn_page.py index 35d7d64..1e3c794 100644 --- a/src/ovirt/node/setup/rhn/rhn_page.py +++ b/src/ovirt/node/setup/rhn/rhn_page.py @@ -108,6 +108,8 @@ ("satellite", "Satellite"), ("sam", "SAM")] _fields_enabled = False + _type = "RHNSM Registration" if system.is_min_el(7) else \ + "RHN Registration" def __init__(self, app): super(Plugin, self).__init__(app) @@ -117,7 +119,7 @@ return True def name(self): - return "RHN Registration" + return self._type def rank(self): return 310 @@ -185,17 +187,17 @@ else: status, rhn_type = get_rhn_status() if status == 0: - rhn_msg = ("RHN Registration is required only if you wish " + - "to use Red Hat Enterprise Linux with virtual " + - "guests subscriptions for your guests.") + rhn_msg = ("{0} is required only if you wish to use Red Hat " + "Enterprise Linux with virtual guests " + "subscriptions for your guests.".format(self._type)) else: rhntype = cfg["rhntype"] if "satellite" in rhntype: rhntype = rhntype.title() else: rhntype = rhntype.upper() - rhn_msg = "RHN Registration\n\nRegistration Status: %s" \ - % rhntype + rhn_msg = "%s\n\nRegistration Status: %s" \ + % (self._type, rhntype) ws = [ui.Header("header[0]", rhn_msg), ui.Entry("rhn.username", "Login:"), -- To view, visit https://gerrit.ovirt.org/46989 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9527d78b2d0a05b86576aec6f55aea995e07f51c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ryan Barry <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
