X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=nokia%2Fvnfmdriver%2Fvfcadaptorservice%2Fvfcadaptor%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm%2Fadaptor%2FVnfmDriverMgmrImplTest.java;h=d783446576d5ee78612df27ec9c1395355df2335;hb=refs%2Fchanges%2F73%2F20773%2F1;hp=aa24bf3c93db01e6aa8c422d6f20a84c89e18e11;hpb=c0134003468a9331c1efb70872d0324bbe89ee88;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java
index aa24bf3c..d7834465 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java
@@ -105,14 +105,21 @@ public class VnfmDriverMgmrImplTest {
 		cbamHttpHead = protocol + "://" + ip + ":" + port;
 		
 		EsrSystemInfo esrSystemInfo = new EsrSystemInfo();
-		esrSystemInfo.setProtocal(protocol);
-		esrSystemInfo.setIp(ip);
-		esrSystemInfo.setPort(port);
+		esrSystemInfo.setEsrSystemId("esrSystemId");
+		esrSystemInfo.setPassword("password");
+		esrSystemInfo.setServiceUrl(cbamHttpHead);
+		esrSystemInfo.setType("type");
+		esrSystemInfo.setUserName("userName");
+		esrSystemInfo.setVendor("vendor");
+		esrSystemInfo.setVersion("version");
 		
 		List<EsrSystemInfo> esrSystemInfoList = new ArrayList<EsrSystemInfo>();
 		esrSystemInfoList.add(esrSystemInfo);
 		AaiVnfmInfo mockVnfmInfo = new AaiVnfmInfo();
 		mockVnfmInfo.setVnfmId(vnfmId);
+		mockVnfmInfo.setVimId("vimId");
+		mockVnfmInfo.setResourceVersion("resourceVersion");
+		mockVnfmInfo.setCertificateUrl("certificateUrl");
 		mockVnfmInfo.setEsrSystemInfoList(esrSystemInfoList);
 		
 		Driver2CbamRequestConverter reqConverter = new Driver2CbamRequestConverter();
@@ -180,11 +187,10 @@ public class VnfmDriverMgmrImplTest {
 	public void testQueryVnf() throws ClientProtocolException, IOException {
 		CBAMQueryVnfResponse mockCbamResponse = new CBAMQueryVnfResponse();
 		mockCbamResponse.setId("executionId_001");
-		
+		mockCbamResponse.setVnfdId(vnfInstanceId);
 		when(cbamMgmr.queryVnf(Mockito.anyString())).thenReturn(mockCbamResponse);
-		ScaleVnfRequest request = new ScaleVnfRequest();
-		request.setType(CommonEnum.ScaleType.SCALE_IN);
 		QueryVnfResponse response = vnfmDriverMgmr.queryVnf(vnfmId, vnfInstanceId);
+		Assert.assertEquals(vnfInstanceId, response.getVnfdId());
 	}
 	
 	@Test
@@ -201,8 +207,9 @@ public class VnfmDriverMgmrImplTest {
 		cbamResponse.setGrantId("001002001");
 		
 		when(cbamMgmr.queryOperExecution(Mockito.anyString())).thenReturn(cbamResponse);
-		ScaleVnfRequest request = new ScaleVnfRequest();
 		OperStatusVnfResponse response = vnfmDriverMgmr.getOperStatus(vnfmId, "1");
+		
+		Assert.assertEquals("executionId_001", response.getJobId());
 	}
 
 }