Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

python: fixes for v2 API

Browse source
This commit is contained in:
Steffen Vogel 2020-10-15 10:21:22 +02:00
parent c73d3b39b4
commit 9b2b6aa351
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
python/villas/node/node.py
View file

@ -13,23 +13,17 @@ class Node(object):
api_version = 'v2' api_version = 'v2'
def __init__(self, log_filename=None, config_filename=None, def __init__(self, api_url=None,
config={}, api='http://localhost:8080', log_filename=None,
config_filename=None, config={},
executable='villas-node', **kwargs): executable='villas-node', **kwargs):
self.api_url = api_url
self.log_filename = log_filename
self.config = config self.config = config
self.config_filename = config_filename self.config_filename = config_filename
self.log_filename = log_filename
self.api_endpoint = api
self.executable = executable self.executable = executable
schema, _ = api.split('://')
if schema in ('http', 'https'):
pass
elif schema in ('ws', 'wss'):
pass
elif schema == 'unix':
pass
def start(self): def start(self):
self.config_file = tempfile.NamedTemporaryFile(mode='w+', self.config_file = tempfile.NamedTemporaryFile(mode='w+',
suffix='.json') suffix='.json')
@ -97,21 +91,21 @@ class Node(object):
args['json'] = req args['json'] = req
r = requests.get( r = requests.get(
f'{self.api_endpoint}/api/{self.api_version}/{action}', **args) f'{self.api_url}/api/{self.api_version}/{action}', **args)
r.raise_for_status() r.raise_for_status()
return r.json() return r.json()
def get_local_version(self):
ver = subprocess.check_output([self.executable, '-V'])
return ver.decode('ascii').rstrip()
def get_version(self): def get_version(self):
try:
resp = self.request('capabilities') resp = self.request('capabilities')
return resp['build'] return resp['build']
except Exception:
ver = subprocess.check_output([self.executable, '-V'], )
return ver.decode('ascii').rstrip()
def is_running(self): def is_running(self):
if self.child is None: if self.child is None: