Add modify vnf feature on driver

[vfc/nfvo/driver/vnfm/svnfm.git] / nokia / vnfmdriver / vfcadaptorservice / vfcadaptor / src / test / java / org / onap / vfc / nfvo / driver / vnfm / svnfm / nslcm / impl / NslcmMgmrImplTest.java

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nslcm/impl/NslcmMgmrImplTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nslcm/impl/NslcmMgmrImplTest.java
index ddff4ca..1e98670 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nslcm/impl/NslcmMgmrImplTest.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nslcm/impl/NslcmMgmrImplTest.java
@@ -40,12 +40,19 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.NslcmGrantVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.NslcmGrantVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.NslcmNotifyLCMEventsRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.AccessInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.AddResource;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.AdditionalParam;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.AffectedVirtualStorage;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.AffectedVnfc;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.InterfaceInfo;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.ResourceDefinition;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.ResourceTemplate;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VimAssets;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VimInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VirtualComputeDescriptor;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VirtualCpu;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VirtualMemory;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VirtualStorageDescriptor;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.NslcmVimInfo;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.google.gson.Gson;
@@ -58,6 +65,7 @@ public class NslcmMgmrImplTest {
        private HttpClientProcessorInf httpClientProcessor;
        
        private String vnfInstanceId = "vnfInstanceId_001";
+       private String vnfmId = "vnfmId_001";
        
        private Gson gson = new Gson();
        
@@ -73,8 +81,35 @@ public class NslcmMgmrImplTest {
        public void testGrantVnf() throws ClientProtocolException, IOException
        {
                ResourceDefinition resource = new ResourceDefinition();
-               resource.setResourceDefinitionId("resourceDefinitionId");
-               resource.setVdu("vdu");
+               resource.setVimId("vimId");
+               resource.setVnfInstanceId("vnfInstanceId");
+               
+               List<AddResource> addresources=new ArrayList<AddResource>();
+               AddResource addresource=new AddResource();
+               addresource.setResourceDefinitionId(1);
+               addresource.setType("type");
+               addresource.setVdu("vdu");
+               ResourceTemplate temp=new ResourceTemplate();
+               VirtualComputeDescriptor compute=new VirtualComputeDescriptor();
+               VirtualCpu cpu=new VirtualCpu();
+           cpu.setNumVirtualCpu(1);
+           VirtualMemory memory=new VirtualMemory();
+               compute.setVirtualCpu(cpu);
+               compute.setVirtualMemory(memory);
+               VirtualStorageDescriptor storage=new VirtualStorageDescriptor();
+               storage.setSizeOfStorage(1);
+               storage.setSwImageDescriptor("swImageDescriptor");
+               storage.setSizeOfStorage(1);
+               temp.setVirtualComputeDescriptor(compute);
+               temp.setVirtualStorageDescriptor(storage);
+               addresources.add(addresource);
+               AdditionalParam param=new AdditionalParam();
+               param.setTenant("tenant");
+               param.setVimid("vimid");
+               param.setVnfmid("vnfmid");
+               
+               resource.setAdditionalParam(param);
+               resource.setAddResource(addresources);
                
                NslcmGrantVnfResponse gresponse = new NslcmGrantVnfResponse();
                List<KeyValuePair> additionalParam1 = new ArrayList<KeyValuePair>();
@@ -87,18 +122,21 @@ public class NslcmMgmrImplTest {
                additionalParam2.add(resource);
                gresponse.setAdditionalParam(additionalParam2);
                
-               VimInfo vim = new VimInfo();
-               vim.setInterfaceEndpoint("interfaceEndpoint");
-               vim.setVimId("vimId");
-               AccessInfo accessInfo = null;
-               vim.setAccessInfo(accessInfo );
-               InterfaceInfo interfaceInfo = null;
-               vim.setInterfaceInfo(interfaceInfo);
+               List<NslcmVimInfo> vim = new ArrayList<NslcmVimInfo>();
+               NslcmVimInfo vims=new NslcmVimInfo();
+               
+               vims.setInterfaceEndpoint("interfaceEndpoint");
+               vims.setVimId("vimId");
+               List<AccessInfo> accessInfo = null;
+               vims.setAccessInfo(accessInfo);
+               List<InterfaceInfo> interfaceInfo = null;
+               vims.setInterfaceInfo(interfaceInfo);
                
+               vim.add(vims);
                VimAssets vimAssets = null;
                gresponse.setVimAssets(vimAssets);
                
-               gresponse.setVim(vim );
+               gresponse.setVim(vim);
                String json = gson.toJson(gresponse);
                HttpResult httpResult = new HttpResult();
                httpResult.setContent(json);
@@ -139,10 +177,10 @@ public class NslcmMgmrImplTest {
                cbamRequest.setJobId("jobId");
                cbamRequest.setOperation("operation");
                cbamRequest.setVnfInstanceId(vnfInstanceId);
-               AffectedVirtualStorage affectedVirtualStorage = new AffectedVirtualStorage();
+               List<AffectedVirtualStorage> affectedVirtualStorage = new ArrayList<AffectedVirtualStorage>();
                cbamRequest.setAffectedVirtualStorage(affectedVirtualStorage );
-               AffectedVnfc affectedVnfc = new AffectedVnfc();
+               List<AffectedVnfc> affectedVnfc = new ArrayList<AffectedVnfc>();
                cbamRequest.setAffectedVnfc(affectedVnfc );
-               nslcmMgmr.notifyVnf(cbamRequest, vnfInstanceId);
+               nslcmMgmr.notifyVnf(cbamRequest, vnfmId, vnfInstanceId);
        }
 }