Skip to content
Snippets Groups Projects
Commit a02bad89 authored by user's avatar user
Browse files

AT1-709: Resolve review comments.

parent 7eabfb3d
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,8 @@ def cm_configure_attributes(): ...@@ -10,6 +10,8 @@ def cm_configure_attributes():
configure_fail_count = 0 configure_fail_count = 0
already_configured_count = 0 already_configured_count = 0
total_attrib_count = 0 total_attrib_count = 0
attribute_started_count = 0
error_starting_attrib_count = 0
with open(attr_list_file, 'r') as attrib_list_file: with open(attr_list_file, 'r') as attrib_list_file:
configuration_blocks = json.load(attrib_list_file) configuration_blocks = json.load(attrib_list_file)
for cb in configuration_blocks: for cb in configuration_blocks:
...@@ -28,7 +30,8 @@ def cm_configure_attributes(): ...@@ -28,7 +30,8 @@ def cm_configure_attributes():
if attribute.lower() in str(already_archived).lower(): if attribute.lower() in str(already_archived).lower():
print("Attribute " + attribute + " already configured.") print("Attribute " + attribute + " already configured.")
is_already_archived = True is_already_archived = True
already_configured_count, configure_fail_count = start_archiving(attribute, already_configured_count, configure_fail_count) already_configured_count += 1
attribute_started_count, error_starting_attrib_count = start_archiving(attribute, attribute_started_count, error_starting_attrib_count)
break break
if not is_already_archived: if not is_already_archived:
...@@ -71,18 +74,18 @@ def cm_configure_attributes(): ...@@ -71,18 +74,18 @@ def cm_configure_attributes():
configure_fail_count += 1 configure_fail_count += 1
print("Exception occured while adding attribute for archiving: ", df) print("Exception occured while adding attribute for archiving: ", df)
return configure_success_count, configure_fail_count, already_configured_count, total_attrib_count return configure_success_count, configure_fail_count, already_configured_count, total_attrib_count, attribute_started_count, error_starting_attrib_count
def start_archiving(str_attribute, already_configured_count, configure_fail_count): def start_archiving(str_attribute, attribute_started_count, error_starting_attrib_count):
try: try:
conf_manager_proxy.command_inout("AttributeStart", str_attribute) conf_manager_proxy.command_inout("AttributeStart", str_attribute)
already_configured_count += 1 attribute_started_count +=1
except Exception as except_occured: except Exception as except_occured:
configure_fail_count += 1 error_starting_attrib_count += 1
print("start_archiving except_occured: ", except_occured) print("start_archiving except_occured: ", except_occured)
return already_configured_count return attribute_started_count, error_starting_attrib_count
# Main entrypoint of the script. # Main entrypoint of the script.
conf_manager_device_fqdn = "" conf_manager_device_fqdn = ""
...@@ -115,8 +118,10 @@ sleep_time = 6 ...@@ -115,8 +118,10 @@ sleep_time = 6
max_retries = 10 max_retries = 10
for x in range(0, max_retries): for x in range(0, max_retries):
try: try:
configure_success_count, configure_fail_count, already_configured_count, total_attrib_count = cm_configure_attributes() configure_success_count, configure_fail_count, already_configured_count, total_attrib_count, attribute_started_count, error_starting_attrib_count = cm_configure_attributes()
print("Configured successfully: ", configure_success_count, "Failed: ", configure_fail_count, "Already configured: ", already_configured_count, "Total attributes: ", total_attrib_count) print("Configured successfully: ", configure_success_count, "Failed: ", configure_fail_count, "Already configured: ",
already_configured_count, "Total attributes: ", total_attrib_count, "Attribute started: ", attribute_started_count,
"Error starting attribute: ", error_starting_attrib_count)
break break
except: except:
print("configure_attribute exception: " + str(sys.exc_info())) print("configure_attribute exception: " + str(sys.exc_info()))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment