UT case increase for grant resource

Change-Id: Ia077192aa8cc4b781fc1b107debcdad158ac6f13
Issue-ID: VFC-747
Signed-off-by: luxin <luxin7@huawei.com>

diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java
index d9e8867..fbd779d 100644 (file)
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java
@@ -73,6 +73,9 @@ public class VimUtil {
      */
     public static String getVimIdByName(String name) {
         JSONArray vims = getVims();
+        if(vims == null) {
+            return "";
+        }
         for(int i = 0; i < vims.size(); i++) {
             JSONObject vim = vims.getJSONObject(i);
             LOG.info("vimInfo: " + vim);

diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
index ead1f5d..2feaba3 100644 (file)
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
@@ -166,6 +166,8 @@ public class ResmgrAdapterMgrService implements IResmgrAdapterMgrService {
                     }
                 } catch(InterruptedException e) {
                     LOG.error(e.getMessage(), e);
+                    // Restore interrupted state...
+                    Thread.currentThread().interrupt();
                 }
 
                 sendRequest(this.paramsMap, this.adapterInfo);

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImplTest.java
index 15906b1..9e1c1ce 100644 (file)
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImplTest.java
@@ -102,6 +102,158 @@ public class GrantResServiceImplTest {
         assertNotNull(result);\r
     }\r
 \r
+    @Test\r
+    public void testGrantResourceRealByCpu() throws ServiceException {\r
+        GrantResServiceImpl impl = new GrantResServiceImpl();\r
+        JSONObject obj = new JSONObject();\r
+        JSONObject vimObj = getVimObj();\r
+        obj.put("additionalParam", vimObj);\r
+        obj.put("vimId", "vimId");\r
+        JSONArray addResource = new JSONArray();\r
+        addResource.add(getAddResObj());\r
+        obj.put("addResource", addResource);\r
+        new MockUp<VimUtil>() {\r
+\r
+            @Mock\r
+            public JSONObject getVimById(String vimId) {\r
+                return getVimObj();\r
+            }\r
+        };\r
+        new MockUp<LimitsBusinessImpl>() {\r
+\r
+            @Mock\r
+            public JSONObject getLimits(String vimId) throws ServiceException {\r
+                JSONObject result = new JSONObject();\r
+                result.put("vimId", "vimId");\r
+                result.put("vimName", "vimName");\r
+                result.put("totalCPU", "10");\r
+                result.put("totalMemory", "10");\r
+                result.put("totalDisk", "10");\r
+                result.put("usedCPU", "10");\r
+                result.put("usedMemory", "1");\r
+                result.put("usedDisk", "1");\r
+                return result;\r
+            }\r
+        };\r
+\r
+        JSONObject result = impl.grantResourceReal(obj);\r
+        assertNotNull(result);\r
+    }\r
+\r
+    @Test\r
+    public void testGrantResourceRealByMem() throws ServiceException {\r
+        GrantResServiceImpl impl = new GrantResServiceImpl();\r
+        JSONObject obj = new JSONObject();\r
+        JSONObject vimObj = getVimObj();\r
+        obj.put("additionalParam", vimObj);\r
+        obj.put("vimId", "vimId");\r
+        JSONArray addResource = new JSONArray();\r
+        addResource.add(getAddResObj());\r
+        obj.put("addResource", addResource);\r
+        new MockUp<VimUtil>() {\r
+\r
+            @Mock\r
+            public JSONObject getVimById(String vimId) {\r
+                return getVimObj();\r
+            }\r
+        };\r
+        new MockUp<LimitsBusinessImpl>() {\r
+\r
+            @Mock\r
+            public JSONObject getLimits(String vimId) throws ServiceException {\r
+                JSONObject result = new JSONObject();\r
+                result.put("vimId", "vimId");\r
+                result.put("vimName", "vimName");\r
+                result.put("totalCPU", "10");\r
+                result.put("totalMemory", "10");\r
+                result.put("totalDisk", "10");\r
+                result.put("usedCPU", "1");\r
+                result.put("usedMemory", "10");\r
+                result.put("usedDisk", "1");\r
+                return result;\r
+            }\r
+        };\r
+\r
+        JSONObject result = impl.grantResourceReal(obj);\r
+        assertNotNull(result);\r
+    }\r
+\r
+    @Test\r
+    public void testGrantResourceRealByDisk() throws ServiceException {\r
+        GrantResServiceImpl impl = new GrantResServiceImpl();\r
+        JSONObject obj = new JSONObject();\r
+        JSONObject vimObj = getVimObj();\r
+        obj.put("additionalParam", vimObj);\r
+        obj.put("vimId", "vimId");\r
+        JSONArray addResource = new JSONArray();\r
+        addResource.add(getAddResObj());\r
+        obj.put("addResource", addResource);\r
+        new MockUp<VimUtil>() {\r
+\r
+            @Mock\r
+            public JSONObject getVimById(String vimId) {\r
+                return getVimObj();\r
+            }\r
+        };\r
+        new MockUp<LimitsBusinessImpl>() {\r
+\r
+            @Mock\r
+            public JSONObject getLimits(String vimId) throws ServiceException {\r
+                JSONObject result = new JSONObject();\r
+                result.put("vimId", "vimId");\r
+                result.put("vimName", "vimName");\r
+                result.put("totalCPU", "10");\r
+                result.put("totalMemory", "10");\r
+                result.put("totalDisk", "10");\r
+                result.put("usedCPU", "1");\r
+                result.put("usedMemory", "1");\r
+                result.put("usedDisk", "10");\r
+                return result;\r
+            }\r
+        };\r
+\r
+        JSONObject result = impl.grantResourceReal(obj);\r
+        assertNotNull(result);\r
+    }\r
+\r
+    @Test\r
+    public void testGrantResourceRealByRemoveRes() throws ServiceException {\r
+        GrantResServiceImpl impl = new GrantResServiceImpl();\r
+        JSONObject obj = new JSONObject();\r
+        JSONObject vimObj = getVimObj();\r
+        obj.put("additionalParam", vimObj);\r
+        obj.put("vimId", "vimId");\r
+        JSONArray addResource = new JSONArray();\r
+        addResource.add(getAddResObj());\r
+        obj.put("removeResource", addResource);\r
+        new MockUp<VimUtil>() {\r
+\r
+            @Mock\r
+            public JSONObject getVimById(String vimId) {\r
+                return getVimObj();\r
+            }\r
+        };\r
+        new MockUp<LimitsBusinessImpl>() {\r
+\r
+            @Mock\r
+            public JSONObject getLimits(String vimId) throws ServiceException {\r
+                JSONObject result = new JSONObject();\r
+                result.put("vimId", "vimId");\r
+                result.put("vimName", "vimName");\r
+                result.put("totalCPU", "10");\r
+                result.put("totalMemory", "10");\r
+                result.put("totalDisk", "10");\r
+                result.put("usedCPU", "1");\r
+                result.put("usedMemory", "1");\r
+                result.put("usedDisk", "1");\r
+                return result;\r
+            }\r
+        };\r
+\r
+        JSONObject result = impl.grantResourceReal(obj);\r
+        assertNotNull(result);\r
+    }\r
+\r
     /**\r
      * {\r
      * "vimId": "57674786-5b2e-4c92-bb68-578dbd79e2f5",\r
@@ -186,4 +338,25 @@ public class GrantResServiceImplTest {
         return addResObj;\r
     }\r
 \r
+    private JSONObject getRemoveResObj() {\r
+        JSONObject addResObj = new JSONObject();\r
+        JSONObject virtualCpu = new JSONObject();\r
+        virtualCpu.put("numVirtualCpu", 1);\r
+        JSONObject virtualMemory = new JSONObject();\r
+        virtualMemory.put("virtualMemSize", 1);\r
+        JSONObject virtualComputeDescriptor = new JSONObject();\r
+        virtualComputeDescriptor.put("virtualCpu", virtualCpu);\r
+        virtualComputeDescriptor.put("virtualMemory", virtualMemory);\r
+        JSONObject virtualStorageDescriptor = new JSONObject();\r
+        virtualStorageDescriptor.put("typeOfStorage", "");\r
+        virtualStorageDescriptor.put("sizeOfStorage", "1");\r
+        JSONObject resourceTemplate = new JSONObject();\r
+        resourceTemplate.put("virtualComputeDescriptor", virtualComputeDescriptor);\r
+        resourceTemplate.put("virtualStorageDescriptor", virtualStorageDescriptor);\r
+        addResObj.put("resourceDefinitionId", "1");\r
+        addResObj.put("resourceTemplate", resourceTemplate);\r
+\r
+        return addResObj;\r
+    }\r
+\r
 }\r