diff options
| author | gjoranv <gv@verizonmedia.com> | 2023-02-06 12:40:15 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2023-02-06 19:51:29 +0100 |
| commit | 5576fac0ea15626d7aceb41e8715a01271018ef9 (patch) | |
| tree | 3b8340bb5159aedb2b1910493adaa63944e8da9d /node-admin | |
| parent | 6c1a1b9fd053966ba606b90ea0ff54de285e3e34 (diff) | |
Remove 'ip' from TenantParameters, was not useful.
Diffstat (limited to 'node-admin')
2 files changed, 2 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParameters.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParameters.java index 81bb0064547..e06ffacdf3b 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParameters.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParameters.java @@ -10,14 +10,13 @@ import com.yahoo.slime.SlimeUtils; * * @author gjoranv */ -public record TenantParameters(String hostname, String ip, WireguardKey publicKey) { +public record TenantParameters(String hostname, WireguardKey publicKey) { public static TenantParameters fromJson(String json) { Slime slime = SlimeUtils.jsonToSlime(json); Cursor root = slime.get(); return new TenantParameters( root.field("hostname").asString(), - root.field("ip").asString(), WireguardKey.from(root.field("publicKey").asString()) ); } @@ -26,7 +25,6 @@ public record TenantParameters(String hostname, String ip, WireguardKey publicKe Slime slime = new Slime(); Cursor cursor = slime.setObject(); cursor.setString("hostname", hostname); - cursor.setString("ip", ip); cursor.setString("publicKey", publicKey.value()); return SlimeUtils.toJson(slime); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParametersTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParametersTest.java index c1adce84264..b1109ea351c 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParametersTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParametersTest.java @@ -14,8 +14,7 @@ public class TenantParametersTest { @Test public void parameters_can_be_converted_to_json_and_back() { - TenantParameters params = new TenantParameters("host", "ip", - WireguardKey.from(dummyKey)); + TenantParameters params = new TenantParameters("host", WireguardKey.from(dummyKey)); TenantParameters params2 = TenantParameters.fromJson(params.toJson()); assertEquals(params, params2); } |