opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #1112 do not use envvars for the operating-system module

ogcore1
Natalia Serrano 2024-11-20 13:44:57 +01:00
parent 831da3a053
commit 7293aee3ea
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cfg/ogagent.cfg
View File

@ -7,9 +7,9 @@ port=8000
#path=test_modules/server,more_modules/server
# Remote OpenGnsys Service
remote={}://{}/opengnsys/rest
remote=https://192.168.2.1/opengnsys/rest
# Alternate OpenGnsys Service (comment out to enable this option)
#altremote={}://{}/opengnsys/rest
#altremote=https://10.0.2.2/opengnsys/rest
# Execution level (permitted operations): status, halt, full
level=full

5
src/opengnsys/modules/server/CloningEngine/__init__.py
View File

@ -146,7 +146,10 @@ class CloningEngineWorker (ogLiveWorker):
self.muestraMensaje (3)
try:
self.interfaceAdmin (nfn, [dsk, par, nci, ipr, ptc])
## the ptc.split() is useless right now, since interfaceAdmin() does ' '.join(params) in order to spawn a shell
## however we're going to need it in the future (when everything gets translated into python), plus it's harmless now. So let's do it
#self.interfaceAdmin (nfn, [dsk, par, nci, ipr, ptc])
self.interfaceAdmin (nfn, [dsk, par, nci, ipr] + ptc.split())
self.muestraMensaje (11)
herror = 0
except:

13
src/opengnsys/modules/server/OpenGnSys/__init__.py
View File

@ -115,18 +115,9 @@ class OpenGnSysWorker(ServerWorker):
t = 0 # Count of time
# Generate random secret to send on activation
self.random = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(self.length))
# Ensure cfg has required configuration variables or an exception will be thrown
ogcore_scheme = os.environ.get ('OGAGENTCFG_OGCORE_SCHEME', 'https')
ogcore_ip = os.environ.get ('OGAGENTCFG_OGCORE_IP', '192.168.2.1')
ogcore_port = os.environ.get ('OGAGENTCFG_OGCORE_PORT', '8443')
ogcore_altip = os.environ.get ('OGAGENTCFG_OGCORE_ALTIP', '192.168.2.254')
ogcore_altport = os.environ.get ('OGAGENTCFG_OGCORE_ALTPORT', '8443')
ogcore_ip_port = ':'.join (map (str, filter (None, [ogcore_ip, ogcore_port ])))
ogcore_altip_port = ':'.join (map (str, filter (None, [ogcore_altip, ogcore_altport ])))
try:
url = self.service.config.get(self.name, 'remote')
url = url.format (ogcore_scheme, ogcore_ip_port)
except NoOptionError as e:
logger.error("Configuration error: {}".format(e))
raise e
@ -170,9 +161,7 @@ class OpenGnSysWorker(ServerWorker):
logger.warn (str (e))
# Trying to initialize on alternative server, if defined
# (used in "exam mode" from the University of Seville)
alturl = self.service.config.get(self.name, 'altremote')
alturl = alturl.format (ogcore_scheme, ogcore_altip_port)
self.REST = REST(alturl)
self.REST = REST(self.service.config.get(self.name, 'altremote'))
self.REST.sendMessage('ogagent/started', {'mac': self.interface.mac, 'ip': self.interface.ip,
'secret': self.random, 'ostype': operations.os_type,
'osversion': operations.os_version, 'alt_url': True,