Multiple Sonar Fixes
[appc.git] / appc-outbound / appc-aai-client / provider / src / test / java / org / onap / appc / aai / client / aai / TestAaiService.java
index aa80708..bf22606 100644 (file)
@@ -2,23 +2,26 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
+ * Modification Copyright (C) 2018 IBM.
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
+ * =============================================================================
  * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ *
  * ============LICENSE_END=========================================================
  */
 
@@ -28,324 +31,481 @@ import static org.junit.Assert.assertEquals;
 
 import java.util.HashMap;
 import java.util.Map;
-
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 import org.onap.ccsdk.sli.adaptors.aai.AAIClient;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({FrameworkUtil.class})
 public class TestAaiService {
-       // ONAP merging
+    // ONAP merging
+
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(TestAaiService.class);
+    private AAIClient aaiClient = Mockito.mock(AAIClient.class);
+    private final BundleContext bundleContext= Mockito.mock(BundleContext.class);
+    private final Bundle bundleService=Mockito.mock(Bundle.class);
+    private final ServiceReference sref=Mockito.mock(ServiceReference.class);
+
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+
+    @Before
+    public void setup() {
+        PowerMockito.mockStatic(FrameworkUtil.class);
+        PowerMockito.when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
+        PowerMockito.when(bundleService.getBundleContext()).thenReturn(bundleContext);
+        PowerMockito.when(bundleContext.getServiceReference(Matchers.any(Class.class))).thenReturn(sref);
+        PowerMockito.when(bundleContext.getService(sref)).thenReturn(aaiClient);
+    }
+
+    @Test
+    public void testMissingVnfId() throws AaiServiceInternalException, SvcLogicException {
+        AaiService aaiService = new AaiService();
+        expectedEx.expect(AaiServiceInternalException.class);
+        expectedEx.expectMessage("VnfId is missing");
+        aaiService.getGenericVnfInfo(new HashMap<String, String>(), new SvcLogicContext());
+    }
+
+    @Test
+    public void testGetVmInfoExceptionFlow() throws SvcLogicException, AaiServiceInternalException {
+        AaiService aaiService = Mockito.spy(new AaiService());
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("vserverId", "vserverId1");
+        inParams.put("tenantId", "tenantId1");
+        inParams.put("cloudOwner", "cloudOwner1");
+        inParams.put("cloudRegionId", "cloudRegionId1");
+        inParams.put("responsePrefix", "tmp.vnfInfo");
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        Mockito.doThrow(new SvcLogicException()).when(aaiService).readResource(Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
+        expectedEx.expect(SvcLogicException.class);
+        expectedEx.expectMessage("Failed to fetch VM info");
+        aaiService.getVMInfo(inParams, ctx);
+    }
+
+    @Test
+    public void testGetVnfcInfoExceptionFlow() throws Exception {
+        AaiService aaiService = new AaiService();
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("vnfcName", "");
+        inParams.put("responsePrefix", "tmp.vnfInfo");
+        SvcLogicContext ctx = new SvcLogicContext();
+        expectedEx.expect(AaiServiceInternalException.class);
+        expectedEx.expectMessage("Vnfc Name is missing");
+        aaiService.getVnfcInfo(inParams, ctx);
+    }
+
+    @Test
+    public void testInsertVnfcsExceptionFlow() throws Exception {
+        AaiService aaiService = new AaiService();
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("responsePrefix", "tmp.vnfInfo");
+        SvcLogicContext ctx = new SvcLogicContext();
+        inParams.put("AppcAaiClientConstant.INPUT_PARAM_RESPONSE_PREFIX", "prefix.");
+        ctx.setAttribute("tmp.vnfInfo.vm[1].vnfc-name", "nullnull001");
+        aaiService.insertVnfcs(inParams, ctx, 2, null);
+    }
+
+    @Test
+    public void testGetVnfcData() {
+        AaiService aaiService = new AaiService();
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("responsePrefix", "tmp.vnfInfo");
+        SvcLogicContext ctx = new SvcLogicContext();
+        inParams.put("AppcAaiClientConstant.INPUT_PARAM_RESPONSE_PREFIX", "prefix.");
+        ctx.setAttribute("tmp.vnfInfo.vm[1].vnfc-name", "nullnull001");
+        aaiService.getVnfcData(inParams, ctx, 1);
+    }
+
+    @Test
+    public void testReadResource() throws AaiServiceInternalException, SvcLogicException {
+        AaiService aaiService = Mockito.spy(new AaiService());
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("responsePrefix", "tmp.vnfInfo");
+        inParams.put("AppcAaiClientConstant.INPUT_PARAM_RESPONSE_PREFIX", "prefix.");
+        Mockito.doReturn(QueryStatus.FAILURE).when(aaiClient).query(Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyString(),
+                Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.any(SvcLogicContext.class));
+        expectedEx.expect(AaiServiceInternalException.class);
+        expectedEx.expectMessage("Error Retrieving null from A&AI");
+        aaiService.readResource(null, null, null);
+    }
+
+    @Test
+    public void testCheckAndUpdateVnfc() throws AaiServiceInternalException, SvcLogicException {
+        AaiService aaiService = Mockito.spy(new AaiService());
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("responsePrefix", "tmp.vnfInfo");
+        SvcLogicContext ctx = new SvcLogicContext();
+        inParams.put("AppcAaiClientConstant.INPUT_PARAM_RESPONSE_PREFIX", "prefix.");
+        ctx.setAttribute("tmp.vnfInfo.vm[0].vnfc-name", "nullnull001");
+        aaiService.checkAndUpdateVnfc(inParams, ctx, 1, 1);
+        Mockito.verify(aaiService).updateVnfcStatus(Mockito.anyString(), Mockito.anyMap(), Mockito.anyString());
+    }
+
+    @Test
+    public void testGetGenericVnfInfo() throws Exception {
+
+        MockAaiService mockAai = new MockAaiService(aaiClient);
+
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("vnfId", "ibcxvm0000");
+        inParams.put("responsePrefix", "tmp.vnfInfo");
+
+        SvcLogicContext ctx = new SvcLogicContext();
+
+        mockAai.getGenericVnfInfo(inParams, ctx);
+
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vnf.vnf-type"), "vUSP-Metaswitch");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm-count"), "2");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vserver-id"), "ibcx001vm001-id");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vserver-id"), "ibcx000000");
+    }
+
+    @Test
+    public void testGetVmInfo() throws Exception {
+
+        MockAaiService mockAai = new MockAaiService(aaiClient);
+
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("vserverId", "vserverId1");
+        inParams.put("tenantId", "tenantId1");
+        inParams.put("cloudOwner", "cloudOwner1");
+        inParams.put("cloudRegionId", "cloudRegionId1");
+        inParams.put("responsePrefix", "tmp.vnfInfo");
+
+        SvcLogicContext ctx = new SvcLogicContext();
+
+        mockAai.getVMInfo(inParams, ctx);
 
-       private static final EELFLogger log = EELFManager.getInstance().getLogger(TestAaiService.class);
-       private AAIClient aaiClient;
+        printContext(ctx);
 
-       @Test
-       public void testGetGenericVnfInfo() throws Exception {
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm.vserver-name"), "ibcx0000000");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm.vnfc-count"), "1");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm.vf-module-id"), "vfModule1");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm.vnfc[0].vnfc-name"), "ibcx0001vm001vnfc1");
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+    }
 
-               Map<String, String> inParams = new HashMap<String, String>();
-               inParams.put("vnfId", "ibcxvm0000");
-               inParams.put("responsePrefix", "tmp.vnfInfo");
+    @Test
+    public void testGetVnfcInfo() throws Exception {
 
-               SvcLogicContext ctx = new SvcLogicContext();
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-               mockAai.getGenericVnfInfo(inParams, ctx);
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("vnfcName", "vnfcName1");
 
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vnf.vnf-type"), "vUSP-Metaswitch");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm-count"), "2");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vserver-id"), "ibcx001vm001-id");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vserver-id"), "ibcx000000");
-       }
+        inParams.put("responsePrefix", "tmp.vnfInfo");
 
-       @Test
-       public void testGetVmInfo() throws Exception {
+        SvcLogicContext ctx = new SvcLogicContext();
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        mockAai.getVnfcInfo(inParams, ctx);
 
-               Map<String, String> inParams = new HashMap<String, String>();
-               inParams.put("vserverId", "vserverId1");
-               inParams.put("tenantId", "tenantId1");
-               inParams.put("cloudOwner", "cloudOwner1");
-               inParams.put("cloudRegionId", "cloudRegionId1");
-               inParams.put("responsePrefix", "tmp.vnfInfo");
+        printContext(ctx);
 
-               SvcLogicContext ctx = new SvcLogicContext();
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vnfc.vnfc-type"), null);
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vnfc.vnfc-function-code"), null);
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vnfc.group-notation"), "grpnot1");
 
-               mockAai.getVMInfo(inParams, ctx);
+    }
 
