#2642 fixed check to consider removed containers during modification

management/server/core/environment-manager/environment-manager-api/src/main/java/io/subutai/core/environment/api/EnvironmentManager.java

@@ -2,7 +2,6 @@
 
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -75,7 +74,7 @@ Set<EnvironmentContainerHost> growEnvironment( final String environmentId, final
      * new quota
      * @param async true - env will be created in background, false - caller will block
      */
-    EnvironmentCreationRef modifyEnvironment( String environmentId, Topology topology, List<String> removedContainers,
+    EnvironmentCreationRef modifyEnvironment( String environmentId, Topology topology, Set<String> removedContainers,
                                               Map<String, ContainerQuota> changedContainers, boolean async )
             throws EnvironmentModificationException, EnvironmentNotFoundException;
 

management/server/core/environment-manager/environment-manager-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerImpl.java

@@ -577,7 +577,7 @@ public Set<EnvironmentContainerHost> growEnvironment( final String environmentId
 
     @Override
     public EnvironmentCreationRef modifyEnvironment( final String environmentId, final Topology topology,
-                                                     final List<String> removedContainers,
+                                                     final Set<String> removedContainers,
                                                      final Map<String, ContainerQuota> changedContainers,
                                                      final boolean async )
             throws EnvironmentModificationException, EnvironmentNotFoundException
@@ -633,7 +633,7 @@ public EnvironmentCreationRef modifyEnvironment( final String environmentId, fin
             {
                 try
                 {
-                    if ( !peer.canAccommodate( new Nodes( newNodes, changedQuotas ) ) )
+                    if ( !peer.canAccommodate( new Nodes( newNodes, removedContainers, changedQuotas ) ) )
                     {
                         operationTracker.addLogFailed(
                                 String.format( "Peer %s can not accommodate the requested containers",
@@ -716,33 +716,64 @@ public void run()
     }
 
 
+    private Map<String, ContainerQuota> getPeerRemovedQuotas( final String peerId, final List<String> removedNodes,
+                                                              final LocalEnvironment environment )
+            throws EnvironmentModificationException
+    {
+
+        if ( CollectionUtil.isCollectionEmpty( removedNodes ) )
+        {
+            return Maps.newHashMap();
+        }
+
+        try
+        {
+            Map<String, ContainerQuota> peerRemovedNodes = Maps.newHashMap();
+
+            for ( String containerId : removedNodes )
+            {
+                final ContainerHost containerHost = environment.getContainerHostById( containerId );
+
+                if ( Objects.equals( containerHost.getPeerId(), peerId ) )
+                {
+                    peerRemovedNodes.put( containerHost.getResourceHostId().getId(), containerHost.getQuota() );
+                }
+            }
+
+            return peerRemovedNodes;
+        }
+        catch ( Exception e )
+        {
+            throw new EnvironmentModificationException( e );
+        }
+    }
+
+
     private Map<String, ContainerQuota> getPeerChangedContainers( final String peerId,
                                                                   final Map<String, ContainerQuota> allChangedContainers,
                                                                   final LocalEnvironment environment )
             throws EnvironmentModificationException
     {
+        if ( allChangedContainers == null )
+        {
+            return Maps.newHashMap();
+        }
+
         try
         {
-            if ( allChangedContainers == null )
-            {
-                return Maps.newHashMap();
-            }
-            else
-            {
-                Map<String, ContainerQuota> peerChangedContainers = Maps.newHashMap();
+            Map<String, ContainerQuota> peerChangedContainers = Maps.newHashMap();
 
-                for ( Map.Entry<String, ContainerQuota> entry : allChangedContainers.entrySet() )
+            for ( Map.Entry<String, ContainerQuota> entry : allChangedContainers.entrySet() )
+            {
+                String containerId = entry.getKey();
+                EnvironmentContainerHost containerHost = environment.getContainerHostById( containerId );
+                if ( Objects.equals( containerHost.getPeerId(), peerId ) )
                 {
-                    String containerId = entry.getKey();
-                    EnvironmentContainerHost containerHost = environment.getContainerHostById( containerId );
-                    if ( Objects.equals( containerHost.getPeerId(), peerId ) )
-                    {
-                        peerChangedContainers.put( containerId, entry.getValue() );
-                    }
+                    peerChangedContainers.put( containerId, entry.getValue() );
                 }
-
-                return peerChangedContainers;
             }
+
+            return peerChangedContainers;
         }
         catch ( Exception e )
         {
@@ -1642,7 +1673,7 @@ protected EnvironmentCreationWorkflow getEnvironmentCreationWorkflow( final Loca
     protected EnvironmentModifyWorkflow getEnvironmentModifyingWorkflow( final LocalEnvironment environment,
                                                                          final Topology topology,
                                                                          final TrackerOperation operationTracker,
-                                                                         final List<String> removedContainers,
+                                                                         final Set<String> removedContainers,
                                                                          final Map<String, ContainerQuota> changedContainers )
 
     {

management/server/core/environment-manager/environment-manager-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerSecureProxy.java

@@ -259,7 +259,7 @@ public EnvironmentCreationRef createEnvironment( final Topology topology, final
     @Override
     @RolesAllowed( "Environment-Management|Write" )
     public EnvironmentCreationRef modifyEnvironment( final String environmentId, final Topology topology,
-                                                     final List<String> removedContainers,
+                                                     final Set<String> removedContainers,
                                                      final Map<String, ContainerQuota> changedContainers,
                                                      final boolean async )
             throws EnvironmentModificationException, EnvironmentNotFoundException

management/server/core/environment-manager/environment-manager-impl/src/main/java/io/subutai/core/environment/impl/workflow/modification/EnvironmentModifyWorkflow.java

@@ -2,8 +2,8 @@
 
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import io.subutai.common.environment.EnvironmentStatus;
 import io.subutai.common.environment.Topology;
@@ -34,7 +34,7 @@ public class EnvironmentModifyWorkflow extends CancellableWorkflow<EnvironmentMo
     private final PeerManager peerManager;
     private LocalEnvironment environment;
     private final Topology topology;
-    private List<String> removedContainers;
+    private Set<String> removedContainers;
     private Map<String, ContainerQuota> changedContainers;
     private final String defaultDomain;
     private final TrackerOperation operationTracker;
@@ -59,7 +59,7 @@ public enum EnvironmentGrowingPhase
 
     public EnvironmentModifyWorkflow( String defaultDomain, IdentityManager identityManager, PeerManager peerManager,
                                       SecurityManager securityManager, LocalEnvironment environment, Topology topology,
-                                      List<String> removedContainers, Map<String, ContainerQuota> changedContainers,
+                                      Set<String> removedContainers, Map<String, ContainerQuota> changedContainers,
                                       TrackerOperation operationTracker, EnvironmentManagerImpl environmentManager )
     {
 

management/server/core/environment-manager/environment-manager-impl/src/main/java/io/subutai/core/environment/impl/workflow/modification/steps/DestroyContainersStep.java

@@ -1,7 +1,7 @@
 package io.subutai.core.environment.impl.workflow.modification.steps;
 
 
-import java.util.List;
+import java.util.Set;
 
 import io.subutai.common.environment.ContainerHostNotFoundException;
 import io.subutai.common.environment.Environment;
@@ -22,13 +22,13 @@ public class DestroyContainersStep
 {
     private final LocalEnvironment environment;
     private final EnvironmentManagerImpl environmentManager;
-    private final List<String> removedContainers;
+    private final Set<String> removedContainers;
     private final TrackerOperation trackerOperation;
     protected TaskUtil<Object> destroyUtil = new TaskUtil<>();
 
 
     public DestroyContainersStep( final LocalEnvironment environment, final EnvironmentManagerImpl environmentManager,
-                                  final List<String> removedContainers, TrackerOperation trackerOperation )
+                                  final Set<String> removedContainers, TrackerOperation trackerOperation )
     {
         this.environment = environment;
         this.environmentManager = environmentManager;

management/server/core/environment-manager/environment-manager-impl/src/test/java/io/subutai/core/environment/impl/EnvironmentManagerImplTest.java

@@ -1,7 +1,6 @@
 package io.subutai.core.environment.impl;
 
 
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -98,9 +97,9 @@
 import static junit.framework.TestCase.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyList;
 import static org.mockito.Matchers.anyLong;
 import static org.mockito.Matchers.anyMap;
+import static org.mockito.Matchers.anySet;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isA;
@@ -449,20 +448,20 @@ public void testGrowEnvironment() throws Exception
     {
 
         doReturn( environmentCreationRef ).when( environmentManager )
-                                          .modifyEnvironment( eq( TestHelper.ENV_ID ), eq( topology ), anyList(),
+                                          .modifyEnvironment( eq( TestHelper.ENV_ID ), eq( topology ), anySet(),
                                                   anyMap(), anyBoolean() );
 
         environmentManager.growEnvironment( TestHelper.ENV_ID, topology, false );
 
         verify( environmentManager )
-                .modifyEnvironment( eq( TestHelper.ENV_ID ), eq( topology ), anyList(), anyMap(), anyBoolean() );
+                .modifyEnvironment( eq( TestHelper.ENV_ID ), eq( topology ), anySet(), anyMap(), anyBoolean() );
     }
 
 
     @Test
     public void testModifyEnvironment() throws Exception
     {
-        List<String> removedContainers = Lists.newArrayList( TestHelper.CONTAINER_ID );
+        Set<String> removedContainers = Sets.newHashSet( TestHelper.CONTAINER_ID );
         Map<String, ContainerQuota> changedContainers = Maps.newHashMap();
         changedContainers.put( TestHelper.CONTAINER_ID, new ContainerQuota( ContainerSize.LARGE ) );
         EnvironmentModifyWorkflow environmentModifyWorkflow = mock( EnvironmentModifyWorkflow.class );

management/server/core/environment-manager/environment-manager-impl/src/test/java/io/subutai/core/environment/impl/EnvironmentManagerSecureProxyTest.java

@@ -12,7 +12,6 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
@@ -245,11 +244,11 @@ public void testModifyEnvironment() throws Exception
         Map<String, ContainerQuota> changedContainers = Maps.newHashMap();
         changedContainers.put( TestHelper.CONTAINER_ID, new ContainerQuota( ContainerSize.LARGE ) );
 
-        proxy.modifyEnvironment( TestHelper.ENV_ID, topology, Lists.newArrayList( TestHelper.CONTAINER_ID ),
+        proxy.modifyEnvironment( TestHelper.ENV_ID, topology, Sets.newHashSet( TestHelper.CONTAINER_ID ),
                 changedContainers, true );
 
         verify( environmentManager )
-                .modifyEnvironment( TestHelper.ENV_ID, topology, Lists.newArrayList( TestHelper.CONTAINER_ID ),
+                .modifyEnvironment( TestHelper.ENV_ID, topology, Sets.newHashSet( TestHelper.CONTAINER_ID ),
                         changedContainers, true );
     }
 

management/server/core/environment-manager/environment-manager-impl/src/test/java/io/subutai/core/environment/impl/workflow/modification/EnvironmentModifyWorkflowTest.java

@@ -1,17 +1,17 @@
 package io.subutai.core.environment.impl.workflow.modification;
 
 
-import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 
 import io.subutai.common.environment.Topology;
 import io.subutai.common.peer.Peer;
@@ -46,7 +46,7 @@ class EnvironmentModifyWorkflowSUT extends EnvironmentModifyWorkflow
         public EnvironmentModifyWorkflowSUT( final String defaultDomain, final IdentityManager identityManager,
                                              final PeerManager peerManager, final SecurityManager securityManager,
                                              final LocalEnvironment environment, final Topology topology,
-                                             final List<String> removedContainers,
+                                             final Set<String> removedContainers,
                                              final Map<String, ContainerQuota> changedContainers,
                                              final TrackerOperation operationTracker,
                                              final EnvironmentManagerImpl environmentManager )
@@ -94,8 +94,8 @@ public void setUp() throws Exception
         changedContainers.put( TestHelper.CONTAINER_ID, new ContainerQuota( ContainerSize.LARGE ) );
 
         workflow = new EnvironmentModifyWorkflowSUT( Common.DEFAULT_DOMAIN_NAME, identityManager, peerManager,
-                securityManager, environment, topology, Lists.newArrayList( TestHelper.CONTAINER_ID ),
-                changedContainers, trackerOperation, environmentManager );
+                securityManager, environment, topology, Sets.newHashSet( TestHelper.CONTAINER_ID ), changedContainers,
+                trackerOperation, environmentManager );
 
         doReturn( environment ).when( environmentManager ).update( environment );
         doReturn( environmentContainer ).when( environment ).getContainerHostById( TestHelper.CONTAINER_ID );

management/server/core/environment-manager/environment-manager-impl/src/test/java/io/subutai/core/environment/impl/workflow/modification/steps/DestroyContainersStepTest.java

@@ -7,7 +7,7 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 
 import io.subutai.common.security.relation.RelationManager;
 import io.subutai.common.tracker.TrackerOperation;
@@ -49,8 +49,8 @@ public class DestroyContainersStepTest
     @Before
     public void setUp() throws Exception
     {
-        step = new DestroyContainersStep( environment, environmentManager,
-                Lists.newArrayList( TestHelper.CONTAINER_ID ), trackerOperation );
+        step = new DestroyContainersStep( environment, environmentManager, Sets.newHashSet( TestHelper.CONTAINER_ID ),
+                trackerOperation );
         step.destroyUtil = taskUtil;
         TestHelper.bind( taskUtil, taskResults, taskResult );
         doReturn( task ).when( taskResult ).getTask();

management/server/core/environment-manager/environment-manager-rest-ui/src/main/java/io/subutai/core/environment/rest/ui/RestServiceImpl.java

@@ -357,7 +357,7 @@ public Response modify( final String environmentId, final String topologyJson, f
             }
 
 
-            List<String> removedContainersList = JsonUtil.fromJson( removedContainers, new TypeToken<List<String>>()
+            Set<String> removedContainersList = JsonUtil.fromJson( removedContainers, new TypeToken<Set<String>>()
             {
             }.getType() );
 
@@ -418,7 +418,7 @@ public Response modifyAdvanced( final String environmentId, final String topolog
 
             topology.addAllNodePlacement( nodes );
 
-            List<String> containersToRemove = JsonUtil.fromJson( removedContainers, new TypeToken<List<String>>()
+            Set<String> containersToRemove = JsonUtil.fromJson( removedContainers, new TypeToken<Set<String>>()
             {
             }.getType() );
 

management/server/core/hub-manager/hub-manager-impl/src/main/java/io/subutai/core/hubmanager/impl/environment/state/change/ContainerStateHandler.java

@@ -1,7 +1,7 @@
 package io.subutai.core.hubmanager.impl.environment.state.change;
 
 
-import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 
 import io.subutai.common.environment.Environment;
 import io.subutai.common.peer.ContainerId;
@@ -76,7 +76,7 @@ else if ( nodeDto.getState().equals( ContainerStateDto.ABORTING ) )
                             if ( envDto.isCreatedOnSS() )
                             {
                                 ctx.envManager.modifyEnvironment( nodeDto.getEnvironmentId(), null,
-                                        Lists.newArrayList( nodeDto.getContainerId() ), null, false );
+                                        Sets.newHashSet( nodeDto.getContainerId() ), null, false );
                             }
                             else
                             {
@@ -117,7 +117,7 @@ else if ( nodeDto.getState().equals( ContainerStateDto.ABORTING ) )
                                 if ( envDto.isCreatedOnSS() )
                                 {
                                     ctx.envManager.modifyEnvironment( nodeDto.getEnvironmentId(), null,
-                                            Lists.newArrayList( nodeDto.getContainerId() ), null, false );
+                                            Sets.newHashSet( nodeDto.getContainerId() ), null, false );
                                 }
 
                                 nodeDto.setState( ContainerStateDto.FROZEN );