summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJie Hu <hu.jie@zte.com.cn>2016-12-21 14:23:41 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-21 14:23:41 +0000
commit2021d90abd0a12ee6afedc2d0ed2872d67243e97 (patch)
treebf4e359d7acdfa493ef04d9e138f0b6fd8d20a4a /api
parent04a66a586cc90b2be310d2323d526e11c95ab258 (diff)
parentbb4fad27927c6fba2c6231d136661da050f6f5c6 (diff)
Merge "There are some flake8 errors. Clear them before other work."
Diffstat (limited to 'api')
-rw-r--r--api/escalator/api/v1/__init__.py1
-rw-r--r--api/escalator/cmd/api.py2
-rw-r--r--api/escalator/common/utils.py16
-rw-r--r--api/escalator/common/wsgi.py10
-rw-r--r--api/escalator/i18n.py2
5 files changed, 7 insertions, 24 deletions
diff --git a/api/escalator/api/v1/__init__.py b/api/escalator/api/v1/__init__.py
index 151165a..31285c4 100644
--- a/api/escalator/api/v1/__init__.py
+++ b/api/escalator/api/v1/__init__.py
@@ -12,4 +12,3 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
-
diff --git a/api/escalator/cmd/api.py b/api/escalator/cmd/api.py
index 7b29589..a0f63dc 100644
--- a/api/escalator/cmd/api.py
+++ b/api/escalator/cmd/api.py
@@ -32,9 +32,7 @@ from oslo_log import log as logging
import osprofiler.notifier
import osprofiler.web
-from escalator.common import utils
from escalator.common import config
-from escalator.common import exception
from escalator.common import wsgi
from escalator import notifier
diff --git a/api/escalator/common/utils.py b/api/escalator/common/utils.py
index ccdc7f8..6cb1784 100644
--- a/api/escalator/common/utils.py
+++ b/api/escalator/common/utils.py
@@ -43,15 +43,10 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import encodeutils
from oslo_utils import excutils
-from oslo_utils import netutils
-from oslo_utils import strutils
import six
from webob import exc
-import ConfigParser
-
from escalator.common import exception
from escalator import i18n
-# from providerclient.v1 import client as provider_client
CONF = cfg.CONF
@@ -666,9 +661,11 @@ def ip_into_int(ip):
def int_into_ip(num):
- inter_ip = lambda x: '.'.join(
- [str(x / (256 ** i) % 256) for i in range(3, -1, -1)])
- return inter_ip(num)
+ s = []
+ for i in range(4):
+ s.append(str(num % 256))
+ num /= 256
+ return '.'.join(s[::-1])
def is_ip_in_cidr(ip, cidr):
@@ -939,6 +936,3 @@ def translate_marks_4_sed_command(ori_str):
translated_str = translated_str.\
replace(translated_mark, translated_marks[translated_mark])
return translated_str
-
-
-
diff --git a/api/escalator/common/wsgi.py b/api/escalator/common/wsgi.py
index c4e8bfd..8884ea4 100644
--- a/api/escalator/common/wsgi.py
+++ b/api/escalator/common/wsgi.py
@@ -232,12 +232,9 @@ def get_asynchronous_eventlet_pool(size=1000):
class Server(object):
"""Server class to manage multiple WSGI sockets and applications.
-
- This class requires initialize_escalator_store set to True if
- escalator store needs to be initialized.
"""
- def __init__(self, threads=1000, initialize_escalator_store=False):
+ def __init__(self, threads=1000):
os.umask(0o27) # ensure files are created with the correct privileges
self._logger = logging.getLogger("eventlet.wsgi.server")
self._wsgi_logger = loggers.WritableLogger(self._logger)
@@ -245,9 +242,6 @@ class Server(object):
self.children = set()
self.stale_children = set()
self.running = True
- # NOTE(abhishek): Allows us to only re-initialize escalator_store when
- # the API's configuration reloads.
- self.initialize_escalator_store = initialize_escalator_store
self.pgid = os.getpid()
try:
# NOTE(flaper87): Make sure this process
@@ -362,8 +356,6 @@ class Server(object):
"""
eventlet.wsgi.MAX_HEADER_LINE = CONF.max_header_line
self.configure_socket(old_conf, has_changed)
- if self.initialize_escalator_store:
- initialize_escalator_store()
def reload(self):
"""
diff --git a/api/escalator/i18n.py b/api/escalator/i18n.py
index 02384a5..56bfde3 100644
--- a/api/escalator/i18n.py
+++ b/api/escalator/i18n.py
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from oslo_i18n import * # noqa
+from oslo_i18n import TranslatorFactory # noqa
_translators = TranslatorFactory(domain='escalator')