-               printContext(ctx);
+    @Test
+    public void testGetFirstVnfcNameForVnfcType() throws Exception {
 
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm.vserver-name"), "ibcx0000000");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm.vnfc-count"), "1");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm.vf-module-id"), "vfModule1");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm.vnfc[0].vnfc-name"), "ibcx0001vm001vnfc1");
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-       }
+        String prefix = "tmp.vnfInfo.";
 
-       @Test
-       public void testGetVnfcInfo() throws Exception {
+        SvcLogicContext ctx = new SvcLogicContext(); // VNFC with specified vnfc
+                                                        // type found
+        mockAai.populateFirstVnfcData(ctx, prefix);
+        String firstVnfcName = mockAai.getFirstVnfcNameForVnfcType(ctx, prefix, "ssc");
+        assertEquals(firstVnfcName, "vnfcname3");
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        ctx = new SvcLogicContext(); // no VMS found
+        firstVnfcName = mockAai.getFirstVnfcNameForVnfcType(ctx, prefix, "ssc");
+        assertEquals(firstVnfcName, null);
 
-               Map<String, String> inParams = new HashMap<String, String>();
-               inParams.put("vnfcName", "vnfcName1");
+        ctx = new SvcLogicContext(); // no VMS found with specified type
+        mockAai.populateFirstVnfcData(ctx, prefix);
+        firstVnfcName = mockAai.getFirstVnfcNameForVnfcType(ctx, prefix, "test");
+        assertEquals(firstVnfcName, null);
 
-               inParams.put("responsePrefix", "tmp.vnfInfo");
+    }
 
-               SvcLogicContext ctx = new SvcLogicContext();
+    @Test
+    public void testGroupNotation() throws Exception {
 
-               mockAai.getVnfcInfo(inParams, ctx);
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-               printContext(ctx);
+        String prefix = "tmp.vnfInfo.";
 
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vnfc.vnfc-type"), null);
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vnfc.vnfc-function-code"), null);
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vnfc.group-notation"), "grpnot1");
+        SvcLogicContext ctx = new SvcLogicContext();
+        mockAai.populateGroupNotation(ctx, prefix);
 
-       }
+        // printContext(ctx);
+        String grpNotation = mockAai.getGroupNotationForVServer(ctx, prefix, "ibcxvm0002");
+        assertEquals(grpNotation, "grpNot2");
 
-       @Test
-       public void testGetFirstVnfcNameForVnfcType() throws Exception {
+        ctx = new SvcLogicContext(); // no VMS found
+        grpNotation = mockAai.getGroupNotationForVServer(ctx, prefix, "ibcxvm0002");
+        assertEquals(grpNotation, null);
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        ctx = new SvcLogicContext(); // no VMS found with specified name
+        mockAai.populateGroupNotation(ctx, prefix);
+        grpNotation = mockAai.getGroupNotationForVServer(ctx, prefix, "test");
+        assertEquals(grpNotation, null);
 
-               String prefix = "tmp.vnfInfo.";
+    }
 
-               SvcLogicContext ctx = new SvcLogicContext(); // VNFC with specified vnfc
-                                                                                                               // type found
-               mockAai.populateFirstVnfcData(ctx, prefix);
-               String firstVnfcName = mockAai.getFirstVnfcNameForVnfcType(ctx, prefix, "ssc");
-               assertEquals(firstVnfcName, "vnfcname3");
+    @Test
+    public void testGetGroupNotation() throws Exception {
 
-               ctx = new SvcLogicContext(); // no VMS found
-               firstVnfcName = mockAai.getFirstVnfcNameForVnfcType(ctx, prefix, "ssc");
-               assertEquals(firstVnfcName, null);
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-               ctx = new SvcLogicContext(); // no VMS found with specified type
-               mockAai.populateFirstVnfcData(ctx, prefix);
-               firstVnfcName = mockAai.getFirstVnfcNameForVnfcType(ctx, prefix, "test");
-               assertEquals(firstVnfcName, null);
+        String prefix = "tmp.vnfInfo.";
 
-       }
+        SvcLogicContext ctx = new SvcLogicContext();
 
