Sysdeploy/idlers-agent
2
0
Fork 2
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

refractor

Browse Source
This commit is contained in:
Shailaja Kumari 2024-07-03 15:17:50 +05:30
parent 90dcb330a4
commit 4a3222bb84
Signed by: shailaja
GPG Key ID: 2B9455CAFBC4D75A
1 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
agent.py
View File

@ -234,41 +234,81 @@ class ServerData:
return '127.0.0.1'
def get_os_release_info(self):
os_release_info = {}
# reading from /etc/os-release
try:
with open('/etc/os-release') as f:
lines = f.read().splitlines()
return {line.split('=')[0]: line.split('=')[1].strip('"') for line in lines if '=' in line}
os_release_info = {line.split('=')[0]: line.split('=')[1].strip('"') for line in lines if '=' in line}
except FileNotFoundError:
logging.warning("/etc/os-release not found, trying /etc/VERSION")
except Exception as e:
logging.error("Failed to read /etc/os-release: {}".format(e))
return {}
# If /etc/os-release is not found or empty, fallback to /etc/VERSION
if not os_release_info:
try:
with open('/etc/VERSION') as f:
lines = f.read().splitlines()
for line in lines:
if '=' in line:
key, value = line.split('=', 1)
os_release_info[key.strip()] = value.strip()
except Exception as e:
logging.error("Failed to read /etc/VERSION: {}".format(e))
return {}
return os_release_info
def get_os_id(self, os_list):
try:
os_info = self.get_os_release_info()
if not os_info:
logging.error("No OS release info found.")
return next(os['id'] for os in os_list if os['name'].lower() == "other" or os['name'].lower() == "custom")
current_os = f"{os_info.get('NAME', 'Unknown')} {os_info.get('VERSION', '').strip()}".strip().lower()
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']
if 'ubuntu' in current_os:
return next(os['id'] for os in os_list if 'ubuntu' in os['name'].lower())
elif 'centos' in current_os:
return next(os['id'] for os in os_list if 'centos' in os['name'].lower())
elif 'fedora' in current_os:
return next(os['id'] for os in os_list if 'fedora' in os['name'].lower())
return next(os['id'] for os in os_list if os['name'].lower() == "other" or os['name'].lower() == "custom")
# 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 None
except Exception as e:
logging.error("Failed to fetch OS ID: {}".format(e))
return 27
for os_entry in os_list:
if os_entry['name'].lower() in ["other", "custom"]:
return os_entry['id']
return None
def create_post_data(self):
ram, disk = self.get_ram_and_disk()
post_data = {
"server_type": 1,
"os_id": self.get_os(os_list),
"os_id": self.get_os_id(os_list),
"provider_id": 10,
"location_id": 15,
"ssh_port": 22,
@ -431,21 +471,15 @@ class ServerManager:
else:
return self.create_note(note_data)
def get_os_list(self):
try:
connection = http.client.HTTPSConnection(self.host)
connection.request("GET", "/api/v1/os", headers=self.headers)
response = connection.getresponse()
if response.status == 200:
os_list = json.loads(response.read().decode('utf-8'))
logging.info("OS list fetched successfully")
return os_list
else:
logging.error(f"Failed to fetch OS list: {response.status} {response.reason}")
return []
except Exception as e:
logging.error(f"Exception occurred while fetching OS list: {e}")
def get_os_list(self):
os_list = self.send_request('GET', '/api/v1/os')
if os_list:
logging.info("OS list fetched successfully")
return os_list
else:
logging.error("Failed to fetch OS list")
return []
def validate_env_vars():
api_key = os.getenv('AGENT_API')
host = os.getenv('HOST')