*/
package org.onap.vfc.nfvo.driver.vnfm.svnfm.adaptor;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateSubscriptionResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMHealVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMQueryVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.ScaleType;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean.VnfmJobExecutionInfo;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.mapper.VnfmJobExecutionMapper;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.OperStatusVnfResponse;
if (OperationType.INSTANTIATE == oper.getOperationType()) {
double instantiateProgress = (nowTime - jobInfo.getOperateStartTime())
- / (double)(adaptorEnv.getInstantiateTimeInterval());
+ / adaptorEnv.getInstantiateTimeInterval();
initialProgress = (int) (instantiateProgress + initialProgress);
} else if (OperationType.TERMINATE == oper.getOperationType()) {
double terminateProgress = (nowTime - jobInfo.getOperateStartTime())
- / (double)(adaptorEnv.getTerminateTimeInterval());
+ / adaptorEnv.getTerminateTimeInterval();
initialProgress = (int) (terminateProgress + initialProgress);
} else {
initialProgress = 0;
this.adaptorEnv = adaptorEnv;
}
+ public CreateSubscriptionResponse queryRspConvert(CBAMCreateSubscriptionResponse cbamResponse) {
+ CreateSubscriptionResponse response = new CreateSubscriptionResponse();
+
+ response.set_links(cbamResponse.get_links());
+ response.setId(cbamResponse.getId());
+ response.setCallbackUri(cbamResponse.getCallbackUrl());
+ response.setCallbackUrl(cbamResponse.getCallbackUrl());
+ response.setFilter(cbamResponse.getFilter());
+
+ return response;
+ }
+
}
}
public CBAMInstantiateVnfRequest instantiateRequestConvert(InstantiateVnfRequest driverRequest,
- NslcmGrantVnfResponse nslc, GrantInfo grant, VimComputeResourceFlavour vimco) throws IOException{
- Gson gson = new Gson();
+ NslcmGrantVnfResponse nslc, GrantInfo grant, VimComputeResourceFlavour vimco) throws Exception {
+ Gson gson = new Gson();
String inputJson = readcbamInputInfoFromJsonFile();
CBAMInstantiateVnfRequest request = gson.fromJson(inputJson, CBAMInstantiateVnfRequest.class);
-
+
return request;
}
request.setAdditionalParams(driverRequest.getAdditionalParam());
return request;
}
-
+
+// public static void main(String[] argv) throws IOException {
+// Gson gson = new Gson();
+// String filePath = "D:\\cbam_input.json";
+// String inputJson = readcbamInputInfo(filePath);
+// CBAMInstantiateVnfRequest request = gson.fromJson(inputJson, CBAMInstantiateVnfRequest.class);
+// System.out.println(gson.toJson(request));
+// }
+//
+// public static String readcbamInputInfo(String filePath) throws IOException {
+// InputStream ins = null;
+// BufferedInputStream bins = null;
+// String fileContent = "";
+// String fileName = filePath;
+//
+// try {
+// ins = new FileInputStream(fileName);
+// bins = new BufferedInputStream(ins);
+//
+// byte[] contentByte = new byte[ins.available()];
+// int num = bins.read(contentByte);
+//
+// if(num > 0) {
+// fileContent = new String(contentByte);
+// }
+// } catch(FileNotFoundException e) {
+// e.printStackTrace();;
+// } finally {
+// if(ins != null) {
+// ins.close();
+// }
+// if(bins != null) {
+// bins.close();
+// }
+// }
+// return fileContent;
+// }
}
import org.onap.vfc.nfvo.driver.vnfm.svnfm.aai.bo.entity.EsrSystemInfo;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.aai.inf.AaiMgmrInf;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.inf.CatalogMgmrInf;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateSubscriptionResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMQueryVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean.VnfmJobExecutionInfo;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.mapper.VnfcResourceInfoMapper;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.mapper.VnfmJobExecutionMapper;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.mapper.VnfmSubscriptionsMapper;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.exception.VnfmDriverException;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.inf.NslcmMgmrInf;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
@Autowired
private VnfcResourceInfoMapper vnfcDbMgmr;
+
+ @Autowired
+ private VnfmSubscriptionsMapper subscriptionsMapper;
@Autowired
AdaptorEnv adaptorEnv;
this.responseConverter = responseConverter;
}
+ @Override
+ public CreateSubscriptionResponse createSubscription(CreateSubscriptionRequest request) throws VnfmDriverException {
+ CreateSubscriptionResponse driverResponse;
+ try {
+ CBAMCreateSubscriptionResponse cbamResponse = cbamMgmr.createSubscription(request);
+ driverResponse = responseConverter.queryRspConvert(cbamResponse);
+ subscriptionsMapper.insert(cbamResponse.getId());
+ } catch (Exception e) {
+ logger.error("error VnfmDriverMgmrImpl --> createSubscripiton. ", e);
+ throw new VnfmDriverException(HttpStatus.SC_INTERNAL_SERVER_ERROR, CommonConstants.HTTP_ERROR_DESC_500);
+ }
+
+ return driverResponse;
+ }
+
}
@JsonProperty("callbackUrl")
private String callbackUrl;
- @JsonProperty("description")
+ @JsonProperty("authentication")
private SubscriptionAuthentication authentication;
public SubscriptionFilter getFilter() {
logger.info("CbamMgmrImpl -> createSubscription, requestStr is " + gson.toJson(subscriptionRequest));
HttpResult httpResult = operateCbamHttpTask(subscriptionRequest, httpPath, method);
String responseStr = httpResult.getContent();
+
+ CBAMCreateSubscriptionResponse response = null;
logger.info("CbamMgmrImpl -> createSubscription, responseStr is " + responseStr);
int code = httpResult.getStatusCode();
if (code == 201) {
logger.info("CbamMgmrImpl -> createSubscription success ");
+ response = gson.fromJson(responseStr, CBAMCreateSubscriptionResponse.class);
} else {
logger.error("CbamMgmrImpl -> createSubscription error , statusCode = " + code);
}
- CBAMCreateSubscriptionResponse response = gson.fromJson(responseStr, CBAMCreateSubscriptionResponse.class);
return response;
}
return response;
}
-
-
-
}
+++ /dev/null
-/*
- * Copyright 2016-2017, Nokia Corporation
- *
- * 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 org.onap.vfc.nfvo.driver.vnfm.svnfm.init;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.http.client.ClientProtocolException;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateSubscriptionRequest;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateSubscriptionResponse;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.Subscription;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.inf.CbamMgmrInf;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean.VnfmSubscriptionInfo;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.mapper.VnfmSubscriptionsMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-//@Order(3)
-//@Component
-public class CbamNofiticationSubscription implements ApplicationRunner {
- private static final Logger logger = LoggerFactory.getLogger(CbamNofiticationSubscription.class);
-
- @Autowired
- AdaptorEnv adaptorEnv;
-
- @Autowired
- private CbamMgmrInf cbamMgmr;
-
- @Autowired
- private VnfmSubscriptionsMapper subscriptionsMapper;
-
- @Override
- public void run(ApplicationArguments args){
- boolean subscribed = false;
- List<VnfmSubscriptionInfo> allSubscripions = subscriptionsMapper.getAll();
- if(allSubscripions != null && !allSubscripions.isEmpty())
- {
- for(VnfmSubscriptionInfo subscriptionInfo : allSubscripions)
- {
- try {
- Subscription subscription = cbamMgmr.getSubscription(subscriptionInfo.getId());
- if(subscription != null)
- {
- subscribed = true;
- logger.info("CBAM Notification has already been subscribed with id = " + subscriptionInfo.getId());
- }
- else
- {
- subscriptionsMapper.delete(subscriptionInfo.getId());
- }
- } catch (Exception e) {
- logger.error("Query or delete subscription error.", e);
- }
- }
- }
-
- if(!subscribed)
- {
- CBAMCreateSubscriptionRequest subscriptionRequest = new CBAMCreateSubscriptionRequest();
- subscriptionRequest.setCallbackUrl(adaptorEnv.getDriverApiUriFront() + "/api/nokiavnfmdriver/v1/notifications");
- try {
- CBAMCreateSubscriptionResponse createSubscription = cbamMgmr.createSubscription(subscriptionRequest);
- if(createSubscription != null)
- {
- subscriptionsMapper.insert(createSubscription.getId());
- logger.info("CBAM Notification is successfully subscribed with id = " + createSubscription.getId());
- }
- } catch (Exception e) {
- logger.error("Subscribe notification error.", e);
- }
- }
- }
-}
--- /dev/null
+/*
+ * Copyright 2016-2017, Nokia Corporation
+ *
+ * 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 org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo;
+
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateSubscriptionRequest;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class CreateSubscriptionRequest extends CBAMCreateSubscriptionRequest{
+
+
+ //the attribute callbackUri is for SOL003 driver, while callbackUrl is for CBAM
+ @JsonProperty("callbackUri")
+ private String callbackUri;
+
+ public String getCallbackUri() {
+ return callbackUri;
+ }
+
+ public void setCallbackUri(String callbackUri) {
+ this.callbackUri = callbackUri;
+ }
+}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo;
+package org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo;
-public class CBAMOperExecutVnfRequest {
-
-
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.Subscription;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class CreateSubscriptionResponse extends Subscription{
+ //the attribute callbackUri is for SOL003 driver, while callbackUrl is for CBAM
+ @JsonProperty("callbackUri")
+ private String callbackUri;
+
+ public String getCallbackUri() {
+ return callbackUri;
+ }
+
+ public void setCallbackUri(String callbackUri) {
+ this.callbackUri = callbackUri;
+ }
}
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpStatus;
-import org.apache.http.client.ClientProtocolException;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.inf.CbamMgmrInf;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.exception.VnfmDriverException;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
return null;
}
-// @RequestMapping(value = "/notifications", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-// public CBAMVnfNotificationResponse notificationVnf(@RequestBody CBAMVnfNotificationRequest request, HttpServletResponse httpResponse) throws ClientProtocolException, Exception
- @RequestMapping(value = "/notifications")
-// @ResponseBody
- public void notificationVnf(HttpServletRequest request, HttpServletResponse httpResponse) throws ClientProtocolException, Exception
- {
-
-// String jsonString = gson.toJson(request);
-// logger.info("notificationVnf request: bodyMessage is " + jsonString);
- logger.info("notificationVnf request: bodyMessage is " + request.getMethod() + ",");
-
- try {
-// CBAMVnfNotificationResponse response = cbamMgmr.getNotification(request);
- httpResponse.setStatus(204);
-// logger.info("cbamController --> notificationVnf response is " + gson.toJson(response));
-// return response;
- }
- catch(VnfmDriverException e)
- {
- processControllerException(httpResponse, e);
- }
-
-// return null;
- }
+//// @RequestMapping(value = "/notifications", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+//// public CBAMVnfNotificationResponse notificationVnf(@RequestBody CBAMVnfNotificationRequest request, HttpServletResponse httpResponse) throws ClientProtocolException, Exception
+// @RequestMapping(value = "/notifications")
+//// @ResponseBody
+// public void notificationVnf(HttpServletRequest request, HttpServletResponse httpResponse) throws ClientProtocolException, Exception
+// {
+//
+//// String jsonString = gson.toJson(request);
+//// logger.info("notificationVnf request: bodyMessage is " + jsonString);
+// logger.info("notificationVnf request: bodyMessage is " + request.getMethod() + ",");
+//
+// try {
+//// CBAMVnfNotificationResponse response = cbamMgmr.getNotification(request);
+// httpResponse.setStatus(204);
+//// logger.info("cbamController --> notificationVnf response is " + gson.toJson(response));
+//// return response;
+// }
+// catch(VnfmDriverException e)
+// {
+// processControllerException(httpResponse, e);
+// }
+//
+//// return null;
+// }
private void processControllerException(HttpServletResponse httpResponse, VnfmDriverException e) {
try {
logger.error("VnfmDriverController --> processControllerException error to sendError ", e1);
}
}
+
+// -- The following VNFM Driver APIs are compliant to ETSI SOL003 -- Begin
+
+ @RequestMapping(value = "/createSubscripiton", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+ @ResponseBody
+ public CreateSubscriptionResponse createSubscripiton(@RequestBody CreateSubscriptionRequest request, HttpServletResponse httpResponse)
+ {
+ String jsonString = gson.toJson(request);
+ logger.info("VnfmDriverController --> createSubscripiton, bodyMessage is " + jsonString);
+
+ try {
+ request.setCallbackUrl(request.getCallbackUri());
+ CreateSubscriptionResponse response = vnfmDriverMgmr.createSubscription(request);
+ httpResponse.setStatus(HttpStatus.SC_CREATED);
+ logger.info("VnfmDriverController --> createSubscripiton end ");
+ return response;
+ }
+ catch(VnfmDriverException e)
+ {
+ processControllerException(httpResponse, e);
+ }
+
+ return null;
+ }
+
+// -- The following VNFM Driver APIs are compliant to ETSI SOL003 -- End
}
+
package org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.inf;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.exception.VnfmDriverException;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
public ScaleVnfResponse scaleVnf(ScaleVnfRequest request, String vnfmId, String vnfInstanceId) throws VnfmDriverException;
public HealVnfResponse healVnf(HealVnfRequest request, String vnfmId, String vnfInstanceId) throws VnfmDriverException;
+
+ public CreateSubscriptionResponse createSubscription(CreateSubscriptionRequest request) throws VnfmDriverException;
}
## for logging begin ##
com.fasterxml.jackson.core=jackson-databind
-logging.file=${catalina.base}/logs/vfcadaptor.log
+logging.file=/var/log/onap/vfc/svnfm/nokiavnfmdriver.log
logging.level.org.springframework.web=DEBUG
logging.level.org.hibernate=DEBUG
## for logging end ##
<charset>UTF-8</charset>
</encoder>
</appender>
- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${catalina.base}/logs/vfcadaptor.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${catalina.base}/logs/vfcadaptor.%i.log.zip
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>/var/log/onap/vfc/svnfm/nokiavnfmdriver.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <fileNamePattern>/var/log/onap/vfc/svnfm/nokiavnfmdriver.%i.log.zip
</fileNamePattern>
<minIndex>1</minIndex>
<maxIndex>9</maxIndex>
String json = "{"
+ "\"vnfm-id\":\"vnfm-id_001\","
+ + "\"resource-version\" : \"resource-version\","
+ "\"vim-id\":\"vim-id_001\","
+ "\"certificate-url\":\"certificate-url_001\","
- + "\"resource-version\":\"resource-version_001\","
- + "\"esr-system-info\":[{\"type\" : \"vnfm\"}]"
+ + "\"esr-system-info\":[{"
+ + "\"type\" : \"vnfm\","
+ + "\"system-name\" : \"system-name\","
+ + "\"vendor\" : \"vendor\","
+ + "\"esr-system-info-id\" : \"esr-system-info-id\","
+ + "\"version\" : \"version\","
+ + "\"service-url\" : \"service-url\","
+ + "\"user-name\" : \"user-name\","
+ + "\"password\" : \"password\","
+ + "\"system-type\" : \"system-type\","
+ + "\"resource-version\" : \"resource-version\""
+ + "}]"
+ "}"
+ "";
HttpResult httpResult = new HttpResult();
public void testQueryVnfPackage() throws ClientProtocolException, IOException
{
AaiVnfmInfo vnfmInfo = aaiMgmr.queryVnfm(vnfmId);
+ vnfmInfo.getEsrSystemInfoList().get(0).setEsrSystemName("system-name");
+ vnfmInfo.getEsrSystemInfoList().get(0).setSystemType("system-type");
+ vnfmInfo.getEsrSystemInfoList().get(0).setResourceVersion("resource-version");
Assert.assertEquals("vnfm", vnfmInfo.getEsrSystemInfoList().get(0).getType());
+ Assert.assertEquals("esr-system-info-id", vnfmInfo.getEsrSystemInfoList().get(0).getEsrSystemId());
+ Assert.assertEquals("system-name", vnfmInfo.getEsrSystemInfoList().get(0).getEsrSystemName());
+ Assert.assertEquals("vendor", vnfmInfo.getEsrSystemInfoList().get(0).getVendor());
+ Assert.assertEquals("version", vnfmInfo.getEsrSystemInfoList().get(0).getVersion());
+ Assert.assertEquals("user-name", vnfmInfo.getEsrSystemInfoList().get(0).getUserName());
+ Assert.assertEquals("password", vnfmInfo.getEsrSystemInfoList().get(0).getPassword());
+ Assert.assertEquals("system-type", vnfmInfo.getEsrSystemInfoList().get(0).getSystemType());
+ Assert.assertEquals("resource-version", vnfmInfo.getEsrSystemInfoList().get(0).getResourceVersion());
+
+ Assert.assertEquals("vnfm-id_001", vnfmInfo.getVnfmId());
+ Assert.assertEquals("vim-id_001", vnfmInfo.getVimId());
+ Assert.assertEquals("certificate-url_001", vnfmInfo.getCertificateUrl());
+ Assert.assertEquals("resource-version", vnfmInfo.getResourceVersion());
}
}
package org.onap.vfc.nfvo.driver.vnfm.svnfm.adaptor;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;
import java.io.IOException;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.aai.bo.entity.EsrSystemInfo;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.aai.inf.AaiMgmrInf;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.inf.CatalogMgmrInf;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateSubscriptionRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateSubscriptionResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMHealVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.ScaleType;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean.VnfmJobExecutionInfo;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.mapper.VnfmJobExecutionMapper;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.mapper.VnfmSubscriptionsMapper;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.exception.VnfmDriverException;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.inf.NslcmMgmrInf;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
@Mock
private VnfmJobExecutionMapper jobDbManager;
+ @Mock
+ private VnfmSubscriptionsMapper subscriptionsMapper;
+
@Mock
private VnfContinueProcessorInf vnfContinueProcessorInf;
//
// Assert.assertEquals("executionId_001", response.getJobId());
}
+
+ @Test
+ public void testCreateSubscription() throws ClientProtocolException, IOException {
+ CBAMCreateSubscriptionResponse mockCbamResponse = new CBAMCreateSubscriptionResponse();
+ mockCbamResponse.setId("subscriptionId_001");
+ mockCbamResponse.setCallbackUrl("callbackUrl");
+ when(cbamMgmr.createSubscription(Mockito.any(CBAMCreateSubscriptionRequest.class))).thenReturn(mockCbamResponse);
+ doNothing().when(subscriptionsMapper).insert(Mockito.anyString());
+ CreateSubscriptionRequest request = new CreateSubscriptionRequest();
+ CreateSubscriptionResponse response = vnfmDriverMgmr.createSubscription(request);
+ Assert.assertEquals("callbackUrl", response.getCallbackUri());
+ }
}
packageInfo.setVnfdProvider("vnfdProvider");
packageInfo.setVnfdVersion("vnfdVersion");
packageInfo.setVnfVersion("vnfVersion");
+ packageInfo.setProvider("provider");
+ packageInfo.setVnfdProvider("vnfdProvider");
+ packageInfo.setVersion("version");
Deletionpending deletionPending = CommonEnum.Deletionpending.fALSE;
packageInfo.setDeletionPending(deletionPending );
when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
VnfPackageInfo packageInfo1 = catalogMgmr.queryVnfPackage(vnfPackageId);
Assert.assertEquals("1.3.5.6", packageInfo.getDownloadUri());
+ Assert.assertEquals("name", packageInfo.getName());
+ Assert.assertEquals("onBoardState", packageInfo.getOnBoardState());
+ Assert.assertEquals("vnfdId", packageInfo.getVnfdId());
+ Assert.assertEquals("provider", packageInfo.getProvider());
+ Assert.assertEquals("vnfdProvider", packageInfo.getVnfdProvider());
+ Assert.assertEquals("vnfdVersion", packageInfo.getVnfdVersion());
+ Assert.assertEquals("vnfVersion", packageInfo.getVnfVersion());
+ Assert.assertEquals("version", packageInfo.getVersion());
+ Assert.assertEquals(CommonEnum.Deletionpending.fALSE, packageInfo.getDeletionPending());
+
+ Assert.assertEquals("csarId", response.getCsarId());
+ Assert.assertEquals("fileName", response.getImageInfo().getFileName());
+ Assert.assertEquals("imageId", response.getImageInfo().getImageId());
+ Assert.assertEquals("index", response.getImageInfo().getIndex());
+ Assert.assertEquals("status", response.getImageInfo().getStatus());
+ Assert.assertEquals("tenant", response.getImageInfo().getTenant());
+ Assert.assertEquals("vimId", response.getImageInfo().getVimId());
+ Assert.assertEquals("vimUser", response.getImageInfo().getVimUser());
+ Assert.assertEquals("vnfInstanceId", response.getVnfInstanceInfo().get(0).getVnfInstanceId());
+ Assert.assertEquals("vnfInstanceName", response.getVnfInstanceInfo().get(0).getVnfInstanceName());
}
}
import static org.mockito.Mockito.when;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import org.apache.http.client.ClientProtocolException;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMTerminateVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMVnfNotificationRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMVnfNotificationResponse;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.ExtManagedVirtualLinkData;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.ExtVirtualLinkData;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.NetworkAddress;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.Subscription;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimComputeResourceFlavour;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimSoftwareImage;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VnfExtCpData;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VnfcResourceInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.ZoneInfo;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpClientProcessorInf;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpResult;
private String vnfInstanceId = "vnfInstanceId_001";
+ private String json = "{"
+ + "'access_token':'1234567',"
+ + "'id':'id',"
+ + "'name':'name',"
+ + "'description':'description',"
+ + "'vnfdId':'vnfdId',"
+ + "'vnfProvider':'vnfProvider',"
+ + "'onboardedVnfPkgInfoId':'onboardedVnfPkgInfoId',"
+ + "'vnfProductName':'vnfProductName'"
+ + "}";
+
+ HttpResult httpResult = new HttpResult();
+ private int statusCode = 200;
+
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
AdaptorEnv env = new AdaptorEnv();
cbamMgmr.setAdaptorEnv(env);
- String json = "{\"access_token\":\"1234567\"}";
- HttpResult httpResult = new HttpResult();
- httpResult.setStatusCode(200);
+ httpResult.setStatusCode(statusCode);
httpResult.setContent(json);
when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
}
@Test
- public void testCreateVnf() throws ClientProtocolException, IOException
+ public void testCreateVnfSuccess() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(201);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
+ CBAMCreateVnfRequest cbamRequest = new CBAMCreateVnfRequest();
+ CBAMCreateVnfResponse response = cbamMgmr.createVnf(cbamRequest);
+ }
+
+ @Test
+ public void testCreateVnfError() throws ClientProtocolException, IOException
{
CBAMCreateVnfRequest cbamRequest = new CBAMCreateVnfRequest();
CBAMCreateVnfResponse response = cbamMgmr.createVnf(cbamRequest);
}
@Test
- public void testInstantiateVnf() throws ClientProtocolException, IOException
+ public void testInstantiateVnfSucess() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(202);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
+ CBAMInstantiateVnfRequest cbamRequest = new CBAMInstantiateVnfRequest();
+ cbamRequest.setFlavourId("flavourId");
+ cbamRequest.setGrantlessMode(false);
+
+ VimInfo vimInfo = new VimInfo();
+ vimInfo.setId("id");
+ vimInfo.setInterfaceEndpoint("interfaceEndpoint");
+
+ List<VimInfo> vims = new ArrayList<>();
+ vims.add(vimInfo);
+ cbamRequest.setVims(vims);
+
+ cbamRequest.setInstantiationLevelId("instantiationLevelId");
+
+ ExtVirtualLinkData linkData = new ExtVirtualLinkData();
+ linkData.setExtVirtualLinkId("extVirtualLinkId");
+ linkData.setResourceId("resourceId");
+ linkData.setVimId("vimId");
+
+ List<VnfExtCpData> extCps = new ArrayList<>();
+ VnfExtCpData vnfExtCpData = new VnfExtCpData();
+ vnfExtCpData.setCpdId("cpdId");
+ vnfExtCpData.setNumDynamicAddresses(10000);
+ List<NetworkAddress> addresses = new ArrayList<>();
+ NetworkAddress address = new NetworkAddress();
+ address.setIp("ip");
+ address.setMac("mac");
+ address.setSubnetId("subnetId");
+ addresses.add(address);
+ vnfExtCpData.setAddresses(addresses );
+
+ extCps.add(vnfExtCpData);
+ linkData.setExtCps(extCps);
+
+ List<ExtVirtualLinkData> extVirtualLinks = new ArrayList<>();
+ extVirtualLinks.add(linkData);
+ cbamRequest.setExtVirtualLinks(extVirtualLinks);
+
+
+ List<ExtManagedVirtualLinkData> managedVirtualLinks = new ArrayList<>();
+ ExtManagedVirtualLinkData managedVirtualLink = new ExtManagedVirtualLinkData();
+ managedVirtualLink.setResourceId("resourceId");
+ managedVirtualLink.setExtManagedVirtualLinkId("extManagedVirtualLinkId");
+ managedVirtualLink.setVimId("vimId");
+ managedVirtualLink.setVirtualLinkDescId("virtualLinkDescId");
+ managedVirtualLinks.add(managedVirtualLink );
+
+ cbamRequest.setExtManagedVirtualLinks(managedVirtualLinks);
+
+
+ List<VimSoftwareImage> softwareImages = new ArrayList<>();
+ VimSoftwareImage vimSoftwareImage = new VimSoftwareImage();
+ vimSoftwareImage.setResourceId("resourceId");
+ vimSoftwareImage.setVimId("vimId");
+ vimSoftwareImage.setVnfdSoftwareImageId("vnfdSoftwareImageId");
+ softwareImages.add(vimSoftwareImage);
+ cbamRequest.setSoftwareImages(softwareImages);
+
+
+ List<VimComputeResourceFlavour> computeResourceFlavours = new ArrayList<>();
+ VimComputeResourceFlavour computeResourceFlavour = new VimComputeResourceFlavour();
+ computeResourceFlavour.setResourceId("resourceId");
+ computeResourceFlavour.setVimId("vimId");
+ computeResourceFlavour.setVnfdVirtualComputeDescId("vnfdVirtualComputeDescId");
+ computeResourceFlavours.add(computeResourceFlavour);
+ cbamRequest.setComputeResourceFlavours(computeResourceFlavours);
+
+ List<ZoneInfo> zoneInfos = new ArrayList<>();
+ ZoneInfo zoneInfo = new ZoneInfo();
+ zoneInfo.setResourceId("resourceId");
+ zoneInfo.setId("id");
+ zoneInfos.add(zoneInfo);
+ cbamRequest.setZones(zoneInfos);
+
+ cbamRequest.setAdditionalParams("additionalParams");
+
+ CBAMInstantiateVnfResponse response = cbamMgmr.instantiateVnf(cbamRequest, vnfInstanceId);
+
+ Assert.assertEquals("result is ", "instantiationLevelId", cbamRequest.getInstantiationLevelId());
+ Assert.assertEquals("result is ", "flavourId", cbamRequest.getFlavourId());
+ Assert.assertEquals("result is ", false, cbamRequest.isGrantlessMode());
+ Assert.assertEquals("result is ", "id", cbamRequest.getVims().get(0).getId());
+ Assert.assertEquals("result is ", "interfaceEndpoint", cbamRequest.getVims().get(0).getInterfaceEndpoint());
+
+ Assert.assertEquals("result is ", "extVirtualLinkId", cbamRequest.getExtVirtualLinks().get(0).getExtVirtualLinkId());
+ Assert.assertEquals("result is ", "resourceId", cbamRequest.getExtVirtualLinks().get(0).getResourceId());
+ Assert.assertEquals("result is ", "vimId", cbamRequest.getExtVirtualLinks().get(0).getVimId());
+
+ Assert.assertEquals("result is ", "cpdId", cbamRequest.getExtVirtualLinks().get(0).getExtCps().get(0).getCpdId());
+ Assert.assertEquals("result is ", "ip", cbamRequest.getExtVirtualLinks().get(0).getExtCps().get(0).getAddresses().get(0).getIp());
+ Assert.assertEquals("result is ", "mac", cbamRequest.getExtVirtualLinks().get(0).getExtCps().get(0).getAddresses().get(0).getMac());
+ Assert.assertEquals("result is ", "subnetId", cbamRequest.getExtVirtualLinks().get(0).getExtCps().get(0).getAddresses().get(0).getSubnetId());
+
+ Assert.assertEquals("result is ", "extManagedVirtualLinkId", cbamRequest.getExtManagedVirtualLinks().get(0).getExtManagedVirtualLinkId());
+ Assert.assertEquals("result is ", "resourceId", cbamRequest.getExtManagedVirtualLinks().get(0).getResourceId());
+ Assert.assertEquals("result is ", "vimId", cbamRequest.getExtManagedVirtualLinks().get(0).getVimId());
+ Assert.assertEquals("result is ", "virtualLinkDescId", cbamRequest.getExtManagedVirtualLinks().get(0).getVirtualLinkDescId());
+
+ Assert.assertEquals("result is ", "resourceId", cbamRequest.getSoftwareImages().get(0).getResourceId());
+ Assert.assertEquals("result is ", "vimId", cbamRequest.getSoftwareImages().get(0).getVimId());
+ Assert.assertEquals("result is ", "vnfdSoftwareImageId", cbamRequest.getSoftwareImages().get(0).getVnfdSoftwareImageId());
+
+ Assert.assertEquals("result is ", "resourceId", cbamRequest.getComputeResourceFlavours().get(0).getResourceId());
+ Assert.assertEquals("result is ", "vimId", cbamRequest.getComputeResourceFlavours().get(0).getVimId());
+ Assert.assertEquals("result is ", "vnfdVirtualComputeDescId", cbamRequest.getComputeResourceFlavours().get(0).getVnfdVirtualComputeDescId());
+
+ Assert.assertEquals("result is ", "id", cbamRequest.getZones().get(0).getId());
+ Assert.assertEquals("result is ", "resourceId", cbamRequest.getZones().get(0).getResourceId());
+
+ Assert.assertEquals("result is ", "additionalParams", cbamRequest.getAdditionalParams());
+ }
+
+ @Test
+ public void testInstantiateVnfError() throws ClientProtocolException, IOException
{
CBAMInstantiateVnfRequest cbamRequest = new CBAMInstantiateVnfRequest();
CBAMInstantiateVnfResponse response = cbamMgmr.instantiateVnf(cbamRequest, vnfInstanceId);
}
@Test
- public void testModifyVnf() throws ClientProtocolException, IOException
+ public void testModifyVnfSuccess() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(202);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
+
+ CBAMModifyVnfRequest cbamRequest = new CBAMModifyVnfRequest();
+ CBAMModifyVnfResponse response = cbamMgmr.modifyVnf(cbamRequest, vnfInstanceId);
+ }
+
+ @Test
+ public void testModifyVnfError() throws ClientProtocolException, IOException
{
CBAMModifyVnfRequest cbamRequest = new CBAMModifyVnfRequest();
CBAMModifyVnfResponse response = cbamMgmr.modifyVnf(cbamRequest, vnfInstanceId);
}
@Test
- public void testTerminateVnf() throws ClientProtocolException, IOException
+ public void testTerminateVnfSuccess() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(202);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
+ CBAMTerminateVnfRequest cbamRequest = new CBAMTerminateVnfRequest();
+ CBAMTerminateVnfResponse response = cbamMgmr.terminateVnf(cbamRequest, vnfInstanceId);
+ }
+
+ @Test
+ public void testTerminateVnfError() throws ClientProtocolException, IOException
{
CBAMTerminateVnfRequest cbamRequest = new CBAMTerminateVnfRequest();
CBAMTerminateVnfResponse response = cbamMgmr.terminateVnf(cbamRequest, vnfInstanceId);
}
@Test
- public void testDeleteVnf() throws ClientProtocolException, IOException
+ public void testDeleteVnfSuccess() throws ClientProtocolException, IOException
{
+ httpResult.setStatusCode(204);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
cbamMgmr.deleteVnf(vnfInstanceId);
}
@Test
- public void testScaleVnf() throws ClientProtocolException, IOException
+ public void testDeleteVnfError() throws ClientProtocolException, IOException
{
+ cbamMgmr.deleteVnf(vnfInstanceId);
+ }
+
+ @Test
+ public void testScaleVnfSuccess() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(202);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
CBAMScaleVnfRequest cbamRequest = new CBAMScaleVnfRequest();
CBAMScaleVnfResponse response = cbamMgmr.scaleVnf(cbamRequest, vnfInstanceId);
}
@Test
- public void testHealVnf() throws ClientProtocolException, IOException
+ public void testScaleVnfError() throws ClientProtocolException, IOException
+ {
+ CBAMScaleVnfRequest cbamRequest = new CBAMScaleVnfRequest();
+ CBAMScaleVnfResponse response = cbamMgmr.scaleVnf(cbamRequest, vnfInstanceId);
+ }
+
+ @Test
+ public void testHealVnfSuccess() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(202);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
+ CBAMHealVnfRequest cbamRequest = new CBAMHealVnfRequest();
+ CBAMHealVnfResponse response = cbamMgmr.healVnf(cbamRequest, vnfInstanceId);
+ }
+
+ @Test
+ public void testHealVnfError() throws ClientProtocolException, IOException
{
CBAMHealVnfRequest cbamRequest = new CBAMHealVnfRequest();
CBAMHealVnfResponse response = cbamMgmr.healVnf(cbamRequest, vnfInstanceId);
}
+ @Test
+ public void testQueryVnfSuccess() throws ClientProtocolException, IOException
+ {
+ CBAMQueryVnfResponse response = cbamMgmr.queryVnf(vnfInstanceId);
+ }
+
@Test
public void testQueryVnf() throws ClientProtocolException, IOException
{
+ httpResult.setStatusCode(400);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
CBAMQueryVnfResponse response = cbamMgmr.queryVnf(vnfInstanceId);
}
@Test
- public void testCreateSubscription() throws ClientProtocolException, IOException
+ public void testCreateSubscriptionSuccess() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(201);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
+ CBAMCreateSubscriptionRequest cbamRequest = new CBAMCreateSubscriptionRequest();
+ CBAMCreateSubscriptionResponse response = cbamMgmr.createSubscription(cbamRequest);
+ }
+
+ @Test
+ public void testCreateSubscriptionError() throws ClientProtocolException, IOException
{
CBAMCreateSubscriptionRequest cbamRequest = new CBAMCreateSubscriptionRequest();
CBAMCreateSubscriptionResponse response = cbamMgmr.createSubscription(cbamRequest);
}
@Test
- public void testGetSubscription() throws ClientProtocolException, IOException
+ public void testGetSubscriptionSuccess() throws ClientProtocolException, IOException
{
String subscriptionId = "subscriptionId_001";
Subscription response = cbamMgmr.getSubscription(subscriptionId);
}
@Test
- public void testQueryVnfcResource() throws ClientProtocolException, IOException
+ public void testGetSubscriptionError() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(400);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
+ String subscriptionId = "subscriptionId_001";
+ Subscription response = cbamMgmr.getSubscription(subscriptionId);
+ }
+
+ @Test
+ public void testQueryVnfcResourceSuccess() throws ClientProtocolException, IOException
{
String json = "[{'id':'id_001'}]";
HttpResult httpResult = new HttpResult();
}
@Test
- public void testQueryOperExecution() throws ClientProtocolException, IOException
+ public void testQueryVnfcResourceErrot() throws ClientProtocolException, IOException
{
+ String json = "[{'id':'id_001'}]";
+ HttpResult httpResult = new HttpResult();
+ httpResult.setStatusCode(400);
+ httpResult.setContent(json);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+ List<VnfcResourceInfo> response = cbamMgmr.queryVnfcResource(vnfInstanceId);
+ }
+
+ @Test
+ public void testQueryOperExecutionSuccess() throws ClientProtocolException, IOException
+ {
+ String execId = "execId_001";
+ CBAMQueryOperExecutionResponse response = cbamMgmr.queryOperExecution(execId);
+ }
+
+ @Test
+ public void testQueryOperExecutionOngoing() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(202);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
+
String execId = "execId_001";
CBAMQueryOperExecutionResponse response = cbamMgmr.queryOperExecution(execId);
}
@Test
- public void testUploadVnfPackage() throws ClientProtocolException, IOException
+ public void testQueryOperExecutionError() throws ClientProtocolException, IOException
{
+ httpResult.setStatusCode(400);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
+
+ String execId = "execId_001";
+ CBAMQueryOperExecutionResponse response = cbamMgmr.queryOperExecution(execId);
+ }
+
+ @Test
+ public void testUploadVnfPackageSuccess() throws ClientProtocolException, IOException
+ {
+ String cbamPackageFilePath = "cbamPackageFilePath_001";
+ cbamMgmr.uploadVnfPackage(cbamPackageFilePath);
+ }
+
+ @Test
+ public void testUploadVnfPackageError() throws ClientProtocolException, IOException
+ {
+ httpResult.setStatusCode(400);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
+
String cbamPackageFilePath = "cbamPackageFilePath_001";
cbamMgmr.uploadVnfPackage(cbamPackageFilePath);
}
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.http.HttpStatus;
import org.json.JSONObject;
import org.junit.Assert;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonConstants;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.repository.VnfmJobExecutionRepository;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.exception.VnfmDriverException;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.CreateSubscriptionResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
Assert.assertEquals("Error Message is ", exception.getMessage(), erroMsg);
}
+
@Test
public void testHealVnf() throws Exception {
HealVnfResponse mockResponse = new HealVnfResponse();
Assert.assertEquals("Error Message is ", exception.getMessage(), erroMsg);
}
+
+ @Test
+ public void testCreateSubscripiton() throws Exception {
+ CreateSubscriptionResponse mockResponse = new CreateSubscriptionResponse();
+ mockResponse.setCallbackUri("callbackUri");
+ String jsonString = "{\"callbackUri\":\"callbackUri\",\"callbackUri\":\"callbackUrl\"," + "\"authentication\":{\"userName\":\"userName\",\"password\":\"password\",\"clientName\":\"clientName\"}}";
+
+ when(vnfmDriverMgmr.createSubscription(Mockito.any(CreateSubscriptionRequest.class))).thenReturn(mockResponse);
+
+ String responseString = mockMvc.perform(
+ post("/api/nokiavnfmdriver/v1/createSubscripiton").
+ characterEncoding("UTF-8").
+ accept(MediaType.APPLICATION_JSON).
+ contentType(MediaType.APPLICATION_JSON).
+ content(jsonString))
+ .andDo(print())
+ .andExpect(status().isCreated())
+ .andReturn().getResponse().getContentAsString();
+
+ JSONObject jsonObj = new JSONObject(responseString);
+ Assert.assertEquals("jobId is ", mockResponse.getCallbackUri(), jsonObj.get("callbackUri"));
+ }
}
Code Review / vfc / nfvo / driver / vnfm / svnfm.git / commitdiff