Fabian Deutsch has uploaded a new change for review. Change subject: Change RHNSM to RHSM now... ......................................................................
Change RHNSM to RHSM now... Initial bug report asked for a change from RHN to RHNSM. Change it to RHSM now. While we're at it, change every instance of RHN to RHSM (except those in rhn_model, which all reference actual RHN classic) Change-Id: I1eb621f2f997384c2eb4d95ceec77b2be276821f 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, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/73/51773/1 diff --git a/src/ovirt/node/setup/rhn/rhn_page.py b/src/ovirt/node/setup/rhn/rhn_page.py index 1840bc8..26e1732 100755 --- a/src/ovirt/node/setup/rhn/rhn_page.py +++ b/src/ovirt/node/setup/rhn/rhn_page.py @@ -27,7 +27,7 @@ class Plugin(plugins.NodePlugin): _model = None - _rhn_types = [("rhn", "RHN"), + _rhn_types = [("rhn", "RHSM"), ("satellite", "Satellite"), ("sam", "SAM")] _fields_enabled = False @@ -40,7 +40,7 @@ return True def name(self): - return "RHN Registration" + return "RHSM Registration" def rank(self): return 310 @@ -97,11 +97,11 @@ ws = ([ui.Divider("notice.divider"), ui.Notice("network.notice", "Networking is not configured, please " + - "configure it before configuring RHN"), + "configure it before configuring RHSM"), ui.Divider("notice.divider")]) else: - rhn_msg = ("RHNSM Registration is required only if you wish " + + rhn_msg = ("RHSM Registration is required only if you wish " + "to use Red Hat Enterprise Linux with virtual " + "guests subscriptions for your guests.") @@ -152,7 +152,7 @@ return def on_merge(self, effective_changes): - self.logger.debug("Saving RHN page") + self.logger.debug("Saving RHSM page") changes = Changeset(self.pending_changes(False)) effective_model = Changeset(self.model()) effective_model.update(effective_changes) @@ -186,7 +186,7 @@ "Username or activationkey must be set." "Please set one of the values.") - txs = utils.Transaction("Updating RHN configuration") + txs = utils.Transaction("Updating RHSM configuration") if changes.contains_any(rhn_keys): def update_proxy(): @@ -224,7 +224,7 @@ if warning_text: txt = "%s must not be empty!" % warning_text self._error_dialog = ui.InfoDialog("dialog.error", - "RHN Error", + "RHSM Error", txt) return self._error_dialog else: @@ -251,7 +251,7 @@ cmd = ["subscription-manager", "status"] output = process.check_output(cmd) if not "Status: Unknown" in output: - rhn_msg = "RHNSM Registration\n\nRegistration Status: %s" \ + rhn_msg = "RHSM Registration\n\nRegistration Status: %s" \ % rhntype except process.CalledProcessError as e: @@ -277,7 +277,7 @@ def clear_invalid(dialog, changes): [plugin.stash_change(prefix) for prefix in self.keys] - title = _("RHN Proxy Information") + title = _("RHSM Proxy Information") entries = [ui.Entry("rhn.proxyhost", "Server:"), ui.Entry("rhn.proxyport", "Port:"), -- To view, visit https://gerrit.ovirt.org/51773 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1eb621f2f997384c2eb4d95ceec77b2be276821f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Fabian Deutsch <[email protected]> Gerrit-Reviewer: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
