Traffic Monitor Integration Test Framework by shamrickus · Pull Request #5817 · apache/trafficcontrol

shamrickus · 2021-05-06T16:31:08Z

What does this PR (Pull Request) do?

This PR is not related to any Issue

It is based off of #3707 and includes fixes for dual homing changes as well as addressing the feedback posted on the previous PR.

Also adds a TM client as well for use in the tests.

Which Traffic Control components are affected by this PR?

Traffic Monitor
CI tests

What is the best way to verify this PR?

Run the integration tests by following the instructions found in the tests/_integration/README.md.
Should also verify that @zrhoffman's comments on the previous PR have been addressed.

If this is a bug fix, what versions of Traffic Control are affected?

The following criteria are ALL met by this PR

This PR includes tests OR I have explained why tests are unnecessary
This PR includes documentation OR I have explained why documentation is unnecessary
This PR includes an update to CHANGELOG.md OR such an update is not necessary
This PR includes any and all required license headers
This PR DOES NOT FIX A SERIOUS SECURITY VULNERABILITY (see the Apache Software Foundation's security guidelines for details)

zrhoffman

A lot of the TM integration test Docker environment seems to be copied from an older version of CDN in a Box.
I can understand only wanting to build and use the pieces that are relevant for the TM integration tests, but using CDN in a Box where it sits instead of copying it does not require starting everything. For example, neither the TO integration tests nor the TP integration tests require starting all of the CDN in a Box services:

trafficcontrol/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml

Lines 23 to 24 in 55dbb7e

    
           # docker-compose -f docker-compose.yml -f docker-compose.traffic-ops-test.yml up -d edge enroller dns db smtp trafficops trafficvault integration 
        
           # docker-compose -f docker-compose.traffic-ops-test.yml logs -f integration

trafficcontrol/infrastructure/cdn-in-a-box/docker-compose.traffic-portal-test.yml

Lines 23 to 24 in 55dbb7e

    
           # docker-compose -f docker-compose.yml -f docker-compose.traffic-portal-test.yml up -d db edge trafficportal trafficops trafficvault portal-integration-test 
        
           # docker-compose -f docker-compose.traffic-portal-test.yml logs -f portal-integration-test

rob05c · 2021-05-08T17:06:38Z

A lot of the TM integration test Docker environment seems to be copied from an older version of CDN in a Box.

For the record, it is not. It's based on #3707 whose compose was written from scratch. I believe the Dockerfiles may have been based on the independent dockerfiles in infrastructure/docker (which I also originally wrote), but neither they nor the docker-compose.yml are derivative works of the CDN-in-a-Box.

shamrickus · 2021-05-12T17:45:16Z

A lot of the TM integration test Docker environment seems to be copied from an older version of CDN in a Box.
I can understand only wanting to build and use the pieces that are relevant for the TM integration tests, but using CDN in a Box where it sits instead of copying it does not require starting everything. For example, neither the TO integration tests nor the TP integration tests require starting all of the CDN in a Box services:

trafficcontrol/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml

Lines 23 to 24 in 55dbb7e

# docker-compose -f docker-compose.yml -f docker-compose.traffic-ops-test.yml up -d edge enroller dns db smtp trafficops trafficvault integration

# docker-compose -f docker-compose.traffic-ops-test.yml logs -f integration

trafficcontrol/infrastructure/cdn-in-a-box/docker-compose.traffic-portal-test.yml

Lines 23 to 24 in 55dbb7e

# docker-compose -f docker-compose.yml -f docker-compose.traffic-portal-test.yml up -d db edge trafficportal trafficops trafficvault portal-integration-test

# docker-compose -f docker-compose.traffic-portal-test.yml logs -f portal-integration-test

I agree it'd be better for that, but I was going off of what Rob already did. I figured it would be more valuable to get this merged and working, and then later down the road it can be moved to CiaB (testcaches would also need to be ported). That also has the added benefit of building and running this currently only takes about as long as it does to build just TM.

zrhoffman · 2021-05-17T21:17:05Z

A lot of the TM integration test Docker environment seems to be copied from an older version of CDN in a Box.

For the record, it is not. It's based on #3707 whose compose was written from scratch. I believe the Dockerfiles may have been based on the independent dockerfiles in infrastructure/docker (which I also originally wrote), but neither they nor the docker-compose.yml are derivative works of the CDN-in-a-Box.

Fair enough, we don't really group things based on infrastructure/docker like we do CDN in a Box, and it's not a ton of code duplication.

This is with the intention of adding an integration test framework for Traffic Monitor, which can use this tool and send commands to change the fake caches to test various scenarios.

zrhoffman

Builds with minimal manual steps, and tests pass!

zrhoffman suggested changes May 6, 2021

View reviewed changes

mitchell852 mentioned this pull request May 10, 2021

Traffic Monitor Integration Test Framework #3707

Closed

7 tasks

zrhoffman suggested changes May 17, 2021

View reviewed changes

zrhoffman suggested changes May 18, 2021

View reviewed changes

Comment thread traffic_monitor/tests/_integration/kbps_test.go Outdated

Comment thread traffic_monitor/tmclient/tmclient.go Outdated

zrhoffman suggested changes May 21, 2021

View reviewed changes

rob05c and others added 22 commits May 24, 2021 10:23

Add tm testcaches http commands to change caches

0394998

This is with the intention of adding an integration test framework for Traffic Monitor, which can use this tool and send commands to change the fake caches to test various scenarios.

Add TM client, integration test framework

4cfa8c7

Get tests passing

d2f8635

Test CacheStatsNew

00352b4

Add build script and add licenses

a8ca8a9

Forgot script

4ccab55

Code review fixes

775323c

go vet

877e5aa

Rename test dir

49d8ee5

Cleanup and use latest api/structs

4780aff

Changelog

00fdb0b

Fix CodeQL issues

2795027

More CodeQL

bae510e

Code review fixes & code clean up

178667c

English and better build

0da78c4

Better build instructions

926daec

Clean up readmes

ffbaa93

Code review fixes

a69b983

Woops

31e88e7

Code review fixes

d049ef6

Missed some feedback

6e24d6b

Didnt mean to commit this

7f40650

zrhoffman approved these changes May 28, 2021

View reviewed changes

zrhoffman merged commit 60a9ffd into apache:master May 28, 2021

rawlinp added tests related to tests and/or testing infrastructure Traffic Monitor related to Traffic Monitor labels May 28, 2021

	# docker-compose -f docker-compose.yml -f docker-compose.traffic-ops-test.yml up -d edge enroller dns db smtp trafficops trafficvault integration
	# docker-compose -f docker-compose.traffic-ops-test.yml logs -f integration

Conversation

shamrickus commented May 6, 2021

What does this PR (Pull Request) do?

Which Traffic Control components are affected by this PR?

What is the best way to verify this PR?

If this is a bug fix, what versions of Traffic Control are affected?

The following criteria are ALL met by this PR

Uh oh!

zrhoffman left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rob05c commented May 8, 2021

Uh oh!

shamrickus commented May 12, 2021

Uh oh!

zrhoffman commented May 17, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zrhoffman left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants