Skip to content
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.

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

Run VPP+VPPAgent in a container for e2e tests (support for multi-VPP tests) #1770

Merged
merged 14 commits into from
Dec 17, 2020

Conversation

ondrej-fabry
Copy link
Member

@ondrej-fabry ondrej-fabry commented Dec 9, 2020

This is a change that affects how VPP and VPPAgent are started for end-to-end tests.
Until now both VPP and VPPAgent processes were started as a processes in the system,
which was a special built container for running end-to-end tests. However to allow
for multi-VPP tests and make the execution of tests closer match the real use it is
better to run VPP+VPPAgent using a separate container that is normally built via
make images.

This PR currently seems to conflict with #1769 so it seems we need to orchestrate the changes.

milanlenco and others added 2 commits December 4, 2020 16:45
Signed-off-by: Milan Lenco <lencomilan@gmail.com>
This is a change that affects how VPP and VPPAgent are started for end-to-end tests.
Until now both VPP and VPPAgent processes were started as a processes in the system,
which was a special built container for running end-to-end tests. However to allow
for multi-VPP tests and make the execution of tests closer match the real use it is
better to run VPP+VPPAgent using a separate container that is normally built.

Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
@ondrej-fabry ondrej-fabry added 🔨 testing 🚧 WIP do not merge! work in progress! labels Dec 9, 2020
@ondrej-fabry ondrej-fabry changed the title WIP: Run VPP+VPPAgent in a container for e2e tests (support for multi-VPP tests) Run VPP+VPPAgent in a container for e2e tests (support for multi-VPP tests) Dec 9, 2020
milanlenco
milanlenco previously approved these changes Dec 14, 2020
Signed-off-by: Milan Lenco <milan.lenco@pantheon.tech>
ondrej-fabry and others added 8 commits December 15, 2020 16:38
…ssignment (ligato#1773)

Signed-off-by: Milan Lenco <milan.lenco@pantheon.tech>
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
@ondrej-fabry ondrej-fabry removed the 🚧 WIP do not merge! work in progress! label Dec 16, 2020
# Conflicts:
#	plugins/linux/ifplugin/descriptor/interface_vrf.go
#	tests/e2e/012_linux_interfaces_test.go
#	tests/e2e/080_vrf_test.go
#	tests/e2e/101_rest_api_test.go
#	tests/e2e/e2e.go
@ondrej-fabry ondrej-fabry marked this pull request as ready for review December 16, 2020 14:27
@ondrej-fabry
Copy link
Member Author

All tests passing:

==========================================================================
 E2E TEST - Wed 16 Dec 2020 03:03:49 PM CET 
==========================================================================
-    VPP_AGENT: prod_vpp_agent
-     image ID: sha256:8f561b6b81d1b0eee6aa313287f2e3f96af7d75fb8560dee3ceadefb63a29748
-      created: 2020-12-16T15:03:34.790539216+01:00
-  VPP version: 20.05.1-1~g9ba2ead1a~b53
--------------------------------------------------------------------------
PASS e2e.TestAgentInSync (1.38s)
PASS e2e.TestStartStopMicroservice (3.67s)
PASS e2e.TestInterfaceConnTap (85.31s)
PASS e2e.TestInterfaceTapTunnel (8.78s)
PASS e2e.TestInterfaceConnAfPacket (79.13s)
PASS e2e.TestInterfaceAfPacketWithLogicalReference (80.19s)
PASS e2e.TestInterfaceLinkOnlyTap (18.32s)
PASS e2e.TestDummyInterface (34.63s)
PASS e2e.TestExistingInterface (1.23s)
PASS e2e.TestExistingLinkOnlyInterface (19.69s)
PASS e2e.TestIPWithNeighGW (48.54s)
PASS e2e.TestIPWithNonLocalGW (50.52s)
PASS e2e.TestVPPRoutesWithNetalloc (61.99s)
PASS e2e.TestSpan (5.56s)
PASS e2e.TestBridgeDomainWithTAPs (105.70s)
PASS e2e.TestBridgeDomainWithAfPackets (107.38s)
PASS e2e.TestSourceNAT (37.82s)
PASS e2e.TestNATPools/CRUD_for_named_pool (3.29s)
PASS e2e.TestNATPools/CRUD_for_unnamed_pool (2.53s)
PASS e2e.TestNATPools (5.81s)
PASS e2e.TestNATStaticMappings (20.98s)
PASS e2e.TestSourceNATDeprecatedAPI (35.63s)
PASS e2e.TestL3ACLs (81.64s)
PASS e2e.TestIPSec (2.55s)
PASS e2e.TestIPSecMultiPoint (2.46s)
PASS e2e.TestVRFsWithSameSubnets (38.70s)
PASS e2e.TestVRFRoutes (41.50s)
PASS e2e.TestExistingLinuxVRF (14.28s)
PASS e2e.TestAgentCtlCommands/Check_if_executable_is_present (0.17s)
PASS e2e.TestAgentCtlCommands/Test_`dump_all`_action (0.14s)
PASS e2e.TestAgentCtlCommands/Test_`dump_vpp.*`_action (0.11s)
PASS e2e.TestAgentCtlCommands/Test_`dump`_action_with_bad_model (0.11s)
PASS e2e.TestAgentCtlCommands/Test_`dump`_action_with_one_bad_model (0.11s)
PASS e2e.TestAgentCtlCommands/Test_`dump_--view=SB`_action (0.14s)
PASS e2e.TestAgentCtlCommands/Test_`dump_--view=NB`_action (0.13s)
PASS e2e.TestAgentCtlCommands/Test_`dump_--view=cached`_action (0.14s)
PASS e2e.TestAgentCtlCommands/Test_`dump`_with_JSON_format (0.16s)
PASS e2e.TestAgentCtlCommands/Test_`dump`_with_YAML_format (0.17s)
PASS e2e.TestAgentCtlCommands/Test_`dump`_with_custom_format (0.24s)
PASS e2e.TestAgentCtlCommands/Test_`generate`_action (0.23s)
PASS e2e.TestAgentCtlCommands/Test_`generate`_action_with_not_exsiting_model (0.25s)
PASS e2e.TestAgentCtlCommands/Test_`generate`_action_to_yaml (0.16s)
PASS e2e.TestAgentCtlCommands/Test_`generate`_action_to_json (0.17s)
PASS e2e.TestAgentCtlCommands/Test_`generate`_action_to_json_(oneline) (0.16s)
PASS e2e.TestAgentCtlCommands/Test_`kvdb_list`_action (3.15s)
PASS e2e.TestAgentCtlCommands/Test_`log_list`_action (0.09s)
PASS e2e.TestAgentCtlCommands/Test_`log_set`_action (0.08s)
PASS e2e.TestAgentCtlCommands/Test_`log_list`_action#01 (0.10s)
PASS e2e.TestAgentCtlCommands/Test_`model_ls`_action (0.08s)
PASS e2e.TestAgentCtlCommands/Test_`models`_action (0.09s)
PASS e2e.TestAgentCtlCommands/Test_`model_inspect`_action (0.09s)
PASS e2e.TestAgentCtlCommands/Test_`model_inspect`_action_(no_models) (0.11s)
PASS e2e.TestAgentCtlCommands/Test_`model_inspect`_action_(multiple_models) (0.08s)
PASS e2e.TestAgentCtlCommands/Test_`status`_action (0.10s)
PASS e2e.TestAgentCtlCommands/Test_`status`_action_(with_format) (0.13s)
PASS e2e.TestAgentCtlCommands/Test_`values`_action (0.13s)
PASS e2e.TestAgentCtlCommands/Test_`vpp_info`_action (0.12s)
PASS e2e.TestAgentCtlCommands/Test_`vpp_cli`_action (0.09s)
PASS e2e.TestAgentCtlCommands (8.06s)
PASS e2e.TestAgentCtlSecureGrpc (1.43s)
PASS e2e.TestAgentCtlSecureETCD/no_TLS (3.11s)
PASS e2e.TestAgentCtlSecureETCD/insecure_TLS (3.09s)
PASS e2e.TestAgentCtlSecureETCD (7.53s)
PASS e2e.TestInfoVersionHandler (1.04s)
PASS e2e.TestTelemetryStatsPoller/periodSec=0 (0.02s)
PASS e2e.TestTelemetryStatsPoller/numPolls=1 (0.00s)
PASS e2e.TestTelemetryStatsPoller/numPolls=2 (0.00s)
PASS e2e.TestTelemetryStatsPoller (12.77s)
PASS e2e

DONE 68 tests in 1024.276s
-------------------------------------------------------------
 PASSED (took: 1038s)
-------------------------------------------------------------

docker/dev/vpp.conf Show resolved Hide resolved
tests/e2e/e2e.go Outdated Show resolved Hide resolved
tests/e2e/microservice.go Outdated Show resolved Hide resolved
tests/e2e/system.go Outdated Show resolved Hide resolved
tests/e2e/e2e.go Outdated Show resolved Hide resolved
tests/e2e/080_vrf_test.go Outdated Show resolved Hide resolved
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants