shailaja/idlers-agent
1
0
Fork 0
forked from Sysdeploy/idlers-agent
Code Pull Requests Activity

refractor

Browse Source
This commit is contained in:
Shailaja Kumari 2024-07-05 15:03:11 +05:30
parent 9c581fb6dd
commit 49a3f63c34
Signed by: shailaja
GPG Key ID: 2B9455CAFBC4D75A
1 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
agent.py
View File

@ -264,48 +264,44 @@ class ServerData:
def get_os_id(self, os_list): def get_os_id(self, os_list):
try: os_info = self.get_os_release_info()
os_info = self.get_os_release_info()
if not os_info: if not os_info:
logging.error("No OS release info found.") logging.error("No OS release info found.")
for os_entry in os_list:
if os_entry['name'].lower() in ["other", "custom"]:
return os_entry['id']
return None
if 'NAME' in os_info and 'VERSION' in os_info:
current_os = f"{os_info.get('NAME', 'Unknown')} {os_info.get('VERSION', '').strip()}".strip().lower()
else:
current_os = f"{os_info.get('os_name', 'Unknown')} {os_info.get('productversion', '').strip()}".strip().lower()
for os_entry in os_list:
if current_os in os_entry['name'].lower():
return os_entry['id']
# Fallback checks for common OS names if full name doesn't match
for os_entry in os_list:
if 'ubuntu' in current_os and 'ubuntu' in os_entry['name'].lower():
return os_entry['id']
elif 'centos' in current_os and 'centos' in os_entry['name'].lower():
return os_entry['id']
elif 'fedora' in current_os and 'fedora' in os_entry['name'].lower():
return os_entry['id']
# Default to 'other' or 'custom' if no match found
for os_entry in os_list: for os_entry in os_list:
if os_entry['name'].lower() in ["other", "custom"]: if os_entry['name'].lower() in ["other", "custom"]:
return os_entry['id'] return os_entry['id']
return None return 1
except Exception as e:
logging.error("Failed to fetch OS ID: {}".format(e)) if 'NAME' in os_info and 'VERSION' in os_info:
for os_entry in os_list: current_os = f"{os_info.get('NAME', 'Unknown')} {os_info.get('VERSION', '').strip()}".strip().lower()
if os_entry['name'].lower() in ["other", "custom"]: else:
return os_entry['id'] current_os = f"{os_info.get('os_name', 'Unknown')} {os_info.get('productversion', '').strip()}".strip().lower()
return None
for os_entry in os_list:
if current_os in os_entry['name'].lower():
return os_entry['id']
# Fallback checks for common OS names if full name doesn't match
for os_entry in os_list:
if 'ubuntu' in current_os and 'ubuntu' in os_entry['name'].lower():
return os_entry['id']
elif 'centos' in current_os and 'centos' in os_entry['name'].lower():
return os_entry['id']
elif 'fedora' in current_os and 'fedora' in os_entry['name'].lower():
return os_entry['id']
# Default to 'other' or 'custom' if no match found
for os_entry in os_list:
if os_entry['name'].lower() in ["other", "custom"]:
return os_entry['id']
return 1
def create_post_data(self): def create_post_data(self):
ram, disk = self.get_ram_and_disk() ram, disk = self.get_ram_and_disk()
os_list = self.get_os_list()
post_data = { post_data = {
"server_type": 1, "server_type": 1,
"os_id": self.get_os_id(os_list), "os_id": self.get_os_id(os_list),
@ -471,14 +467,10 @@ class ServerManager:
else: else:
return self.create_note(note_data) return self.create_note(note_data)
def get_os_list(self): def get_os_list(self):
os_list = self.send_request('GET', '/api/v1/os') os_list = self.send_request('GET', '/api/v1/os')
if os_list: logging.info("OS list fetched successfully") if os_list else logging.error("Failed to fetch OS list")
logging.info("OS list fetched successfully") return os_list or []
return os_list
else:
logging.error("Failed to fetch OS list")
return []
def validate_env_vars(): def validate_env_vars():
api_key = os.getenv('AGENT_API') api_key = os.getenv('AGENT_API')