-       @Test
-       public void testGroupNotation() throws Exception {
+        String grpNotation = mockAai.getGroupNotation("fixed-value", "2", null, null, null, null, null,null, 0);
+        assertEquals(grpNotation, "2");
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        mockAai.populateFirstVnfcData(ctx, prefix); // Existing VNFC Found
+        grpNotation = mockAai.getGroupNotation("first-vnfc-name", "2", "currentVnfcName", "currentVServerName", prefix,
+                ctx, "ssc", null, 0);
+        assertEquals(grpNotation, "vnfcname32");
 
-               String prefix = "tmp.vnfInfo.";
+        ctx = new SvcLogicContext(); // no vnfcs exist in A&AI- Use current
+                                        // vnfcName
+        grpNotation = mockAai.getGroupNotation("first-vnfc-name", "2", "currentVnfcName", "currentVServerName", prefix,
+                ctx, "ssc", null, 0);
+        assertEquals(grpNotation, "currentVnfcName2");
 
-               SvcLogicContext ctx = new SvcLogicContext();
-               mockAai.populateGroupNotation(ctx, prefix);
+        ctx = new SvcLogicContext();
+        mockAai.populateGroupNotation(ctx, prefix);
+        grpNotation = mockAai.getGroupNotation("relative-value", "same", "currentVnfcName", "ibcxvm0003", prefix, ctx,
+                "ssc", null, 0);
+        assertEquals(grpNotation, "grpNot2");
 
-               // printContext(ctx);
-               String grpNotation = mockAai.getGroupNotationForVServer(ctx, prefix, "ibcxvm0002");
-               assertEquals(grpNotation, "grpNot2");
+        ctx = new SvcLogicContext();
+        mockAai.populateGroupNotation(ctx, prefix);
+        grpNotation = mockAai.getGroupNotation("relative-value", "next", "currentVnfcName", "ibcxvm0006", prefix, ctx,
+                "ssc",null,0);
+        assertEquals(grpNotation, "5");
 
-               ctx = new SvcLogicContext(); // no VMS found
-               grpNotation = mockAai.getGroupNotationForVServer(ctx, prefix, "ibcxvm0002");
-               assertEquals(grpNotation, null);
+        ctx = new SvcLogicContext();
+        mockAai.populateGroupNotation(ctx, prefix);
+        grpNotation = mockAai.getGroupNotation("relative-value", "next", "currentVnfcName", "ibcxvm0003", prefix, ctx,
+                "ssc",null,0);
+        assertEquals(grpNotation, null); // Null if grpNotation is not numeric
 
-               ctx = new SvcLogicContext(); // no VMS found with specified name
-               mockAai.populateGroupNotation(ctx, prefix);
-               grpNotation = mockAai.getGroupNotationForVServer(ctx, prefix, "test");
-               assertEquals(grpNotation, null);
+    }
 
