# Config mysql credentials
function start_mysql {
+ echo "start mysql ... "
service mysql start
sleep 1
}
import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VnfExtCpData;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.NslcmGrantVnfResponse;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.AccessInfo;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.GrantInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.NslcmVimInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VimAssets;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VimComputeResourceFlavour;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
VimInfo vim = new VimInfo();
EndpointInfo inter = new EndpointInfo();
OpenstackV3Info openstackV3 = new OpenstackV3Info();
-
- vim.setId(nslc.getVim().getVimId());
- openstackV3.setId(nslc.getVim().getVimId());
- inter.setEndpoint(nslc.getVim().getInterfaceEndpoint());
+ List<NslcmVimInfo> nslcmVim=nslc.getVim();
+ for(int i=0;i<=nslcmVim.size();i++) {
+ vim.setId(nslcmVim.get(i).getVimInfoId());
+ openstackV3.setId(nslcmVim.get(i).getVimId());
+ inter.setEndpoint(nslcmVim.get(i).getInterfaceEndpoint());
openstackV3.setInterfaceInfo(inter);
OpenStackAccessInfoV3 v3 = new OpenStackAccessInfoV3();
- v3.setUsername(nslc.getVim().getAccessInfo().getUsername());
- v3.setPassword(nslc.getVim().getAccessInfo().getPassword());
+ List<AccessInfo> accessInfo=nslcmVim.get(i).getAccessInfo();
+ for(int j=0;j<=accessInfo.size();j++) {
+ v3.setUsername(accessInfo.get(j).getUsername());
+ v3.setPassword(accessInfo.get(j).getPassword());
+ }
openstackV3.setAccessInfo(v3);
+ }
+
vims.add(vim);
List<ExtVirtualLinkData> list = new ArrayList<ExtVirtualLinkData>();
ExtVirtualLinkData ext = new ExtVirtualLinkData();
import java.util.HashMap;
import org.apache.http.client.ClientProtocolException;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.CatalogQueryVnfResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.inf.CatalogMgmrInf;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonConstants;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpClientProcessorInf;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpRequestProcessor;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VnfPackageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestMethod;
//cbamApiFront is from aai query
private String cbamApiUriFront;
+
+ private String msbApiUriFront;
// for retrieving token from CBAM, configured in application.properties
@Value("${grantType}")
this.lcmApiUriFront = lcmApiUriFront;
}
+ public String getMsbApiUriFront() {
+ return msbApiUriFront;
+ }
+
+ public void setMsbApiUriFront(String msbApiUriFront) {
+ this.msbApiUriFront = msbApiUriFront;
+ }
+
}
public static final String MSB_REGISTER_SERVICE_PATH = "/api/microservices/v1/services";
// public static final String MSB_REGISTER_SERVICE_PATH = "/api/microservices/v1/services/{serviceName}/version/{version}/nodes/{ip}/{port}";
public static final String MSB_UNREGISTER_SERVICE_PATH = "/api/microservices/v1/services/%s/version/%s/nodes/%s/%s";
+ public static final String MSB_QUERY_SERVICE_PATH = "/api/microservices/v1/services/%s/version/%s";
}
import java.io.IOException;
+import org.apache.http.client.ClientProtocolException;
import org.json.JSONException;
import org.json.JSONObject;
import org.onap.msb.sdk.discovery.common.RouteException;
try {
handleAaiMsbServiceInfo();
- } catch (RouteException e) {
+ } catch (Exception e) {
logger.error("handleAaiMsbServiceInfo error", e);
}
try {
handLcmMsbServiceInfo();
- } catch (RouteException e) {
+ } catch (Exception e) {
logger.error("handLcmMsbServiceInfo error", e);
}
try {
handCatalogMsbServiceInfo();
- } catch (RouteException e) {
+ } catch (Exception e) {
logger.error("handCatalogMsbServiceInfo error", e);
}
}
- private void handleAaiMsbServiceInfo() throws RouteException {
- String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndPort(adaptorEnv.getAaiServiceNameInMsb(), adaptorEnv.getAaiVersionInMsb());
+ private void handleAaiMsbServiceInfo() throws RouteException, ClientProtocolException, IOException {
+ String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getAaiServiceNameInMsb(), adaptorEnv.getAaiVersionInMsb());
adaptorEnv.setAaiUrlInMsb(urlInMsb);
adaptorEnv.setAaiApiUriFront(generateApiUriFront(urlInMsb));
}
private String generateApiUriFront(String urlInMsb) {
- return CommonConstants.SCHEMA_HTTP + "://" + adaptorEnv.getMsbIp() + ":" + adaptorEnv.getMsbPort() + urlInMsb;
+ return generateMsbApiUriFront() + urlInMsb;
+ }
+
+ private String generateMsbApiUriFront()
+ {
+ return CommonConstants.SCHEMA_HTTP + "://" + adaptorEnv.getMsbIp() + ":" + adaptorEnv.getMsbPort();
}
- private void handLcmMsbServiceInfo() throws RouteException {
- String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndPort(adaptorEnv.getLcmServiceNameInMsb(), adaptorEnv.getLcmVersionInMsb());
+ private void handLcmMsbServiceInfo() throws RouteException, ClientProtocolException, IOException {
+ String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getLcmServiceNameInMsb(), adaptorEnv.getLcmVersionInMsb());
adaptorEnv.setLcmUrlInMsb(urlInMsb);
adaptorEnv.setLcmApiUriFront(generateApiUriFront(urlInMsb));
}
- private void handCatalogMsbServiceInfo() throws RouteException {
- String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndPort(adaptorEnv.getCatalogServiceNameInMsb(), adaptorEnv.getCatalogVersionInMsb());
+ private void handCatalogMsbServiceInfo() throws RouteException, ClientProtocolException, IOException {
+ String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getCatalogServiceNameInMsb(), adaptorEnv.getCatalogVersionInMsb());
adaptorEnv.setCatalogUrlInMsb(urlInMsb);
adaptorEnv.setCatalogApiUriFront(generateApiUriFront(urlInMsb));
}
adaptorEnv.setMsbIp(msb_ip);
adaptorEnv.setMsbPort(msb_port);
+ adaptorEnv.setMsbApiUriFront(generateMsbApiUriFront());
}
private String readMsbInfoFromJsonFile() throws IOException {
--- /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.msb.bo;
+
+public class MsbServiceInfo {
+ private String serviceName;
+ private String version;
+ private String protocol;
+ private String visualRange;
+ private String url;
+
+ public String getServiceName() {
+ return serviceName;
+ }
+
+ public void setServiceName(String serviceName) {
+ this.serviceName = serviceName;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public String getVisualRange() {
+ return visualRange;
+ }
+
+ public void setVisualRange(String visualRange) {
+ this.visualRange = visualRange;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+}
package org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.impl;
+import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.HashMap;
-import org.onap.msb.sdk.discovery.common.RouteException;
-import org.onap.msb.sdk.discovery.entity.MicroServiceFullInfo;
-import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
-import org.onap.msb.sdk.discovery.entity.RouteResult;
-import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
+import org.apache.http.client.ClientProtocolException;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.util.CommonUtil;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonConstants;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpClientProcessorInf;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.bo.MsbServiceInfo;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.inf.IMsbMgmr;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMethod;
-import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
@Component
@Autowired
AdaptorEnv adaptorEnv;
+ @Autowired
+ HttpClientProcessorInf httpClientProcessor;
+
private Gson gson = new Gson();
@Override
public void register() {
+
try {
- String vfcAdaptorInfoJsonStr = readVfcAdaptorInfoFromJsonFile();
+ String url = adaptorEnv.getMsbApiUriFront() + CommonConstants.MSB_REGISTER_SERVICE_PATH;
+ HashMap<String, String> map = new HashMap<>();
+ map.put(CommonConstants.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
- JSON json = com.alibaba.fastjson.JSON.parseObject(vfcAdaptorInfoJsonStr);
- MicroServiceInfo msinfo = com.alibaba.fastjson.JSON.toJavaObject(json , MicroServiceInfo.class);
+ String bodyPostStr = readVfcAdaptorInfoFromJsonFile();;
- MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
- MicroServiceFullInfo microServiceInfo = msbClient.registerMicroServiceInfo(msinfo);
- logger.info("Registered service response info is " + microServiceInfo.toString());
+ String responseStr = httpClientProcessor.process(url, RequestMethod.POST, map, bodyPostStr).getContent();
- } catch (RouteException e) {
- logger.error("RouteException Failed to register nokia vnfm driver! ", e);
- } catch (IOException e) {
+ logger.info("MsbMgmrImpl -> register, responseStr is " + responseStr);
+
+ } catch (IOException e) {
logger.error("IOException Failed to register nokia vnfm driver! ", e);
- }
+ }
}
@Override
public void unregister() {
try {
- String jsonStr = readVfcAdaptorInfoFromJsonFile();
- MicroServiceInfo msinfo = gson.fromJson(jsonStr, MicroServiceInfo.class);
+ String url = adaptorEnv.getMsbApiUriFront() + String.format(CommonConstants.MSB_UNREGISTER_SERVICE_PATH);
+
+ String responseStr = httpClientProcessor.process(url, RequestMethod.DELETE, null, null).getContent();
- MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
- RouteResult routeResult = msbClient.cancelMicroServiceInfo(msinfo.getServiceName(), msinfo.getVersion());
- logger.info("unregistered service response info is " + routeResult.toString());
+ logger.info("MsbMgmrImpl -> unregister, responseStr is " + responseStr);
- } catch (IOException e) {
- logger.error("Failed to read vfcadaptor info! ", e);
- } catch (RouteException e) {
- logger.error("Failed to register nokia vnfm driver! ", e);
+ } catch (Exception e) {
+ logger.error("IOException Failed to unregister nokia vnfm driver! ", e);
}
+
}
- public String getServiceUrlInMsbBySeriveNameAndPort(String serviceName, String version) throws RouteException
+ public String getServiceUrlInMsbBySeriveNameAndVersion(String serviceName, String version) throws ClientProtocolException, IOException
{
- String serviceUrl = null;
- MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
- MicroServiceFullInfo microServiceInfo = msbClient.queryMicroServiceInfo(serviceName, version);
- if(null == microServiceInfo)
- {
- logger.error("There is no service in MSB for serviceName = {} and version = {}", serviceName, version);
- }
- else
- {
- serviceUrl = microServiceInfo.getUrl();
- logger.info("Service Url in MSB for serviceName = {} and version = {} is {}", serviceName, version, serviceUrl);
- }
- return serviceUrl;
+ String url=adaptorEnv.getMsbApiUriFront() + String.format(CommonConstants.MSB_QUERY_SERVICE_PATH, serviceName, version);
+
+ String responseStr = httpClientProcessor.process(url, RequestMethod.GET, null, null).getContent();
+ logger.info("MsbMgmrImpl -> getServiceUrlInMsbBySeriveNameAndVersion, responseStr is " + responseStr);
+
+ MsbServiceInfo serviceInfo = gson.fromJson(responseStr, MsbServiceInfo.class);
+ if(null == serviceInfo)
+ {
+ logger.error("There is no service in MSB for serviceName = {} and version = {}", serviceName, version);
+ }
+
+ String serviceUrl = serviceInfo.getUrl();
+ logger.info("Service Url in MSB for serviceName = {} and version = {} is {}", serviceName, version, serviceUrl);
+ return serviceUrl;
}
public void setAdaptorEnv(AdaptorEnv env) {
package org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.inf;
+import java.io.IOException;
+
+import org.apache.http.client.ClientProtocolException;
import org.onap.msb.sdk.discovery.common.RouteException;
public interface IMsbMgmr {
public void register();
public void unregister();
- public String getServiceUrlInMsbBySeriveNameAndPort(String serviceName, String version) throws RouteException;
+ public String getServiceUrlInMsbBySeriveNameAndVersion(String serviceName, String version) throws RouteException, ClientProtocolException, IOException;
}
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.ResourceDefinition;
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.NslcmVimInfo;
import com.fasterxml.jackson.annotation.JsonProperty;
public class NslcmGrantVnfResponse {
@JsonProperty("vim")
- private VimInfo vim;
+ private List<NslcmVimInfo> vim;
@JsonProperty("vimAssets")
private VimAssets vimAssets;
@JsonProperty("additionalParam")
private List<ResourceDefinition> additionalParam;
- public VimInfo getVim() {
+
+
+ public List<NslcmVimInfo> getVim() {
return vim;
}
- public void setVim(VimInfo vim) {
+ public void setVim(List<NslcmVimInfo> vim) {
this.vim = vim;
}
*/
package org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo;
+import java.util.List;
+
import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.AffectedVirtualLink;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.AffectedVirtualStorage;
@JsonProperty("jobId")
private String jobId;
@JsonProperty("affectedVnfc")
- private AffectedVnfc affectedVnfc;
+ private List<AffectedVnfc> affectedVnfc;
@JsonProperty("affectedVl")
- private AffectedVirtualLink affectedVl;
+ private List<AffectedVirtualLink> affectedVl;
@JsonProperty("affectedVirtualStorage")
- private AffectedVirtualStorage affectedVirtualStorage;
+ private List<AffectedVirtualStorage> affectedVirtualStorage;
public CommonEnum.status getStatus() {
return status;
}
public void setJobId(String jobId) {
this.jobId = jobId;
}
- public AffectedVnfc getAffectedVnfc() {
+ public List<AffectedVnfc> getAffectedVnfc() {
return affectedVnfc;
}
- public void setAffectedVnfc(AffectedVnfc affectedVnfc) {
+ public void setAffectedVnfc(List<AffectedVnfc> affectedVnfc) {
this.affectedVnfc = affectedVnfc;
}
- public AffectedVirtualLink getAffectedVl() {
+ public List<AffectedVirtualLink> getAffectedVl() {
return affectedVl;
}
- public void setAffectedVl(AffectedVirtualLink affectedVl) {
+ public void setAffectedVl(List<AffectedVirtualLink> affectedVl) {
this.affectedVl = affectedVl;
}
- public AffectedVirtualStorage getAffectedVirtualStorage() {
+ public List<AffectedVirtualStorage> getAffectedVirtualStorage() {
return affectedVirtualStorage;
}
- public void setAffectedVirtualStorage(AffectedVirtualStorage affectedVirtualStorage) {
+ public void setAffectedVirtualStorage(List<AffectedVirtualStorage> affectedVirtualStorage) {
this.affectedVirtualStorage = affectedVirtualStorage;
}
-
}
*/
package org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonProperty;
-public class VimInfo {
+public class NslcmVimInfo {
@JsonProperty("vimInfoId")
private String vimInfoId;
@JsonProperty("vimId")
private String vimId;
@JsonProperty("interfaceInfo")
- private InterfaceInfo interfaceInfo;
+ private List<InterfaceInfo> interfaceInfo;
@JsonProperty("accessInfo")
- private AccessInfo accessInfo;
+ private List<AccessInfo> accessInfo;
@JsonProperty("interfaceEndpoint")
private String interfaceEndpoint;
public void setVimId(String vimId) {
this.vimId = vimId;
}
-
- public InterfaceInfo getInterfaceInfo() {
+
+
+
+
+ public List<InterfaceInfo> getInterfaceInfo() {
return interfaceInfo;
}
- public void setInterfaceInfo(InterfaceInfo interfaceInfo) {
+ public void setInterfaceInfo(List<InterfaceInfo> interfaceInfo) {
this.interfaceInfo = interfaceInfo;
}
- public AccessInfo getAccessInfo() {
+ public List<AccessInfo> getAccessInfo() {
return accessInfo;
}
- public void setAccessInfo(AccessInfo accessInfo) {
+ public void setAccessInfo(List<AccessInfo> accessInfo) {
this.accessInfo = accessInfo;
}
*/
package org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonProperty;
public class VimAssets {
@JsonProperty("softwareImage")
- private VimSoftwareImage softwareImage;
+ private List<VimSoftwareImage> softwareImage;
- public VimSoftwareImage getSoftwareImage() {
+ public List<VimSoftwareImage> getSoftwareImage() {
return softwareImage;
}
- public void setSoftwareImage(VimSoftwareImage softwareImage) {
+ public void setSoftwareImage(List<VimSoftwareImage> softwareImage) {
this.softwareImage = softwareImage;
- }
+ }
+
+
package org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.impl;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.apache.http.client.ClientProtocolException;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import org.onap.msb.sdk.discovery.common.RouteException;
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;
+import org.springframework.web.bind.annotation.RequestMethod;
public class MsbMgmrImplTest {
@InjectMocks
env.setMsbPort(80);
msbMgmr.setAdaptorEnv(env);
MockitoAnnotations.initMocks(this);
+
+ String json = "{\"serviceName\":\"catalog\", \"url\":\"/api/catalog/v1\"}";
+ HttpResult httpResult = new HttpResult();
+ httpResult.setContent(json);
+
+ when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
}
- @Test(expected = RuntimeException.class)
+ @Test
public void testRegister()
{
msbMgmr.register();
}
- @Test(expected = RuntimeException.class)
+ @Test
public void testunRegister()
{
msbMgmr.unregister();
}
- @Test(expected = RouteException.class)
- public void testGetServiceUrlInMsbBySeriveNameAndPort() throws RouteException
+ @Test
+ public void testGetServiceUrlInMsbBySeriveNameAndPort() throws ClientProtocolException, IOException
{
- msbMgmr.getServiceUrlInMsbBySeriveNameAndPort("serviceName", "88");
+ msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion("serviceName", "88");
}
}
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.VimAssets;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VimInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.NslcmVimInfo;
import org.springframework.web.bind.annotation.RequestMethod;
import com.google.gson.Gson;
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);
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);
}
Code Review / vfc / nfvo / driver / vnfm / svnfm.git / commitdiff