user_dict = dict()
auth_str = authstr
user_pw = auth_str.split(' ')[1]
+ user_pw = user_pw.encode() # below function needs user_pw in bytes object in python 3 so converting that
decode_user_pw = base64.b64decode(user_pw)
- list_id_pw = decode_user_pw.split(':')
+ list_id_pw = decode_user_pw.decode().split(':')
user_dict['username'] = str(list_id_pw[0])
user_dict['password'] = str(list_id_pw[1])
password = CONF.conductor_api.password
if six.PY3:
app_data = app_data.decode('utf-8')
try:
- fault = json.loads(app_data)
+ fault = list(json.loads(app_data))
if error is not None and 'faultstring' in fault:
fault['faultstring'] = i18n.translate(error,
user_locale)
return \
api.MUSIC_API.row_insert_by_condition(
self.__keyspace__, self.__tablename__, self.pk_name(),
- self.pk_value(), self.values(), self.PARKED)
+ self.pk_value(),self.values(), self.PARKED)
def __init__(self, id=None, group=None,rule=None,_insert=False):
"""Initializer"""
self.rest.session.headers['ns'] = CONF.music_api.aafns
self.rest.session.headers['userId'] = CONF.music_api.aafuser
self.rest.session.headers['password'] = music_pwd
- self.rest.session.headers['Authorization'] = basic_auth_util.encode(CONF.music_api.aafuser,
- CONF.music_api.aafpass)
+ self.rest.session.headers['Authorization'] = str(basic_auth_util.encode(CONF.music_api.aafuser,
+ CONF.music_api.aafpass))
self.lock_ids = {}
def __del__(self):
"""Deletion."""
if type(self.lock_ids) is dict:
- for lock_name in self.lock_ids.keys():
+ for lock_name in list(self.lock_ids.keys()): # Python 3 Conversion -- dict object to list object
self.lock_delete(lock_name)
@staticmethod
#lock_id = self.lock_ids.get(lock_name)
data = {
'consistencyInfo': {
- 'type': 'atomic' if condition else 'eventual',
+ 'type': 'atomic',
}
}
msgs = self.RPC.query.all()
for msg in msgs:
if msg.enqueued:
- if 'plan_name' in msg.ctxt.keys():
+ if 'plan_name' in list(msg.ctxt.keys()): # Python 3 Conversion -- dict object to list object
LOG.info('Plan name: {}'.format(msg.ctxt['plan_name']))
- elif 'plan_name' in msg.args.keys():
+ elif 'plan_name' in list(msg.args.keys()): # Python 3 Conversion -- dict object to list object
LOG.info('Plan name: {}'.format(msg.args['plan_name']))
msg.delete()
if not msg.enqueued:
continue
- if 'plan_name' in msg.ctxt.keys():
+ if 'plan_name' in list(msg.ctxt.keys()): # Python 3 Conversion -- dict object to list object
LOG.info('Plan name: {}'.format(msg.ctxt['plan_name']))
- elif 'plan_name' in msg.args.keys():
+ elif 'plan_name' in list(msg.args.keys()): # Python 3 Conversion -- dict object to list object
LOG.info('Plan name: {}'.format(msg.args['plan_name']))
# Change the status to WORKING (operation with a lock)
return
# All methods must take a ctxt and args param.
- if inspect.getargspec(method).args != ['self', 'ctx', 'arg']:
+ if inspect.getfullargspec(method).args != ['self', 'ctx', 'arg']:
error_msg = _LE("Method {} must take three args: "
"self, ctx, arg").format(msg.method)
self._log_error_and_update_msg(msg, error_msg)
}
if headers:
full_headers.update(headers)
- full_url = '{}/{}'.format(self.server_url, path.lstrip('/'))
+ full_url = '{}/{}'.format(self.server_url, path.lstrip('/').rstrip('/'))
# Prepare the request args
try:
json.dumps(response_dict)))
except ValueError:
LOG.debug("Response Body: {}".format(response.text))
+ #response._content = response._content.decode()
if response.ok:
break
except requests.exceptions.RequestException as err:
- LOG.error("Exception: %s", err.message)
+ LOG.error("Exception: %s", err.args)
# Response.__bool__ returns false if status is not ok. Ruh roh!
# That means we must check the object type vs treating it as a bool.
if base_unit not in self.UNITS:
raise ThresholdException(
"Base unit {} unsupported, must be one of: {}".format(
- base_unit, ', '.join(self.UNITS.keys())))
+ base_unit, ', '.join(list(self.UNITS.keys())))) # Python 3 Conversion -- dict object to list object
self._expression = expression
self._base_unit = base_unit
def _all_units(self):
"""Returns a single list of all supported units"""
- unit_lists = [self.UNITS[k].keys() for k in self.UNITS.keys()]
+ unit_lists = [list(self.UNITS[k].keys()) for k in list(self.UNITS.keys())] # Python 3 Conversion -- dict object to list object
return list(itertools.chain.from_iterable(unit_lists))
def _default_for_base_unit(self, base_unit):
def encode(user_id, password):
""" Provide the basic authencation encoded value in an 'Authorization' Header """
- user_pass = str(user_id) + ":" + str(password)
+ user_pass = user_id + ":" + password
+ # Here user_pass is str type but in python 3.x version, base64.b64encode is expecting byte
+ # like object so we need to convert the str into bytes
+
+ user_pass = user_pass.encode() # converting str into bytes form
base64_val = base64.b64encode(user_pass)
authorization_val = _LE("Basic {}".format(base64_val))
self.bs = 32
if key is None:
- key = CONF.auth.appkey.encode()
+ key = CONF.auth.appkey # ---> python3.8 Code version code
+ # key= CONF.auth.appkey.encode() ---> Python 2.7 version code
+ # in Python 3+ key is already a b'' type so no need to encode it again.
self.key = hashlib.sha256(key.encode()).digest()
"{} {} has an invalid key {}".format(
name, content_name, key))
- demand_keys = self._demands.keys()
- location_keys = self._locations.keys()
+ demand_keys = list(self._demands.keys()) # Python 3 Conversion -- dict object to list object
+ location_keys = list(self._locations.keys()) # Python 3 Conversion -- dict object to list object
for constraint_name, constraint in self._constraints.items():
# Require a single demand (string), or a list of one or more.
# Traverse a dict
elif type(obj) is dict:
# Did we find a "{get_param: ...}" intrinsic?
- if obj.keys() == ['get_param']:
+ if list(obj.keys()) == ['get_param']:
param_name = obj['get_param']
# The parameter name must be a string.
return self._parameters.get(param_name)
# Not an intrinsic. Traverse as usual.
- for key in obj.keys():
+ for key in list(obj.keys()):
# Add path to the breadcrumb trail.
new_path = list(path)
new_path.append(key)
"not a dictionary".format(name))
# Must have only supported keys
- for key in candidate.keys():
+ for key in list(candidate.keys()):
if key not in CANDIDATE_KEYS:
raise TranslatorException(
"Candidate with invalid key {} found "
# Make sure all required properties are present
required = constraint_def.get('required', [])
for req_prop in required:
- if req_prop not in value.keys():
+ if req_prop not in list(value.keys()):
raise TranslatorException(
"Required property '{}' not found in "
"constraint named '{}'".format(
# Make sure there are no unknown properties
optional = constraint_def.get('optional', [])
- for prop_name in value.keys():
+ for prop_name in list(value.keys()):
if prop_name not in required + optional:
raise TranslatorException(
"Unknown property '{}' in "
# sure its value is one of the allowed ones.
allowed = constraint_def.get('allowed', {})
for prop_name, allowed_values in allowed.items():
- if prop_name in value.keys():
+ if prop_name in list(value.keys()):
prop_value = value.get(prop_name, '')
if prop_value not in allowed_values:
raise TranslatorException(
# Break all threshold-formatted values into parts
thresholds = constraint_def.get('thresholds', {})
for thr_prop, base_units in thresholds.items():
- if thr_prop in value.keys():
+ if thr_prop in list(value.keys()):
expression = value.get(thr_prop)
thr = threshold.Threshold(expression, base_units)
value[thr_prop] = thr.parts
if type(optimization_copy) is not dict:
raise TranslatorException("Optimization must be a dictionary.")
- goals = optimization_copy.keys()
+ goals = list(optimization_copy.keys())
if goals != ['minimize']:
raise TranslatorException(
"Optimization must contain a single goal of 'minimize'.")
- funcs = optimization_copy['minimize'].keys()
+ funcs = list(optimization_copy['minimize'].keys())
if funcs != ['sum']:
raise TranslatorException(
"Optimization goal 'minimize' must "
got_demand = False
got_location = False
for arg in args:
- if not got_demand and arg in self._demands.keys():
+ if not got_demand and arg in list(self._demands.keys()):
got_demand = True
- if not got_location and arg in self._locations.keys():
+ if not got_location and arg in list(self._locations.keys()):
got_location = True
if not got_demand or not got_location:
raise TranslatorException(
got_demand = False
got_location = False
for arg in args:
- if not got_demand and arg in self._demands.keys():
+ if not got_demand and arg in list(self._demands.keys()):
got_demand = True
- if not got_location and arg in self._locations.keys():
+ if not got_location and arg in list(self._locations.keys()):
got_location = True
if not got_demand or not got_location:
raise TranslatorException(
args = None
nested = False
- if operand.keys() == ['distance_between']:
+ if list(operand.keys()) == ['distance_between']:
# Value must be a list of length 2 with one
# location and one demand
function = 'distance_between'
args = get_distance_between_args(operand)
- elif operand.keys() == ['product']:
+ elif list(operand.keys()) == ['product']:
for product_op in operand['product']:
if threshold.is_number(product_op):
weight = product_op
elif isinstance(product_op, dict):
- if product_op.keys() == ['latency_between']:
+ if list(product_op.keys()) == ['latency_between']:
function = 'latency_between'
args = get_latency_between_args(product_op)
- elif product_op.keys() == ['distance_between']:
+ elif list(product_op.keys()) == ['distance_between']:
function = 'distance_between'
args = get_distance_between_args(product_op)
- elif product_op.keys() == ['aic_version']:
+ elif list(product_op.keys()) == ['aic_version']:
function = 'aic_version'
args = product_op.get('aic_version')
- elif product_op.keys() == ['hpa_score']:
+ elif list(product_op.keys()) == ['hpa_score']:
function = 'hpa_score'
args = product_op.get('hpa_score')
if not self.is_hpa_policy_exists(args):
raise TranslatorException(
"HPA Score Optimization must include a "
"HPA Policy constraint ")
- elif product_op.keys() == ['sum']:
+ elif list(product_op.keys()) == ['sum']:
nested = True
nested_operands = product_op.get('sum')
for nested_operand in nested_operands:
- if nested_operand.keys() == ['product']:
+ if list(nested_operand.keys()) == ['product']:
nested_weight = weight
for nested_product_op in nested_operand['product']:
if threshold.is_number(nested_product_op):
nested_weight = nested_weight * int(nested_product_op)
elif isinstance(nested_product_op, dict):
- if nested_product_op.keys() == ['latency_between']:
+ if list(nested_product_op.keys()) == ['latency_between']:
function = 'latency_between'
args = get_latency_between_args(nested_product_op)
- elif nested_product_op.keys() == ['distance_between']:
+ elif list(nested_product_op.keys()) == ['distance_between']:
function = 'distance_between'
args = get_distance_between_args(nested_product_op)
parsed['operands'].append(
if not reservation_details.get('properties'):
reservation_details['properties'] = {}
for demand in reservation_details.get('demands', []):
- if demand in demands.keys():
+ if demand in list(demands.keys()):
reservation_demand = name + '_' + demand
parsed['demands'][reservation_demand] = copy.deepcopy(reservation_details)
parsed['demands'][reservation_demand]['name'] = name
self.do_translation()
self._ok = True
except Exception as exc:
- self._error_message = exc.message
+ self._error_message = exc.args
@property
def valid(self):
keys = ('latitude', 'longitude', 'city', 'country',
'complex_name')
missing_keys = \
- list(set(keys).difference(complex_info.keys()))
+ list(set(keys).difference(list(complex_info.keys()))) # Python 3 Conversion -- dict object to list object
LOG.error(_LE("Complex {} is missing {}, link: {}").
format(complex_id, missing_keys, complex_link))
LOG.debug("Complex {}: {}".
if not (latitude and longitude and city and country):
keys = ('latitude', 'longitude', 'city', 'country')
missing_keys = \
- list(set(keys).difference(complex_info.keys()))
+ list(set(keys).difference(set(complex_info.keys())))
LOG.error(_LE("Complex {} is missing {}, link: {}").
format(complex_id, missing_keys, complex_link))
LOG.debug("Complex {}: {}".
from conductor.common.models.triage_tool import TriageTool
from conductor.common.music.model import base
from oslo_config import cfg
-from StringIO import StringIO
+try:
+ from StringIO import StringIO ## for Python 2
+except ImportError:
+ from io import StringIO ## for Python 3
+
CONF = cfg.CONF
io = StringIO()
triage_translator_data['plan_name'] = plan_name
triage_translator_data['plan_id'] = plan_id
def addDemandsTriageTranslator(self, name, triage_translator_data):
- if not 'dropped_candidates' in triage_translator_data.keys():
+ if not 'dropped_candidates' in list(triage_translator_data.keys()): # Python 3 Conversion -- dict object to list object
triage_translator_data['dropped_candidates'] = []
dropped_candidate_details = {}
dropped_candidate_details['name'] = name
triage_translator_data['dropped_candidates'].append(dropped_candidate_details)
else:
for dc in triage_translator_data['dropped_candidates']:
- print name
+ print(name) # Python 3 conversion as print statement changed from python 2
if not dc['name'] == name:
dropped_candidate_details = {}
dropped_candidate_details['name'] = name
host_name = arg.get('host_name')
clli_code = arg.get('clli_code')
+
if host_name:
results = self.ip_ext_manager.map_method(
'resolve_host_location',
# order_lock spin-up rollback
for decision in solution.get('recommendations'):
- candidate = decision.values()[0].get('candidate')
+ candidate = list(decision.values())[0].get('candidate') # Python 3 Conversion -- dict object to list object
if candidate.get('inventory_type') == 'cloud':
# TODO(larry) change the code to get('conflict_id') instead of 'location_id'
conflict_id = candidate.get('conflict_id')
# order_lock spin-up rollback
for decision in solution.get('recommendations'):
- candidate = decision.values()[0].get('candidate')
+ candidate = list(decision.values())[0].get('candidate') # Python 3 Conversion -- dict object to list object
if candidate.get('inventory_type') == 'cloud':
conflict_id = candidate.get('conflict_id')
order_record = self.OrderLock.query.get_plan_by_col("id", conflict_id)[0]
# check closeness for this decision
np.set_decision_id(p, candidate.name)
- if np.decision_id in close_paths.keys():
+ if np.decision_id in list(close_paths.keys()): # Python 3 Conversion -- dict object to list object
valid_candidate = False
''' for base comparison heuristic '''
def _get_new_demand(self, _p, _demand_list):
for demand in _demand_list:
- if demand.name not in _p.decisions.keys():
+ if demand.name not in list(_p.decisions.keys()): # Python 3 Conversion -- dict object to list object
return demand
return None
from oslo_log import log
-from constraint import Constraint
+from .constraint import Constraint # Python 3 import statement relative imports
LOG = log.getLogger(__name__)
import operator
from oslo_log import log
-from constraint import Constraint
+from .constraint import Constraint # Python 3 import statement relative imports
LOG = log.getLogger(__name__)
if op.function.func_type == "latency_between": #TODO
if op.function.loc_a.name == d.name:
if op.function.loc_z.name in \
- _request.demands.keys():
+ list(_request.demands.keys()): # Python 3 Conversion -- dict object to list object
if _request.demands[
op.function.loc_z.name].sort_base != 1:
_request.demands[
_open_demand_list.append(op.function.loc_z)
elif op.function.loc_z.name == d.name:
if op.function.loc_a.name in \
- _request.demands.keys():
+ list(_request.demands.keys()): # Python 3 Conversion -- dict object to list object
if _request.demands[
op.function.loc_a.name].sort_base != 1:
_request.demands[
elif op.function.func_type == "distance_between":
if op.function.loc_a.name == d.name:
if op.function.loc_z.name in \
- _request.demands.keys():
+ list(_request.demands.keys()): # Python 3 Conversion -- dict object to list object
if _request.demands[
op.function.loc_z.name].sort_base != 1:
_request.demands[
_open_demand_list.append(op.function.loc_z)
elif op.function.loc_z.name == d.name:
if op.function.loc_a.name in \
- _request.demands.keys():
+ list(_request.demands.keys()): # Python 3 Conversion -- dict object to list object
if _request.demands[
op.function.loc_a.name].sort_base != 1:
_request.demands[
if self.function.func_type == "latency_between":
if isinstance(self.function.loc_a, demand.Location):
if self.function.loc_z.name in \
- _decision_path.decisions.keys():
+ list(_decision_path.decisions.keys()): # Python 3 Conversion -- dict object to list object
resource = \
_decision_path.decisions[self.function.loc_z.name]
candidate_cost = resource.get('cost')
+ candidate_cost
elif isinstance(self.function.loc_z, demand.Location):
if self.function.loc_a.name in \
- _decision_path.decisions.keys():
+ list(_decision_path.decisions.keys()): # Python 3 Conversion -- dict object to list object
resource = \
_decision_path.decisions[self.function.loc_a.name]
candidate_cost = resource.get('cost')
+ candidate_cost
else:
if self.function.loc_a.name in \
- _decision_path.decisions.keys() and \
+ list(_decision_path.decisions.keys()) and \
self.function.loc_z.name in \
- _decision_path.decisions.keys():
+ list(_decision_path.decisions.keys()): # Python 3 Conversion -- dict object to list object
resource_a = \
_decision_path.decisions[self.function.loc_a.name]
loc_a = None
elif self.function.func_type == "distance_between":
if isinstance(self.function.loc_a, demand.Location):
if self.function.loc_z.name in \
- _decision_path.decisions.keys():
+ list(_decision_path.decisions.keys()): # Python 3 Conversion -- dict object to list object
resource = \
_decision_path.decisions[self.function.loc_z.name]
candidate_cost = resource.get('cost')
+ candidate_cost
elif isinstance(self.function.loc_z, demand.Location):
if self.function.loc_a.name in \
- _decision_path.decisions.keys():
+ list(_decision_path.decisions.keys()): # Python 3 Conversion -- dict object to list object
resource = \
_decision_path.decisions[self.function.loc_a.name]
candidate_cost = resource.get('cost')
+ candidate_cost
else:
if self.function.loc_a.name in \
- _decision_path.decisions.keys() and \
+ list(_decision_path.decisions.keys()) and \
self.function.loc_z.name in \
- _decision_path.decisions.keys():
+ list(_decision_path.decisions.keys()): # Python 3 Conversion -- dict object to list object
resource_a = \
_decision_path.decisions[self.function.loc_a.name]
loc_a = None
candidate_countries = ''
for demand_id, demands in self.demands.items():
candidate_countries += demand_id
- for candidte in demands.resources.values():
+ for candidte in list(demands.resources.values()): # Python 3 Conversion -- dict object to list object
candidate_country_list.append(candidte["country"])
candidate_countries += candidte["country"]
candidate_countries += ','
for demand_id, demands in self.demands.items():
LOG.info("demand id " + demand_id)
- for candidte in demands.resources.values():
+ for candidte in list(demands.resources.values()): # Python 3 Conversion -- dict object to list object
LOG.info("candidate id " + candidte['candidate_id'])
dem_candidate = {demand_id: demands}
temp_candidates.update(dem_candidate)
droped_candidates = ''
for demand_id, demands in temp_candidates.items():
droped_candidates += demand_id
- for candidate in demands.resources.values():
+ for candidate in list(demands.resources.values()): # Python 3 Conversion -- dict object to list object
if demand_id in self.obj_func_param and candidate["country"] in diff_bw_candidates_and_countries:
droped_candidates += candidate['candidate_id']
droped_candidates += ','
self.reorder_constraint()
for constraint_name, constraint in self.constraints.items():
for d in constraint.demand_list:
- if d in self.demands.keys():
+ if d in list(self.demands.keys()): # Python 3 Conversion -- dict object to list object
self.demands[d].constraint_list.append(constraint)
self.sort_constraint_by_rank()
except Exception as err:
message = _LE("Plan {} status encountered a "
- "parsing error: {}").format(p.id, err.message)
+ "parsing error: {}").format(p.id, err)
LOG.error(traceback.print_exc())
p.status = self.Plan.ERROR
p.message = message
:param flavor_map: flavor map get
:param directives: All the directives get from request
'''
- keys = flavor_map.keys()
+ keys = list(flavor_map.keys()) # Python 3 Conversion -- dict object to list object
for ele in directives.get("directives"):
for item in ele.get("directives"):
if "flavor_directives" in item.get("type"):
from conductor.common.models.triage_tool import TriageTool
from conductor.common.music.model import base
from oslo_config import cfg
-from StringIO import StringIO
+try:
+ from StringIO import StringIO ## for Python 2
+except ImportError:
+ from io import StringIO ## for Python 3
CONF = cfg.CONF
io = StringIO()
ca['type'] ='dropped'
for cca in ca['constraints']:
for dl in dc['constraints']:
- if 'constraint_name_dropped' in dl.keys():
+ if 'constraint_name_dropped' in list(dl.keys()): # Python 3 Conversion -- dict object to list object
if(cca['name'] == dl['constraint_name_dropped']):
dc['status'] = "dropped"
return self.triage
count = self.sorted_demand.index(demanHadNoCandidate.name)
count = count-1
if count == 0:
- decision_rolba = decisionWeneedtoRollback.decisions.values()
+ decision_rolba = list(decisionWeneedtoRollback.decisions.values()) # Python 3 Conversion -- dict object to list object
for x in decision_rolba:
for canrb in self.triage['candidates']:
if x['node_id'] == canrb['node_id'] :
counter = 0
d1 = []; d2 = []; d3 = []; d4 = []; d5 = []; d6 = []
for fc in decision_list:
- for final_cand in fc.values():
+ for final_cand in list(fc.values()): # Python 3 Conversion -- dict object to list object
for final_resou in self.triage['candidates']:
if final_cand['node_id'] == final_resou['node_id']:
- if 'type' in final_resou.keys() :
+ if 'type' in list(final_resou.keys()) : # Python 3 Conversion -- dict object to list object
if not final_resou['type'] == "dropped":
final_resou['type'] = 'solution'
final_resou['children'] = []
final_resou['type'] = 'solution'
final_resou['children'] = []
- elif not 'type' in final_resou.keys():
+ elif not 'type' in list(final_resou.keys()): # Python 3 Conversion -- dict object to list object
final_resou['type'] = 'not tried'
#
for cand in self.triage['candidates']:
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent-python</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0</version>
</parent>
<groupId>org.onap.optf.has</groupId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
+ <version>3.8</version>
<configuration>
<retryFailedDeploymentCount>2</retryFailedDeploymentCount>
</configuration>
Code Review / optf / has.git / commitdiff