diff options
| author |   c00149107 <chenchuanyu@huawei.com> | 2018-01-22 11:43:38 +0800 |
|---|---|---|
| committer | c00149107 <chenchuanyu@huawei.com> | 2018-01-22 11:43:38 +0800 |
| commit | 3afe83aa94a9763595968fde3e9dd1e1347f7d56 (patch) | |
| tree | 113efe6dd2c7ddefd82b989054c001bd1974a8be /asdc-controller/src | |
| parent | d3c4fa041696288e30b15e218e496a98dc12fb85 (diff) | |
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>
Diffstat (limited to 'asdc-controller/src')
| -rw-r--r-- | asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java | 12 |
1 files changed, 9 insertions, 3 deletions
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 b7b35158cd..b998be9a69 100644 --- 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));
} else {
- throw new ArtifactInstallerException("No NetworkResourceName found in TempNetworkHeatTemplateLookup for " + networkResourceModelName);
+ logger.info(MessageEnum.ASDC_GENERAL_INFO,
+ "No NetworkResourceName found in TempNetworkHeatTemplateLookup for" + networkResourceModelName, "ASDC",
+ "createVfModuleStructures");
+ createNetworkResource(vlNode, toscaResourceStruct, null);
}
@@ -832,13 +835,16 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller { networkResource.setModelVersion(testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION)));
networkResource.setAicVersionMax(testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES)));
- networkResource.setAicVersionMin(networkHeatTemplateLookup.getAicVersionMin());
+ String aicVersionMin = networkHeatTemplateLookup != null ? networkHeatTemplateLookup.getAicVersionMin() : "2.5";
+ networkResource.setAicVersionMin(aicVersionMin);
networkResource.setToscaNodeType(networkNodeTemplate.getType());
networkResource.setDescription(testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
networkResource.setOrchestrationMode("HEAT");
networkResource.setCategory(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CATEGORY));
networkResource.setSubCategory(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_SUBCATEGORY));
- networkResource.setHeatTemplateArtifactUUID(networkHeatTemplateLookup.getHeatTemplateArtifactUuid());
+ //for tosca NS ,there is no heat for network VL
+ String heatTemplateArtifactUUID = networkHeatTemplateLookup != null ? networkHeatTemplateLookup.getHeatTemplateArtifactUuid() : "null";
+ networkResource.setHeatTemplateArtifactUUID(heatTemplateArtifactUUID);
toscaResourceStructure.setCatalogNetworkResource(networkResource);
|