[MAC manager] Improve API consistency and impose retry limit

lib/src/main/java/com/futurewei/alcor/common/db/ignite/IgniteConfiguration.java

@@ -80,7 +80,7 @@ public IgniteClient igniteClientInstance() {
             logger.log(Level.WARNING, "Unexpected failure:" + e.getMessage());
         }
 
-        Assert.notNull(igniteClient, "IgniteClient is null");
+        //Assert.notNull(igniteClient, "IgniteClient is null");
 
         return igniteClient;
     }

lib/src/main/java/com/futurewei/alcor/common/repo/ICacheRepository.java

@@ -16,9 +16,7 @@
 
 package com.futurewei.alcor.common.repo;
 
-import com.futurewei.alcor.common.exception.CacheException;
-import com.futurewei.alcor.common.exception.ResourceNotFoundException;
-
+import com.futurewei.alcor.common.db.CacheException;
 import java.util.Map;
 
 public interface ICacheRepository<T> {

pom.xml

@@ -7,7 +7,13 @@
     <groupId>com.futurewei.alcor.controller</groupId>
     <artifactId>AlcorController</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <modules>
+        <module>services/node_manager</module>
+        <module>services/node_manager</module>
+        <module>services/node_manager</module>
+        <module>services/nodemanager</module>
+    </modules>
+    <packaging>pom</packaging>
 
     <properties>
         <java.version>1.8</java.version>

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/config/RedisConfiguration.java

@@ -22,8 +22,8 @@
 import com.futurewei.alcor.common.service.RedisListener;
 import com.futurewei.alcor.macmanager.entity.MacRange;
 import com.futurewei.alcor.macmanager.entity.MacState;
-import com.futurewei.alcor.macmanager.service.implement.RedisMacRangePublisherServiceImpl;
-import com.futurewei.alcor.macmanager.service.implement.RedisPublisherServiceImpl;
+import com.futurewei.alcor.macmanager.service.implement.redis.RedisMacRangePublisherServiceImpl;
+import com.futurewei.alcor.macmanager.service.implement.redis.RedisPublisherServiceImpl;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/controller/MacController.java

@@ -29,6 +29,8 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 import static org.springframework.web.bind.annotation.RequestMethod.*;
@@ -104,15 +106,15 @@ public MacStateJson updateMacState(@PathVariable String macaddress, @RequestBody
     @RequestMapping(
             method = DELETE,
             value = {"/macs/{macaddress}", "/v4/macs/{macaddress}"})
-    public ResponseId deleteMacAllocation(@PathVariable String macaddress) throws Exception {
+    public String deleteMacAllocation(@PathVariable String macaddress) throws Exception {
         String macAddress = null;
         try {
             RestPreconditionsUtil.verifyParameterNotNullorEmpty(macaddress);
             macAddress = service.releaseMacState(macaddress);
         } catch (ParameterNullOrEmptyException e) {
             throw new Exception(e);
         }
-        return new ResponseId(macAddress);
+        return "{mac_address: " + macAddress + "}";
     }
 
     @RequestMapping(
@@ -139,22 +141,22 @@ public MacRangeJson getMacRangeByMacRangeId(@PathVariable String rangeid) throws
     @RequestMapping(
             method = GET,
             value = {"/macs/ranges", "/v4/macs/ranges"})
-    public Map<String, MacRange> getAllMacRanges() throws Exception {
-
-        Map<String, MacRange> macRanges = null;
+    public Map<String, Collection<MacRange>> getAllMacRanges() throws Exception {
+        Map<String, MacRange> macRanges;
+        HashMap<String, Collection<MacRange>> map = new HashMap<String, Collection<MacRange>>();
         try {
             macRanges = service.getAllMacRanges();
-
         } catch (Exception e) {
             //TODO: REST error code
             throw new Exception(e);
         }
 
         if (macRanges == null) {
             //TODO: REST error code
-            return macRanges;
-        }
-        return macRanges;
+            map.put("mac_ranges", null);
+        } else
+            map.put("mac_ranges", macRanges.values());
+        return map;
     }
 
     @RequestMapping(
@@ -209,6 +211,6 @@ public ResponseId deleteMacRange(@PathVariable String rangeid) throws Exception
         } catch (ParameterNullOrEmptyException e) {
             throw new Exception(e);
         }
-        return new ResponseId(rangeid);
+        return new ResponseId(rangeId);
     }
 }

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/dao/MacRangeRepository.java

@@ -0,0 +1,99 @@
+/*Copyright 2019 The Alcor Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+*/
+package com.futurewei.alcor.macmanager.dao;
+
+import com.futurewei.alcor.common.db.CacheException;
+import com.futurewei.alcor.common.db.CacheFactory;
+import com.futurewei.alcor.common.db.ICache;
+import com.futurewei.alcor.common.repo.ICacheRepository;
+import com.futurewei.alcor.macmanager.entity.MacRange;
+import com.futurewei.alcor.macmanager.entity.MacState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.Map;
+
+@Repository
+@ComponentScan(value = "com.futurewei.alcor.common.db")
+public class MacRangeRepository implements ICacheRepository<MacRange> {
+    private static final Logger logger = LoggerFactory.getLogger(MacRangeRepository.class);
+    private ICache<String, MacRange> cache;
+
+    @Autowired
+    public MacRangeRepository(CacheFactory cacheFactory) {
+        cache = cacheFactory.getCache(MacRange.class);
+    }
+
+    public ICache<String, MacRange> getCache() {
+        return cache;
+    }
+
+    @PostConstruct
+    private void init() {
+        logger.info("MacRangeRepository init: Done");
+    }
+
+    @Override
+    public MacRange findItem(String rangeId) throws CacheException {
+        MacRange macRange = null;
+        try {
+            macRange = cache.get(rangeId);
+        } catch (CacheException e) {
+            logger.error("MacRangeRepository findItem() exception:", e);
+            throw e;
+        }
+        return macRange;
+    }
+
+    @Override
+    public Map<String, MacRange> findAllItems() throws CacheException {
+        HashMap<String, MacRange> hashMap = new HashMap<String, MacRange>();
+        try {
+            hashMap = new HashMap(cache.getAll());
+        } catch (CacheException e) {
+            logger.error("MacRangeRepository findAllItems() exception:", e);
+            throw e;
+        }
+
+        return hashMap;
+    }
+
+    @Override
+    public void addItem(MacRange macRange) throws CacheException {
+        try {
+            cache.put(macRange.getRangeId(), macRange);
+            logger.info("MacRangeRepository addItem() {}: ", macRange.getRangeId());
+        } catch (CacheException e) {
+            logger.error("MacRangeRepository addItem() exception:", e);
+            throw e;
+        }
+    }
+
+    @Override
+    public void deleteItem(String rangeId) throws CacheException {
+        try {
+            cache.remove(rangeId);
+            logger.info("MacRangeRepository deleteItem() {}: ", rangeId);
+        } catch (CacheException e) {
+            logger.error("MacRangeRepository deleteItem() exception:", e);
+            throw e;
+        }
+    }
+}

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/dao/MacRepository.java → services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/dao/MacStateRepository.java

@@ -15,29 +15,29 @@
 
 package com.futurewei.alcor.macmanager.dao;
 
-import com.futurewei.alcor.common.exception.CacheException;
-import com.futurewei.alcor.common.logging.Logger;
-import com.futurewei.alcor.common.logging.LoggerFactory;
-import com.futurewei.alcor.common.repo.ICache;
+import com.futurewei.alcor.common.db.CacheException;
+import com.futurewei.alcor.common.db.CacheFactory;
+import com.futurewei.alcor.common.db.ICache;
 import com.futurewei.alcor.common.repo.ICacheRepository;
-import com.futurewei.alcor.common.service.CacheFactory;
 import com.futurewei.alcor.macmanager.entity.MacState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.PostConstruct;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
 
 @Repository
-@ConditionalOnBean(CacheFactory.class)
-public class MacRepository implements ICacheRepository<MacState> {
-    private static final Logger logger = LoggerFactory.getLogger();
+@ComponentScan(value = "com.futurewei.alcor.common.db")
+public class MacStateRepository implements ICacheRepository<MacState> {
+    private static final Logger logger = LoggerFactory.getLogger(MacStateRepository.class);
     private ICache<String, MacState> cache;
 
     @Autowired
-    public MacRepository(CacheFactory cacheFactory) {
+    public MacStateRepository(CacheFactory cacheFactory) {
         cache = cacheFactory.getCache(MacState.class);
     }
 
@@ -47,28 +47,52 @@ public ICache<String, MacState> getCache() {
 
     @PostConstruct
     private void init() {
-        logger.log(Level.INFO, "MacRepository init completed");
+        logger.info("MacState repository init: Done");
     }
 
     @Override
     public MacState findItem(String macAddress) throws CacheException {
-        return cache.get(macAddress);
+        MacState macState = null;
+        try {
+            macState = cache.get(macAddress);
+        } catch (CacheException e) {
+            logger.error("MacStateRepository findItem() exception:", e);
+            throw e;
+        }
+        return macState;
     }
 
     @Override
     public Map findAllItems() throws CacheException {
-        return cache.getAll();
+        HashMap hashMap = new HashMap();
+        try {
+            hashMap = new HashMap(cache.getAll());
+        } catch (CacheException e) {
+            logger.error("MacStateRepository findAllItems() exception:", e);
+            throw e;
+        }
+        return hashMap;
     }
 
     @Override
     public void addItem(MacState macState) throws CacheException {
-        logger.log(Level.INFO, "Add mac state, mac_state:" + macState.getMacAddress());
-        cache.put(macState.getMacAddress(), macState);
+        try {
+            cache.put(macState.getMacAddress(), macState);
+            logger.info("MacStateRepository addItem() {}: ", macState.getMacAddress());
+        } catch (CacheException e) {
+            logger.error("MacStateRepository addItem() exception:", e);
+            throw e;
+        }
     }
 
     @Override
     public void deleteItem(String macAddress) throws CacheException {
-        logger.log(Level.INFO, "Delete mac state, mac address:" + macAddress);
-        cache.remove(macAddress);
+        try {
+            cache.remove(macAddress);
+            logger.info("MacStateRepository deleteItem() {}: ", macAddress);
+        } catch (CacheException e) {
+            logger.error("MacStateRepository deleteItem() exception:", e);
+            throw e;
+        }
     }
-}
+}

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/dao/MacPoolRedisRepository.java → services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/dao/redis/MacPoolRedisRepository.java

@@ -12,7 +12,7 @@
         See the License for the specific language governing permissions and
         limitations under the License.
 */
-package com.futurewei.alcor.macmanager.dao;
+package com.futurewei.alcor.macmanager.dao.redis;
 
 import com.futurewei.alcor.common.logging.Logger;
 import com.futurewei.alcor.common.logging.LoggerFactory;
@@ -46,32 +46,36 @@ private void init() {
     }
 
     @Override
-    public String findItem(String value) {
+    public synchronized String findItem(String value) {
         if (setOperations.isMember(KEY, value))
             return value;
         else
             return null;
     }
 
     @Override
-    public Map findAllItems() {
+    public synchronized Map findAllItems() {
         return (Map) setOperations.members(KEY);
     }
 
     @Override
-    public void addItem(String newItem) {
+    public synchronized void addItem(String newItem) {
         Logger logger = LoggerFactory.getLogger();
         logger.log(Level.INFO, newItem);
-        setOperations.add(KEY, newItem);
+        if (setOperations.isMember(KEY, newItem) == false)
+            setOperations.add(KEY, newItem);
     }
 
     @Override
-    public void deleteItem(String value) {
+    public synchronized void deleteItem(String value) {
         setOperations.remove(KEY, value);
     }
 
-    public String getItem() {
-
+    public synchronized String getItem() {
         return (String) setOperations.randomMember(KEY);
     }
+
+    public synchronized long getSize() {
+        return setOperations.size(KEY);
+    }
 }