[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;
     }

services/node_manager/pom.xml

@@ -79,12 +79,6 @@
 			<version>0.1.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
-        <dependency>
-            <groupId>com.futurewei.alcor.controller</groupId>
-            <artifactId>AlcorController</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 	<build>

services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/NodeManagerApplication.java

@@ -1,17 +1,8 @@
 package com.futurewei.alcor.nodemanager;
 
-import com.futurewei.alcor.controller.app.onebox.OneBoxConfig;
-import com.futurewei.alcor.controller.app.onebox.OneBoxUtil;
-import com.futurewei.alcor.controller.model.HostInfo;
-import com.futurewei.alcor.controller.resourcemgr.physical.nodemgmt.DataCenterConfig;
-import com.futurewei.alcor.controller.resourcemgr.physical.nodemgmt.DataCenterConfigLoader;
-import com.futurewei.alcor.controller.resourcemgr.physical.nodemgmt.NodeManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import java.util.List;
-import java.util.logging.Level;
-
 @SpringBootApplication
 public class NodeManagerApplication {
 

services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/controller/NodeController.java

@@ -24,6 +24,10 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+
 import static org.springframework.web.bind.annotation.RequestMethod.*;
 
 @RestController
@@ -52,6 +56,42 @@ public NodeInfoJson getNodeInfoByMacAddress(@PathVariable String nodeid) throws
         return new NodeInfoJson(hostInfo);
     }
 
+    @RequestMapping(
+            method = GET,
+            value = {"/nodes", "/v4/nodes"})
+    public Hashtable getAllNodes() throws Exception {
+        Hashtable nodes = null;
+        try {
+             nodes = service.getAllNodes();
+        } catch (ParameterNullOrEmptyException e) {
+            //TODO: REST error code
+            throw new Exception(e);
+        }
+        if (nodes == null) {
+            //TODO: REST error code
+            return new Hashtable();
+        }
+        return nodes;
+    }
+
+    @RequestMapping(
+            method = GET,
+            value = {"/nodeslist", "/v4/nodeslist"})
+    public List<NodeInfo> getAllNodesList() throws Exception {
+        List<NodeInfo> nodes = null;
+        try {
+            nodes = service.getAllNodesList();
+        } catch (ParameterNullOrEmptyException e) {
+            //TODO: REST error code
+            throw new Exception(e);
+        }
+        if (nodes == null) {
+            //TODO: REST error code
+            return new ArrayList();
+        }
+        return nodes;
+    }
+
     @RequestMapping(
             method = POST,
             value = {"/nodes", "/v4/nodes"})

services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/dao/repository/NodeRepository.java → services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/dao/NodeRepository.java

@@ -12,7 +12,7 @@
         See the License for the specific language governing permissions and
         limitations under the License.
 */
-package com.futurewei.alcor.nodemanager.dao.repository;
+package com.futurewei.alcor.nodemanager.dao;
 
 import com.futurewei.alcor.common.db.CacheException;
 import com.futurewei.alcor.common.db.CacheFactory;
@@ -71,6 +71,12 @@ public void deleteItem(String id) throws CacheException {
         cache.remove(id);
     }
 
+    /**
+     * add a new node info to node repository
+     * @param nodeInfo new node information
+     * @return void
+     * @throws Exception Db or cache operation exception
+     */
     public void addItemTransaction(NodeInfo nodeInfo) throws Exception {
         logger.info("Add node, Node Id:" + nodeInfo.getId());
         cache.put(nodeInfo.getId(), nodeInfo);

services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/entity/NodeInfo.java

@@ -14,6 +14,7 @@
 */
 package com.futurewei.alcor.nodemanager.entity;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.futurewei.alcor.nodemanager.utils.NodeUtil;
 import lombok.Data;
@@ -27,6 +28,8 @@
 import java.util.regex.Pattern;
 
 @Data
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
+        setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)
 public class NodeInfo implements Serializable {
     private static final Logger logger = LoggerFactory.getLogger(NodeInfo.class);
 
@@ -53,34 +56,39 @@ public NodeInfo() {
     }
 
     public NodeInfo(NodeInfo nodeInfo) {
-        this(nodeInfo.id, nodeInfo.name, nodeInfo.localIp, nodeInfo.macAddress, nodeInfo.gRPCServerPort);
+        this(nodeInfo.id, nodeInfo.name, nodeInfo.localIp, nodeInfo.macAddress, nodeInfo.veth, nodeInfo.gRPCServerPort);
     }
 
-    public NodeInfo(String id, String name, InetAddress localIp, String macAddress, int gRPCServerPort) {
+    public NodeInfo(String id, String name, InetAddress localIp, String macAddress, String veth, int gRPCServerPort) {
         this.id = id;
         this.name = name;
         this.localIp = localIp;
         this.macAddress = macAddress;
+        this.veth = veth;
         this.gRPCServerPort = gRPCServerPort;
     }
 
     public NodeInfo(String nodeId, String nodeName, byte[] ipAddress, String macAddress, int gRPCServerPort) {
         this(nodeId, nodeName, ipAddress, macAddress);
+        this.veth = "";
         this.gRPCServerPort = gRPCServerPort;
     }
 
     public NodeInfo(String nodeId, String nodeName, byte[] ipAddress, String macAddress) {
         this.id = nodeId;
+        this.name = nodeName;
         try {
-            this.localIp = InetAddress.getByAddress(nodeName, ipAddress);
+            this.localIp = InetAddress.getByAddress(ipAddress);
             if (this.validate(macAddress)) {
                 this.macAddress = macAddress;
             } else {
-                this.macAddress = null;
+                this.macAddress = "";
             }
         } catch (UnknownHostException e) {
             logger.error(NodeUtil.NODE_EXCEPTION_NODE_IP_INVALID + ipAddress, e);
         }
+        this.veth = "";
+        this.gRPCServerPort = NodeUtil.GRPC_SERVER_PORT;
     }
 
     private boolean validate(String mac) {

services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/service/NodeService.java

@@ -2,9 +2,16 @@
 
 import com.futurewei.alcor.nodemanager.entity.NodeInfo;
 
+import java.util.Hashtable;
+import java.util.List;
+
 public interface NodeService {
     NodeInfo getNodeInfoById(String nodeId) throws Exception;
 
+    Hashtable getAllNodes() throws Exception;
+
+    List getAllNodesList() throws Exception;
+
     NodeInfo createNodeInfo(NodeInfo nodeInfo) throws Exception;
 
     NodeInfo updateNodeInfo(String nodeId, NodeInfo nodeInfo) throws Exception;

services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/dao/file/DataCenterConfig.java → services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/service/datacenter/DataCenterConfig.java

@@ -13,7 +13,7 @@
         See the License for the specific language governing permissions and
         limitations under the License.
 */
-package com.futurewei.alcor.nodemanager.dao.file;
+package com.futurewei.alcor.nodemanager.service.datacenter;
 
 public class DataCenterConfig {
 

services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/dao/file/DataCenterConfigLoader.java → services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/service/datacenter/DataCenterConfigLoader.java

@@ -14,9 +14,9 @@
         limitations under the License.
 */
 
-package com.futurewei.alcor.nodemanager.dao.file;
+package com.futurewei.alcor.nodemanager.service.datacenter;
 
-import com.futurewei.alcor.controller.utilities.Common;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.futurewei.alcor.nodemanager.entity.NodeInfo;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -27,32 +27,37 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.stereotype.Component;
 
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
+@Component
 public class DataCenterConfigLoader {
     private static final Logger logger = LoggerFactory.getLogger(DataCenterConfigLoader.class);
 
     @Autowired
     private ResourceLoader resourceLoader;
 
-    @Value("${alcor.machine.config:app/config/machine.json}")
+    @Value("${alcor.machine.config:.\\machine.json}")
     private String machineConfigFile;
 
-    String getPropertyFile() {
-        return resourceLoader.getResource(this.machineConfigFile).getFilename();
-    }
+    //String getPropertyFile() {
+    //    return resourceLoader.getResource(this.machineConfigFile).getFilename();
+    //}
 
     public List<NodeInfo> loadAndGetHostNodeList() {
         logger.info("Loading node from " + this.machineConfigFile);
         return this.loadAndGetHostNodeList(this.machineConfigFile);
     }
 
+    @JsonIgnore
     public List<NodeInfo> loadAndGetHostNodeList(String machineConfigFilePath) {
         JSONParser jsonParser = new JSONParser();
         List<NodeInfo> nodeInfos = new ArrayList<>();
@@ -75,19 +80,33 @@ public List<NodeInfo> loadAndGetHostNodeList(String machineConfigFilePath) {
         return nodeInfos;
     }
 
+    @JsonIgnore
     private NodeInfo parseNodeObject(JSONObject node) {
         String id = (String) node.get("id");
         String ip = (String) node.get("ip");
         String mac = (String) node.get("mac");
-        System.out.println("Node ID:" + id + "|IP:" + ip + "|MAC:" + mac);
-
         byte[] ipByteArray;
         try {
-            ipByteArray = Common.fromIpAddressStringToByteArray(ip);
+            ipByteArray = fromIpAddressStringToByteArray(ip);
             return new NodeInfo(id, id, ipByteArray, mac);
         } catch (UnknownHostException e) {
             logger.error("UnknownHostException");
         }
         return null;
     }
+
+    @JsonIgnore
+    public byte[] fromIpAddressStringToByteArray(String ipAddressString) throws UnknownHostException {
+        InetAddress ip = InetAddress.getByName(ipAddressString);
+        byte[] bytes = ip.getAddress();
+        return bytes;
+    }
+
+    public int getRandomNumberInRange(int min, int max) {
+        if (min >= max) {
+            throw new IllegalArgumentException("Max must be greater than min");
+        }
+        Random r = new Random();
+        return r.nextInt((max - min) + 1) + min;
+    }
 }