f0082849df
With this change, "tox -e py34" now pass. Changes: * Replace unichr() with six.unichr() * Replace StringIO.StringIO() with six.Bytes() in nova.crypto.generate_key_pair() * On Python 3, replace UserDict.IterableUserDict with collections.UserDict * Replace __builtin__.open with six.moves.builtins.open * Replace ConfigParser import with six.moves.configparser * On Python 3, get the original "queue" module instead of the "Queue" module in nova/virt/libvirt/host.py * Replace urllib2 with six.moves.urllib * tox.ini: "tox -e py34" now only runs nova.tests.unit.test_versions Blueprint nova-python3 Change-Id: I056769c7c5b32276894f7aade8c0a27af81c42ae
89 lines
2.2 KiB
Python
89 lines
2.2 KiB
Python
# Copyright 2011 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import pbr.version
|
|
|
|
from nova.i18n import _LE
|
|
|
|
NOVA_VENDOR = "OpenStack Foundation"
|
|
NOVA_PRODUCT = "OpenStack Nova"
|
|
NOVA_PACKAGE = None # OS distro package version suffix
|
|
|
|
loaded = False
|
|
version_info = pbr.version.VersionInfo('nova')
|
|
version_string = version_info.version_string
|
|
|
|
|
|
def _load_config():
|
|
# Don't load in global context, since we can't assume
|
|
# these modules are accessible when distutils uses
|
|
# this module
|
|
from six.moves import configparser
|
|
|
|
from oslo_config import cfg
|
|
|
|
import logging
|
|
|
|
global loaded, NOVA_VENDOR, NOVA_PRODUCT, NOVA_PACKAGE
|
|
if loaded:
|
|
return
|
|
|
|
loaded = True
|
|
|
|
cfgfile = cfg.CONF.find_file("release")
|
|
if cfgfile is None:
|
|
return
|
|
|
|
try:
|
|
cfg = configparser.RawConfigParser()
|
|
cfg.read(cfgfile)
|
|
|
|
if cfg.has_option("Nova", "vendor"):
|
|
NOVA_VENDOR = cfg.get("Nova", "vendor")
|
|
|
|
if cfg.has_option("Nova", "product"):
|
|
NOVA_PRODUCT = cfg.get("Nova", "product")
|
|
|
|
if cfg.has_option("Nova", "package"):
|
|
NOVA_PACKAGE = cfg.get("Nova", "package")
|
|
except Exception as ex:
|
|
LOG = logging.getLogger(__name__)
|
|
LOG.error(_LE("Failed to load %(cfgfile)s: %(ex)s"),
|
|
{'cfgfile': cfgfile, 'ex': ex})
|
|
|
|
|
|
def vendor_string():
|
|
_load_config()
|
|
|
|
return NOVA_VENDOR
|
|
|
|
|
|
def product_string():
|
|
_load_config()
|
|
|
|
return NOVA_PRODUCT
|
|
|
|
|
|
def package_string():
|
|
_load_config()
|
|
|
|
return NOVA_PACKAGE
|
|
|
|
|
|
def version_string_with_package():
|
|
if package_string() is None:
|
|
return version_info.version_string()
|
|
else:
|
|
return "%s-%s" % (version_info.version_string(), package_string())
|