From f35958f65633049526d7596ba3409231a33d8b3b Mon Sep 17 00:00:00 2001
From: Can Soylu <c.soylu@geco-it.fr>
Date: Tue, 11 Jan 2022 11:32:24 +0100
Subject: [PATCH] Support for all Administrator usernames from metadata

---
 localscripts/ActivateAdministrator.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/localscripts/ActivateAdministrator.py b/localscripts/ActivateAdministrator.py
index 7260489..f5ff24e 100644
--- a/localscripts/ActivateAdministrator.py
+++ b/localscripts/ActivateAdministrator.py
@@ -14,13 +14,17 @@ def load_json_file(file_path,variable):
     file.close()
     return data.get(variable)
 
-
 def get_administrator_status():
     command = "(Get-LocalUser | Where-Object{$_.SID -like \"S-1-5-*-500\"}).Enabled"
     run = subprocess.run(["powershell", "-Command", command], stdout=subprocess.PIPE, universal_newlines=True)
     print("Is admin account enabled already: " + run.stdout)
     return run.stdout
 
+def get_administrator_name():
+    command = "(Get-LocalUser | Where-Object{$_.SID -like \"S-1-5-*-500\"}).Name"
+    run = subprocess.run(["powershell", "-Command", command], stdout=subprocess.PIPE, universal_newlines=True)
+    print("Administrator username: " + run.stdout)
+    return run.stdout
 
 def enable_administrator_account():
     command = "(Get-LocalUser | Where-Object{$_.SID -like \"S-1-5-*-500\"}).Name | Enable-LocalUser"
@@ -28,15 +32,17 @@ def enable_administrator_account():
     print("\n Administrator account is activated by localscript")
     return run.stdout
 
-#execute
-
+# variables
 meta_data_path = find_drive(":\OPENSTACK\LATEST\META_DATA.json")
+admin_name = get_administrator_name()
+
+# execute
 if meta_data_path != "False":
     meta_data = load_json_file(meta_data_path,"meta")
 else:
     sys.exit(0)
 
-if meta_data["admin_username"] in ["Administrateur","Administrator"] and "False" in get_administrator_status():
+if meta_data["admin_username"] in admin_name and "False" in get_administrator_status():
     run = enable_administrator_account()
     sys.exit(1001)
 else: