Remove macvlan from DockerNetworking

2 files changed, 3 insertions, 28 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
index fa94a7ff819..7f4dad6ee36 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
@@ -81,15 +81,11 @@ public class DockerOperationsImplTest {
     }
 
     @Test
-    public void runsCommandInNetworkNamespace() {
+    public void runsCommandInNetworkNamespace() throws IOException {
         Container container = makeContainer("container-42", Container.State.RUNNING, 42);
 
-        try {
-            when(processExecuter.exec(aryEq(new String[]{"sudo", "nsenter", "--net=/host/proc/42/ns/net", "--", "iptables", "-nvL"})))
-                    .thenReturn(new Pair<>(0, ""));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        when(processExecuter.exec(aryEq(new String[]{"nsenter", "--net=/host/proc/42/ns/net", "--", "iptables", "-nvL"})))
+                .thenReturn(new Pair<>(0, ""));
 
         dockerOperations.executeCommandInNetworkNamespace(container.name, "iptables", "-nvL");
     }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java
index bc9e5d380a3..5b882461937 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java
@@ -46,31 +46,10 @@ public class AclMaintainerTest {
     @Before
     public void before() {
         when(dockerOperations.getAllManagedContainers()).thenReturn(containerList);
-        when(env.getCloud()).thenReturn("aws");
         when(env.getDockerNetworking()).thenReturn(DockerNetworking.NPT);
     }
 
     @Test
-    public void no_redirect_in_yahoo() {
-        when(env.getCloud()).thenReturn("yahoo");
-        when(env.getDockerNetworking()).thenReturn(DockerNetworking.MACVLAN);
-
-        Container container = addContainer("container1", "container1.host.com", Container.State.RUNNING);
-        Map<String, Acl> acls = makeAcl(container.hostname, "4321", "2001::1");
-        when(nodeRepository.getAcls(NODE_ADMIN_HOSTNAME)).thenReturn(acls);
-
-        whenListRules(container.name, "filter", IPVersion.IPv6, "");
-        whenListRules(container.name, "filter", IPVersion.IPv4, "");
-
-        aclMaintainer.run();
-
-        verify(dockerOperations, never()).executeCommandInNetworkNamespace(eq(container.name), eq("iptables"), eq("-S"), eq("-t"), eq("nat"));
-        verify(dockerOperations, never()).executeCommandInNetworkNamespace(eq(container.name), eq("ip6tables"), eq("-S"), eq("-t"), eq("nat"));
-        verify(dockerOperations, times(1)).executeCommandInNetworkNamespace(eq(container.name), eq("iptables-restore"), anyVararg());
-        verify(dockerOperations, times(1)).executeCommandInNetworkNamespace(eq(container.name), eq("ip6tables-restore"), anyVararg());
-    }
-
-    @Test
     public void empty_trusted_ports_are_handled() {
         Container container = addContainer("container1", "container1.host.com", Container.State.RUNNING);
         Map<String, Acl> acls = makeAcl(container.hostname, "4321", "2001::1");