Skip to content

[Platform API] Test against Python 3 platform API if available on DuT #2821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jleveque merged 2 commits into from
Jan 17, 2021
Merged

[Platform API] Test against Python 3 platform API if available on DuT #2821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c052681
[Platform API] Test against Python 3 platform API if available on DuT
Jan 15, 2021
ce1f4a6
Remove unnecessary BytesIO module; Change encoding to UTF-8 just to b…
Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions tests/common/helpers/platform_api/scripts/platform_api_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
import inspect
import json
import os
import sys
import syslog
from io import BytesIO

from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
# TODO: Clean this up once we no longer need to support Python 2
if sys.version_info.major == 3:
from http.server import HTTPServer, BaseHTTPRequestHandler
else:
from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler

import sonic_platform

Expand Down Expand Up @@ -66,7 +70,13 @@ def do_platform_api(self):
obj = platform
while len(path) != 1:
_dir = path.pop()
args = inspect.getargspec(getattr(obj, 'get_' + _dir)).args

# TODO: Clean this up once we no longer need to support Python 2
if sys.version_info.major == 3:
args = inspect.getfullargspec(getattr(obj, 'get_' + _dir)).args
else:
args = inspect.getargspec(getattr(obj, 'get_' + _dir)).args

if 'index' in args:
_idx = int(path.pop())
obj = getattr(obj, 'get_' + _dir)(_idx)
Expand All @@ -83,10 +93,7 @@ def do_platform_api(self):
except NotImplementedError as e:
syslog.syslog(syslog.LOG_WARNING, "API '{}' not implemented".format(api))

response = BytesIO()
response.write(json.dumps({'res': res}, default=obj_serialize))

self.wfile.write(response.getvalue())
self.wfile.write(json.dumps({'res': res}, default=obj_serialize).encode('utf-8'))


if __name__ == '__main__':
Expand Down
16 changes: 10 additions & 6 deletions tests/platform_tests/api/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@ def start_platform_api_service(duthost, localhost):
timeout=5,
module_ignore_errors=True)
if 'exception' in res:
# TODO: Remove this check once we no longer need to support Python 2
res = duthost.command('docker exec -i pmon python3 -c "import sonic_platform"', module_ignore_errors=True)
py3_platform_api_available = not res['failed']

supervisor_conf = [
"[program:platform_api_server]",
"command=/usr/bin/python /opt/platform_api_server.py --port {}".format(SERVER_PORT),
"autostart=True",
"autorestart=True",
"stdout_logfile=syslog",
"stderr_logfile=syslog",
'[program:platform_api_server]',
'command=/usr/bin/python{} /opt/platform_api_server.py --port {}'.format('3' if py3_platform_api_available else '2', SERVER_PORT),
'autostart=True',
'autorestart=True',
'stdout_logfile=syslog',
'stderr_logfile=syslog',
]
dest_path = os.path.join(os.sep, 'tmp', 'platform_api_server.conf')
pmon_path = os.path.join(os.sep, 'etc', 'supervisor', 'conf.d', 'platform_api_server.conf')
Expand Down