Add additional explicit imports of _ where needed

It appears that I missed some of the needed explicit
imports of _.  I have now run through all the /bin/cinder-*
functions and ensured that they can be properly started.

This patch adds additional imports of _ and also changes
cinder-rtstool to use the 'cinder' domain as was suggested by
Duncan Thomas in the first review cycle.

Change-Id: I6477093cb817b5b9506dd3787f027e073c51f37d
Closes-Bug:  1345789

diff --git a/bin/cinder-all b/bin/cinder-all
index 566273c266db10bfb6001153f376c7790f9d4dce..7243712bb9e38c2e024c23be52181bb5c1620ded 100755 (executable)
--- a/bin/cinder-all
+++ b/bin/cinder-all
@@ -49,6 +49,7 @@ gettextutils.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config   # noqa
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils

diff --git a/bin/cinder-manage b/bin/cinder-manage
index a0448322661341d00e296818fc8939f7d1c03fea..1e9762ce86be0d053a5e3c548640d29dc2714c36 100755 (executable)
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
@@ -80,6 +80,7 @@ from cinder.common import config  # noqa
 from cinder import context
 from cinder import db
 from cinder.db import migration
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import uuidutils
 from cinder import rpc

diff --git a/bin/cinder-rtstool b/bin/cinder-rtstool
index 7801268e72815df68bdd83cfd4af99746a43f9e6..a4300fc5cc0fe4e710d2561fab59a8f6ede893aa 100755 (executable)
--- a/bin/cinder-rtstool
+++ b/bin/cinder-rtstool
@@ -16,13 +16,15 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import gettext
 import sys
 
 import rtslib
 
-gettext.install('cinder-rtstool', unicode=1)
-gettext.enable_lazy()
+from cinder.openstack.common import gettextutils
+from cinder.openstack.common.gettextutils import _
+
+gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 
 class RtstoolError(Exception):

diff --git a/bin/cinder-volume-usage-audit b/bin/cinder-volume-usage-audit
index 13cb1c23118779bc00fe5afa170f5a987f435e28..2b143dc87073f5fd829d56cb7222cfa22cfb49b1 100755 (executable)
--- a/bin/cinder-volume-usage-audit
+++ b/bin/cinder-volume-usage-audit
@@ -57,6 +57,7 @@ gettextutils.enable_lazy()
 
 from cinder import context
 from cinder import db
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import rpc
 from cinder import utils