[MAC manager] Improve API consistency and impose retry limit

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/MacPoolRedisRepository.java

@@ -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);
+    }
 }

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.put(KEY, newItem.getRangeId(), newItem);
+        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.put(KEY, newItem.getMacAddress(), newItem);
+        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/entity/MacRange.java

@@ -49,8 +49,10 @@ public MacRange(String rangeId, String from, String to, String state) {
 
     public void createDefault(String oui) {
         rangeId = MacUtil.DEFAULT_RANGE;
-        from = new MacAddress(oui, MacAddress.longToMac(0)).getMacAddress();
-        to = new MacAddress(oui, MacAddress.longToMac((long)Math.pow(2,MacAddress.NIC_LENGTH))).getMacAddress();
+        String strFrom  = MacAddress.longToMac(0);
+        String strTo = MacAddress.longToMac((long)Math.pow(2,MacAddress.NIC_LENGTH) - 1);
+        from = new MacAddress(oui, strFrom).getMacAddress();
+        to = new MacAddress(oui, strTo).getMacAddress();
         state = MacUtil.MAC_RANGE_STATE_ACTIVE;
     }
 }

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/entity/MacRangeJson.java

@@ -14,11 +14,13 @@
 */
 package com.futurewei.alcor.macmanager.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
 public class MacRangeJson {
 
+    @JsonProperty("mac_range")
     private MacRange macRange;
 
     public MacRangeJson() {

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/entity/MacState.java

@@ -35,23 +35,23 @@ public class MacState implements Serializable {
     @JsonProperty("port_id")
     private String portId;
 
-    @JsonProperty("active")
-    private String active;
+    @JsonProperty("state")
+    private String state;
 
     public MacState() {
 
     }
 
     public MacState(MacState state) {
-        this(state.macAddress, state.projectId, state.vpcId, state.portId, state.active);
+        this(state.macAddress, state.projectId, state.vpcId, state.portId, state.state);
     }
 
-    public MacState(String macAddress, String projectId, String vpcId, String portId, String active) {
+    public MacState(String macAddress, String projectId, String vpcId, String portId, String state) {
         this.macAddress = macAddress;
         this.projectId = projectId;
         this.vpcId = vpcId;
         this.portId = portId;
-        this.active = active;
+        this.state = state;
     }
 }
 

services/mac_manager/src/main/java/com/futurewei/alcor/macmanager/entity/MacStateJson.java

@@ -15,10 +15,13 @@
 */
 package com.futurewei.alcor.macmanager.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
 public class MacStateJson {
+
+    @JsonProperty("mac_state")
     private MacState macState;
 
     public MacStateJson() {

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() {
     }