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: use new API version

Browse source
This commit is contained in:
Steffen Vogel 2020-08-17 17:12:54 +02:00
parent 7e5c298d90
commit ee67e13da7
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,8 @@ LOGGER = logging.getLogger('villas.node')
class Node(object): class Node(object):
api_version = 'v2'
def __init__(self, log_filename=None, config_filename=None, def __init__(self, log_filename=None, config_filename=None,
config={}, api='http://localhost:8080', config={}, api='http://localhost:8080',
executable='villas-node', **kwargs): executable='villas-node', **kwargs):
@ -21,7 +23,13 @@ class Node(object):
self.api_endpoint = api self.api_endpoint = api
self.executable = executable self.executable = executable
self.child = None 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+',
@ -71,26 +79,25 @@ class Node(object):
def active_config(self): def active_config(self):
resp = self.request('config') resp = self.request('config')
return resp['response'] return resp
@property @property
def nodes(self): def nodes(self):
return self.request('nodes')['response'] return self.request('nodes')
@property @property
def paths(self): def paths(self):
return self.request('paths')['response'] return self.request('paths')
def request(self, action, req=None): def request(self, action, req=None):
body = { args = {
'action': action, 'timeout': 1
'id': str(uuid.uuid4())
} }
if req is not None: if req is not None:
body['request'] = req args['json'] = req
r = requests.post(self.api_endpoint + '/api/v1', json=body, timeout=1) r = requests.get(f'{self.api_endpoint}/api/{self.api_version}/{action}', **args)
r.raise_for_status() r.raise_for_status()
@ -100,7 +107,7 @@ class Node(object):
try: try:
resp = self.request('capabilities') resp = self.request('capabilities')
return resp['response']['build'] return resp['build']
except Exception: except Exception:
ver = subprocess.check_output([self.executable, '-V'], ) ver = subprocess.check_output([self.executable, '-V'], )