/**
* Initializes the Widget to UUID mapping configuration.
- *
+ *
* @throws IOException
* if an error occurs reading the configuration properties
*/
/**
* Initializes the group filtering and TOSCA to Widget mapping configuration.
- *
+ *
* @param configLocation
* the pathname to the JSON mappings file
* @throws IOException
/**
* Add the resource/widget to the specified model.
- *
+ *
* @param model
* @param relation
* resource or widget model to add
if (relation.getModelType() == ModelType.RESOURCE) {
model.addResource(relation);
} else {
- model.addWidget(Widget.getWidget(relation.getWidgetType()));
+ model.addWidget(Widget.createWidget(relation.getWidgetType()));
}
}
* @param model
* @param serviceNode
* @throws XmlArtifactGenerationException
+ * if the configured widget mappings do not support the widget type of a VF Module
*/
public void processVfModules(List<Resource> resources, Model resourceModel, NodeTemplate serviceNode)
throws XmlArtifactGenerationException {
- // Get the customisation UUID for each VF node and use it to get its Groups
+ // Get the customization UUID for each VF node and use it to get its Groups
String uuid = csarHelper.getNodeTemplateCustomizationUuid(serviceNode);
List<Group> serviceGroups = csarHelper.getVfModulesByVf(uuid);
// Process each VF Group
for (Group serviceGroup : serviceGroups) {
Model groupModel = Model.getModelFor(serviceGroup.getType());
- if (groupModel.getWidgetType() == WidgetType.valueOf("VFMODULE")) {
+ if (groupModel.hasWidgetType("VFMODULE")) {
processVfModule(resources, resourceModel, serviceGroup, serviceNode, (Resource) groupModel);
}
}
Resource model = Model.getModelFor(nodeTypeName, metaDataType);
if (metadata != null && hasAllottedResource(metadata.getAllProperties())
- && model.getWidgetType() == WidgetType.valueOf("VSERVER")) {
+ && model.hasWidgetType("VSERVER")) {
model = new Resource(WidgetType.valueOf("ALLOTTED_RESOURCE"), false);
Map<String, Object> props = new HashMap<>();
props.put("providingService", true);
foundProvidingService |= processModel(resourceModel, metadata, model, resourceNodeTemplate.getProperties());
}
- if (resourceModel.getWidgetType() == WidgetType.valueOf("ALLOTTED_RESOURCE") && !foundProvidingService) {
+ if (resourceModel.hasWidgetType("ALLOTTED_RESOURCE") && !foundProvidingService) {
final String modelInvariantId = resourceModel.getModelId();
throw new IllegalArgumentException(String.format(GENERATOR_AAI_PROVIDING_SERVICE_MISSING,
modelInvariantId == null ? "<null ID>" : modelInvariantId));
return resources;
}
+ /**
+ * @param resources
+ * @param vfModel
+ * @param groupDefinition
+ * @param serviceNode
+ * @param groupModel
+ * @throws XmlArtifactGenerationException
+ * if the configured widget mappings do not support the widget type of a VF Module
+ */
private void processVfModule(List<Resource> resources, Model vfModel, Group groupDefinition,
NodeTemplate serviceNode, Resource groupModel) throws XmlArtifactGenerationException {
groupModel.populateModelIdentificationInformation(
}
}
+ /**
+ * @param groupModel
+ * @param members
+ * @throws XmlArtifactGenerationException
+ * if the configured widget mappings do not support the widget type of a member
+ */
private void processVfModuleGroup(Resource groupModel, List<NodeTemplate> members)
throws XmlArtifactGenerationException {
if (members != null && !members.isEmpty()) {
/**
* Process the Widget members of a VF Module Group
- *
+ *
* @param group
+ * the group resource model
* @param member
+ * the group member to process
* @throws XmlArtifactGenerationException
+ * if the configured widget mappings do not support the widget type of the member
*/
private void processGroupMembers(Resource group, NodeTemplate member) throws XmlArtifactGenerationException {
Resource resource = Model.getModelFor(member.getType());
log.debug(member.getType() + " mapped to " + resource);
- if (resource.getWidgetType() == WidgetType.valueOf("L3_NET")) {
+ if (resource.hasWidgetType("L3_NET")) {
// An l3-network inside a vf-module is treated as a Widget
resource.setModelType(ModelType.WIDGET);
}
if (resource.getModelType() == ModelType.WIDGET) {
- Widget widget = Widget.getWidget(resource.getWidgetType());
+ Widget widget = Widget.createWidget(resource.getWidgetType());
widget.addKey(member.getName());
// Add the widget element encountered to the Group model
group.addWidget(widget);
if (foundProvidingService) {
processProvidingService(resourceModel, resourceNode, nodeProperties);
} else if (resourceNode != null && resourceNode.getModelType() == ModelType.RESOURCE
- && resourceNode.getWidgetType() != WidgetType.valueOf("L3_NET")) {
+ && !resourceNode.hasWidgetType("L3_NET")) {
if (metaData != null) {
resourceNode.populateModelIdentificationInformation(metaData.getAllProperties());
}
- resourceModel.addResource((Resource) resourceNode);
+ resourceModel.addResource(resourceNode);
}
return foundProvidingService;
}