[MAC manager] Improve API consistency and impose retry limit

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

@@ -16,6 +16,7 @@
 
 package com.futurewei.alcor.macmanager.controller;
 
+import com.futurewei.alcor.common.entity.ResponseId;
 import com.futurewei.alcor.common.exception.ParameterNullOrEmptyException;
 import com.futurewei.alcor.common.exception.ResourcePersistenceException;
 import com.futurewei.alcor.macmanager.entity.MacRange;
@@ -202,14 +203,14 @@ public MacRangeJson updateMacRange(@PathVariable String rangeid, @RequestBody Ma
     @RequestMapping(
             method = DELETE,
             value = {"/macs/ranges/{rangeid}", "/v4/macs/ranges/{rangeid}"})
-    public String deleteMacRange(@PathVariable String rangeid) throws Exception {
+    public ResponseId deleteMacRange(@PathVariable String rangeid) throws Exception {
         String rangeId = null;
         try {
             RestPreconditionsUtil.verifyParameterNotNullorEmpty(rangeid);
             rangeId = service.deleteMacRange(rangeid);
         } catch (ParameterNullOrEmptyException e) {
             throw new Exception(e);
         }
-        return "{mac_range: " + rangeId + "}";
+        return new ResponseId(rangeId);
     }
 }

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

@@ -46,36 +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);
         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 long getSize() {
+    public synchronized long getSize() {
         return setOperations.size(KEY);
     }
 }

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

@@ -48,30 +48,29 @@ private void init() {
     }
 
     @Override
-    public MacRange findItem(String id) {
+    public synchronized MacRange findItem(String id) {
 
         return (MacRange) hashOperations.get(KEY, id);
     }
 
     @Override
-    public Map<String, MacRange> findAllItems() {
-        System.out.print("test" + KEY);
+    public synchronized Map<String, MacRange> findAllItems() {
         return hashOperations.entries(KEY);
     }
 
     @Override
-    public void addItem(MacRange newItem) {
+    public synchronized void addItem(MacRange newItem) {
         Logger logger = LoggerFactory.getLogger();
         logger.log(Level.INFO, "mac address:" + newItem.getRangeId());
         hashOperations.putIfAbsent(KEY, newItem.getRangeId(), newItem);
     }
 
     @Override
-    public void deleteItem(String id) {
+    public synchronized void deleteItem(String id) {
         hashOperations.delete(KEY, id);
     }
 
-    public void updateItem(MacRange newItem) {
+    public synchronized void updateItem(MacRange newItem) {
         hashOperations.put(KEY, newItem.getRangeId(), newItem);
     }
 }

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

@@ -49,43 +49,34 @@ private void init() {
     }
 
     @Override
-    public MacState findItem(String id) {
+    public synchronized MacState findItem(String id) {
 
         return (MacState) hashOperations.get(KEY, id);
     }
 
     @Override
-    public Map findAllItems() {
+    public synchronized Map findAllItems() {
         return hashOperations.entries(KEY);
     }
 
     @Override
-    public void addItem(MacState newItem) {
+    public synchronized void addItem(MacState newItem) {
         Logger logger = LoggerFactory.getLogger();
         logger.log(Level.INFO, "mac address:" + newItem.getMacAddress());
         hashOperations.putIfAbsent(KEY, newItem.getMacAddress(), newItem);
     }
 
     @Override
-    public void deleteItem(String id) {
+    public synchronized void deleteItem(String id) {
         hashOperations.delete(KEY, id);
     }
 
-    public void updateItem(MacState newItem) {
+    public synchronized void updateItem(MacState newItem) {
         hashOperations.put(KEY, newItem.getMacAddress(), newItem);
     }
 
-    public MacState findMac(String id) {
+    public synchronized MacState findMac(String id) {
         return (MacState) hashOperations.get(KEY, id);
     }
-
-    public void setKey(String key) {
-        KEY = key;
-    }
-
-    public boolean exisingOui(String oui) {
-
-        return redisTemplate.hasKey(oui);
-    }
 }
 

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/exception/InvalidMacRangeException.java

@@ -0,0 +1,32 @@
+/*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.exception;
+
+public class InvalidMacRangeException extends Exception {
+    public InvalidMacRangeException() {
+    }
+
+    public InvalidMacRangeException(String message) {
+        super(message);
+    }
+
+    public InvalidMacRangeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidMacRangeException(Throwable cause) {
+        super(cause);
+    }
+}

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/exception/RetryLimitExceedException.java

@@ -0,0 +1,32 @@
+/*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.exception;
+
+public class RetryLimitExceedException extends Exception {
+    public RetryLimitExceedException() {
+    }
+
+    public RetryLimitExceedException(String message) {
+        super(message);
+    }
+
+    public RetryLimitExceedException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public RetryLimitExceedException(Throwable cause) {
+        super(cause);
+    }
+}

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/exception/UniquenessViolationException.java

@@ -15,8 +15,6 @@
 package com.futurewei.alcor.macmanager.exception;
 
 public class UniquenessViolationException extends Exception {
-    private static final long serialVersionUID = 1L;
-
     public UniquenessViolationException() {
     }