Jv rox 26711 collector mock server should handle external ips #1901
+26
−2
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This makes it so that the mock server for collector integration tests can handle external IP addresses and CIDR blocks. Currently the mock server can only handle the
AddressData
field of theNetworkAddress
struct. However, for external IP addressed and CIDR blocks theIpNetwork
field is used. This change is needed for testing runtime configuration and the external IPs feature. See #1899The function modified here is used to convert objects of type
NetworkConnection
toNetworkInfo
. In the futureNetworkInfo
will not be used andNetworkConnection
will be used directly. The same will be done for all of the types inintegration-tests/pkg/types
. See https://issues.redhat.com/browse/ROX-26716Checklist
Automated testing
If any of these don't apply, please comment below.
Testing Performed
The code change here was tested by using it in integration tests here #1899