From 7e81ac4a42212aa08be2986ac0d354fc1337b417 Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@oath.com>
Date: Mon, 3 Dec 2018 00:25:08 +0100
Subject: Fixes after review round

---
 .../hosted/provision/maintenance/InfrastructureProvisioner.java  | 2 +-
 .../provision/maintenance/InfrastructureProvisionerTest.java     | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'node-repository/src')

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java
index d37629241f8..9248ab36f2a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java
@@ -12,7 +12,6 @@ import com.yahoo.transaction.NestedTransaction;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.service.monitor.application.DuperModelInfraApi;
-import com.yahoo.vespa.service.monitor.application.InfraApplication;
 import com.yahoo.vespa.service.monitor.application.InfraApplicationApi;
 
 import java.time.Duration;
@@ -66,6 +65,7 @@ public class InfrastructureProvisioner extends Maintainer {
                                 .orElse(null))
                         .collect(Collectors.toList());
                 if (wantedVersions.isEmpty()) {
+                    // TODO: Unprovision active nodes from application?
                     logger.log(LogLevel.DEBUG, "Skipping provision of " + nodeType + ": No nodes to provision");
                     duperModel.infraApplicationRemoved(application.getApplicationId());
                     continue;
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisionerTest.java
index 4926d3f5013..a4c2cee9404 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisionerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisionerTest.java
@@ -8,7 +8,6 @@ import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.Provisioner;
-import com.yahoo.log.event.Collection;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.NodeRepositoryTester;
@@ -18,9 +17,7 @@ import com.yahoo.vespa.hosted.provision.node.Generation;
 import com.yahoo.vespa.service.monitor.application.ConfigServerApplication;
 import com.yahoo.vespa.service.monitor.application.ControllerApplication;
 import com.yahoo.vespa.service.monitor.application.DuperModelInfraApi;
-import com.yahoo.vespa.service.monitor.application.InfraApplication;
 import com.yahoo.vespa.service.monitor.application.InfraApplicationApi;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -31,17 +28,13 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Optional;
 
-import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyList;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 /**
@@ -199,7 +192,7 @@ public class InfrastructureProvisionerTest {
     }
 
     @Test
-    public void returns_empty_if_no_usable_nodes() {
+    public void avoid_provisioning_if_no_usable_nodes() {
         when(infrastructureVersions.getTargetVersionFor(eq(nodeType))).thenReturn(Optional.of(target));
 
         infrastructureProvisioner.maintain();
-- 
cgit v1.2.3