starlingx
/
nfv
Code Issues Proposed changes

Fix bad-indentation in the nfv code 

Unsuppress and fix the following pylint error code:
 W0311 bad-indentation

This change has no runtime effect.

Story: 2004515
Task: 28244
Change-Id: Ic0a43748e2795ae17a94ba283c31abf42bf26b12
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2018-12-03 13:29:37 -06:00
parent b4579b875b
commit d8b1eedb61
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nfv/nfv-tests/nfv_scenario_tests/main.py
View File

@ -58,16 +58,16 @@ def process_finalize():
def process_progress_marker_start(marker_name):
space_str = '.' * (60 - len(marker_name))
sys.stdout.write("%s %s %s "
% (str(datetime.datetime.now())[:-3], marker_name,
space_str))
sys.stdout.flush()
space_str = '.' * (60 - len(marker_name))
sys.stdout.write("%s %s %s "
% (str(datetime.datetime.now())[:-3], marker_name,
space_str))
sys.stdout.flush()
def process_progress_marker_end(marker_result):
sys.stdout.write("%s\n" % marker_result)
sys.stdout.flush()
sys.stdout.write("%s\n" % marker_result)
sys.stdout.flush()
def process_do_setup(loads_dir, setup_data):

2
nfv/nfv-vim/nfv_vim/objects/_guest_services.py
View File

@ -73,7 +73,7 @@ class GuestServices(ObjectData):
"""
if nfvi.objects.v1.GUEST_SERVICE_ADMIN_STATE.LOCKED \
== nfvi_service_admin_state:
return GuestServices.SERVICE_DISABLED
return GuestServices.SERVICE_DISABLED
else:
if nfvi.objects.v1.GUEST_SERVICE_OPER_STATE.ENABLED \
== nfvi_service_oper_state:

22
nfv/nfv-vim/nfv_vim/objects/_instance.py
View File

@ -2900,18 +2900,18 @@ class Instance(ObjectData):
prev_action_type != INSTANCE_ACTION_TYPE.DELETE and
not (self._action_data.is_cancelled() or
self._action_data.is_completed())):
DLOG.info("Reject action %s for instance %s, %s action is "
"already inprogress, state=%s."
% (nfvi_action_data.action_type, self.name,
self._action_data.action_type,
self._action_data.action_state))
DLOG.info("Reject action %s for instance %s, %s action is "
"already inprogress, state=%s."
% (nfvi_action_data.action_type, self.name,
self._action_data.action_type,
self._action_data.action_state))
reason = ("Cannot '%s' instance %s action '%s' is in progress"
% (nfvi_action_data.action_type, self.uuid,
self._action_data.action_type))
nfvi.nfvi_reject_instance_action(self.uuid, reason,
nfvi_action_data.context)
return
reason = ("Cannot '%s' instance %s action '%s' is in progress"
% (nfvi_action_data.action_type, self.uuid,
self._action_data.action_type))
nfvi.nfvi_reject_instance_action(self.uuid, reason,
nfvi_action_data.context)
return
if new_action_type == INSTANCE_ACTION_TYPE.START:
host_table = tables.tables_get_host_table()

3
nfv/pylint.rc
View File

@ -33,7 +33,6 @@ load-plugins=
# W0223 abstract-method
# W0231 super-init-not-called
# W0235 useless-super-delegation
# W0311 bad-indentation
# W0401 wildcard-import
# W0403 relative-import warning
# W0404 reimported
@ -45,7 +44,7 @@ load-plugins=
# W0622 redefined-builtin
# W0703 broad except warning
# W1401 anomalous-backslash-in-string
disable=C, R, W0120, W0125, W0212, W0221, W0223, W0231, W0235, W0311,
disable=C, R, W0120, W0125, W0212, W0221, W0223, W0231, W0235,
W0401, W0403, W0404, W0511, W0603, W0612, W0613, W0621, W0622, W0703, W1401