From 64ecb4a77eb5aaf6f17aeb8b04ee0e3847abd82c Mon Sep 17 00:00:00 2001 From: yufei_zhou Date: Fri, 20 Oct 2017 23:10:51 +0800 Subject: [PATCH] modify server.xml 8482 as 8486 Change-Id: I7856df6890ec183477bfc21eb077ed9670ea9c76 Issue-ID: VFC-544 Signed-off-by: yufei_zhou --- .../deployment/src/main/release/conf/server.xml | 2 +- nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh | 2 +- nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh | 9 +-------- nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh | 4 ++-- .../vnfm/svnfm/adaptor/InstantiateVnfContinueRunnable.java | 2 +- .../driver/vnfm/svnfm/catalog/bo/CatalogQueryVnfResponse.java | 10 ++++++---- .../svnfm/{nslcm => catalog}/bo/entity/VnfPackageInfo.java | 2 +- .../nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImpl.java | 2 +- .../vfc/nfvo/driver/vnfm/svnfm/catalog/inf/CatalogMgmrInf.java | 3 ++- .../driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java | 7 ++----- 10 files changed, 18 insertions(+), 25 deletions(-) rename nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/{nslcm => catalog}/bo/entity/VnfPackageInfo.java (97%) diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.xml index 7b93b3b0..825cbc01 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.xml @@ -30,7 +30,7 @@ name="UserDatabase" pathname="conf/tomcat-users.xml" type="org.apache.catalina.UserDatabase" /> - + imageInfo; + private ImageInfo imageInfo; @JsonProperty("vnfInstanceInfo") private List vnfInstanceInfo; @@ -52,11 +52,13 @@ public class CatalogQueryVnfResponse { this.packageInfo = packageInfo; } - public List getImageInfo() { + + + public ImageInfo getImageInfo() { return imageInfo; } - public void setImageInfo(List imageInfo) { + public void setImageInfo(ImageInfo imageInfo) { this.imageInfo = imageInfo; } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nslcm/bo/entity/VnfPackageInfo.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/bo/entity/VnfPackageInfo.java similarity index 97% rename from nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nslcm/bo/entity/VnfPackageInfo.java rename to nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/bo/entity/VnfPackageInfo.java index 53f80c1d..59ec8169 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nslcm/bo/entity/VnfPackageInfo.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/bo/entity/VnfPackageInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity; +package org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.entity; import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum; diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImpl.java index a3fb8e57..fd93ee41 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImpl.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImpl.java @@ -21,11 +21,11 @@ import java.util.HashMap; import org.apache.http.client.ClientProtocolException; import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.CatalogQueryVnfResponse; +import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.entity.VnfPackageInfo; 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.nslcm.bo.entity.VnfPackageInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/inf/CatalogMgmrInf.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/inf/CatalogMgmrInf.java index 5984aaaf..72ce572e 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/inf/CatalogMgmrInf.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/inf/CatalogMgmrInf.java @@ -19,7 +19,8 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.inf; import java.io.IOException; import org.apache.http.client.ClientProtocolException; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VnfPackageInfo; +import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.entity.VnfPackageInfo; + public interface CatalogMgmrInf { public VnfPackageInfo queryVnfPackage(String vnfPackageId) throws ClientProtocolException, IOException; diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java index 5667908d..d1df4dbb 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java @@ -34,12 +34,12 @@ import org.mockito.MockitoAnnotations; import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.CatalogQueryVnfResponse; import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.entity.ImageInfo; import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.entity.VnfInstanceInfo; +import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.entity.VnfPackageInfo; import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv; import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum; import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum.Deletionpending; import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpClientProcessorInf; import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpResult; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VnfPackageInfo; import org.springframework.web.bind.annotation.RequestMethod; import com.google.gson.Gson; @@ -77,7 +77,6 @@ public class CatalogMgmrImplTest { response.setVnfInstanceInfo(vnfInstanceInfos); response.setCsarId("csarId"); - List imageInfos = new ArrayList(); ImageInfo imageInfo = new ImageInfo(); imageInfo.setFileName("fileName"); imageInfo.setImageId("imageId"); @@ -86,9 +85,7 @@ public class CatalogMgmrImplTest { imageInfo.setTenant("tenant"); imageInfo.setVimId("vimId"); imageInfo.setVimUser("vimUser"); - - imageInfos.add(imageInfo); - response.setImageInfo(imageInfos); + response.setImageInfo(imageInfo); VnfPackageInfo packageInfo = new VnfPackageInfo(); packageInfo.setDownloadUri("1.3.5.6"); -- 2.16.6