External ip config for winrm byon location #690
Conversation
| int port; | ||
| if (ssh != null) { | ||
| userAndHostAndPort = parseUserAndHostAndPort(ssh, 22); | ||
| if (machineConfig.containsKey("winrm") && !(machineConfig.get("winrm") instanceof String)) { |
There was a problem hiding this comment.
Looks good.
@iyovcheva what do you think about supporting external provider for ssh address as well. It will be more consistent.
There was a problem hiding this comment.
@bostko I agree. Will need to test it.
There was a problem hiding this comment.
External config is not supported for ssh. If we implement it, it's good to go in separate PR.
There was a problem hiding this comment.
!(machineConfig.get("winrm") instanceof String) might be better as machineConfig.get("winrm") instanceof DeferredSupplier?
ivanayov
force-pushed
the
feature/external-ip
branch
from
4ec5eb2 to
7bffcd6
Compare
| int port; | ||
| if (ssh != null) { | ||
| userAndHostAndPort = parseUserAndHostAndPort(ssh, 22); | ||
| if (machineConfig.containsKey("winrm") && !(machineConfig.get("winrm") instanceof String)) { |
There was a problem hiding this comment.
@iyovcheva The changes here break the support for specifying winrm as user@host:port. Can you add it to the test cases.
On the other hand your approach is also interesting because it doesn't resolve the value here - at the time of deploying the blueprint. Obtaining the machine could happen much later in the lifecycle where the external values have already changed.
A proper solution would involve moving all of non-essential parsing to the machine location, leaving only minimal sanity checks here.
| waitForApplicationTasks(app); | ||
| Asserts.shouldHaveFailedPreviously(); | ||
| } catch (Exception e) { | ||
| Asserts.expectedFailureOfType(e, NullPointerException.class); |
There was a problem hiding this comment.
It's bad if we are throwing null pointer exceptions - these should be caught lower in the code and at least turned into something more useful with a useful error message that you can then test in here. For example use Preconditions.checkArgument on whatever is throwing the NPE.
| userAndHostAndPort = parseUserAndHostAndPort(ssh, 22); | ||
| } else { | ||
| // TODO set to null and rely on the MachineLocation. If not then make a dependency to WinRmMachineLocation and use its config key name. | ||
| userAndHostAndPort = parseUserAndHostAndPort(winrm, vals.get("winrm.useHttps") != null && (Boolean)vals.get("winrm.useHttps") ? 5986 : 5985); |
There was a problem hiding this comment.
Use a variable here to store the result of the logical expression, it will make it a lot easier to read.
The second clause should be Boolean.parseBoolean(vals.get("winrm.useHttps").toString()).
| machineConfig.put("port", port); | ||
| // If there is a tcpPortMapping defined for the connection-port, then use that for ssh/winrm machine | ||
| port = userAndHostAndPort.getHostAndPort().getPort(); | ||
| if (tcpPortMappings != null && tcpPortMappings.containsKey(port)) { |
There was a problem hiding this comment.
I would do this if in a separate method, this one is long enough already!
| machineConfig.put("address", host); | ||
| try { | ||
| InetAddress.getByName(host); | ||
| } catch (Exception e) { |
| int port; | ||
| if (ssh != null) { | ||
| userAndHostAndPort = parseUserAndHostAndPort(ssh, 22); | ||
| if (machineConfig.containsKey("winrm") && !(machineConfig.get("winrm") instanceof String)) { |
There was a problem hiding this comment.
!(machineConfig.get("winrm") instanceof String) might be better as machineConfig.get("winrm") instanceof DeferredSupplier?
|
@geomacy yep, I'm currently working on it |
ivanayov
force-pushed
the
feature/external-ip
branch
from
39a9cc1 to
58847c1
Compare
ivanayov
force-pushed
the
feature/external-ip
branch
from
30dd296 to
946c0de
Compare
|
retest this please |
|
Failing with "cannot create temporary folders in parent /tmp after 1000 attempts" which is not related to the PR |
|
retest this please |
1 similar comment
|
retest this please |
No description provided.