diff options
| author |   c00149107 <chenchuanyu@huawei.com> | 2018-01-17 17:45:28 +0800 |
|---|---|---|
| committer | c00149107 <chenchuanyu@huawei.com> | 2018-01-17 18:06:46 +0800 |
| commit | aee589307a4121c5b7609952837cc68bf327b62f (patch) | |
| tree | 944c7f22a247c1430af9cce45c16d8795c6a3427 /asdc-controller/src/main/java/org/openecomp/mso | |
| parent | 18c1c6853450e0aa1383f42bf76cb85578260c7f (diff) | |
Update VF Module Check for Tosca VNF
Update VF Module Check for Tosca VNF, so that voLTE can distribute to SO
Change-Id: I39d87f198532e480540e039f207f1bd201a5d4d7
Issue-ID: SO-380
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
Diffstat (limited to 'asdc-controller/src/main/java/org/openecomp/mso')
| -rw-r--r-- | asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java index 70fa7c14be..c2879a4df2 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java @@ -32,23 +32,21 @@ import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; - -import org.openecomp.sdc.api.IDistributionClient; -import org.openecomp.sdc.api.notification.IArtifactInfo; -import org.openecomp.sdc.api.notification.INotificationData; -import org.openecomp.sdc.api.notification.IResourceInstance; -import org.openecomp.sdc.api.notification.IVfModuleMetadata; -import org.openecomp.sdc.api.results.IDistributionClientDownloadResult; import org.openecomp.mso.asdc.client.ASDCConfiguration; import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException; -import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization; import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization; +import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization; import org.openecomp.mso.db.catalog.beans.Service; import org.openecomp.mso.db.catalog.beans.ServiceToAllottedResources; import org.openecomp.mso.db.catalog.beans.ServiceToNetworks; import org.openecomp.mso.db.catalog.beans.VnfResource; - +import org.openecomp.mso.logger.MessageEnum; import org.openecomp.mso.logger.MsoLogger; +import org.openecomp.sdc.api.IDistributionClient; +import org.openecomp.sdc.api.notification.IArtifactInfo; +import org.openecomp.sdc.api.notification.INotificationData; +import org.openecomp.sdc.api.notification.IResourceInstance; +import org.openecomp.sdc.api.results.IDistributionClientDownloadResult; /** * This structure exists to avoid having issues if the order of the vfResource/vfmodule artifact is not good (tree structure). * @@ -141,8 +139,10 @@ public final class VfResourceStructure { public void createVfModuleStructures() throws ArtifactInstallerException { + //for vender tosca VNF there is no VFModule in VF if (vfModulesMetadataList == null) { - throw new ArtifactInstallerException("VfModule Meta DATA could not be decoded properly or was not present in the notification"); + LOGGER.info(MessageEnum.ASDC_GENERAL_INFO,"There is no VF mudules in the VF.", "ASDC", "createVfModuleStructures"); + return; } for (IVfModuleData vfModuleMeta:vfModulesMetadataList) { vfModulesStructureList.add(new VfModuleStructure(this,vfModuleMeta)); |