* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017-2019 European Software Marketing Ltd.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.aai.babel.xml.generator.model;
-import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
-import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
+import org.onap.aai.babel.parser.ArtifactGeneratorToscaParser;
+import org.onap.aai.babel.util.ArtifactTestUtils;
import org.onap.aai.babel.xml.generator.model.Widget.Type;
-import org.onap.aai.babel.xml.generator.types.ModelType;
/**
* Direct tests of the Model abstract class (to improve code coverage). Not all methods are tested here. Some are
*/
public class TestModel {
- private Service serviceModel = new Service();
- private List<Resource> resourceModels = Arrays.asList(new VirtualFunction());
- private Widget widgetModel = new OamNetwork();
+ private Widget widgetModel = new Widget(Type.OAM_NETWORK, "oam-network", true);
private Model anonymousModel;
- static {
- System.setProperty("APP_HOME", ".");
- }
-
/**
- * Load the Widget to UUID mappings from the Artifact Generator properties.
+ * Initialize the Artifact Generator with filtering and mapping configuration. Also load the Widget to UUID mappings
+ * from the Artifact Generator properties.
*
- * @throws FileNotFoundException
- * if the properties file is missing
* @throws IOException
- * if the properties file is not loaded
+ * if the mappings configuration cannot be loaded
*/
@Before
- public void setup() throws FileNotFoundException, IOException {
- InputStream in = TestModel.class.getClassLoader().getResourceAsStream("artifact-generator.properties");
- Properties properties = new Properties();
- properties.load(in);
- in.close();
- WidgetConfigurationUtil.setConfig(properties);
+ public void setup() throws IOException {
+ ArtifactTestUtils utils = new ArtifactTestUtils();
+ utils.setGeneratorSystemProperties();
+
+ String configLocation = System.getProperty(ArtifactGeneratorToscaParser.PROPERTY_TOSCA_MAPPING_FILE);
+ if (configLocation == null) {
+ throw new IllegalArgumentException(
+ String.format(ArtifactGeneratorToscaParser.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND,
+ ArtifactGeneratorToscaParser.PROPERTY_TOSCA_MAPPING_FILE));
+ }
+
+ ArtifactGeneratorToscaParser.initToscaMappingsConfiguration(configLocation);
+ utils.loadWidgetToUuidMappings();
anonymousModel = new Model() {
@Override
- public boolean addResource(Resource resource) {
+ public boolean addWidget(Widget resource) {
return false;
}
@Override
- public boolean addWidget(Widget resource) {
- return false;
+ public Type getWidgetType() {
+ return null;
}
@Override
- public Type getWidgetType() {
+ public String getModelTypeName() {
return null;
}
};
assertThat(Model.getModelFor(""), is(nullValue()));
assertThat(Model.getModelFor("any.unknown.type"), is(nullValue()));
- assertThat(Model.getModelFor("org.openecomp.resource.vf.allottedResource"), instanceOf(AllotedResource.class));
- assertThat(Model.getModelFor("org.openecomp.resource.vf.allottedResource.with.sub.type"),
- instanceOf(AllotedResource.class));
- assertThat(Model.getModelFor("org.openecomp.resource.vfc.AllottedResource"),
- instanceOf(ProvidingService.class));
- assertThat(Model.getModelFor("org.openecomp.resource.vfc"), instanceOf(VServerWidget.class));
- assertThat(Model.getModelFor("org.openecomp.resource.cp"), instanceOf(LIntfWidget.class));
- assertThat(Model.getModelFor("org.openecomp.cp"), instanceOf(LIntfWidget.class));
- assertThat(Model.getModelFor("org.openecomp.cp.some.suffix"), instanceOf(LIntfWidget.class));
- assertThat(Model.getModelFor("org.openecomp.resource.vl"), instanceOf(L3Network.class));
- assertThat(Model.getModelFor("org.openecomp.resource.vf"), instanceOf(VirtualFunction.class));
- assertThat(Model.getModelFor("org.openecomp.groups.vfmodule"), instanceOf(VfModule.class));
- assertThat(Model.getModelFor("org.openecomp.groups.VfModule"), instanceOf(VfModule.class));
- assertThat(Model.getModelFor("org.openecomp.resource.vfc.nodes.heat.cinder"), instanceOf(VolumeWidget.class));
- assertThat(Model.getModelFor("org.openecomp.nodes.PortMirroringConfiguration"),
- instanceOf(Configuration.class));
+ assertMapping("org.openecomp.resource.vfc", Type.VSERVER);
+ assertMapping("org.openecomp.resource.cp", Type.LINT);
+ assertMapping("org.openecomp.cp", Type.LINT);
+ assertMapping("org.openecomp.cp.some.suffix", Type.LINT);
+ assertMapping("org.openecomp.resource.vl", Type.L3_NET);
+ assertMapping("org.openecomp.resource.vf", Type.VF);
+ assertMapping("org.openecomp.groups.vfmodule", Type.VFMODULE);
+ assertMapping("org.openecomp.groups.VfModule", Type.VFMODULE);
+ assertMapping("org.openecomp.resource.vfc.nodes.heat.cinder", Type.VOLUME);
+ assertMapping("org.openecomp.nodes.PortMirroringConfiguration", "Configuration", Type.CONFIGURATION);
+ assertMapping("any.string", "Configuration", Type.CONFIGURATION);
+ assertMapping("org.openecomp.resource.cr.Kk1806Cr1", "CR", Type.CR);
+ assertMapping("any.string", "CR", Type.CR);
+
+ assertMapping("org.openecomp.resource.vfc", "an.unknown.type", Type.VSERVER);
}
- @Test
- public void testGetCardinality() {
- resourceModels.get(0).getCardinality();
+ /**
+ * Assert that the TOSCA type String is mapped to the expected Widget Type.
+ *
+ * @param toscaType
+ * the TOSCA type or prefix
+ * @param widgetType
+ * the type of Widget expected from the mappings
+ */
+ private void assertMapping(String toscaType, Type widgetType) {
+ assertThat(Model.getModelFor(toscaType).getWidgetType(), is(widgetType));
}
- @Test
- public void testGetModelType() {
- assertThat(serviceModel.getModelType(), is(ModelType.SERVICE));
- for (Resource resourceModel : resourceModels) {
- assertThat(resourceModel.getModelType(), is(ModelType.RESOURCE));
- }
- assertThat(widgetModel.getModelType(), is(ModelType.WIDGET));
- assertThat(anonymousModel.getModelType(), is(nullValue()));
+ /**
+ * Assert that the TOSCA metadata type is mapped to the expected Widget Type.
+ *
+ * @param toscaType
+ * the name (or name prefix) of the TOSCA type
+ * @param metadataType
+ * the type specified in the TOSCA metadata
+ * @param widgetType
+ * the type of Widget expected from the mappings
+ */
+ private void assertMapping(String toscaType, String metadataType, Type widgetType) {
+ assertThat(Model.getModelFor(toscaType, metadataType).getWidgetType(), is(widgetType));
}
@Test
@Test(expected = org.onap.aai.babel.xml.generator.error.IllegalAccessException.class)
public void testGetModelNameVersionIdIsUnsupported() {
assertThat(widgetModel.getModelNameVersionId(), is(nullValue()));
- assertThat(resourceModels.get(0).getModelType(), is(ModelType.RESOURCE));
- assertThat(widgetModel.getModelType(), is(ModelType.WIDGET));
- assertThat(anonymousModel.getModelType(), is(nullValue()));
}
}
Code Review / aai / babel.git / blobdiff