diff options
| -rw-r--r-- | adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml | 2 | ||||
| -rw-r--r-- | asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml b/adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml index cd97471b5b..66ea46fcc9 100644 --- a/adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml +++ b/adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml @@ -16,7 +16,7 @@ </context-param> <context-param> <param-name>mso.configuration</param-name> - <param-value>MSO_PROP_NETWORK_ADAPTER=mso.vfc.properties,MSO_PROP_TOPOLOGY=topology.properties</param-value> + <param-value>MSO_PROP_VFC_ADAPTER=mso.vfc.properties,MSO_PROP_TOPOLOGY=topology.properties</param-value> </context-param> <context-param> <param-name>mso.cloud_config.configuration</param-name> 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);
|