diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2019-11-15 12:57:04 +0100 |
---|---|---|
committer | Morten Tokle <mortent@oath.com> | 2019-11-15 14:04:57 +0100 |
commit | 7dafbbd736062e5c58e45e013f50e1b540e334d9 (patch) | |
tree | 3b7f56ef401e95be23932aef77b6ed645be0d6ba | |
parent | 519e504b3128a6b7caf26fca2df93af13235ed1d (diff) |
Allow dev hosts with only ipv4
3 files changed, 10 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java index a3714ffe033..302be920950 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java @@ -242,6 +242,11 @@ public class IP { return pool; } + // For dev hosts, allow only ipv4 addresses + if(ipv6AddrCount == 0 && ipv4AddrCount == pool.size()) { + return pool; + } + throw new IllegalArgumentException(String.format("Dual-stacked IP address list must have an " + "equal number of addresses of each version " + "[IPv6 address count = %d, IPv4 address count = %d]", diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java index ada180cb333..885368810a8 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java @@ -58,11 +58,10 @@ public class DuperModelManager implements DuperModelInfraApi { this.duperModel = duperModel; if (system == SystemName.dev) { + // TODO (mortent): Support controllerApplication in dev system supportedInfraApplications = - (isController ? - Stream.of(devHostApplicaton, controllerApplication) : - Stream.of(devHostApplicaton, configServerApplication) - ).collect(Collectors.toUnmodifiableMap(InfraApplication::getApplicationId, Function.identity())); + Stream.of(devHostApplicaton, configServerApplication) + .collect(Collectors.toUnmodifiableMap(InfraApplication::getApplicationId, Function.identity())); } else if (multitenant) { supportedInfraApplications = (isController ? diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java index 8f777b33081..67508f14e5a 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java @@ -7,6 +7,7 @@ import com.yahoo.config.model.api.SuperModelListener; import com.yahoo.config.model.api.SuperModelProvider; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostName; +import com.yahoo.config.provision.SystemName; import com.yahoo.vespa.flags.InMemoryFlagSource; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -38,7 +39,7 @@ public class DuperModelManagerTest { private SuperModelListener superModelListener; private void makeManager(boolean isController) { - manager = new DuperModelManager(true, isController, superModelProvider, duperModel, flagSource); + manager = new DuperModelManager(true, isController, superModelProvider, duperModel, flagSource, SystemName.cd); when(superModelProvider.getSuperModel()).thenReturn(superModel); verify(duperModel, times(0)).add(any()); |