X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=api%2Fescalator%2Fcommon%2Futils.py;h=6cb178440fd767a20945a064663aa9d07ecc397f;hb=74c631c6dae08d463f0d4c3953a1addcb187d090;hp=ccdc7f89c5ffc1bedd1bd883c3b2d9cc056a8e83;hpb=3a203b0a44b6952df2b7f8b93f3d27b421cdd1f6;p=escalator.git 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 - - -