-Relevant configuration files need to be copied here to successfully run this service locally.
\ No newline at end of file
+Relevant configuration files need to be copied here to successfully run this service locally.
+
+mvn -DKEY_STORE_PASSWORD=<obfuscated_password> spring-boot:run
<jvmArguments>
-DCONFIG_HOME=./appconfig-local
-DAPP_HOME=.
- -Dartifactgenerator.config=./appconfig-local/artifact-generator.properties
+ -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json
-DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
</jvmArguments>
</configuration>
# ============LICENSE_START=======================================================
# org.onap.aai
# ================================================================================
-# Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
-# Copyright © 2017-2019 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.
APP_HOME="${APP_HOME:-/opt/app/babel}"
if [ -z "${CONFIG_HOME}" ]; then
- echo "CONFIG_HOME must be set in order to start up process"
+ echo "CONFIG_HOME must be set in order to start the process"
exit 1
fi
if [ -z "${KEY_STORE_PASSWORD}" ]; then
- echo "KEY_STORE_PASSWORD must be set in order to start up process"
+ echo "KEY_STORE_PASSWORD must be set in order to start the process"
exit 1
fi
PROPS="-DAPP_HOME=${APP_HOME}"
PROPS="${PROPS} -DCONFIG_HOME=${CONFIG_HOME}"
-PROPS="${PROPS} -Dartifactgenerator.config=${CONFIG_HOME}/artifact-generator.properties"
PROPS="${PROPS} -Dtosca.mappings.config=${CONFIG_HOME}/tosca-mappings.json"
PROPS="${PROPS} -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}"
JVM_MAX_HEAP=${MAX_HEAP:-1024}
import com.google.gson.JsonSyntaxException;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.Properties;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.onap.aai.babel.logging.LogHelper;
private static Logger log = LogHelper.INSTANCE;
- public static final String PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE = "artifactgenerator.config";
public static final String PROPERTY_TOSCA_MAPPING_FILE = "tosca.mappings.config";
public static final String GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND =
this.csarHelper = csarHelper;
}
- /**
- * Initializes the Widget to UUID mapping configuration.
- *
- * @throws IOException
- * if an error occurs reading the configuration properties
- */
- public static void initWidgetConfiguration() throws IOException {
- log.debug("Getting Widget Configuration");
- String configLocation = System.getProperty(PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE);
- if (configLocation != null) {
- File file = new File(configLocation);
- if (file.exists()) {
- Properties properties = new Properties();
- properties.load(new FileInputStream(file));
- WidgetConfigurationUtil.setConfig(properties);
- } else {
- throw new IllegalArgumentException(String.format(GENERATOR_AAI_CONFIGFILE_NOT_FOUND, configLocation));
- }
- } else {
- throw new IllegalArgumentException(
- String.format(GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND, PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE));
- }
- }
-
/**
* Initializes the group filtering and TOSCA to Widget mapping configuration.
*
}
try {
- ArtifactGeneratorToscaParser.initWidgetConfiguration();
ArtifactGeneratorToscaParser.initToscaMappingsConfiguration(configLocation);
} catch (IOException e) {
log.error(ApplicationMsgs.LOAD_PROPERTIES, e, configLocation);
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.Properties;
import org.onap.aai.babel.xml.generator.XmlArtifactGenerationException;
import org.onap.aai.babel.xml.generator.model.Resource;
import org.onap.aai.babel.xml.generator.model.Widget;
public static final String GENERATOR_AAI_CONFIGLPROP_NOT_FOUND =
"Cannot generate artifacts. Widget configuration not found for %s";
- private static Properties config;
private static List<String> instanceGroups = Collections.emptyList();
private static Map<String, Resource> typeToResource = new HashMap<>();
private static Map<String, Widget> typeToWidget = new HashMap<>();
throw new UnsupportedOperationException("This static class should not be instantiated!");
}
- public static void setConfig(Properties config) {
- WidgetConfigurationUtil.config = config;
- }
-
public static void setSupportedInstanceGroups(List<String> supportedInstanceGroups) {
instanceGroups = supportedInstanceGroups;
}
public static void setWidgetTypes(List<WidgetTypeConfig> types) {
WidgetType.clearElements();
for (WidgetTypeConfig type : types) {
- if (type.type == null || type.name == null) {
+ if (type.type == null || type.name == null || type.modelInvariantId == null
+ || type.modelVersionId == null) {
throw new IllegalArgumentException("Incomplete widget type specified: " + type);
}
- if (type.modelInvariantId == null) {
- type.modelInvariantId = WidgetConfigurationUtil.getModelInvariantId(type.name);
- }
- if (type.modelVersionId == null) {
- type.modelVersionId = WidgetConfigurationUtil.getModelVersionId(type.name);
- }
Widget widget = new Widget(new WidgetType(type.type), type.name, type.deleteFlag, //
type.modelInvariantId, type.modelVersionId);
typeToWidget.put(type.type, widget);
}
}
- public static String getModelInvariantId(String name) {
- String id = config.getProperty(ArtifactType.AAI.name() + ".model-invariant-id." + name);
- if (id == null) {
- throw new IllegalArgumentException(String.format(GENERATOR_AAI_CONFIGLPROP_NOT_FOUND,
- ArtifactType.AAI.name() + ".model-invariant-id." + name));
- }
- return id;
- }
-
- public static String getModelVersionId(String name) {
- String id = config.getProperty(ArtifactType.AAI.name() + ".model-version-id." + name);
- if (id == null) {
- throw new IllegalArgumentException(String.format(GENERATOR_AAI_CONFIGLPROP_NOT_FOUND,
- ArtifactType.AAI.name() + ".model-version-id." + name));
- }
- return id;
- }
}
private static final String TEST_UUID = "1234";
- /**
- * Initialize the Generator with an invalid artifact generator properties file path.
- *
- * @throws IOException
- * if an error occurs reading the configuration properties
- */
- @Test(expected = IllegalArgumentException.class)
- public void testMissingPropertiesFile() throws IOException {
- System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE, "non-existent.file");
- ArtifactGeneratorToscaParser.initWidgetConfiguration();
- }
-
/**
* Initialize the Generator with an invalid mappings file path.
*
public void testAddWidgetToService() throws IOException, XmlArtifactGenerationException {
ArtifactTestUtils testUtils = new ArtifactTestUtils();
testUtils.loadWidgetMappings();
- testUtils.loadWidgetToUuidMappings();
Model serviceModel = new Service();
Resource resourceModel = new Resource(WidgetType.valueOf("VF"), false);
SERVICE_VERSION);
}
- /**
- * Test that an Exception is thrown when the Artifact Generator properties are not present.
- *
- * @throws CsarConverterException
- * if there is an error either extracting the YAML files or generating XML artifacts
- * @throws IOException
- * if an I/O exception occurs loading the test CSAR file
- */
- @Test
- public void testArtifactGeneratorConfigMissing() throws CsarConverterException, IOException {
- exception.expect(IllegalArgumentException.class);
- exception.expectMessage("Cannot generate artifacts. System property "
- + ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE + " not configured");
-
- // Unset the required system property
- System.clearProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE);
- converter.generateXmlFromCsar(CsarTest.SD_WAN_CSAR_FILE.getContent(), CsarTest.SD_WAN_CSAR_FILE.getName(),
- SERVICE_VERSION);
- }
-
/**
* Test that an Exception is thrown when the Artifact Generator's TOSCA Mappings configuration file is not present.
*
import org.custommonkey.xmlunit.Diff;
import org.onap.aai.babel.parser.ArtifactGeneratorToscaParser;
import org.onap.aai.babel.xml.generator.data.Artifact;
-import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
import org.xml.sax.SAXException;
/**
* Initialize System Properties for test configuration files.
*/
public void setGeneratorSystemProperties() {
- System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE,
- getResourcePath(Resources.ARTIFACT_GENERATOR_CONFIG));
-
System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_TOSCA_MAPPING_FILE,
getResourcePath(Resources.TOSCA_MAPPING_CONFIG));
}
- /**
- * Load the Widget to UUID mappings from the Artifact Generator Properties (resource).
- *
- * @throws IOException
- * if the properties file is not loaded
- */
- public void loadWidgetToUuidMappings() throws IOException {
- WidgetConfigurationUtil.setConfig(getResourceAsProperties(Resources.ARTIFACT_GENERATOR_CONFIG));
- }
-
/**
* Load the Widget type mappings (resource).
*
*/
public class Resources {
- public static final String ARTIFACT_GENERATOR_CONFIG = "artifact-generator.properties";
public static final String TOSCA_MAPPING_CONFIG = "tosca-mappings.json";
public static final String EMPTY_TOSCA_MAPPING_CONFIG = "empty-tosca-mappings.json";
public static final String INVALID_TOSCA_MAPPING_CONFIG = "invalid-tosca-mappings.json";
public void testParserWithIncompleteMappings()
throws SdcToscaParserException, IOException, XmlArtifactGenerationException {
testUtils.loadWidgetMappings();
- testUtils.loadWidgetToUuidMappings();
AaiArtifactGenerator artifactGenerator = new AaiArtifactGenerator();
WidgetType.clearElements(); // Remove all WidgetTypes so that the generator fails
public class TestModel {
/**
- * Load the Widget Configuration, including the type mappings and the UUID mappings.
+ * Load the Widget mapping configuration.
*
* @throws IOException
* if the mappings configuration cannot be loaded
*/
@BeforeClass
public static void setup() throws IOException {
- ArtifactTestUtils util = new ArtifactTestUtils();
- util.loadWidgetToUuidMappings();
- util.loadWidgetMappings();
+ new ArtifactTestUtils().loadWidgetMappings();
}
@Test
public class TestVfModule {
/**
- * Load the Widget Configuration, including the type mappings and the UUID mappings.
+ * Load the Widget mappings configuration.
*
* @throws IOException
* if the mappings configuration cannot be loaded
*/
@BeforeClass
public static void setup() throws IOException {
- ArtifactTestUtils util = new ArtifactTestUtils();
- util.loadWidgetToUuidMappings();
- util.loadWidgetMappings();
+ new ArtifactTestUtils().loadWidgetMappings();
}
/**
public class TestWidget {
/**
- * Load the Widget Configuration, including the type mappings and the UUID mappings.
+ * Load the Widget mappings configuration.
*
* @throws IOException
* if the mappings configuration cannot be loaded
*/
@BeforeClass
public static void setup() throws IOException {
- ArtifactTestUtils util = new ArtifactTestUtils();
- util.loadWidgetToUuidMappings();
- util.loadWidgetMappings();
+ new ArtifactTestUtils().loadWidgetMappings();
}
@Test
Code Review / aai / babel.git / commitdiff