feature delete group folder when folder is empty

jesuspg · May 6, 2014 · b26d0af · b26d0af
1 parent 20aa56b
commit b26d0af
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 0 deletions.
diff --git a/...per/src/main/java/com/telefonica/euro_iaas/sdc/puppetwrapper/services/CatalogManager.java b/...per/src/main/java/com/telefonica/euro_iaas/sdc/puppetwrapper/services/CatalogManager.java
@@ -44,4 +44,6 @@ public interface CatalogManager {
     public String generateSiteStr();
 
     public void removeNodesByGroupName(String groupName);
+
+    public boolean isLastGroupNode(String groupName);
 }
diff --git a/...ava/com/telefonica/euro_iaas/sdc/puppetwrapper/services/impl/CatalogManagerMongoImpl.java b/...ava/com/telefonica/euro_iaas/sdc/puppetwrapper/services/impl/CatalogManagerMongoImpl.java
@@ -111,6 +111,16 @@ public void removeNodesByGroupName(String groupName) {
         mongoTemplate.remove(searchNodeQuery, Node.class);
 
     }
+
+    public boolean isLastGroupNode(String groupName) {
+        Query searchNodeQuery = new Query(Criteria.where("groupName").is(groupName));
+        List<Node> nodeList = mongoTemplate.find(searchNodeQuery, Node.class);
+        if(nodeList!= null && nodeList.size()==1){
+            return true;
+        }else{
+            return false;
+        }
+    }
 
     // public void setMongoTemplate(MongoTemplate mongoTemplate) {
     // this.mongoTemplate = mongoTemplate;

diff --git a/.../java/com/telefonica/euro_iaas/sdc/puppetwrapper/services/impl/FileAccessServiceImpl.java b/.../java/com/telefonica/euro_iaas/sdc/puppetwrapper/services/impl/FileAccessServiceImpl.java
@@ -134,6 +134,12 @@ public void deleteNodeFiles(String nodeName) throws IOException {
 
             if (!file.delete()) {
                 logger.info(format("File {0} could not be deleted. Did it exist?", path + "/" + node.getId() + ".pp"));
+            }else{
+                logger.info(format("File {0} deleted.", path + "/" + node.getId() + ".pp"));
+            }
+
+            if(catalogManager.isLastGroupNode(node.getGroupName())){
+                deleteGoupFolder(node.getGroupName());
             }
 
         } catch (NoSuchElementException e) {
@@ -147,6 +153,8 @@ public void deleteGoupFolder(String groupName) throws IOException {
         File path = new File(defaultManifestsPath + groupName);
 
         FileUtils.deleteDirectory(path);
+
+        logger.info(format("Folder {0} deleted.", path + "/" + groupName));
     }
 
     @Override

diff --git a/...va/com/telefonica/euro_iaas/sdc/pupperwrapper/services/tests/CatalogManagerMongoTest.java b/...va/com/telefonica/euro_iaas/sdc/pupperwrapper/services/tests/CatalogManagerMongoTest.java
@@ -25,6 +25,7 @@
 package com.telefonica.euro_iaas.sdc.pupperwrapper.services.tests;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.Matchers.anyObject;
@@ -103,6 +104,16 @@ public void setUp() {
             }
         });
 
+        Query queryFindOK = new Query(Criteria.where("groupName").is("groupNameOK"));
+        when(mongoTemplateMock.find(queryFindOK, Node.class)).thenReturn(new ArrayList<Node>() {
+            {
+                add(node);
+            }
+        });
+
+        Query queryFindErr = new Query(Criteria.where("groupName").is("groupNameErr"));
+        when(mongoTemplateMock.find(queryFindErr, Node.class)).thenReturn(null);
+
     }
 
     @Test(expected = NoSuchElementException.class)
@@ -194,4 +205,18 @@ public void removeNodesByGroupNameTest() {
         assertTrue(catalogManagerMongo.getNodeLength() == 3);
 
     }
+
+    @Test
+    public void isLastGroupNodeTestOK(){
+
+        assertTrue(catalogManagerMongo.isLastGroupNode("groupNameOK"));
+
+    }
+
+    @Test
+    public void isLastGroupNodeTestFail(){
+
+        assertFalse(catalogManagerMongo.isLastGroupNode("groupNameErr"));
+
+    }
 }
diff --git a/...java/com/telefonica/euro_iaas/sdc/pupperwrapper/services/tests/FileAccessServiceTest.java b/...java/com/telefonica/euro_iaas/sdc/pupperwrapper/services/tests/FileAccessServiceTest.java
@@ -100,6 +100,8 @@ public void setUp(){
         when(catalogManager.generateSiteStr()).thenReturn("site.pp content");
         when(catalogManager.generateManifestStr("test")).thenReturn("manifest test1 content");
         when(catalogManager.generateManifestStr("test2")).thenReturn("manifest test2 content");
+
+        when(catalogManager.isLastGroupNode("group")).thenReturn(false).thenReturn(true);
     }
 
     @Test