-       }
+@Test
+    public void testInsertVnfcs() throws Exception {
 
-       @Test
-       public void testGetGroupNotation() throws Exception {
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        Map<String, String> inParams = new HashMap<String, String>();
 
-               String prefix = "tmp.vnfInfo.";
+        inParams.put("responsePrefix", "tmp.vnfInfo");
 
-               SvcLogicContext ctx = new SvcLogicContext();
+        SvcLogicContext ctx = new SvcLogicContext();
 
-               String grpNotation = mockAai.getGroupNotation("fixed-value", "2", null, null, null, null, null);
-               assertEquals(grpNotation, "2");
+        mockAai.populateVnfcRef(ctx);
 
-               mockAai.populateFirstVnfcData(ctx, prefix); // Existing VNFC Found
-               grpNotation = mockAai.getGroupNotation("first-vnfc-name", "2", "currentVnfcName", "currentVServerName", prefix,
-                               ctx, "ssc");
-               assertEquals(grpNotation, "vnfcname32");
+        mockAai.populateAllVnfInfo(ctx, "tmp.vnfInfo");
 
-               ctx = new SvcLogicContext(); // no vnfcs exist in A&AI- Use current
-                                                                               // vnfcName
-               grpNotation = mockAai.getGroupNotation("first-vnfc-name", "2", "currentVnfcName", "currentVServerName", prefix,
-                               ctx, "ssc");
-               assertEquals(grpNotation, "currentVnfcName2");
+        // mockAai.insertVnfcs(inParams,ctx,2, 2) ;
+    }
 
-               ctx = new SvcLogicContext();
-               mockAai.populateGroupNotation(ctx, prefix);
-               grpNotation = mockAai.getGroupNotation("relative-value", "same", "currentVnfcName", "ibcxvm0003", prefix, ctx,
-                               "ssc");
-               assertEquals(grpNotation, "grpNot2");
+    @Test
+    public void testUpdateVServerStatus() throws Exception {
 
-               ctx = new SvcLogicContext();
-               mockAai.populateGroupNotation(ctx, prefix);
-               grpNotation = mockAai.getGroupNotation("relative-value", "next", "currentVnfcName", "ibcxvm0006", prefix, ctx,
-                               "ssc");
-               assertEquals(grpNotation, "5");
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-               ctx = new SvcLogicContext();
-               mockAai.populateGroupNotation(ctx, prefix);
-               grpNotation = mockAai.getGroupNotation("relative-value", "next", "currentVnfcName", "ibcxvm0003", prefix, ctx,
-                               "ssc");
-               assertEquals(grpNotation, null); // Null if grpNotation is not numeric
+        Map<String, String> inParams = new HashMap<String, String>();
 
-       }
+        inParams.put("responsePrefix", "tmp.vnfInfo");
 
-       @Test
-       public void testInsertVnfcs() throws Exception {
+        SvcLogicContext ctx = new SvcLogicContext();
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        mockAai.populateAllVnfInfo(ctx, "tmp.vnfInfo");
 
-               Map<String, String> inParams = new HashMap<String, String>();
+        mockAai.updateVServerStatus(inParams, ctx, 2);
+    }
 
-               inParams.put("responsePrefix", "tmp.vnfInfo");
+    @Test
+    public void testInsertVnfcsForFirstVnfc() throws Exception {
 
-               SvcLogicContext ctx = new SvcLogicContext();
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-               mockAai.populateVnfcRef(ctx);
+        Map<String, String> inParams = new HashMap<String, String>();
 
-               mockAai.populateAllVnfInfo(ctx, "tmp.vnfInfo");
+        inParams.put("responsePrefix", "tmp.vnfInfo");
 
-               // mockAai.insertVnfcs(inParams,ctx,2, 2) ;
-       }
+        SvcLogicContext ctx = new SvcLogicContext();
 
-       @Test
-       public void testUpdateVServerStatus() throws Exception {
+        mockAai.populateVnfcRefFirstVnfcName(ctx);
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        mockAai.populateAllVnfInfo1(ctx, "tmp.vnfInfo");
 
-               Map<String, String> inParams = new HashMap<String, String>();
+        mockAai.insertVnfcs(inParams, ctx, 2,"vfModuleId1");
 
-               inParams.put("responsePrefix", "tmp.vnfInfo");
 
-               SvcLogicContext ctx = new SvcLogicContext();
+    }
 
-               mockAai.populateAllVnfInfo(ctx, "tmp.vnfInfo");
+    @Test
+    public void testInsertVnfcsForRelativeValueSame() throws Exception {
 
-               mockAai.updateVServerStatus(inParams, ctx, 2);
-       }
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-       @Test
-       public void testInsertVnfcsForFirstVnfc() throws Exception {
+        Map<String, String> inParams = new HashMap<String, String>();
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        inParams.put("responsePrefix", "tmp.vnfInfo");
 
-               Map<String, String> inParams = new HashMap<String, String>();
+        SvcLogicContext ctx = new SvcLogicContext();
 
-               inParams.put("responsePrefix", "tmp.vnfInfo");
+        mockAai.populateVnfcRefRelValueSame(ctx);
 
-               SvcLogicContext ctx = new SvcLogicContext();
+        mockAai.populateAllVnfInfo1(ctx, "tmp.vnfInfo");
 
-               mockAai.populateVnfcRefFirstVnfcName(ctx);
+        mockAai.insertVnfcs(inParams, ctx, 2, null);
 
-               mockAai.populateAllVnfInfo1(ctx, "tmp.vnfInfo");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-name"), "dbjx0001vm001dbj001");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-function-code"), "dbj");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-type"), "v-I? - DBJX");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].group-notation"), "1");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-name"), "dbjx0001vm002dbj001");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-function-code"), "dbj");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-type"), "v-I? - DBJX");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].group-notation"), "1");
+    }
 
-               mockAai.insertVnfcs(inParams, ctx, 2, 2);
+    @Test
+    public void testInsertVnfcsForRelativeValueNext() throws Exception {
 
-               
-       }
-       @Test
-       public void testInsertVnfcsForRelativeValueSame() throws Exception {
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        Map<String, String> inParams = new HashMap<String, String>();
 
-               Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("responsePrefix", "tmp.vnfInfo");
 
-               inParams.put("responsePrefix", "tmp.vnfInfo");
+        SvcLogicContext ctx = new SvcLogicContext();
 
-               SvcLogicContext ctx = new SvcLogicContext();
+        mockAai.populateVnfcRefRelValueNext(ctx);
 
-               mockAai.populateVnfcRefRelValueSame(ctx);
+        mockAai.populateAllVnfInfo1(ctx, "tmp.vnfInfo");
 
-               mockAai.populateAllVnfInfo1(ctx, "tmp.vnfInfo");
+        mockAai.insertVnfcs(inParams, ctx, 2,null);
 
-               mockAai.insertVnfcs(inParams, ctx, 2, 2);
 
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-name"), "dbjx0001vm001dbj001");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-function-code"), "dbj");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-type"), "v-I? - DBJX");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].group-notation"), "1");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-name"), "dbjx0001vm002dbj001");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-function-code"), "dbj");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-type"), "v-I? - DBJX");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].group-notation"), "1");
-       }
 
-       @Test
-       public void testInsertVnfcsForRelativeValueNext() throws Exception {
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-name"), "dbjx0001vm001dbj001");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-function-code"), "dbj");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-type"), "v-I? - DBJX");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].group-notation"), "1");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-name"), "dbjx0001vm002dbj001");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-function-code"), "dbj");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-type"), "v-I? - DBJX");
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].group-notation"), "2");
+    }
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+    @Test
+    public void testUpdateVnfStatus() throws Exception {
 
-               Map<String, String> inParams = new HashMap<String, String>();
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-               inParams.put("responsePrefix", "tmp.vnfInfo");
+        Map<String, String> inParams = new HashMap<String, String>();
 
-               SvcLogicContext ctx = new SvcLogicContext();
+        inParams.put("responsePrefix", "tmp.vnfInfo");
 
-               mockAai.populateVnfcRefRelValueNext(ctx);
+        SvcLogicContext ctx = new SvcLogicContext();
 
-               mockAai.populateAllVnfInfo1(ctx, "tmp.vnfInfo");
+        mockAai.populateAllVnfInfo(ctx, "tmp.vnfInfo");
 
-               mockAai.insertVnfcs(inParams, ctx, 2, 2);
+        mockAai.updateVnfStatus(inParams, ctx);
+    }
 
-       
-       
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-name"), "dbjx0001vm001dbj001");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-function-code"), "dbj");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].vnfc-type"), "v-I? - DBJX");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[0].group-notation"), "1");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-name"), "dbjx0001vm002dbj001");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-function-code"), "dbj");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].vnfc-type"), "v-I? - DBJX");
-               assertEquals(ctx.getAttribute("tmp.vnfInfo.vm[1].group-notation"), "2");
-       }
+    private void printContext(SvcLogicContext ctx) throws Exception {
+        for (String key : ctx.getAttributeKeySet()) {
+            log.info(" KEY " + key);
+            log.info(" VALUE " + ctx.getAttribute(key));
+        }
+    }
 
