* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.auth;
public class AAIAuthException extends Exception {
- /** */
+
private static final long serialVersionUID = 1L;
public AAIAuthException(String string) {
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.auth;
import com.fasterxml.jackson.core.JsonProcessingException;
private static String policyAuthFileName;
public enum HTTP_METHODS {
- GET,
- PUT,
- DELETE,
- HEAD,
- POST
+ GET, PUT, DELETE, HEAD, POST
}
// Don't instantiate
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.auth;
import java.io.File;
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.babel;
import java.util.HashMap;
throw new IllegalArgumentException("Env property KEY_STORE_PASSWORD not set");
}
HashMap<String, Object> props = new HashMap<>();
- String decryptedValue = keyStorePassword.startsWith(OBFS_PATTERN)? Password.deobfuscate(keyStorePassword) : keyStorePassword;
+ String decryptedValue =
+ keyStorePassword.startsWith(OBFS_PATTERN) ? Password.deobfuscate(keyStorePassword) : keyStorePassword;
props.put("server.ssl.key-store-password", decryptedValue);
String requireClientAuth = System.getenv("REQUIRE_CLIENT_AUTH");
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.babel.csar;
import java.util.List;
* the name of the archive file
* @param version
* the version of the archive file
- * @return List<org.onap.sdc.generator.data.Artifact> a list of generated XML artifacts
+ * @return a list of generated XML artifacts
* @throws CsarConverterException
* if there is an error either extracting the YAML files or generating XML artifacts
*/
/**
* 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");
* @param serviceNodeTemplate
* @return resources for which XML Models should be generated
* @throws XmlArtifactGenerationException
+ * if there is no configuration defined for a member Widget of an instance group
*/
public List<Resource> processInstanceGroups(Model resourceModel, NodeTemplate serviceNodeTemplate)
throws XmlArtifactGenerationException {
}
/**
+ * Add the resource/widget to the specified model.
+ *
* @param model
* @param relation
+ * resource or widget model to add
* @throws XmlArtifactGenerationException
+ * if the relation is a widget and there is no configuration defined for the relation's widget type
*/
public void addRelatedModel(final Model model, final Resource relation) throws XmlArtifactGenerationException {
if (relation.isResource()) {
* the properties of the Group
* @return the Instance Group and Member resource models
* @throws XmlArtifactGenerationException
+ * if there is no configuration defined for one of the member Widgets
*/
private List<Resource> processInstanceGroup(Model resourceModel, ArrayList<NodeTemplate> memberNodes,
Map<String, String> metaProperties, Map<String, Property> properties)
/**
* @param memberNodes
* @param groupModel
- * @return
+ * @return a list of Resources
* @throws XmlArtifactGenerationException
+ * if a member node template is a widget and there is no configuration defined for that relation's
+ * widget type
*/
private List<Resource> generateResourcesAndWidgets(final ArrayList<NodeTemplate> memberNodes,
final Resource groupModel) throws XmlArtifactGenerationException {
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.babel.service;
import com.google.gson.Gson;
private AAIMicroServiceAuth aaiMicroServiceAuth;
- /** @param authorization */
+ /**
+ * @param authorization
+ */
@Inject
public GenerateArtifactsServiceImpl(final AAIMicroServiceAuth authorization) {
this.aaiMicroServiceAuth = authorization;
ArtifactGeneratorToscaParser.initWidgetConfiguration();
ArtifactGeneratorToscaParser.initToscaMappingsConfiguration(configLocation);
} catch (IOException e) {
- log.error(ApplicationMsgs.LOAD_PROPERTIES, e);
+ log.error(ApplicationMsgs.LOAD_PROPERTIES, e, configLocation);
return createErrorData(e);
}
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.babel.xml.generator.model;
import java.util.Collections;
protected Set<Widget> widgets = new HashSet<>();
/**
- * Gets the object (model) corresponding to the supplied TOSCA type.
+ * Gets the Resource Model corresponding to the supplied TOSCA type.
*
* @param toscaType
- * the tosca type
+ * the tosca type
* @return the model for the type, or null
*/
public static Resource getModelFor(String toscaType) {
* information.
*
* @param toscaType
- * the TOSCA type
+ * the TOSCA type
* @param metaDataType
- * the type from the TOSCA metadata
+ * the type from the TOSCA metadata
* @return the model for the type, or null
*/
public static Resource getModelFor(String toscaType, String metaDataType) {
* Gets widget version id.
*
* @return the widget version id
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
*/
public String getWidgetId() throws XmlArtifactGenerationException {
return Widget.getWidget(getWidgetType()).getId();
* Gets invariant id.
*
* @return the invariant id
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
*/
public String getWidgetInvariantId() throws XmlArtifactGenerationException {
return Widget.getWidget(getWidgetType()).getWidgetId();
}
-
+
/**
* Populate model identification information.
*
* @param modelIdentInfo
- * the model ident info
+ * the model ident info
*/
public void populateModelIdentificationInformation(Map<String, String> modelIdentInfo) {
Iterator<String> iter = modelIdentInfo.keySet().iterator();
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.babel.xml.generator.model;
import java.util.Collections;
* Copy Constructor
*
* @param baseWidget
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
*/
public Widget(Widget baseWidget) throws XmlArtifactGenerationException {
this(baseWidget.getWidgetType(), baseWidget.getName(), baseWidget.getDeleteFlag());
* @param type
* the type
* @return a new widget of the specified type
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
+ * if there is no configuration defined for the specified type
*/
public static Widget getWidget(Type type) throws XmlArtifactGenerationException {
Widget widget = WidgetConfigurationUtil.createWidgetFromType(type);
# ============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.
# limitations under the License.
# ============LICENSE_END=========================================================
-#Resource key=Error Code|Message text|Resolution text |Description text
-#######
-#Newlines can be utilized to add some clarity ensuring continuing line
-#has at least one leading space
-#ResourceKey=\
+# Resource key=Error Code|Message text|Resolution text |Description text
+#
+# For example:
+# ResourceKey=\
# ERR0000E\
# Sample error msg txt\
# Sample resolution msg\
# Sample description txt
#
-######
-#Error code classification category
-#000 Info/Debug
-#100 Permission errors
-#200 Availability errors/Timeouts
-#300 Data errors
-#400 Schema Interface type/validation errors
-#500 Business process errors
-#900 Unknown errors
-#
-########################################################################
+# Error code classification category
+# 000 Info/Debug
+# 100 Permission errors
+# 200 Availability errors/Timeouts
+# 300 Data errors
+# 400 Schema Interface type/validation errors
+# 500 Business process errors
+# 900 Unknown errors
DISTRIBUTION_EVENT=\
BABEL0001I|\
LOAD_PROPERTIES=\
BABEL0013E|\
- Error loading properties: {0}|Correct the file contents|\
-
-
\ No newline at end of file
+ Error loading properties: {0}|\
+ Correct the file contents|\
* 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 {
* Initialize the Generator with an invalid mappings file path.
*
* @throws IOException
+ * if the file content could not be read successfully
*/
@Test(expected = IllegalArgumentException.class)
public void testMissingMappingsFile() throws IOException {
* Initialize the Generator with no Widget Mappings content.
*
* @throws IOException
+ * if the file content could not be read successfully
*/
@Test(expected = IOException.class)
public void testMissingMappingsContent() throws IOException {
* Initialize the Generator with invalid Widget Mappings content.
*
* @throws IOException
+ * if the file content could not be read successfully
*/
@Test(expected = IOException.class)
public void testInvalidMappingsContent() throws IOException {
}
/**
- * Initialise the Artifact Generator Widget Mapping config with incomplete data.
+ * Initialise the Artifact Generator Widget Mapping config with incomplete data (no type).
*/
@Test(expected = IllegalArgumentException.class)
public void testToscaMappingWithoutType() {
}
/**
- * Initialise the Artifact Generator Widget Mapping config with incomplete data.
+ * Initialise the Artifact Generator Widget Mapping config with incomplete data (no widget name).
*/
@Test(expected = IllegalArgumentException.class)
public void testToscaMappingWithoutWidget() {
* Process a dummy Group object for a Service Resource.
*
* @throws XmlArtifactGenerationException
+ * if there is no configuration defined for a member Widget of an instance group
*/
@Test
public void testInstanceGroups() throws XmlArtifactGenerationException {
}
/**
+ * Initialize the Widget mappings.
+ *
* @throws IOException
* if a properties file is not loaded
*/
/**
* Add a new Widget to a VF Module, where the Widget is NOT set as a member. N.B. For the current VF Module
* implementation the actual Widget type is not important.
- * @throws XmlArtifactGenerationException
+ *
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
@Test
public void testNonMemberWidgetToVf() throws XmlArtifactGenerationException {
/**
* OAM Network is specifically excluded from a VF Module.
- * @throws XmlArtifactGenerationException
+ *
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
@Test
public void testAddOamNetworkWidgetToVf() throws XmlArtifactGenerationException {
* <li>Add a Volume Widget</li>
* <li>Add a vserver Widget</li>
* <li>Check that the Volume Widget appears under the vserver</li>
- * @throws XmlArtifactGenerationException
+ *
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
@Test
public void testAddVolumeWidgetToVf() throws XmlArtifactGenerationException {
* <li>Add an L-Interface Widget</li>
* <li>Add a vserver Widget</li>
* <li>Check that the L-Interface Widget appears under the vserver</li>
- * @throws XmlArtifactGenerationException
+ *
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
@Test
public void testAddLinterfaceWidgetToVf() throws XmlArtifactGenerationException {
* <li>Add an L-Interface Widget</li>
* <li>Add a vserver Widget</li>
* <li>Check that both Widgets appear under the vserver</li>
- * @throws XmlArtifactGenerationException
+ *
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
@Test
public void testAddVolumeAndLinterfaceWidgetToVf() throws XmlArtifactGenerationException {
* @param widgetType
* type of Widget to create
* @return a new Widget
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
private Widget createNewWidget(Type widgetType) throws XmlArtifactGenerationException {
return Widget.getWidget(widgetType);
* the VF Module to update
* @param widgetType
* the type of Widget to create and add
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
private void assertAddWidget(Resource vfModule, Type widgetType) throws XmlArtifactGenerationException {
assertThat(createNewWidgetForModule(vfModule, widgetType), is(true));
* the VF Module
* @param widgetType
* the type of Widget to create and attempt to add
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
private void assertFailToAddWidget(Resource vfModule, Type widgetType) throws XmlArtifactGenerationException {
assertThat(createNewWidgetForModule(vfModule, widgetType), is(false));
* @param widgetType
* the type of Widget to create and attempt to add
* @return whether or not the Widget was added to the module
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
private boolean createNewWidgetForModule(Resource vfModule, Type widgetType) throws XmlArtifactGenerationException {
Widget widget = createNewWidget(widgetType);
* @param vfModule
* the VF Module to update
* @return the number of Widgets present in the vserver on creation
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
private int createVserverForVf(Resource vfModule) throws XmlArtifactGenerationException {
Widget vserverWidget = createNewWidget(Type.VSERVER);
* @param vserverWidget
* the Widget to add
* @return initial widget count for the vserver Widget
- * @throws XmlArtifactGenerationException
+ * @throws XmlArtifactGenerationException
+ * if the Widget mapping configuration is missing
*/
private int addVserverToVf(Resource vfModule, Widget vserverWidget) throws XmlArtifactGenerationException {
// A vserver (initially) has Flavor, Image, Tenant and Vfc.
import org.onap.aai.babel.xml.generator.types.ModelType;
/**
- * Direct tests of the Widget class for code coverage.
+ * Direct tests of the Widget class for code coverage.
*/
public class TestWidget {
assertThat(widget.getType(), is(ModelType.WIDGET));
assertThat(widget.getName(), is("service-instance"));
assertThat(widget.getDeleteFlag(), is(true));
-
+
widget = Widget.getWidget(Type.VF);
assertThat(widget.getType(), is(ModelType.WIDGET));
assertThat(widget.getName(), is("generic-vnf"));
Code Review / aai / babel.git / commitdiff