Deal with network VL for voLTE

Deal with network VL for voLTE, no heat needed.

Change-Id: Ifc9dda6b90ea6b05841d46cff8e40a93c7ed98e2
Issue-ID: SO-380
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
index b7b3515..b998be9 100644 (file)
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
@@ -563,7 +563,10 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller {
                                                createNetworkResource(vlNode, toscaResourceStruct, networkHeatTemplateLookup.get(0));\r
                                        \r
                                        } else {\r
-                                               throw new ArtifactInstallerException("No NetworkResourceName found in TempNetworkHeatTemplateLookup for " + networkResourceModelName);\r
+                            logger.info(MessageEnum.ASDC_GENERAL_INFO,\r
+                                    "No NetworkResourceName found in TempNetworkHeatTemplateLookup for" + networkResourceModelName, "ASDC",\r
+                                    "createVfModuleStructures");\r
+                            createNetworkResource(vlNode, toscaResourceStruct, null);\r
                                        }\r
                                        \r
                                                                                \r
@@ -832,13 +835,16 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller {
                networkResource.setModelVersion(testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION)));\r
                \r
                networkResource.setAicVersionMax(testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES)));\r
-               networkResource.setAicVersionMin(networkHeatTemplateLookup.getAicVersionMin());\r
+               String aicVersionMin = networkHeatTemplateLookup != null ? networkHeatTemplateLookup.getAicVersionMin() : "2.5";\r
+               networkResource.setAicVersionMin(aicVersionMin);\r
                networkResource.setToscaNodeType(networkNodeTemplate.getType());\r
                networkResource.setDescription(testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));\r
                networkResource.setOrchestrationMode("HEAT");\r
                networkResource.setCategory(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CATEGORY));\r
                networkResource.setSubCategory(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_SUBCATEGORY));\r
-               networkResource.setHeatTemplateArtifactUUID(networkHeatTemplateLookup.getHeatTemplateArtifactUuid());\r
+               //for tosca NS ,there is no heat for network VL\r
+               String heatTemplateArtifactUUID = networkHeatTemplateLookup != null ? networkHeatTemplateLookup.getHeatTemplateArtifactUuid() : "null";\r
+               networkResource.setHeatTemplateArtifactUUID(heatTemplateArtifactUUID);\r
                        \r
                toscaResourceStructure.setCatalogNetworkResource(networkResource); \r
                \r