Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Anfield Bug Fix #76

Merged
merged 1 commit into from
Jul 19, 2023
Merged

Anfield Bug Fix #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion samples/project-anfield/export_cluster_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,9 @@
# Export Active directory entries and AD users and groups along with roles.
if export_access_mgmnt:
cluster_dict["ad"] = library.get_ad_entries(cohesity_client)
cluster_dict["ad_objects"] = library.get_ad_objects(cohesity_client)
domains = [ad.domain_name for ad in cluster_dict["ad"]]
cluster_dict["ad_objects"] = library.get_ad_objects(
cohesity_client, domains)
cluster_dict["roles"] = cohesity_client.roles.get_roles()

exported_res = library.debug()
Expand Down
29 changes: 16 additions & 13 deletions samples/project-anfield/import_cluster_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,18 +1435,7 @@ def create_protection_jobs():
protocol = node["protectionSource"]["isilonProtectionSource"][
"mountPoint"
]["protocols"]
if "kNfs" in protocol:
source_list.append(node["protectionSource"]["id"])
else:
# flag set to skip protection job creation which contains
# objects with SMB protocol.
to_proceed = False
ERROR_LIST.append(
"Protection job '%s' contain objects %s of "
"following protocol %s. Supported protocol is kNfs."
% (job_name, name, ", ".join(protocol))
)
break
source_list.append(node["protectionSource"]["id"])
elif environment == KCASSANDRA:
uuid = node["protectionSource"]["cassandraProtectionSource"].get(
"uuid"
Expand Down Expand Up @@ -1835,10 +1824,20 @@ def add_active_directory():
domain_name = domain.domain_name
if not configparser.has_section(domain_name):
ERROR_LIST.append(
"Please update credentials for active directory '%s'" % domain_name
"Please provide credentials for active directory '%s'" % domain_name
)
continue
if domain_name not in existing_ad_list:
if not configparser[domain_name].get("username"):
ERROR_LIST.append(
"Please provide username for active directory '%s'" % domain_name
)
continue
if not configparser[domain_name].get("password"):
ERROR_LIST.append(
"Please provide password for active directory '%s'" % domain_name
)
continue
domain.user_name = configparser[domain_name]["username"]
domain.password = configparser[domain_name]["password"]
if configparser[domain_name].get("machine_accounts", None):
Expand All @@ -1853,6 +1852,8 @@ def add_active_directory():
"Error while adding active directory '%s', err msg %s"
% (domain_name, err)
)
# Sleep for 10 seconds.
time.sleep(10)


def create_roles():
Expand Down Expand Up @@ -1927,6 +1928,7 @@ def create_ad_objects():
try:
if user.username not in existing_users:
cohesity_client.principals.create_user(user)
imported_res_dict["AD Users"].append(user.username)
except APIException as err:
ERROR_LIST.append(
"Error while creating AD user '%s', err msg %s"
Expand All @@ -1936,6 +1938,7 @@ def create_ad_objects():
try:
if group.name not in existing_groups:
cohesity_client.groups.create_group(group)
imported_res_dict["AD Groups"].append(group.name)
except APIException as err:
ERROR_LIST.append(
"Error while creating AD group '%s', err msg %s" % (group.name, err)
Expand Down