Fix missing Wireserver IP configuration in Wireserver Client #2271
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timraymond
changed the title
rbtr
force-pushed
the
traymond/wireserver-client-config
branch
from
7063b2c to
1f81760
Compare
rbtr
force-pushed
the
traymond/wireserver-client-config
branch
from
1f81760 to
53997a6
Compare
There's a bug with the wireserver client, in that the Wireserver IP from the CNS config isn't respected. This adds coverage so that it becomes safer to make changes here.
This allows the Wireserver client to use a configurable host so that this could, theoretically be mocked. As it currently stands, it's an impediment to running CNS locally, since it uses the real Wireserver IP.
The Wireserver client now accepts a hostport configuration option so that its requests can be redirected. This plumbs the config for the WireserverIP to it so that it can be redirected during test.
rbtr
force-pushed
the
traymond/wireserver-client-config
branch
from
53997a6 to
59e65b7
Compare
Signed-off-by: Evan Baker <rbtr@users.noreply.github.com>
timraymond
approved these changes
Nov 7, 2023
matmerr
pushed a commit
that referenced
this pull request
Jan 17, 2024
* Add coverage around GetInterfaces in WS client There's a bug with the wireserver client, in that the Wireserver IP from the CNS config isn't respected. This adds coverage so that it becomes safer to make changes here. * Allow Wireserver client to use a configurable Host This allows the Wireserver client to use a configurable host so that this could, theoretically be mocked. As it currently stands, it's an impediment to running CNS locally, since it uses the real Wireserver IP. * Add WireserverIP config into Wireserver Client The Wireserver client now accepts a hostport configuration option so that its requests can be redirected. This plumbs the config for the WireserverIP to it so that it can be redirected during test. * fix: replace nil with http.NoBody Signed-off-by: Evan Baker <rbtr@users.noreply.github.com> --------- Signed-off-by: Evan Baker <rbtr@users.noreply.github.com> Co-authored-by: Tim Raymond <traymond@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously, the Wireserver Client used a hardcoded IP, which made starting CNS locally impossible. This is because it attempted to make requests to a Wireserver that wasn't there. There is already a configuration for a WireserverIP, with the intention that that be used to redirect those requests to a mock server for local testing.
This makes the host to which those Wireserver requests are directed configurable so that this configuration is respected by the Wireserver client.
No configuration changes are necessary to end users since no configuration has changed.
To use this locally, any mocks that are in use will need to add an endpoint responding to
/machine/plugins?comp=nmagent&getinterfaceinfov1responding with XML in the form: