Node Manager - Meta data management

legacy/src/com/futurewei/alcor/controller/resourcemgr/physical/nodemgmt/DataCenterConfigLoader.java

@@ -16,17 +16,26 @@
 
 package com.futurewei.alcor.controller.resourcemgr.physical.nodemgmt;
 
+<<<<<<< HEAD:legacy/src/com/futurewei/alcor/controller/resourcemgr/physical/nodemgmt/DataCenterConfigLoader.java
 import com.futurewei.alcor.controller.logging.Logger;
 import com.futurewei.alcor.controller.logging.LoggerFactory;
 import com.futurewei.alcor.controller.model.HostInfo;
 import com.futurewei.alcor.controller.utilities.Common;
+=======
+import com.futurewei.alcor.nodemanager.entity.NodeInfo;
+>>>>>>> [Microservices] Node manager - (1) added API that read machine config file, (2) removed memory repository part:services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/service/implement/DataCenterConfigLoader.java
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
+<<<<<<< HEAD:legacy/src/com/futurewei/alcor/controller/resourcemgr/physical/nodemgmt/DataCenterConfigLoader.java
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ResourceLoader;
+=======
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+>>>>>>> [Microservices] Node manager - (1) added API that read machine config file, (2) removed memory repository part:services/node_manager/src/main/java/com/futurewei/alcor/nodemanager/service/implement/DataCenterConfigLoader.java
 
 import java.io.FileNotFoundException;
 import java.io.FileReader;

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

@@ -27,7 +27,7 @@ public interface ICacheRepository<T> {
 
     Map<String, T> findAllItems() throws CacheException;
 
-    void addItem(T newItem) throws CacheException;
+    void addItem(T newItem) throws Exception;
 
-    void deleteItem(String id) throws CacheException;
+    void deleteItem(String id) throws Exception;
 }

machine.json

@@ -0,0 +1,64 @@
+{
+  "Hosts": [
+    {
+      "id": "ephost_0",
+      "ip": "172.17.0.6",
+      "mac": "02:42:ac:11:00:06",
+      "veth": {}
+    },
+    {
+      "id": "ephost_1",
+      "ip": "172.17.0.7",
+      "mac": "02:42:ac:11:00:07",
+      "veth": {}
+    },
+    {
+      "id": "ephost_2",
+      "ip": "172.17.0.8",
+      "mac": "02:42:ac:11:00:08",
+      "veth": {}
+    },
+    {
+      "id": "ephost_3",
+      "ip": "172.17.0.9",
+      "mac": "02:42:ac:11:00:09",
+      "veth": {}
+    },
+    {
+      "id": "ephost_4",
+      "ip": "172.17.0.10",
+      "mac": "02:42:ac:11:00:0a",
+      "veth": {}
+    },
+    {
+      "id": "ephost_5",
+      "ip": "172.17.0.11",
+      "mac": "02:42:ac:11:00:0b",
+      "veth": {}
+    },
+    {
+      "id": "ephost_6",
+      "ip": "172.17.0.12",
+      "mac": "02:42:ac:11:00:0c",
+      "veth": {}
+    },
+    {
+      "id": "ephost_7",
+      "ip": "172.17.0.13",
+      "mac": "02:42:ac:11:00:0d",
+      "veth": {}
+    },
+    {
+      "id": "ephost_8",
+      "ip": "172.17.0.14",
+      "mac": "02:42:ac:11:00:0e",
+      "veth": {}
+    },
+    {
+      "id": "ephost_9",
+      "ip": "172.17.0.15",
+      "mac": "02:42:ac:11:00:0f",
+      "veth": {}
+    }
+  ]
+}

pom.xml

@@ -33,6 +33,7 @@
         <module>services/route_manager</module>
         <module>services/mac_manager</module>
         <module>services/private_ip_manager</module>
+        <module>services/node_manager</module>
     </modules>
     <packaging>pom</packaging>
 

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

@@ -0,0 +1,126 @@
+/*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.db.Transaction;
+import com.futurewei.alcor.common.exception.ResourceNotFoundException;
+import com.futurewei.alcor.common.repo.ICacheRepository;
+import com.futurewei.alcor.macmanager.entity.MacAddress;
+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.Arrays;
+import java.util.Map;
+import java.util.Vector;
+import java.util.concurrent.ThreadLocalRandom;
+
+@Repository
+@ComponentScan(value = "com.futurewei.alcor.common.db")
+public class MacPoolRepository implements ICacheRepository<MacAddress> {
+    private ICache<String, MacAddress> cache;
+
+    @Autowired
+    public MacPoolRepository(CacheFactory cacheFactory) {
+        cache = cacheFactory.getCache(MacAddress.class);
+    }
+
+    public ICache<String, MacAddress> getCache() {
+        return cache;
+    }
+
+    @PostConstruct
+    private void init() {
+
+    }
+
+    @Override
+    public MacAddress findItem(String strMacAddress) throws CacheException, ResourceNotFoundException {
+        if (cache.containsKey(strMacAddress))
+            return cache.get(strMacAddress);
+        else
+            return null;
+    }
+
+    @Override
+    public Map<String, MacAddress> findAllItems() throws CacheException {
+        return cache.getAll();
+    }
+
+    /**
+     * add a MAC address to MAC pool repository
+     *
+     * @param macAddress MAC address
+     * @return void
+     * @throws Exception Db or cache operation exception
+     */
+    @Override
+    public void addItem(MacAddress macAddress) throws Exception {
+        if (cache.containsKey(macAddress.getMacAddress()) == false) {
+            try (Transaction tx = cache.getTransaction().start()) {
+                cache.put(macAddress.getMacAddress(), macAddress);
+                tx.commit();
+            } catch (CacheException e) {
+                throw e;
+            } catch(Exception e1)
+            {
+
+            }
+        }
+    }
+
+    /**
+     * delete a MAC address from MAC pool repository
+     *
+     * @param strMacAddress MAC address
+     * @return void
+     * @throws Exception Db or cache operation exception
+     */
+    @Override
+    public void deleteItem(String strMacAddress) throws Exception {
+        try (Transaction tx = cache.getTransaction().start()) {
+            cache.remove(strMacAddress);
+            tx.commit();
+        } catch (CacheException e) {
+            throw e;
+        }
+    }
+
+    public synchronized String getItem() throws CacheException {
+        String strMacAddress;
+        try {
+            long randomIndex = ThreadLocalRandom.current().nextLong(0, getSize());
+            Vector<String> sa = new Vector(Arrays.asList(cache.getAll().keySet().toArray()));
+            strMacAddress = sa.elementAt((int) randomIndex);
+        } catch (Exception e) {
+            throw e;
+        }
+        return strMacAddress;
+    }
+
+    public synchronized long getSize() throws CacheException {
+        int nSize = 0;
+        try {
+            nSize = cache.getAll().size();
+        } catch (Exception e) {
+            throw e;
+        }
+        return nSize;
+    }
+}

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

@@ -17,6 +17,7 @@
 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.db.Transaction;
 import com.futurewei.alcor.common.repo.ICacheRepository;
 import com.futurewei.alcor.macmanager.entity.MacRange;
 import com.futurewei.alcor.macmanager.entity.MacState;
@@ -75,22 +76,38 @@ public Map<String, MacRange> findAllItems() throws CacheException {
         return hashMap;
     }
 
+    /**
+     * add a MAC range to MAC range repository
+     *
+     * @param macRange MAC range
+     * @return void
+     * @throws Exception Db or cache operation exception
+     */
     @Override
-    public void addItem(MacRange macRange) throws CacheException {
-        try {
+    public void addItem(MacRange macRange) throws Exception {
+        try (Transaction tx = cache.getTransaction().start()) {
             cache.put(macRange.getRangeId(), macRange);
             logger.info("MacRangeRepository addItem() {}: ", macRange.getRangeId());
+            tx.commit();
         } catch (CacheException e) {
             logger.error("MacRangeRepository addItem() exception:", e);
             throw e;
         }
     }
 
+    /**
+     * delete a MAC range from MAC range repository
+     *
+     * @param rangeId MAC range identifier
+     * @return void
+     * @throws Exception Db or cache operation exception
+     */
     @Override
-    public void deleteItem(String rangeId) throws CacheException {
-        try {
+    public void deleteItem(String rangeId) throws CacheException, Exception {
+        try (Transaction tx = cache.getTransaction().start()) {
             cache.remove(rangeId);
             logger.info("MacRangeRepository deleteItem() {}: ", rangeId);
+            tx.commit();
         } catch (CacheException e) {
             logger.error("MacRangeRepository deleteItem() exception:", e);
             throw e;