Skip to content

[Platform API] Make HTTP server deployment more robust #1749

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
Jun 30, 2020
Merged

[Platform API] Make HTTP server deployment more robust #1749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffd8bfd
[Platform API] Fix deployment of platform API service
Jun 9, 2020
d40a3df
Add and delete explicit iptables allow rule rather than flushing
Jun 18, 2020
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: 18 additions & 3 deletions tests/platform_tests/api/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@
SERVER_FILE = 'platform_api_server.py'
SERVER_PORT = 8000

IPTABLES_PREPEND_RULE_CMD = 'iptables -I INPUT 1 -p tcp -m tcp --dport {} -j ACCEPT'.format(SERVER_PORT)
IPTABLES_DELETE_RULE_CMD = 'iptables -D INPUT -p tcp -m tcp --dport {} -j ACCEPT'.format(SERVER_PORT)

@pytest.fixture(scope='function')
def start_platform_api_service(duthost, localhost):
res = localhost.wait_for(host=duthost.hostname, port=SERVER_PORT, state='started', delay=1, timeout=5)
dut_ip = duthost.setup()['ansible_facts']['ansible_eth0']['ipv4']['address']

res = localhost.wait_for(host=dut_ip, port=SERVER_PORT, state='started', delay=1, timeout=5)
if 'exception' in res:
supervisor_conf = [
"[program:platform_api_server]",
Expand All @@ -29,11 +34,15 @@ def start_platform_api_service(duthost, localhost):
duthost.copy(src=src_path, dest=dest_path)
duthost.command('docker cp {} pmon:{}'.format(dest_path, pmon_path))

# Prepend an iptables rule to allow incoming traffic to the HTTP server
duthost.command(IPTABLES_PREPEND_RULE_CMD)

# Reload the supervisor config and Start the HTTP server
duthost.command('docker exec -i pmon supervisorctl reread')
duthost.command('docker exec -i pmon supervisorctl update')
duthost.command('docker exec -i pmon supervisorctl start platform_api_server.conf')

res = localhost.wait_for(host=duthost.hostname, port=SERVER_PORT, state='started', delay=1, timeout=5)
res = localhost.wait_for(host=dut_ip, port=SERVER_PORT, state='started', delay=1, timeout=5)
assert 'exception' not in res


Expand All @@ -42,6 +51,7 @@ def stop_platform_api_service(duthost):
try:
yield
finally:
# Stop the server and remove our supervisor config changes
pmon_path_supervisor = os.path.join(os.sep, 'etc', 'supervisor', 'conf.d', 'platform_api_server.conf')
pmon_path_script = os.path.join(os.sep, 'opt', SERVER_FILE)
duthost.command('docker exec -i pmon supervisorctl stop platform_api_server')
Expand All @@ -50,9 +60,14 @@ def stop_platform_api_service(duthost):
duthost.command('docker exec -i pmon supervisorctl reread')
duthost.command('docker exec -i pmon supervisorctl update')

# Delete the iptables rule we added
duthost.command(IPTABLES_DELETE_RULE_CMD)

@pytest.fixture(scope='function')
def platform_api_conn(duthost, start_platform_api_service):
conn = httplib.HTTPConnection(duthost.hostname, SERVER_PORT)
dut_ip = duthost.setup()['ansible_facts']['ansible_eth0']['ipv4']['address']

conn = httplib.HTTPConnection(dut_ip, SERVER_PORT)
try:
yield conn
finally:
Expand Down