-       @Test
-       public void testUpdateVnfStatus() throws Exception {
+    @Test
+    public void testGetGroupNotationForExistingValue() throws Exception {
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("req-vf-module-id",  "vfmodule01");
+        ctx.setAttribute("tmp.vnfInfo.vm[0].vf-module-id", "vfmodule01");
+        ctx.setAttribute("tmp.vnfInfo.vm[0].vnfc-function-code", "fc1");
+        ctx.setAttribute("tmp.vnfInfo.vm[0].group-notation", "gn1");
+        ctx.setAttribute("tmp.vnfInfo.vm[1].vf-module-id", "vfmodule01");
+        ctx.setAttribute("tmp.vnfInfo.vm[1].vnfc-function-code", "fc1");
+        ctx.setAttribute("tmp.vnfInfo.vm[0].vnfc-function-code", "fc1");
+        ctx.setAttribute("tmp.vnfInfo.vm[0].group-notation", "gn2");
+        MockAaiService aai=new MockAaiService(aaiClient);
+        String groupNotationValue1 = aai.getGroupNotationForExistigValue(ctx, "fc1", 2);
+        assertEquals (groupNotationValue1,null);
 
-               Map<String, String> inParams = new HashMap<String, String>();
+        ctx.setAttribute("tmp.vnfInfo.vm[0].group-notation", "gn1");
+        ctx.setAttribute("tmp.vnfInfo.vm[1].group-notation", "gn1");
+        String groupNotationValue2 = aai.getGroupNotationForExistigValue(ctx, "fc1", 2);
+        assertEquals (groupNotationValue2,"gn1");
 
-               inParams.put("responsePrefix", "tmp.vnfInfo");
+        ctx.setAttribute("tmp.vnfInfo.vm[2].vf-module-id", "vfmodule01");
+        ctx.setAttribute("tmp.vnfInfo.vm[2].vnfc-function-code", "fc1");
+        ctx.setAttribute("tmp.vnfInfo.vm[2].group-notation", "gn2");
+        String groupNotationValue3 = aai.getGroupNotationForExistigValue(ctx, "fc1", 3);
+        assertEquals (groupNotationValue3,null);
 
-               SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("tmp.vnfInfo.vm[2].group-notation", "gn1");
+        String groupNotationValue4 = aai.getGroupNotationForExistigValue(ctx, "fc1", 3);
+        assertEquals (groupNotationValue4,"gn1");
 
-               mockAai.populateAllVnfInfo(ctx, "tmp.vnfInfo");
+    }
 
-               mockAai.updateVnfStatus(inParams, ctx);
-       }
+    @Test
+    public void testgetIdentityUrl() throws Exception {
 
-       @Test
-       public void testReadResource() throws Exception {
+        MockAaiService mockAai = new MockAaiService(aaiClient);
 
-               MockAaiService mockAai = new MockAaiService(aaiClient);
-               // AaiService mockAai = new AaiService(new AAIClientMock());
+        Map<String, String> inParams = new HashMap<String, String>();
+        inParams.put("responsePrefix", "tmp.vnfInfo");
+        inParams.put("cloudOwner", "testCloudOwner");
+        inParams.put("cloudRegionId", "testCloudRegionId");
 
-               String vnfId = "ibcx0001v";
-               String resourceKey = "generic-vnf.vnf-id = '" + vnfId + "'";
-               String resourceType = "generic-vnf";
-               String queryPrefix = "vnfInfo";
-               SvcLogicContext ctx = mockAai.readResource(resourceKey, queryPrefix, resourceType);
+        SvcLogicContext ctx = new SvcLogicContext();
+        mockAai.getIdentityUrl(inParams, ctx);
+        assertEquals(ctx.getAttribute("tmp.vnfInfo.cloud-region.identity-url"), "TestUrl");
 
-               // System.out.println("VNF TYPE " + queryPrefix + ".vnf.vnf-type");
+    } 
 
-               assertEquals(ctx.getAttribute("vnfInfo.vnf-type"), "vUSP-Metaswitch");
+    @Test
+    public void testAddvnfc()
+    {
+        MockAaiService mockAai = new MockAaiService(aaiClient);
+        Map<String, String> params=mockAai.getExpectedParams();
+        mockAai.addVnfc("ibcxvm0002func0001",params , "");        
+    }
 
-       }
-       private void printContext(SvcLogicContext ctx) throws Exception {
-               for (String key : ctx.getAttributeKeySet()) {
-                       log.info(" KEY " + key);
-                       log.info(" VALUE " + ctx.getAttribute(key));
-               }
-       }
 }