diff options
641 files changed, 1456 insertions, 1487 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml index b733facf80..7a9f2ac300 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -64,18 +64,18 @@ </exclusion> <exclusion> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-api</artifactId> </exclusion> <exclusion> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-core</artifactId> </exclusion> <exclusion> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-common-lib</artifactId> </exclusion> <exclusion> @@ -120,8 +120,8 @@ <!--Artifact Generator--> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-api</artifactId> <version>${artifact-generator-api.version}</version> <scope>compile</scope> <exclusions> @@ -133,8 +133,8 @@ </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-core</artifactId> <version>${artifact-generator-core.version}</version> <scope>compile</scope> <exclusions> @@ -146,8 +146,8 @@ </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-common-lib</artifactId> <version>${dox-common-lib.version}</version> <type>pom</type> <exclusions> diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 621330a61a..0ca00c75f1 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -487,8 +487,8 @@ <!--Artifact Generator--> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-api</artifactId> <version>${artifact-generator-api.version}</version> <scope>compile</scope> <exclusions> @@ -500,8 +500,8 @@ </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-core</artifactId> <version>${artifact-generator-core.version}</version> <scope>compile</scope> <exclusions> @@ -513,8 +513,8 @@ </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-common-lib</artifactId> <version>${dox-common-lib.version}</version> <type>pom</type> <exclusions> diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ArtifactTypes.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ArtifactTypes.java index f13331ed0b..be56ff3b73 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ArtifactTypes.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ArtifactTypes.java @@ -20,7 +20,7 @@ package org.openecomp.sdc.be.tosca; -import org.openecomp.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.ArtifactType; import java.util.List; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java index ed3a2462bd..75810bd286 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java @@ -83,11 +83,11 @@ import org.openecomp.sdc.common.impl.ExternalConfiguration; import org.openecomp.sdc.common.util.GeneralUtility; import org.openecomp.sdc.common.util.ValidationUtils; import org.openecomp.sdc.exception.ResponseFormat; -import org.openecomp.sdc.generator.data.AdditionalParams; -import org.openecomp.sdc.generator.data.Artifact; -import org.openecomp.sdc.generator.data.ArtifactType; -import org.openecomp.sdc.generator.data.GenerationData; -import org.openecomp.sdc.generator.impl.ArtifactGenerationServiceImpl; +import org.onap.sdc.generator.data.AdditionalParams; +import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.impl.ArtifactGenerationServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ArtifactTypesTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ArtifactTypesTest.java index 92fc2fd4cf..38bf484595 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ArtifactTypesTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ArtifactTypesTest.java @@ -3,7 +3,7 @@ package org.openecomp.sdc.be.tosca; import java.util.List; import org.junit.Test; -import org.openecomp.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.ArtifactType; public class ArtifactTypesTest { diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml index 0a06aa3f4e..df2b77ba14 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml @@ -2,12 +2,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>openecomp-configuration-management-api</name> - <artifactId>openecomp-configuration-management-api</artifactId> + <name>onap-configuration-management-api</name> + <artifactId>onap-configuration-management-api</artifactId> <parent> - <artifactId>openecomp-common-configuration-management</artifactId> - <groupId>org.openecomp.sdc.common</groupId> + <artifactId>onap-common-configuration-management</artifactId> + <groupId>org.onap.sdc.common</groupId> <version>1.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/Config.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/Config.java index 2859ce639b..b4cd68df5d 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/Config.java +++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/Config.java @@ -1,4 +1,4 @@ -package org.openecomp.config.api; +package org.onap.config.api; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/Configuration.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/Configuration.java index 07db4ab3aa..58eedd7575 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/Configuration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/Configuration.java @@ -1,4 +1,4 @@ -package org.openecomp.config.api; +package org.onap.config.api; import java.util.Arrays; import java.util.List; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/ConfigurationChangeListener.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationChangeListener.java index f7510aef0a..451a75f3ae 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/ConfigurationChangeListener.java +++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationChangeListener.java @@ -1,4 +1,4 @@ -package org.openecomp.config.api; +package org.onap.config.api; public interface ConfigurationChangeListener { diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/ConfigurationManager.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java index ffa9255f2c..0e8f1409a0 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/ConfigurationManager.java +++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java @@ -1,4 +1,4 @@ -package org.openecomp.config.api; +package org.onap.config.api; import java.lang.reflect.InvocationTargetException; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/DynamicConfiguration.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/DynamicConfiguration.java index 3b64fe71a9..969749b260 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/DynamicConfiguration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/DynamicConfiguration.java @@ -1,4 +1,4 @@ -package org.openecomp.config.api; +package org.onap.config.api; import java.util.Arrays; import java.util.List; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/Hint.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/Hint.java index 600c76df52..17b58f6b0e 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/src/main/java/org/openecomp/config/api/Hint.java +++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/Hint.java @@ -1,4 +1,4 @@ -package org.openecomp.config.api; +package org.onap.config.api; public enum Hint { diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml index 7d55d66446..f242fcc5d9 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml @@ -2,21 +2,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.sdc.common</groupId> - <name>openecomp-configuration-management-cli</name> - <artifactId>openecomp-configuration-management-cli</artifactId> + <groupId>org.onap.sdc.common</groupId> + <name>onap-configuration-management-cli</name> + <artifactId>onap-configuration-management-cli</artifactId> <parent> - <artifactId>openecomp-common-configuration-management</artifactId> - <groupId>org.openecomp.sdc.common</groupId> + <artifactId>onap-common-configuration-management</artifactId> + <groupId>org.onap.sdc.common</groupId> <version>1.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -42,7 +42,7 @@ <configuration> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.openecomp.config.gui.app.Configuration</mainClass> + <mainClass>org.onap.config.gui.app.Configuration</mainClass> </transformer> </transformers> </configuration> diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/src/main/java/org/openecomp/config/cli/app/Configuration.java b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java index d43c0505a8..d1a93f0041 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/src/main/java/org/openecomp/config/cli/app/Configuration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java @@ -1,7 +1,7 @@ -package org.openecomp.config.cli.app; +package org.onap.config.cli.app; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; import java.util.HashMap; import java.util.Map; @@ -47,8 +47,8 @@ public class Configuration { boolean isUpdate = isKeyPresent("update", args); Map<String, Object> input = new HashMap<>(); - input.put("ImplClass", isUpdate ? "org.openecomp.config.type.ConfigurationUpdate" - : "org.openecomp.config.type.ConfigurationQuery"); + input.put("ImplClass", isUpdate ? "org.onap.config.type.ConfigurationUpdate" + : "org.onap.config.type.ConfigurationQuery"); input.put("externalLookup", isKeyPresent("lookup", args)); input.put("nodeOverride", isKeyPresent("nodeOverride", args)); input.put("nodeSpecific", isKeyPresent("nodeSpecific", args)); @@ -70,8 +70,8 @@ public class Configuration { MBeanServerConnection mbsc = jmxc.getMBeanServerConnection(); ObjectName mbeanName = new ObjectName("org.openecomp.jmx:name=SystemConfig"); - org.openecomp.config.api.ConfigurationManager conf = - JMX.newMBeanProxy(mbsc, mbeanName, org.openecomp.config.api.ConfigurationManager.class, + org.onap.config.api.ConfigurationManager conf = + JMX.newMBeanProxy(mbsc, mbeanName, org.onap.config.api.ConfigurationManager.class, true); boolean isGet = isKeyPresent("get", args); diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/src/main/java/org/openecomp/config/gui/app/Configuration.java b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java index 3db67c536a..fa7cf5b77a 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/src/main/java/org/openecomp/config/gui/app/Configuration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java @@ -1,9 +1,9 @@ -package org.openecomp.config.gui.app; +package org.onap.config.gui.app; import com.sun.tools.attach.VirtualMachine; import com.sun.tools.attach.VirtualMachineDescriptor; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.ConfigurationManager; import java.awt.BorderLayout; import java.awt.Button; @@ -318,7 +318,7 @@ public class Configuration extends Frame { Button button = null; bottom.add(button = new Button("GET")); button.addActionListener((actionListener) -> value.setText(manager - .getConfigurationValue(buildMap("org.openecomp.config.type.ConfigurationQuery", value)))); + .getConfigurationValue(buildMap("org.onap.config.type.ConfigurationQuery", value)))); bottom.add(new Label()); bottom.add(button = new Button("CLOSE")); bottom.add(new Label()); @@ -372,7 +372,7 @@ public class Configuration extends Frame { bottom.add(button = new Button("UPDATE")); button.addActionListener((actionListener) -> { manager - .updateConfigurationValue(buildMap("org.openecomp.config.type.ConfigurationUpdate", value)); + .updateConfigurationValue(buildMap("org.onap.config.type.ConfigurationUpdate", value)); message("Info", "Success"); }); bottom.add(new Label()); @@ -417,7 +417,7 @@ public class Configuration extends Frame { Button button = null; bottom.add(button = new Button("List")); button.addActionListener((actionListener) -> populateKeyValue( - manager.listConfiguration(buildMap("org.openecomp.config.type.ConfigurationQuery", null)))); + manager.listConfiguration(buildMap("org.onap.config.type.ConfigurationQuery", null)))); bottom.add(new Label()); bottom.add(button = new Button("CLOSE")); bottom.add(new Label()); diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index a7a55c5b2d..70459a63a5 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -2,13 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>openecomp-configuration-management-core</name> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <name>onap-configuration-management-core</name> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <parent> - <artifactId>openecomp-common-configuration-management</artifactId> - <groupId>org.openecomp.sdc.common</groupId> + <artifactId>onap-common-configuration-management</artifactId> + <groupId>org.onap.sdc.common</groupId> <version>1.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -101,8 +101,8 @@ <version>${slf4j.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> <version>1.2.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java index e8dc16efb6..7f22461cda 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java @@ -1,4 +1,4 @@ -package org.openecomp.config; +package org.onap.config; import com.google.common.collect.ImmutableMap; import com.virtlink.commons.configuration2.jackson.JsonConfiguration; @@ -16,13 +16,14 @@ import org.apache.commons.configuration2.builder.fluent.Parameters; import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.io.IOUtils; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.impl.AgglomerateConfiguration; -import org.openecomp.config.impl.ConfigurationDataSource; -import org.openecomp.config.impl.ConfigurationRepository; -import org.openecomp.config.impl.YamlConfiguration; -import org.openecomp.config.type.ConfigurationMode; -import org.openecomp.config.type.ConfigurationType; +import org.onap.config.api.Config; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.impl.ConfigurationRepository; +import org.onap.config.impl.YamlConfiguration; +import org.onap.config.impl.AgglomerateConfiguration; +import org.onap.config.impl.ConfigurationDataSource; +import org.onap.config.type.ConfigurationMode; +import org.onap.config.type.ConfigurationType; import javax.sql.DataSource; import java.io.File; @@ -64,9 +65,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import static com.google.common.collect.ImmutableMap.builder; -import static org.openecomp.config.api.Hint.EXTERNAL_LOOKUP; -import static org.openecomp.config.api.Hint.LATEST_LOOKUP; -import static org.openecomp.config.api.Hint.NODE_SPECIFIC; +import static org.onap.config.api.Hint.EXTERNAL_LOOKUP; +import static org.onap.config.api.Hint.LATEST_LOOKUP; +import static org.onap.config.api.Hint.NODE_SPECIFIC; /** * The type Configuration utils. @@ -644,19 +645,19 @@ public class ConfigurationUtils { */ public static <T> T read(Configuration config, Class<T> clazz, String keyPrefix) throws Exception { - org.openecomp.config.api.Config confAnnot = - clazz.getAnnotation(org.openecomp.config.api.Config.class); + Config confAnnot = + clazz.getAnnotation(Config.class); if (confAnnot != null) { keyPrefix += (confAnnot.key() + "."); } T objToReturn = clazz.newInstance(); for (Field field : clazz.getDeclaredFields()) { - org.openecomp.config.api.Config fieldConfAnnot = - field.getAnnotation(org.openecomp.config.api.Config.class); + Config fieldConfAnnot = + field.getAnnotation(Config.class); if (fieldConfAnnot != null) { field.setAccessible(true); field.set(objToReturn, config.getProperty(keyPrefix + fieldConfAnnot.key())); - } else if (field.getType().getAnnotation(org.openecomp.config.api.Config.class) != null) { + } else if (field.getType().getAnnotation(Config.class) != null) { field.set(objToReturn, read(config, field.getType(), keyPrefix)); } } diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/Constants.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/Constants.java index b35a5a8d83..a16607cbc0 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/Constants.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/Constants.java @@ -1,4 +1,4 @@ -package org.openecomp.config; +package org.onap.config; public class Constants { diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/NonConfigResource.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java index f4c1c16dc5..830cdfef5a 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/NonConfigResource.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java @@ -1,4 +1,4 @@ -package org.openecomp.config; +package org.onap.config; import java.io.File; import java.net.URL; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/AgglomerateConfiguration.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AgglomerateConfiguration.java index 9556b480c6..0934608c93 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/AgglomerateConfiguration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AgglomerateConfiguration.java @@ -1,4 +1,4 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; import org.apache.commons.configuration2.DatabaseConfiguration; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/AggregateConfiguration.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java index e67de752ec..c8d76d9bd9 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/AggregateConfiguration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java @@ -1,13 +1,13 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; import org.apache.commons.configuration2.CombinedConfiguration; import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.tree.MergeCombiner; import org.apache.commons.configuration2.tree.OverrideCombiner; import org.apache.commons.configuration2.tree.UnionCombiner; -import static org.openecomp.config.Constants.LOAD_ORDER_KEY; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.type.ConfigurationMode; +import static org.onap.config.Constants.LOAD_ORDER_KEY; +import org.onap.config.ConfigurationUtils; +import org.onap.config.type.ConfigurationMode; import java.io.File; import java.net.URL; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/CliConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java index 8452d2f018..3bdebffb48 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/CliConfigurationImpl.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java @@ -1,25 +1,25 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; -import static org.openecomp.config.Constants.DB_NAMESPACE; -import static org.openecomp.config.Constants.DEFAULT_NAMESPACE; -import static org.openecomp.config.Constants.DEFAULT_TENANT; -import static org.openecomp.config.Constants.KEY_ELEMENTS_DELEMETER; -import static org.openecomp.config.Constants.LOAD_ORDER_KEY; -import static org.openecomp.config.Constants.MBEAN_NAME; -import static org.openecomp.config.Constants.MODE_KEY; -import static org.openecomp.config.Constants.NAMESPACE_KEY; +import static org.onap.config.Constants.DB_NAMESPACE; +import static org.onap.config.Constants.DEFAULT_NAMESPACE; +import static org.onap.config.Constants.DEFAULT_TENANT; +import static org.onap.config.Constants.KEY_ELEMENTS_DELEMETER; +import static org.onap.config.Constants.LOAD_ORDER_KEY; +import static org.onap.config.Constants.MBEAN_NAME; +import static org.onap.config.Constants.MODE_KEY; +import static org.onap.config.Constants.NAMESPACE_KEY; import org.apache.commons.configuration2.CombinedConfiguration; import org.apache.commons.configuration2.CompositeConfiguration; import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.FileBasedConfiguration; import org.apache.commons.configuration2.PropertiesConfiguration; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.Constants; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.api.Hint; -import org.openecomp.config.type.ConfigurationQuery; -import org.openecomp.config.type.ConfigurationUpdate; +import org.onap.config.type.ConfigurationQuery; +import org.onap.config.ConfigurationUtils; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.api.Hint; +import org.onap.config.type.ConfigurationUpdate; import java.io.File; import java.io.PrintWriter; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationChangeNotifier.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java index 3922720d48..a7c10caae9 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationChangeNotifier.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java @@ -1,12 +1,10 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; -import static org.openecomp.config.ConfigurationUtils.isArray; - -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.Constants; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.api.Hint; +import org.onap.config.ConfigurationUtils; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.api.Hint; import java.io.File; import java.io.IOException; @@ -162,7 +160,7 @@ public final class ConfigurationChangeNotifier { MBeanServerConnection mbsc = ManagementFactory.getPlatformMBeanServer(); ObjectName mbeanName = new ObjectName(Constants.MBEAN_NAME); ConfigurationManager conf = - JMX.newMBeanProxy(mbsc, mbeanName, org.openecomp.config.api.ConfigurationManager.class, + JMX.newMBeanProxy(mbsc, mbeanName, ConfigurationManager.class, true); conf.updateConfigurationValues(tenant, namespace, map); } @@ -362,7 +360,7 @@ public final class ConfigurationChangeNotifier { .containsKey(key)) { throw new RuntimeException("Key[" + key + "] not found."); } - isArray = isArray(tenant, component, key, Hint.DEFAULT.value()); + isArray = ConfigurationUtils.isArray(tenant, component, key, Hint.DEFAULT.value()); if (isArray) { currentValue = ConfigurationManager.lookup().getAsStringValues(tenant, component, key); } else { @@ -461,7 +459,7 @@ public final class ConfigurationChangeNotifier { } catch (Exception exception) { exception.printStackTrace(); } finally { - isArray = isArray(tenant, namespace, key, Hint.DEFAULT.value()); + isArray = ConfigurationUtils.isArray(tenant, namespace, key, Hint.DEFAULT.value()); if (isArray) { currentValue = ConfigurationManager.lookup().getAsStringValues(tenant, namespace, key); } else { diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationDataSource.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java index a60403e4dc..ea9c61f635 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationDataSource.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java @@ -1,10 +1,10 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; import org.apache.commons.configuration2.ImmutableConfiguration; import org.apache.commons.dbcp2.BasicDataSource; import org.apache.commons.lang3.StringUtils; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.Constants; +import org.onap.config.ConfigurationUtils; +import org.onap.config.Constants; import java.sql.Driver; import java.util.Arrays; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationFilter.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java index 4aa474c9ea..9df69ed1d7 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationFilter.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java @@ -1,7 +1,7 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; -import org.openecomp.config.Constants; -import org.openecomp.config.api.Configuration; +import org.onap.config.Constants; +import org.onap.config.api.Configuration; import java.io.IOException; import javax.servlet.Filter; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java index 26e8f8e7bb..43b1b96fc5 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationImpl.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java @@ -1,24 +1,15 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; -import static org.openecomp.config.ConfigurationUtils.getConfigurationRepositoryKey; -import static org.openecomp.config.ConfigurationUtils.getProperty; -import static org.openecomp.config.ConfigurationUtils.isExternalLookup; -import static org.openecomp.config.ConfigurationUtils.isWrapperClass; -import static org.openecomp.config.ConfigurationUtils.isZeroLengthArray; - -import static org.openecomp.config.Constants.DB_NAMESPACE; -import static org.openecomp.config.Constants.DEFAULT_NAMESPACE; -import static org.openecomp.config.Constants.DEFAULT_TENANT; -import static org.openecomp.config.Constants.KEY_ELEMENTS_DELEMETER; +import static org.onap.config.ConfigurationUtils.getConfigurationRepositoryKey; import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.DatabaseConfiguration; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.Constants; -import org.openecomp.config.NonConfigResource; -import org.openecomp.config.api.Config; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.Hint; +import org.onap.config.ConfigurationUtils; +import org.onap.config.Constants; +import org.onap.config.NonConfigResource; +import org.onap.config.api.Config; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.Hint; import java.io.File; import java.lang.reflect.Constructor; @@ -38,7 +29,7 @@ import java.util.function.Predicate; /** * The type Configuration. */ -public class ConfigurationImpl implements org.openecomp.config.api.Configuration { +public class ConfigurationImpl implements org.onap.config.api.Configuration { private static ThreadLocal<String> tenant = new ThreadLocal<String>() { protected String initialValue() { @@ -67,7 +58,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration Predicate<URL> predicate = ConfigurationUtils::isConfig; for (URL url : classpathResources) { if (predicate.test(url)) { - String moduleName = getConfigurationRepositoryKey(url); + String moduleName = ConfigurationUtils.getConfigurationRepositoryKey(url); AggregateConfiguration moduleConfig = moduleConfigStore.get(moduleName); if (moduleConfig == null) { moduleConfig = new AggregateConfiguration(); @@ -85,7 +76,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration Predicate<File> filePredicate = ConfigurationUtils::isConfig; for (File file : filesystemResources) { if (filePredicate.test(file)) { - String moduleName = getConfigurationRepositoryKey(file); + String moduleName = ConfigurationUtils.getConfigurationRepositoryKey(file); AggregateConfiguration moduleConfig = moduleConfigStore.get(moduleName); if (moduleConfig == null) { moduleConfig = new AggregateConfiguration(); @@ -108,7 +99,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration String moduleName = ConfigurationUtils.getNamespace(file); for (File tenanatFileRoot : tenantsRoot) { if (file.getAbsolutePath().startsWith(tenanatFileRoot.getAbsolutePath())) { - moduleName = getConfigurationRepositoryKey( + moduleName = ConfigurationUtils.getConfigurationRepositoryKey( (tenanatFileRoot.getName().toUpperCase() + Constants.TENANT_NAMESPACE_SAPERATOR + moduleName).split(Constants.TENANT_NAMESPACE_SAPERATOR)); } @@ -132,7 +123,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration for (File file : filesystemResources) { if (filePredicate.test(file)) { ConfigurationRepository.lookup().populateOverrideConfigurtaion( - getConfigurationRepositoryKey(ConfigurationUtils.getNamespace(file) + ConfigurationUtils.getConfigurationRepositoryKey(ConfigurationUtils.getNamespace(file) .split(Constants.TENANT_NAMESPACE_SAPERATOR)), file); } } @@ -233,21 +224,21 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration clazz.isPrimitive() ? getWrapperClass(clazz) : clazz, hints == null || hints.length == 0 ? new Hint[]{Hint.EXTERNAL_LOOKUP, Hint.NODE_SPECIFIC} : hints); - if ((returnValue == null || isZeroLengthArray(clazz, returnValue)) + if ((returnValue == null || ConfigurationUtils.isZeroLengthArray(clazz, returnValue)) && !Constants.DEFAULT_TENANT.equals(tenant)) { returnValue = (T) getInternal(Constants.DEFAULT_TENANT, namespace, key, clazz.isPrimitive() ? getWrapperClass(clazz) : clazz, hints == null || hints.length == 0 ? new Hint[]{Hint.EXTERNAL_LOOKUP, Hint.NODE_SPECIFIC} : hints); } - if ((returnValue == null || isZeroLengthArray(clazz, returnValue)) + if ((returnValue == null || ConfigurationUtils.isZeroLengthArray(clazz, returnValue)) && !Constants.DEFAULT_NAMESPACE.equals(namespace)) { returnValue = (T) getInternal(tenant, Constants.DEFAULT_NAMESPACE, key, clazz.isPrimitive() ? getWrapperClass(clazz) : clazz, hints == null || hints.length == 0 ? new Hint[]{Hint.EXTERNAL_LOOKUP, Hint.NODE_SPECIFIC} : hints); } - if ((returnValue == null ||isZeroLengthArray(clazz, returnValue)) + if ((returnValue == null || ConfigurationUtils.isZeroLengthArray(clazz, returnValue)) && !Constants.DEFAULT_NAMESPACE.equals(namespace) && !Constants.DEFAULT_TENANT.equals(tenant)) { returnValue = (T) getInternal(Constants.DEFAULT_TENANT, Constants.DEFAULT_NAMESPACE, key, @@ -305,9 +296,10 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration clazz = getWrapperClass(clazz); } try { - if (isWrapperClass(clazz) || clazz.isPrimitive()) { + if (ConfigurationUtils.isWrapperClass(clazz) || clazz.isPrimitive()) { Object obj = - getProperty(ConfigurationRepository.lookup().getConfigurationFor(tenant, namespace), + ConfigurationUtils + .getProperty(ConfigurationRepository.lookup().getConfigurationFor(tenant, namespace), key, processingHints); if (obj != null) { if (ConfigurationUtils.isCollection(obj.toString())) { @@ -321,9 +313,10 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration return null; } } else if (clazz.isArray() - && (clazz.getComponentType().isPrimitive() || isWrapperClass(clazz.getComponentType()))) { + && (clazz.getComponentType().isPrimitive() || ConfigurationUtils.isWrapperClass(clazz.getComponentType()))) { Object obj = - getProperty(ConfigurationRepository.lookup().getConfigurationFor(tenant, namespace), + ConfigurationUtils + .getProperty(ConfigurationRepository.lookup().getConfigurationFor(tenant, namespace), key, processingHints); if (obj != null) { Class componentClass = clazz.getComponentType(); @@ -365,8 +358,8 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration private <T> T read(String tenant, String namespace, Class<T> clazz, String keyPrefix, Hint... hints) throws Exception { - org.openecomp.config.api.Config confAnnot = - clazz.getAnnotation(org.openecomp.config.api.Config.class); + Config confAnnot = + clazz.getAnnotation(Config.class); if (confAnnot != null && confAnnot.key().length()>0 && !keyPrefix.endsWith(".")) { keyPrefix += (confAnnot.key() + "."); } @@ -375,13 +368,13 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration T objToReturn = constructor.newInstance(); for (Field field : clazz.getDeclaredFields()) { field.setAccessible(true); - org.openecomp.config.api.Config fieldConfAnnot = - field.getAnnotation(org.openecomp.config.api.Config.class); + Config fieldConfAnnot = + field.getAnnotation(Config.class); if (fieldConfAnnot != null) { - if (field.getType().isPrimitive() || isWrapperClass(field.getType()) + if (field.getType().isPrimitive() || ConfigurationUtils.isWrapperClass(field.getType()) || (field.getType().isArray() && (field.getType().getComponentType().isPrimitive() - || isWrapperClass(field.getType().getComponentType()))) - || field.getType().getAnnotation(org.openecomp.config.api.Config.class) != null) { + || ConfigurationUtils.isWrapperClass(field.getType().getComponentType()))) + || field.getType().getAnnotation(Config.class) != null) { field.set(objToReturn, get(tenant, namespace, keyPrefix + fieldConfAnnot.key(), field.getType(), hints)); } else if (Collection.class.isAssignableFrom(field.getType())) { @@ -457,7 +450,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration obj = obj.toString().trim(); } if (String.class.equals(clazz)) { - if (obj.toString().startsWith("@") && isExternalLookup(processingHint)) { + if (obj.toString().startsWith("@") && ConfigurationUtils.isExternalLookup(processingHint)) { String contents = ConfigurationUtils .getFileContents(NonConfigResource.locate(obj.toString().substring(1).trim())); if (contents == null) { @@ -595,7 +588,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration tenantId = tenantId.toUpperCase(); } if (namespace==null || namespace.trim().length()==0){ - namespace = DEFAULT_NAMESPACE; + namespace = Constants.DEFAULT_NAMESPACE; }else{ namespace = namespace.toUpperCase(); } @@ -603,7 +596,8 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration Iterator<String> keys ; try { if (ConfigurationRepository.lookup().isDBAccessible()){ - keys = ConfigurationUtils.executeSelectSql(ConfigurationRepository.lookup().getConfigurationFor(DEFAULT_TENANT, DB_NAMESPACE).getString("fetchkeysql"), new String[]{tenantId+KEY_ELEMENTS_DELEMETER+namespace}).iterator(); + keys = ConfigurationUtils.executeSelectSql(ConfigurationRepository.lookup().getConfigurationFor( + Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE).getString("fetchkeysql"), new String[]{tenantId+ Constants.KEY_ELEMENTS_DELEMETER+namespace}).iterator(); }else{ keys = ConfigurationRepository.lookup().getConfigurationFor(tenantId, namespace).getKeys(key); } @@ -631,7 +625,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration tenantId = tenantId.toUpperCase(); } if (namespace==null || namespace.trim().length()==0){ - namespace = DEFAULT_NAMESPACE; + namespace = Constants.DEFAULT_NAMESPACE; }else{ namespace = namespace.toUpperCase(); } @@ -639,7 +633,8 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration Iterator<String> keys ; try { if (ConfigurationRepository.lookup().isDBAccessible()){ - keys = ConfigurationUtils.executeSelectSql(ConfigurationRepository.lookup().getConfigurationFor(DEFAULT_TENANT, DB_NAMESPACE).getString("fetchkeysql"), new String[]{tenantId+KEY_ELEMENTS_DELEMETER+namespace}).iterator(); + keys = ConfigurationUtils.executeSelectSql(ConfigurationRepository.lookup().getConfigurationFor( + Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE).getString("fetchkeysql"), new String[]{tenantId+ Constants.KEY_ELEMENTS_DELEMETER+namespace}).iterator(); }else{ if (key==null || key.trim().length()==0){ keys = ConfigurationRepository.lookup().getConfigurationFor(tenantId, namespace).getKeys(); diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationRepository.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java index d67c1af06c..1c3bc1313f 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationRepository.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java @@ -1,4 +1,4 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; import org.apache.commons.configuration2.CombinedConfiguration; import org.apache.commons.configuration2.CompositeConfiguration; @@ -7,8 +7,8 @@ import org.apache.commons.configuration2.FileBasedConfiguration; import org.apache.commons.configuration2.builder.BasicConfigurationBuilder; import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; import org.apache.commons.configuration2.ex.ConfigurationException; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.Constants; +import org.onap.config.ConfigurationUtils; +import org.onap.config.Constants; import java.io.File; import java.sql.Timestamp; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ContextListener.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java index 06652c0843..cf87db936d 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ContextListener.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java @@ -1,13 +1,13 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; -import static org.openecomp.config.Constants.MBEAN_NAME; +import static org.onap.config.Constants.MBEAN_NAME; import java.lang.management.ManagementFactory; import javax.management.ObjectName; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.ConfigurationManager; @WebListener public class ContextListener implements ServletContextListener { diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/YamlConfiguration.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/YamlConfiguration.java index 6e107e95c8..dc6785fd73 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/YamlConfiguration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/YamlConfiguration.java @@ -1,4 +1,4 @@ -package org.openecomp.config.impl; +package org.onap.config.impl; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.virtlink.commons.configuration2.jackson.JacksonConfiguration; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/type/ConfigurationMode.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationMode.java index 475a4cae85..826d53e6bc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/type/ConfigurationMode.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationMode.java @@ -1,4 +1,4 @@ -package org.openecomp.config.type; +package org.onap.config.type; public enum ConfigurationMode { OVERRIDE, UNION, MERGE diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/type/ConfigurationQuery.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationQuery.java index 53b0eed954..6aec7c27da 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/type/ConfigurationQuery.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationQuery.java @@ -1,6 +1,6 @@ -package org.openecomp.config.type; +package org.onap.config.type; -import org.openecomp.config.Constants; +import org.onap.config.Constants; public class ConfigurationQuery { diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/type/ConfigurationType.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationType.java index d34d2e4e1c..54253fa754 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/type/ConfigurationType.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationType.java @@ -1,4 +1,4 @@ -package org.openecomp.config.type; +package org.onap.config.type; public enum ConfigurationType { PROPERTIES, XML, JSON, YAML diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/type/ConfigurationUpdate.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationUpdate.java index 9cfc980399..739dd776bf 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/type/ConfigurationUpdate.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationUpdate.java @@ -1,4 +1,4 @@ -package org.openecomp.config.type; +package org.onap.config.type; public class ConfigurationUpdate extends ConfigurationQuery { private String value; diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/resources/META-INF/services/org.onap.config.api.ConfigurationManager b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/resources/META-INF/services/org.onap.config.api.ConfigurationManager new file mode 100644 index 0000000000..173484f1a7 --- /dev/null +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/resources/META-INF/services/org.onap.config.api.ConfigurationManager @@ -0,0 +1 @@ +org.onap.config.impl.CliConfigurationImpl
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/config-system.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/resources/config-system.properties index cfe91e6c7d..cfe91e6c7d 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/config-system.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/resources/config-system.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/management.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/resources/management.properties index 9874394726..9874394726 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/management.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/resources/management.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/test/java/org/openecomp/config/ConfigurationUtilsTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java index b770d8677b..90966fccf6 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/test/java/org/openecomp/config/ConfigurationUtilsTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java @@ -1,4 +1,4 @@ -package org.openecomp.config; +package org.onap.config; import org.junit.Test; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml index 2dcde64b07..b9ce6a8cbc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml @@ -2,21 +2,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>openecomp-configuration-management-test</name> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-test</artifactId> + <name>onap-configuration-management-test</name> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-test</artifactId> <parent> - <artifactId>openecomp-common-configuration-management</artifactId> - <groupId>org.openecomp.sdc.common</groupId> + <artifactId>onap-common-configuration-management</artifactId> + <groupId>org.onap.sdc.common</groupId> <version>1.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <version>${project.version}</version> </dependency> diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/TestCMSuite.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java index 4ef46f6c9d..de265c7281 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/TestCMSuite.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java @@ -1,10 +1,28 @@ -package org.openecomp.config; +package org.onap.config; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.test.*; +import org.onap.config.test.CLIFallbackAndLookupTest; +import org.onap.config.test.CLITest; +import org.onap.config.test.ConfigSourceLocationTest; +import org.onap.config.test.DynamicConfigurationTest; +import org.onap.config.test.FallbackConfigTest; +import org.onap.config.test.FallbackToGlobalNSTest; +import org.onap.config.test.GlobalAndNSConfigTest; +import org.onap.config.test.JAVAPropertiesConfigTest; +import org.onap.config.test.JSONConfigTest; +import org.onap.config.test.LoadOrderMergeAndOverrideTest; +import org.onap.config.test.ModeAsConfigPropTest; +import org.onap.config.test.MultiTenancyConfigTest; +import org.onap.config.test.NodeSpecificCLITest; +import org.onap.config.test.NotificationForNodeConfigTest; +import org.onap.config.test.NotificationOnPropValTest; +import org.onap.config.test.ResourceChangeNotificationTest; +import org.onap.config.test.UnregisterNotificationTest; +import org.onap.config.test.ValidateDefaultModeTest; +import org.onap.config.test.ValidateNodeConfigTest; +import org.onap.config.test.XMLConfigTest; +import org.onap.config.test.YAMLConfigTest; +import org.onap.config.test.*; import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLIFallbackAndLookupTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java index 4f7ab92dd0..f4598be0d0 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLIFallbackAndLookupTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java @@ -1,9 +1,9 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.Constants; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.TestUtil; import org.junit.Assert; import org.junit.After; import org.junit.Before; @@ -48,7 +48,7 @@ public class CLIFallbackAndLookupTest { MBeanServerConnection mbsc = ManagementFactory.getPlatformMBeanServer(); ObjectName mbeanName = new ObjectName(Constants.MBEAN_NAME); - ConfigurationManager conf = JMX.newMBeanProxy(mbsc, mbeanName, org.openecomp.config.api.ConfigurationManager.class, true); + ConfigurationManager conf = JMX.newMBeanProxy(mbsc, mbeanName, ConfigurationManager.class, true); String maxSizeWithNoFallback = conf.getConfigurationValue(input); Assert.assertEquals("",maxSizeWithNoFallback); diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLITest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java index ff04873b42..5a3f39fd16 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLITest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java @@ -1,10 +1,10 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.Constants; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -18,8 +18,6 @@ import java.lang.management.ManagementFactory; import java.util.HashMap; import java.util.Map; -import static org.openecomp.config.util.ConfigTestConstant.*; - /** * Created by sheetalm on 10/18/2016. * Scenario 17 @@ -48,7 +46,7 @@ public class CLITest { MBeanServerConnection mbsc = ManagementFactory.getPlatformMBeanServer(); ObjectName mbeanName = new ObjectName(Constants.MBEAN_NAME); - ConfigurationManager conf = JMX.newMBeanProxy(mbsc, mbeanName, org.openecomp.config.api.ConfigurationManager.class, true); + ConfigurationManager conf = JMX.newMBeanProxy(mbsc, mbeanName, ConfigurationManager.class, true); String maxLength = conf.getConfigurationValue(input); Assert.assertEquals("14",maxLength); @@ -87,17 +85,20 @@ public class CLITest { private void validateCLIListConfig(Map<String, String> outputMap ) { - Assert.assertEquals("@"+System.getProperty("user.home")+"/TestResources/GeneratorsList.json" , outputMap.get(ARTIFACT_JSON_SCHEMA)); - Assert.assertEquals("appc,catalog", outputMap.get(ARTIFACT_CONSUMER)); - Assert.assertEquals("6", outputMap.get(ARTIFACT_NAME_MINLENGTH)); - Assert.assertEquals("true", outputMap.get(ARTIFACT_ENCODED)); - Assert.assertEquals("24", outputMap.get(ARTIFACT_NAME_MAXLENGTH)); - Assert.assertEquals("pdf,zip,xml,pdf,tgz,xls", outputMap.get(ARTIFACT_EXT)); - Assert.assertEquals("Base64,MD5", outputMap.get(ARTIFACT_ENC)); - Assert.assertEquals("@"+System.getenv("Path")+"/myschema.json", outputMap.get(ARTIFACT_XML_SCHEMA)); - Assert.assertEquals("a-zA-Z_0-9", outputMap.get(ARTIFACT_NAME_UPPER)); - Assert.assertEquals("/opt/spool,"+System.getProperty("user.home")+"/asdc", outputMap.get(ARTIFACT_LOC)); - Assert.assertEquals("deleted,Deleted", outputMap.get(ARTIFACT_STATUS)); + Assert.assertEquals("@"+System.getProperty("user.home")+"/TestResources/GeneratorsList.json" , outputMap.get( + ConfigTestConstant.ARTIFACT_JSON_SCHEMA)); + Assert.assertEquals("appc,catalog", outputMap.get(ConfigTestConstant.ARTIFACT_CONSUMER)); + Assert.assertEquals("6", outputMap.get(ConfigTestConstant.ARTIFACT_NAME_MINLENGTH)); + Assert.assertEquals("true", outputMap.get(ConfigTestConstant.ARTIFACT_ENCODED)); + Assert.assertEquals("24", outputMap.get(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); + Assert.assertEquals("pdf,zip,xml,pdf,tgz,xls", outputMap.get(ConfigTestConstant.ARTIFACT_EXT)); + Assert.assertEquals("Base64,MD5", outputMap.get(ConfigTestConstant.ARTIFACT_ENC)); + Assert.assertEquals("@"+System.getenv("Path")+"/myschema.json", outputMap.get( + ConfigTestConstant.ARTIFACT_XML_SCHEMA)); + Assert.assertEquals("a-zA-Z_0-9", outputMap.get(ConfigTestConstant.ARTIFACT_NAME_UPPER)); + Assert.assertEquals("/opt/spool,"+System.getProperty("user.home")+"/asdc", outputMap.get( + ConfigTestConstant.ARTIFACT_LOC)); + Assert.assertEquals("deleted,Deleted", outputMap.get(ConfigTestConstant.ARTIFACT_STATUS)); } @After diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ConfigSourceLocationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java index 731826b53c..6751a5cc31 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ConfigSourceLocationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java @@ -1,9 +1,9 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/DynamicConfigurationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java index 2140e84873..86422d2361 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/DynamicConfigurationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java @@ -1,10 +1,10 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.api.DynamicConfiguration; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.api.DynamicConfiguration; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackConfigTest.java index 09fca879b0..17b4aee8b0 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackConfigTest.java @@ -1,14 +1,13 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.ConfigurationUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; import java.io.IOException; -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; +import static org.onap.config.util.TestUtil.validateConfiguraton; +import static org.onap.config.util.TestUtil.writeFile; /** * Created by ARR on 10/14/2016. diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackToGlobalNSTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java index 1efc462d4e..14d74fb040 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackToGlobalNSTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java @@ -1,9 +1,9 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/GlobalAndNSConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java index 87324aa35c..a0bb51a73f 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/GlobalAndNSConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java @@ -1,17 +1,15 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; /** * Created by sheetalm on 10/13/2016. diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JAVAPropertiesConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java index 23c5fa3130..ab47765a1c 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JAVAPropertiesConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java @@ -1,14 +1,14 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.util.TestUtil; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; import java.io.IOException; -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; +import static org.onap.config.util.TestUtil.validateConfiguraton; +import static org.onap.config.util.TestUtil.writeFile; /** * Created by ARR on 10/13/2016. diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JSONConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java index 5f2d24e67f..b3fcb730fb 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JSONConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java @@ -1,15 +1,14 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.util.TestUtil; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; import java.io.IOException; -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; +import static org.onap.config.util.TestUtil.validateConfiguraton; +import static org.onap.config.util.TestUtil.writeFile; /** * Created by ARR on 10/14/2016. diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/LoadOrderMergeAndOverrideTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java index 7ce508a063..244511cbf0 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/LoadOrderMergeAndOverrideTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java @@ -1,16 +1,15 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH; -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; +import static org.onap.config.util.TestUtil.writeFile; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import java.io.IOException; @@ -33,7 +32,7 @@ public class LoadOrderMergeAndOverrideTest { public void testConfigurationWithPropertiesFileFormat(){ Configuration config = ConfigurationManager.lookup(); - Assert.assertEquals(config.getAsString(NAMESPACE, ARTIFACT_NAME_MAXLENGTH ), "14"); + Assert.assertEquals(config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH ), "14"); Assert.assertEquals("5", config.getAsString(NAMESPACE, "artifact.length")); Assert.assertEquals("56", config.getAsString(NAMESPACE, "artifact.size")); } diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ModeAsConfigPropTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java index 470694e355..17130d37c1 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ModeAsConfigPropTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java @@ -1,10 +1,9 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/MultiTenancyConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java index 66feea3928..8cdd634794 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/MultiTenancyConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java @@ -1,24 +1,15 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import static org.openecomp.config.util.ConfigTestConstant.*; -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_ENCODED; -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_MANDATORY_NAME; -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; /** * Created by ARR on 10/14/2016. @@ -33,18 +24,18 @@ public class MultiTenancyConfigTest { @Before public void setUp() throws IOException { String data = "{name:\"SCM\"}"; - writeFile(data); + TestUtil.writeFile(data); } @Test public void testConfigurationWithMultiTenancyFileFormat(){ Configuration config = ConfigurationManager.lookup(); - Assert.assertEquals(config.getAsString("OPENECOMP",NAMESPACE, ARTIFACT_NAME_MAXLENGTH ), "20"); + Assert.assertEquals(config.getAsString("OPENECOMP",NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH ), "20"); - Assert.assertEquals(config.getAsString("Telefonica",NAMESPACE, ARTIFACT_STATUS ), "Deleted"); + Assert.assertEquals(config.getAsString("Telefonica",NAMESPACE, ConfigTestConstant.ARTIFACT_STATUS ), "Deleted"); - Assert.assertEquals(config.getAsString("TID",NAMESPACE, ARTIFACT_NAME_MAXLENGTH ), "14"); + Assert.assertEquals(config.getAsString("TID",NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH ), "14"); } diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NodeSpecificCLITest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java index 43729cbaf2..59848f1dba 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NodeSpecificCLITest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java @@ -1,10 +1,10 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.Constants; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.TestUtil; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; @@ -41,7 +41,7 @@ public class NodeSpecificCLITest { MBeanServerConnection mbsc = ManagementFactory.getPlatformMBeanServer(); ObjectName mbeanName = new ObjectName(Constants.MBEAN_NAME); - ConfigurationManager conf = JMX.newMBeanProxy(mbsc, mbeanName, org.openecomp.config.api.ConfigurationManager.class, true); + ConfigurationManager conf = JMX.newMBeanProxy(mbsc, mbeanName, ConfigurationManager.class, true); String maxLength = conf.getConfigurationValue(input); //Verify Property from Namespace configurations diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationForNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java index 9d719103df..55af6900a6 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationForNodeConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java @@ -1,10 +1,10 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationOnPropValTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java index 7354cd19f7..c7b93b019a 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationOnPropValTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java @@ -1,10 +1,10 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ResourceChangeNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java index e3e4e24f28..54bd339f29 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ResourceChangeNotificationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java @@ -1,23 +1,20 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import java.io.File; -import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.util.ConfigTestConstant; +import org.onap.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; /** * Scenario 7 diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/UnregisterNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java index e387f13e93..cdfcfdf22d 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/UnregisterNotificationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java @@ -1,10 +1,10 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateDefaultModeTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java index 7ae2e0a644..f9ce9a37ed 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateDefaultModeTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java @@ -1,9 +1,8 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -13,8 +12,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static org.openecomp.config.util.ConfigTestConstant.*; -import static org.openecomp.config.util.TestUtil.writeFile; +import static org.onap.config.util.TestUtil.writeFile; /** * Created by ARR on 10/17/2016. @@ -36,9 +34,9 @@ public class ValidateDefaultModeTest { public void testConfigurationWithValidateDefaultMode(){ Configuration config = ConfigurationManager.lookup(); - Assert.assertEquals(config.getAsString(NAMESPACE, ARTIFACT_NAME_MAXLENGTH ), "14"); + Assert.assertEquals(config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH ), "14"); - Assert.assertEquals(config.getAsString(NAMESPACE, ARTIFACT_MAXSIZE ), "1048"); + Assert.assertEquals(config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_MAXSIZE ), "1048"); List<String> expectedExtList = new ArrayList<String>(); expectedExtList.add("pdf"); @@ -47,7 +45,7 @@ public class ValidateDefaultModeTest { List<String> extList = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_EXT); Assert.assertEquals(expectedExtList, extList); - Assert.assertEquals(config.getAsString(NAMESPACE, ARTIFACT_NAME_MINLENGTH ), "6"); + Assert.assertEquals(config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MINLENGTH ), "6"); } diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java index 8f7d703468..e4f3a84b05 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateNodeConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java @@ -1,9 +1,9 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/XMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java index 8af5ebf89d..ae6fc3e7b1 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/XMLConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java @@ -1,15 +1,14 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.util.TestUtil; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; import java.io.IOException; -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; +import static org.onap.config.util.TestUtil.validateConfiguraton; +import static org.onap.config.util.TestUtil.writeFile; /** * Created by ARR on 10/14/2016. diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/YAMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java index bc172b0eb7..46240402f4 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/YAMLConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java @@ -1,15 +1,14 @@ -package org.openecomp.config.test; +package org.onap.config.test; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.util.TestUtil; +import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; import java.io.IOException; -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; +import static org.onap.config.util.TestUtil.validateConfiguraton; +import static org.onap.config.util.TestUtil.writeFile; /** * Created by ARR on 10/14/2016. diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/ConfigTestConstant.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/ConfigTestConstant.java index d639ccad42..1d4dead7d2 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/ConfigTestConstant.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/ConfigTestConstant.java @@ -1,4 +1,4 @@ -package org.openecomp.config.util; +package org.onap.config.util; public class ConfigTestConstant { diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/TestUtil.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java index a04f14cb84..83f0371c33 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/TestUtil.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java @@ -1,8 +1,8 @@ -package org.openecomp.config.util; +package org.onap.config.util; -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.ConfigurationUtils; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.junit.Assert; import java.io.File; @@ -11,10 +11,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static org.openecomp.config.util.ConfigTestConstant.*; -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_ENCODED; -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_MANDATORY_NAME; - /** * Created by sheetalm on 10/13/2016. */ @@ -50,10 +46,10 @@ public class TestUtil { public static void validateConfiguraton(String nameSpace) { Configuration config = ConfigurationManager.lookup(); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_NAME_MAXLENGTH ), "14"); + Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH ), "14"); // First value from list is picked from Merge properties - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_MAXSIZE ), "1048576"); + Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_MAXSIZE ), "1048576"); List<String> expectedExtList = new ArrayList<String>(); expectedExtList.add("pdf"); @@ -71,9 +67,9 @@ public class TestUtil { List<String> encList = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_ENC); Assert.assertEquals(expectedEncList, encList); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_NAME_UPPER ), "a-zA-Z_0-9"); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_NAME_LOWER ), "a-zA-Z"); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_STATUS ), "deleted"); + Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_UPPER ), "a-zA-Z_0-9"); + Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_LOWER ), "a-zA-Z"); + Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_STATUS ), "deleted"); List<String> expectedLocList = new ArrayList<String>(); expectedLocList.add("/opt/spool"); @@ -81,15 +77,15 @@ public class TestUtil { List<String> locList = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_LOC); Assert.assertEquals(expectedLocList, locList); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_JSON_SCHEMA ), "@GeneratorList.json"); + Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_JSON_SCHEMA ), "@GeneratorList.json"); Assert.assertEquals("@"+System.getenv("Path")+"/myschema.json",config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_XML_SCHEMA)); List<String> artifactConsumer = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_CONSUMER ); Assert.assertEquals(config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_CONSUMER_APPC ), artifactConsumer); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_NAME_MINLENGTH ), "6"); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_MANDATORY_NAME ), "true"); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_ENCODED ), "true"); + Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_MINLENGTH ), "6"); + Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_MANDATORY_NAME ), "true"); + Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_ENCODED ), "true"); } } diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config-NS.properties index a50cabc151..a50cabc151 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config-NS.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json index 5d98a327db..5d98a327db 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.properties index 4daad19dcc..4daad19dcc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml index 2f09871bd5..2f09871bd5 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.yaml index 4333f3e83e..4333f3e83e 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties index 32da54ffbc..32da54ffbc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json index a1db251671..a1db251671 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.properties index 4daad19dcc..4daad19dcc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml index 4c46762cdd..4c46762cdd 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.yaml index b0b195f354..b0b195f354 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json index c909fe8466..c909fe8466 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties index c3825487a9..c3825487a9 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml index 3f046e232b..3f046e232b 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml index 12ba1f093e..12ba1f093e 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties index b7e985b90a..b7e985b90a 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json index 6f3d68ab75..6f3d68ab75 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties index 4daad19dcc..4daad19dcc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml index 9a881ab4a7..9a881ab4a7 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml index 46f50b6087..46f50b6087 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json index e59e65855c..e59e65855c 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties index 1a86f68a65..1a86f68a65 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml index d8292c167e..d8292c167e 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml index bbbdde22a4..bbbdde22a4 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json index 9c335724bc..9c335724bc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json index c324fc777c..c324fc777c 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json index 05a7e2d7ff..05a7e2d7ff 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json index 0538ba1717..0538ba1717 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties index 5082081102..5082081102 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties index 45018269dd..45018269dd 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties index cb5d5968f5..cb5d5968f5 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties index 79d0815a39..79d0815a39 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties index 164706dba7..164706dba7 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties index ae1f445efd..ae1f445efd 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json index 7c6d552b82..7c6d552b82 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties index a82e6b23fe..a82e6b23fe 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml index 2d05d2724c..2d05d2724c 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml index ef08bba6ce..ef08bba6ce 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NodeCLI/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NodeCLI/config.properties index 435f98ab39..435f98ab39 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NodeCLI/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NodeCLI/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/Notification/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/Notification/config.properties index 4076eefa58..4076eefa58 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/Notification/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/Notification/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip Binary files differindex 42d14a64db..42d14a64db 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json index 0d6395af4f..0d6395af4f 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties index d2c41aa4b5..d2c41aa4b5 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml index 20768aa949..20768aa949 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml index ee85a0c68d..ee85a0c68d 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties index 279d407664..279d407664 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json index fc7f2347aa..fc7f2347aa 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties index 4daad19dcc..4daad19dcc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml index e3a24fbc32..e3a24fbc32 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml index 7283df4ecb..7283df4ecb 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json index 42c6be91b9..42c6be91b9 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties index 22c9840fad..22c9840fad 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml index 1162af576e..1162af576e 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml index 4e073ce7f9..4e073ce7f9 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties index 40b4518945..40b4518945 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json index 3e0464016d..3e0464016d 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.properties index 4daad19dcc..4daad19dcc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml index 1153658161..1153658161 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml index 1deb37ac7a..1deb37ac7a 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json index 72833024c4..72833024c4 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties index c857da38e9..c857da38e9 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties index a782e25835..a782e25835 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties index 4daad19dcc..4daad19dcc 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml index 320e53348d..320e53348d 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml index 508c920b83..508c920b83 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml index 962bd342f3..962bd342f3 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml index 2fff65b2e0..2fff65b2e0 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml index 8ff08cdc43..8ff08cdc43 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml index 051d41d76b..051d41d76b 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml index 8a9ab0e13e..8a9ab0e13e 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml index 706b22db5e..706b22db5e 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/config-system.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/config-system.properties index cfe91e6c7d..cfe91e6c7d 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/config-system.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/config-system.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml index 3595efd87b..3595efd87b 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-override.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json index dd6087b70c..dd6087b70c 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-override.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml index 957b75d40a..957b75d40a 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback.properties index 7839839258..7839839258 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-M.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-M.properties index 8a571ebc89..8a571ebc89 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-M.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-M.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-O.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-O.properties index b27c67a78d..b27c67a78d 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-O.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-O.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-U.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-U.properties index 615f2a2093..615f2a2093 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-U.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-U.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config.properties index d9051f6ec4..d9051f6ec4 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-at.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-at.properties index 3bc773369b..3bc773369b 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-at.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-at.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-tf.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-tf.properties index 196bafe4e4..196bafe4e4 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-tf.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-tf.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-vf.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-vf.properties index 4c0c6ad897..4c0c6ad897 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-vf.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-vf.properties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config.properties index 8ed2485dc2..8ed2485dc2 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config.properties diff --git a/common/openecomp-common-configuration-management/pom.xml b/common/onap-common-configuration-management/pom.xml index 24b8ded023..56f4b5eea5 100644 --- a/common/openecomp-common-configuration-management/pom.xml +++ b/common/onap-common-configuration-management/pom.xml @@ -2,22 +2,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>openecomp-common-configuration-management</name> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-common-configuration-management</artifactId> + <name>onap-common-configuration-management</name> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-common-configuration-management</artifactId> <packaging>pom</packaging> <parent> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-common-lib</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modules> - <module>openecomp-configuration-management-api</module> - <module>openecomp-configuration-management-core</module> - <module>openecomp-configuration-management-test</module> + <module>onap-configuration-management-api</module> + <module>onap-configuration-management-core</module> + <module>onap-configuration-management-test</module> </modules> <repositories> diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml index ca8f6f8792..c6d022ea85 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/pom.xml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml @@ -2,12 +2,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>openecomp-sdc-artifact-generator-api</name> - <artifactId>openecomp-sdc-artifact-generator-api</artifactId> + <name>onap-sdc-artifact-generator-api</name> + <artifactId>onap-sdc-artifact-generator-api</artifactId> <parent> - <artifactId>openecomp-common-lib</artifactId> - <groupId>org.openecomp.sdc.common</groupId> + <artifactId>onap-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> @@ -61,6 +61,24 @@ <artifactId>reflections</artifactId> <version>${org.reflections.version}</version> </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + <version>6.8.5</version> + <exclusions> + <exclusion> + <artifactId>snakeyaml</artifactId> + <groupId>org.yaml</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + <version>${junit.version}</version> + </dependency> </dependencies> <build> @@ -79,7 +97,7 @@ </executions> <configuration> <schemaDirectory>src/main/resources</schemaDirectory> - <generatePackage>org.openecomp.sdc.generator.aai.xml</generatePackage> + <generatePackage>org.onap.sdc.generator.aai.xml</generatePackage> <generateDirectory>target/generated-sources/custom/aai/xml</generateDirectory> <removeOldOutput>false</removeOldOutput> <cleanPackageDirectories>true</cleanPackageDirectories> diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java index 4a1e781049..5c81ff5dda 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGenerator.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java @@ -18,19 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai; +package org.onap.sdc.generator.aai; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ERROR_CATEGORY; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ERROR_CODE; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ERROR_DESCRIPTION; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_CODE; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_PARTNER_NAME; -import static org.openecomp.sdc.generator.data.GeneratorConstants.PARTNER_NAME; - -import org.openecomp.sdc.generator.aai.model.Resource; -import org.openecomp.sdc.generator.aai.model.Service; -import org.openecomp.sdc.generator.logging.CategoryLogLevel; +import org.onap.sdc.generator.data.GeneratorConstants; +import org.onap.sdc.generator.aai.model.Resource; +import org.onap.sdc.generator.aai.model.Service; +import org.onap.sdc.generator.logging.CategoryLogLevel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -48,12 +41,13 @@ public interface AaiModelGenerator { Logger log = LoggerFactory.getLogger(AaiModelGenerator.class.getName()); try { return AaiModelGenerator.class.cast( - Class.forName("org.openecomp.sdc.generator.aai.AaiModelGeneratorImpl").newInstance()); + Class.forName("org.onap.sdc.generator.aai.AaiModelGeneratorImpl").newInstance()); } catch (Exception exception) { - MDC.put(PARTNER_NAME, GENERATOR_PARTNER_NAME); - MDC.put(ERROR_CATEGORY, CategoryLogLevel.ERROR.name()); - MDC.put(ERROR_CODE, GENERATOR_ERROR_CODE); - MDC.put(ERROR_DESCRIPTION, GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED); + MDC.put(GeneratorConstants.PARTNER_NAME, GeneratorConstants.GENERATOR_PARTNER_NAME); + MDC.put(GeneratorConstants.ERROR_CATEGORY, CategoryLogLevel.ERROR.name()); + MDC.put(GeneratorConstants.ERROR_CODE, GeneratorConstants.GENERATOR_ERROR_CODE); + MDC.put( + GeneratorConstants.ERROR_DESCRIPTION, GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED); StringWriter sw = new StringWriter(); log.error(sw.toString(), exception); } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/AllotedResource.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResource.java index ef8555002f..c6389392f6 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/AllotedResource.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResource.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; @Model(widget = Widget.Type.ALLOTTED_RESOURCE, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/AllotedResourceWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResourceWidget.java index 0b0db794c4..88cdaa6af1 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/AllotedResourceWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResourceWidget.java @@ -18,14 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.ALLOTTED_RESOURCE, cardinality +@Model(widget = Widget.Type.ALLOTTED_RESOURCE, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "allotted-resource") public class AllotedResourceWidget extends ResourceWidget { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/FlavorWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java index 0cb76ae2b5..a427918bff 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/FlavorWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.FLAVOR, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false) @ModelWidget(type = ModelType.WIDGET, name = "flavor") diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/ImageWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java index cb514bcc8f..52a52fc71e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/ImageWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.IMAGE, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false) @ModelWidget(type = ModelType.WIDGET, name = "image") diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/L3Network.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3Network.java index 3a4c564668..98713c086b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/L3Network.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3Network.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.L3_NET, cardinality = Cardinality +@Model(widget = Widget.Type.L3_NET, cardinality = Cardinality .UNBOUNDED, dataDeleteFlag = false) public class L3Network extends Resource{ } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/L3NetworkWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3NetworkWidget.java index 67414b4ed8..4b59e99bc9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/L3NetworkWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3NetworkWidget.java @@ -18,13 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.L3_NET, +@Model(widget = Widget.Type.L3_NET, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "l3-network") public class L3NetworkWidget extends Widget { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/LIntfWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java index 4aa6cd29aa..de62624392 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/LIntfWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.LINT, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "l-interface") diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Model.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Model.java index c55abb36c2..ac8dffae02 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Model.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Model.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.data.GeneratorConstants; -import org.openecomp.sdc.generator.error.IllegalAccessException; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.data.GeneratorConstants; +import org.onap.sdc.generator.error.IllegalAccessException; import java.util.HashSet; import java.util.Iterator; @@ -101,8 +101,8 @@ public abstract class Model { * @return the widget version id */ public String getWidgetId() { - org.openecomp.sdc.generator.aai.types.Model model = - this.getClass().getAnnotation(org.openecomp.sdc.generator.aai.types.Model.class); + org.onap.sdc.generator.aai.types.Model model = + this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class); return Widget.getWidget(model.widget()).getId(); } @@ -112,8 +112,8 @@ public abstract class Model { * @return the invariant id */ public String getWidgetInvariantId() { - org.openecomp.sdc.generator.aai.types.Model model = - this.getClass().getAnnotation(org.openecomp.sdc.generator.aai.types.Model.class); + org.onap.sdc.generator.aai.types.Model model = + this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class); return Widget.getWidget(model.widget()).getWidgetId(); } @@ -123,8 +123,8 @@ public abstract class Model { * @return the delete flag */ public boolean getDeleteFlag() { - org.openecomp.sdc.generator.aai.types.Model model = - this.getClass().getAnnotation(org.openecomp.sdc.generator.aai.types.Model.class); + org.onap.sdc.generator.aai.types.Model model = + this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class); return model.dataDeleteFlag(); } @@ -134,8 +134,8 @@ public abstract class Model { * @return the cardinality */ public Cardinality getCardinality() { - org.openecomp.sdc.generator.aai.types.Model model = - this.getClass().getAnnotation(org.openecomp.sdc.generator.aai.types.Model.class); + org.onap.sdc.generator.aai.types.Model model = + this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class); return model.cardinality(); } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/OamNetwork.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java index f51fb529fb..d51bf7af96 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/OamNetwork.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Model; @Model(widget = Widget.Type.L3_NET, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "oam-network") diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/ProvidingService.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ProvidingService.java index 1eb4095f45..3f44fe9b54 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/ProvidingService.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ProvidingService.java @@ -18,11 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.ALLOTTED_RESOURCE, cardinality = Cardinality +@Model(widget = Widget.Type.ALLOTTED_RESOURCE, cardinality = Cardinality .UNBOUNDED, dataDeleteFlag = false) public class ProvidingService extends Resource { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Resource.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Resource.java index cc95706d9f..6c7cbc7548 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Resource.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Resource.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; public class Resource extends Model { @@ -45,8 +45,8 @@ public class Resource extends Model { @Override public Widget.Type getWidgetType() { - org.openecomp.sdc.generator.aai.types.Model model = - this.getClass().getAnnotation(org.openecomp.sdc.generator.aai.types.Model.class); + org.onap.sdc.generator.aai.types.Model model = + this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class); return model.widget(); } } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/ResourceWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ResourceWidget.java index 26ff95dd7a..24975a2a9f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/ResourceWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ResourceWidget.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; public class ResourceWidget extends Widget { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Service.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Service.java index 8b3b7f2c60..f71ff91f3e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Service.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Service.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Cardinality; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.SERVICE, +@org.onap.sdc.generator.aai.types.Model(widget = Widget.Type.SERVICE, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) public class Service extends Model { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/ServiceWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ServiceWidget.java index 58ae7b6e63..f6eb5fab53 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/ServiceWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ServiceWidget.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; @ModelWidget(type = ModelType.WIDGET, name = "service-instance") public class ServiceWidget extends Widget { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/TenantWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java index 4fc6f6e8af..23e57be12f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/TenantWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.TENANT, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false) @ModelWidget(type = ModelType.WIDGET, name = "tenant") diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/TunnelXconnectWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TunnelXconnectWidget.java index 87fd514fa2..1a8a9fea27 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/TunnelXconnectWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TunnelXconnectWidget.java @@ -18,13 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.TUNNEL_XCONNECT, +@Model(widget = Widget.Type.TUNNEL_XCONNECT, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "tunnel-xconnect") public class TunnelXconnectWidget extends Widget { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VServerWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java index 58dd677a18..6df5bb1407 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VServerWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.VSERVER, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "vserver") diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VfModule.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModule.java index 594cfedcbc..1b715630e4 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VfModule.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModule.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; import java.util.List; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VfModuleWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java index 3641ba9171..9753db600c 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VfModuleWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java @@ -18,13 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.ModelWidget; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.VFMODULE, +@Model(widget = Widget.Type.VFMODULE, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "vf-module") public class VfModuleWidget extends Widget { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VfWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfWidget.java index a2fde75b20..20ea9973aa 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VfWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfWidget.java @@ -18,13 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.VF, +@Model(widget = Widget.Type.VF, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "generic-vnf") public class VfWidget extends ResourceWidget { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VfcWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfcWidget.java index 41a07ce1de..2d08ef8b7d 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VfcWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfcWidget.java @@ -18,13 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.VFC, +@Model(widget = Widget.Type.VFC, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "vnfc") public class VfcWidget extends ResourceWidget { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VirtualFunction.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VirtualFunction.java index ec2ca38cbf..3736ebacc3 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VirtualFunction.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VirtualFunction.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; @Model(widget = Widget.Type.VF, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) public class VirtualFunction extends Resource { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VolumeGroupWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeGroupWidget.java index c253ea9058..918cfa897c 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VolumeGroupWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeGroupWidget.java @@ -18,13 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; -@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.VOLUME_GROUP, +@Model(widget = Widget.Type.VOLUME_GROUP, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "volume-group") public class VolumeGroupWidget extends Widget { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VolumeWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeWidget.java index ddf840a822..e0cdac437a 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/VolumeWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeWidget.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import org.openecomp.sdc.generator.aai.types.Cardinality; -import org.openecomp.sdc.generator.aai.types.Model; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.VOLUME, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "volume") diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Widget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java index 6220519a3f..b289b0a83c 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Widget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java @@ -18,16 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.model; +package org.onap.sdc.generator.aai.model; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND; - -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.aai.types.ModelWidget; -import org.openecomp.sdc.generator.data.ArtifactType; -import org.openecomp.sdc.generator.data.GeneratorConstants; -import org.openecomp.sdc.generator.data.WidgetConfigurationUtil; -import org.openecomp.sdc.generator.error.IllegalAccessException; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.GeneratorConstants; +import org.onap.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.data.WidgetConfigurationUtil; +import org.onap.sdc.generator.error.IllegalAccessException; import java.util.Collections; import java.util.HashSet; @@ -93,7 +91,8 @@ public abstract class Widget extends Model { Properties properties = WidgetConfigurationUtil.getConfig(); String id = properties.getProperty(ArtifactType.AAI.name() + ".model-version-id." + getName()); if (id == null) { - throw new IllegalArgumentException(String.format(GENERATOR_AAI_CONFIGLPROP_NOT_FOUND, + throw new IllegalArgumentException(String.format( + GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND, ArtifactType.AAI.name() + ".model-version-id." + getName())); } return id; @@ -118,7 +117,8 @@ public abstract class Widget extends Model { String id = properties.getProperty(ArtifactType.AAI.name() + ".model-invariant-id." + getName()); if (id == null) { - throw new IllegalArgumentException(String.format(GENERATOR_AAI_CONFIGLPROP_NOT_FOUND, + throw new IllegalArgumentException(String.format( + GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND, ArtifactType.AAI.name() + ".model-invariant-id." + getName())); } return id; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/CapabilityAssignment.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/CapabilityAssignment.java index 919d5176db..99f9771654 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/CapabilityAssignment.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/CapabilityAssignment.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.tosca; +package org.onap.sdc.generator.aai.tosca; import java.util.Map; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/GroupDefinition.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/GroupDefinition.java index 7457929bf4..8892eebd7e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/GroupDefinition.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/GroupDefinition.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.tosca; +package org.onap.sdc.generator.aai.tosca; import java.util.List; import java.util.Map; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/NodeTemplate.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/NodeTemplate.java index 330020ba22..d58d9e005d 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/NodeTemplate.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/NodeTemplate.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.tosca; +package org.onap.sdc.generator.aai.tosca; import java.util.List; import java.util.Map; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/RequirementAssignment.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/RequirementAssignment.java index 38c89827bc..20d36a4ea0 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/RequirementAssignment.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/RequirementAssignment.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.tosca; +package org.onap.sdc.generator.aai.tosca; public class RequirementAssignment { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/TopologyTemplate.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/TopologyTemplate.java index 572e105133..124c55cc77 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/TopologyTemplate.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/TopologyTemplate.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.tosca; +package org.onap.sdc.generator.aai.tosca; import java.util.HashMap; import java.util.Map; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/ToscaTemplate.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/ToscaTemplate.java index bd045b89c2..d92b826071 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/tosca/ToscaTemplate.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/ToscaTemplate.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.tosca; +package org.onap.sdc.generator.aai.tosca; import java.util.Map; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/types/Cardinality.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Cardinality.java index 4aa967b730..be7c945af9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/types/Cardinality.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Cardinality.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.types; +package org.onap.sdc.generator.aai.types; public enum Cardinality { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/types/Model.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Model.java index 5fdadf40b3..73407a5516 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/types/Model.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Model.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.types; +package org.onap.sdc.generator.aai.types; -import org.openecomp.sdc.generator.aai.model.Widget; +import org.onap.sdc.generator.aai.model.Widget.Type; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -36,7 +36,7 @@ public @interface Model { * * @return the widget . type */ - public Widget.Type widget(); + public Type widget(); /** * Data delete flag boolean. diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/types/ModelType.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelType.java index e607b6a705..90da359316 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/types/ModelType.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.types; +package org.onap.sdc.generator.aai.types; public enum ModelType { SERVICE, RESOURCE, WIDGET; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/types/ModelWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelWidget.java index 71dbd5ef46..6ce16459ba 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/types/ModelWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelWidget.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai.types; +package org.onap.sdc.generator.aai.types; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/AdditionalParams.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/AdditionalParams.java index 2ec90cee5f..d9cfadec9a 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/AdditionalParams.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/AdditionalParams.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.data; +package org.onap.sdc.generator.data; public enum AdditionalParams { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/Artifact.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/Artifact.java index a6fd487558..d59fbc3bb7 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/Artifact.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/Artifact.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.data; +package org.onap.sdc.generator.data; public class Artifact { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/ArtifactType.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/ArtifactType.java index d6585c1e55..e844f945ab 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/ArtifactType.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/ArtifactType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.data; +package org.onap.sdc.generator.data; public enum ArtifactType { OTHER, diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GenerationData.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GenerationData.java index 4c17924162..83a8452797 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GenerationData.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GenerationData.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.data; +package org.onap.sdc.generator.data; import java.util.ArrayList; import java.util.HashMap; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GeneratorConfiguration.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConfiguration.java index 7a6a897761..af26b2b531 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GeneratorConfiguration.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConfiguration.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.data; +package org.onap.sdc.generator.data; import java.util.List; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GeneratorConstants.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConstants.java index b606e0d86a..8f79aa1503 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GeneratorConstants.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConstants.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.data; +package org.onap.sdc.generator.data; public class GeneratorConstants { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GeneratorUtil.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorUtil.java index 080ae54944..918fa1e0a8 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GeneratorUtil.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorUtil.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.data; +package org.onap.sdc.generator.data; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GroupType.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GroupType.java index f68aaed410..69a8484885 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/GroupType.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GroupType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.data; +package org.onap.sdc.generator.data; public enum GroupType { DEPLOYMENT, diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/WidgetConfigurationUtil.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/WidgetConfigurationUtil.java index dd68544a93..ab2da6caca 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/data/WidgetConfigurationUtil.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/WidgetConfigurationUtil.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.data; +package org.onap.sdc.generator.data; import java.util.Properties; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/error/IllegalAccessException.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/error/IllegalAccessException.java index 06c4e6df31..823af87fcc 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/error/IllegalAccessException.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/error/IllegalAccessException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.error; +package org.onap.sdc.generator.error; public class IllegalAccessException extends RuntimeException { diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/intf/ArtifactGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java index 0c45436dc7..4578a150e0 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/intf/ArtifactGenerator.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.intf; +package org.onap.sdc.generator.intf; -import org.openecomp.sdc.generator.data.Artifact; -import org.openecomp.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.data.Artifact; import java.util.List; import java.util.Map; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/intf/Generator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/Generator.java index 6ccf89cc72..069316a577 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/intf/Generator.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/Generator.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.intf; +package org.onap.sdc.generator.intf; -import org.openecomp.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.ArtifactType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/ArtifactGeneratorLogResponseCode.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/ArtifactGeneratorLogResponseCode.java index e0887876b8..17507f1474 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/ArtifactGeneratorLogResponseCode.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/ArtifactGeneratorLogResponseCode.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.logging; +package org.onap.sdc.generator.logging; import java.util.HashMap; import java.util.Map; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/CategoryLogLevel.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/CategoryLogLevel.java index 00a2e4d494..930b5c78d0 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/CategoryLogLevel.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/CategoryLogLevel.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.logging; +package org.onap.sdc.generator.logging; public enum CategoryLogLevel { INFO, diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/StatusCode.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/StatusCode.java index 201cb973be..0eb3b6d3b6 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/StatusCode.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/StatusCode.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.logging; +package org.onap.sdc.generator.logging; public enum StatusCode { COMPLETE, diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/annotations/Audit.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Audit.java index 9d32c1d1c0..c56bd4a5f1 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/annotations/Audit.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Audit.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.logging.annotations; +package org.onap.sdc.generator.logging.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/annotations/Metrics.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Metrics.java index 74083a37f1..468ab6412b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/logging/annotations/Metrics.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Metrics.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.logging.annotations; +package org.onap.sdc.generator.logging.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/service/ArtifactGenerationService.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java index 1fbd25e14e..2af9664481 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/service/ArtifactGenerationService.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java @@ -18,25 +18,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.service; - -import static org.openecomp.sdc.generator.data.GeneratorConstants.ERROR_CATEGORY; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ERROR_CODE; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ERROR_DESCRIPTION; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_CODE; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_PARTNER_NAME; -import static org.openecomp.sdc.generator.data.GeneratorConstants.PARTNER_NAME; +package org.onap.sdc.generator.service; +import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.data.GeneratorConstants; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.generator.data.Artifact; -import org.openecomp.sdc.generator.data.GenerationData; -import org.openecomp.sdc.generator.logging.CategoryLogLevel; +import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.logging.CategoryLogLevel; import org.slf4j.MDC; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.List; import java.util.Map; @@ -61,13 +52,14 @@ public interface ArtifactGenerationService { Class.forName("org.openecomp.sdc.generator.impl.ArtifactGenerationServiceImpl") .newInstance()); } catch (Exception exception) { - MDC.put(PARTNER_NAME, GENERATOR_PARTNER_NAME); - MDC.put(ERROR_CATEGORY, CategoryLogLevel.ERROR.name()); - MDC.put(ERROR_CODE, GENERATOR_ERROR_CODE); - MDC.put(ERROR_DESCRIPTION, GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED); - log.error(GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED, exception); + MDC.put(GeneratorConstants.PARTNER_NAME, GeneratorConstants.GENERATOR_PARTNER_NAME); + MDC.put(GeneratorConstants.ERROR_CATEGORY, CategoryLogLevel.ERROR.name()); + MDC.put(GeneratorConstants.ERROR_CODE, GeneratorConstants.GENERATOR_ERROR_CODE); + MDC.put( + GeneratorConstants.ERROR_DESCRIPTION, GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED); + log.error(GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED, exception); } - log.debug(GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED); + log.debug(GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED); return null; } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/resources/aai_schema_v10.xsd b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v10.xsd index 7bc3466506..7bc3466506 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/resources/aai_schema_v10.xsd +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v10.xsd diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/resources/aai_schema_v11.xsd b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v11.xsd index 32655fd7c1..32655fd7c1 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/resources/aai_schema_v11.xsd +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v11.xsd diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/resources/aai_schema_v9.xsd b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v9.xsd index c73c583679..c73c583679 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/resources/aai_schema_v9.xsd +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v9.xsd diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml index 0830fa6b92..dfbc90a622 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml @@ -2,12 +2,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>openecomp-sdc-artifact-generator-core</name> - <artifactId>openecomp-sdc-artifact-generator-core</artifactId> + <name>onap-sdc-artifact-generator-core</name> + <artifactId>onap-sdc-artifact-generator-core</artifactId> <parent> - <artifactId>openecomp-common-lib</artifactId> - <groupId>org.openecomp.sdc.common</groupId> + <artifactId>onap-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> @@ -62,8 +62,8 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-api</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorManager.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java index 90c1c332d3..e0049bd719 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorManager.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java @@ -18,18 +18,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator; +package org.onap.sdc.generator; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION; -import static org.openecomp.sdc.generator.util.ArtifactGeneratorUtil.logError; +import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError; import com.fasterxml.jackson.databind.ObjectMapper; +import org.onap.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.GeneratorConfiguration; +import org.onap.sdc.generator.data.GeneratorConstants; +import org.onap.sdc.generator.intf.ArtifactGenerator; +import org.onap.sdc.generator.intf.Generator; +import org.onap.sdc.generator.util.ArtifactGeneratorUtil; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.generator.data.ArtifactType; -import org.openecomp.sdc.generator.data.GeneratorConfiguration; -import org.openecomp.sdc.generator.intf.ArtifactGenerator; -import org.openecomp.sdc.generator.intf.Generator; import org.reflections.Reflections; import java.util.ArrayList; @@ -55,7 +56,7 @@ public class GeneratorManager { if (generators.isEmpty()) { log.debug("Getting list of active generators"); - Reflections reflections = new Reflections("org.openecomp.sdc.generator"); + Reflections reflections = new Reflections("org.onap.sdc.generator"); Set<Class<?>> annotated = reflections.getTypesAnnotatedWith(Generator.class); for (Class<?> clazz : annotated) { Generator generator = clazz.getAnnotation(Generator.class); @@ -82,9 +83,10 @@ public class GeneratorManager { try { return new ObjectMapper().readValue(jsonConfiguration, GeneratorConfiguration.class); } catch (Exception exception) { - logError(GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION, exception); + ArtifactGeneratorUtil + .logError(GeneratorConstants.GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION, exception); throw new IllegalArgumentException( - GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION, exception); + GeneratorConstants.GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION, exception); } } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorTask.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorTask.java index 661aec4188..66004ec89b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/GeneratorTask.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorTask.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator; +package org.onap.sdc.generator; +import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.intf.ArtifactGenerator; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.generator.data.Artifact; -import org.openecomp.sdc.generator.data.GenerationData; -import org.openecomp.sdc.generator.intf.ArtifactGenerator; import java.util.LinkedList; import java.util.List; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/MockArtifactGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java index 78241a29ad..9753c26a03 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/MockArtifactGenerator.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java @@ -18,15 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator; +package org.onap.sdc.generator; -import org.openecomp.sdc.generator.data.Artifact; -import org.openecomp.sdc.generator.data.ArtifactType; -import org.openecomp.sdc.generator.data.GenerationData; -import org.openecomp.sdc.generator.data.GeneratorUtil; -import org.openecomp.sdc.generator.data.GroupType; -import org.openecomp.sdc.generator.intf.ArtifactGenerator; -import org.openecomp.sdc.generator.intf.Generator; +import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.intf.ArtifactGenerator; +import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.GeneratorUtil; +import org.onap.sdc.generator.data.GroupType; +import org.onap.sdc.generator.intf.Generator; import java.util.Date; import java.util.List; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiArtifactGenerator.java index 8462a71a97..995d0846be 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiArtifactGenerator.java @@ -18,43 +18,37 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai; - -import static org.openecomp.sdc.generator.data.GeneratorConstants.ARTIFACT_MODEL_INFO; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ID_LENGTH; -import static org.openecomp.sdc.generator.util.ArtifactGeneratorUtil.logError; - +package org.onap.sdc.generator.aai; + +import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError; + +import org.onap.sdc.generator.aai.model.AllotedResource; +import org.onap.sdc.generator.aai.model.ProvidingService; +import org.onap.sdc.generator.aai.model.Resource; +import org.onap.sdc.generator.aai.model.Service; +import org.onap.sdc.generator.aai.model.Widget; +import org.onap.sdc.generator.aai.tosca.GroupDefinition; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.data.AdditionalParams; +import org.onap.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.data.GeneratorConstants; +import org.onap.sdc.generator.data.GroupType; +import org.onap.sdc.generator.data.WidgetConfigurationUtil; +import org.onap.sdc.generator.intf.ArtifactGenerator; +import org.onap.sdc.generator.intf.Generator; +import org.onap.sdc.generator.util.ArtifactGeneratorUtil; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.generator.aai.model.AllotedResource; -import org.openecomp.sdc.generator.aai.model.ProvidingService; -import org.openecomp.sdc.generator.aai.model.L3NetworkWidget; -import org.openecomp.sdc.generator.aai.model.Model; -import org.openecomp.sdc.generator.aai.model.Resource; -import org.openecomp.sdc.generator.aai.model.Service; -import org.openecomp.sdc.generator.aai.model.TunnelXconnectWidget; -import org.openecomp.sdc.generator.aai.model.VfModule; -import org.openecomp.sdc.generator.aai.model.Widget; -import org.openecomp.sdc.generator.aai.tosca.GroupDefinition; -import org.openecomp.sdc.generator.aai.tosca.NodeTemplate; -import org.openecomp.sdc.generator.aai.tosca.ToscaTemplate; -import org.openecomp.sdc.generator.aai.types.ModelType; -import org.openecomp.sdc.generator.data.AdditionalParams; -import org.openecomp.sdc.generator.data.Artifact; -import org.openecomp.sdc.generator.data.ArtifactType; -import org.openecomp.sdc.generator.data.GenerationData; -import org.openecomp.sdc.generator.data.GeneratorConstants; -import org.openecomp.sdc.generator.data.GeneratorUtil; -import org.openecomp.sdc.generator.data.GroupType; -import org.openecomp.sdc.generator.data.WidgetConfigurationUtil; -import org.openecomp.sdc.generator.intf.ArtifactGenerator; -import org.openecomp.sdc.generator.intf.Generator; -import org.openecomp.sdc.generator.logging.annotations.Audit; -import org.openecomp.sdc.generator.util.ArtifactGeneratorUtil; +import org.onap.sdc.generator.aai.model.L3NetworkWidget; +import org.onap.sdc.generator.aai.model.Model; +import org.onap.sdc.generator.aai.model.TunnelXconnectWidget; +import org.onap.sdc.generator.aai.model.VfModule; +import org.onap.sdc.generator.aai.tosca.NodeTemplate; +import org.onap.sdc.generator.aai.tosca.ToscaTemplate; +import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.data.GeneratorUtil; +import org.onap.sdc.generator.logging.annotations.Audit; import org.slf4j.MDC; import java.io.File; @@ -92,7 +86,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator { initWidgetConfiguration(); return generateArtifactInternal(input, additionalParams); } catch (Exception exception) { - logError(exception.getMessage(), exception); + ArtifactGeneratorUtil.logError(exception.getMessage(), exception); GenerationData generationData = new GenerationData(); generationData.add(ArtifactType.AAI.name(), exception.getMessage()); return generationData; @@ -201,13 +195,13 @@ public class AaiArtifactGenerator implements ArtifactGenerator { AaiModelGenerator modelGenerator = AaiModelGenerator.getInstance(); //Generate AAI XML service model - MDC.put(ARTIFACT_MODEL_INFO , service.getModelName() + "," + getArtifactLabel(service)); + MDC.put(GeneratorConstants.ARTIFACT_MODEL_INFO , service.getModelName() + "," + getArtifactLabel(service)); String aaiServiceModel = modelGenerator.generateModelFor(service); generationData.add(getServiceArtifact(service, aaiServiceModel)); //Generate AAI XML resource model for (Resource res : resources) { - MDC.put(ARTIFACT_MODEL_INFO , res.getModelName() + "," + getArtifactLabel(res)); + MDC.put(GeneratorConstants.ARTIFACT_MODEL_INFO , res.getModelName() + "," + getArtifactLabel(res)); String aaiResourceModel = modelGenerator.generateModelFor(res); generationData.add(getResourceArtifact(res, aaiResourceModel)); } @@ -283,7 +277,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator { if (nodeProperties.get("providing_service_uuid") == null || nodeProperties.get( "providing_service_invariant_uuid") == null) { throw new IllegalArgumentException(String.format( - GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING + GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING , model.getModelId())); } for (String key1 : nodeProperties.keySet()) { @@ -305,7 +299,8 @@ public class AaiArtifactGenerator implements ArtifactGenerator { } if(model instanceof AllotedResource){ if(!flag) { - throw new IllegalArgumentException(String.format(GENERATOR_AAI_PROVIDING_SERVICE_MISSING, + throw new IllegalArgumentException(String.format( + GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING, model.getModelId())); } } @@ -576,7 +571,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator { .format(GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION, "invariantUUID", input.getName())); - } else if (tosca.getMetadata().get("invariantUUID").length() != ID_LENGTH) { + } else if (tosca.getMetadata().get("invariantUUID").length() != GeneratorConstants.ID_LENGTH) { throw new IllegalArgumentException(String.format( GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "invariantUUID", input.getName())); } @@ -587,7 +582,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator { throw new IllegalArgumentException(String .format(GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION, "UUID", input.getName())); - } else if (tosca.getMetadata().get("UUID").length() != ID_LENGTH) { + } else if (tosca.getMetadata().get("UUID").length() != GeneratorConstants.ID_LENGTH) { throw new IllegalArgumentException(String .format(GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "UUID", input.getName())); } @@ -619,7 +614,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator { throw new IllegalArgumentException(String .format(GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION, "vfModuleModelInvariantUUID", input.getName())); - } else if (gd.getMetadata().get("vfModuleModelInvariantUUID").length() != ID_LENGTH) { + } else if (gd.getMetadata().get("vfModuleModelInvariantUUID").length() != GeneratorConstants.ID_LENGTH) { throw new IllegalArgumentException(String.format( GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "vfModuleModelInvariantUUID", input.getName())); @@ -631,7 +626,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator { .format(GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION, "vfModuleModelUUID", input.getName())); - } else if (gd.getMetadata().get("vfModuleModelUUID").length() != ID_LENGTH) { + } else if (gd.getMetadata().get("vfModuleModelUUID").length() != GeneratorConstants.ID_LENGTH) { throw new IllegalArgumentException(String.format( GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "vfModuleModelUUID", input.getName())); @@ -677,11 +672,12 @@ public class AaiArtifactGenerator implements ArtifactGenerator { properties.load(new FileInputStream(file)); WidgetConfigurationUtil.setConfig(properties); } else { - throw new IllegalArgumentException(String.format(GENERATOR_AAI_CONFIGFILE_NOT_FOUND, + throw new IllegalArgumentException(String.format( + GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND, configLocation)); } } else { - throw new IllegalArgumentException(GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND); + throw new IllegalArgumentException(GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND); } } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java index 4e6153d7e4..4a4f9f0923 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java @@ -18,22 +18,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.aai; +package org.onap.sdc.generator.aai; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.generator.aai.model.Resource; -import org.openecomp.sdc.generator.aai.model.Service; -import org.openecomp.sdc.generator.aai.model.Widget; -import org.openecomp.sdc.generator.aai.xml.Model; -import org.openecomp.sdc.generator.aai.xml.ModelElement; -import org.openecomp.sdc.generator.aai.xml.ModelElements; -import org.openecomp.sdc.generator.aai.xml.ModelVer; -import org.openecomp.sdc.generator.aai.xml.ModelVers; -import org.openecomp.sdc.generator.aai.xml.Relationship; -import org.openecomp.sdc.generator.aai.xml.RelationshipData; -import org.openecomp.sdc.generator.aai.xml.RelationshipList; -import org.openecomp.sdc.generator.logging.annotations.Metrics; +import org.onap.sdc.generator.aai.model.Resource; +import org.onap.sdc.generator.aai.model.Service; +import org.onap.sdc.generator.aai.model.Widget; +import org.onap.sdc.generator.aai.xml.Model; +import org.onap.sdc.generator.aai.xml.ModelElement; +import org.onap.sdc.generator.aai.xml.ModelElements; +import org.onap.sdc.generator.aai.xml.ModelVer; +import org.onap.sdc.generator.aai.xml.ModelVers; +import org.onap.sdc.generator.aai.xml.Relationship; +import org.onap.sdc.generator.aai.xml.RelationshipData; +import org.onap.sdc.generator.aai.xml.RelationshipList; +import org.onap.sdc.generator.logging.annotations.Metrics; import org.w3c.dom.DOMException; import java.io.StringWriter; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/impl/ArtifactGenerationServiceImpl.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java index 3f6148f0e7..42975478fe 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/impl/ArtifactGenerationServiceImpl.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java @@ -18,21 +18,20 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.impl; +package org.onap.sdc.generator.impl; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_INVOCATION_ERROR_CODE; -import static org.openecomp.sdc.generator.util.ArtifactGeneratorUtil.logError; +import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError; +import org.onap.sdc.generator.data.GeneratorConstants; +import org.onap.sdc.generator.util.ArtifactGeneratorUtil; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.generator.GeneratorManager; -import org.openecomp.sdc.generator.GeneratorTask; -import org.openecomp.sdc.generator.data.Artifact; -import org.openecomp.sdc.generator.data.GenerationData; -import org.openecomp.sdc.generator.intf.ArtifactGenerator; -import org.openecomp.sdc.generator.service.ArtifactGenerationService; -import org.openecomp.sdc.generator.util.ArtifactGeneratorUtil; +import org.onap.sdc.generator.GeneratorManager; +import org.onap.sdc.generator.GeneratorTask; +import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.intf.ArtifactGenerator; +import org.onap.sdc.generator.service.ArtifactGenerationService; import java.util.List; import java.util.Map; @@ -71,15 +70,17 @@ public class ArtifactGenerationServiceImpl implements ArtifactGenerationService } } catch (IllegalArgumentException iae) { //Invalid client configuration - logError(GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED, iae); + ArtifactGeneratorUtil + .logError(GeneratorConstants.GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED, iae); GenerationData errorData = new GenerationData(); - errorData.add(GENERATOR_INVOCATION_ERROR_CODE, iae.getMessage()); + errorData.add(GeneratorConstants.GENERATOR_INVOCATION_ERROR_CODE, iae.getMessage()); return errorData; } catch (Exception ex) { - logError(GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED, ex); + ArtifactGeneratorUtil + .logError(GeneratorConstants.GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED, ex); GenerationData errorData = new GenerationData(); - errorData.add(GENERATOR_INVOCATION_ERROR_CODE, - GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED); + errorData.add(GeneratorConstants.GENERATOR_INVOCATION_ERROR_CODE, + GeneratorConstants.GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED); return errorData; } } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java index 26bbe7f619..8e6e2c0829 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java @@ -18,72 +18,72 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator.util; +package org.onap.sdc.generator.util; -import static org.openecomp.sdc.generator.data.GeneratorConstants.BEGIN_TIMESTAMP; -import static org.openecomp.sdc.generator.data.GeneratorConstants.BE_FQDN; -import static org.openecomp.sdc.generator.data.GeneratorConstants.CATEGORY_LOG_LEVEL; -import static org.openecomp.sdc.generator.data.GeneratorConstants.CLIENT_IP; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ELAPSED_TIME; -import static org.openecomp.sdc.generator.data.GeneratorConstants.END_TIMESTAMP; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ERROR_CATEGORY; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ERROR_CODE; -import static org.openecomp.sdc.generator.data.GeneratorConstants.ERROR_DESCRIPTION; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_TOSCA_MSG; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION_MSG; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_RESOURCE_TOSCA; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA_MSG; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED_MSG; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION_MSG; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_PARTNER_NAME; -import static org.openecomp.sdc.generator.data.GeneratorConstants.INSTANCE_UUID; -import static org.openecomp.sdc.generator.data.GeneratorConstants.LOCAL_ADDR; -import static org.openecomp.sdc.generator.data.GeneratorConstants.MDC_SDC_INSTANCE_UUID; -import static org.openecomp.sdc.generator.data.GeneratorConstants.PARTNER_NAME; -import static org.openecomp.sdc.generator.data.GeneratorConstants.REMOTE_HOST; -import static org.openecomp.sdc.generator.data.GeneratorConstants.REQUEST_ID; -import static org.openecomp.sdc.generator.data.GeneratorConstants.RESPONSE_CODE; -import static org.openecomp.sdc.generator.data.GeneratorConstants.RESPONSE_DESCRIPTION; -import static org.openecomp.sdc.generator.data.GeneratorConstants.SERVICE_INSTANCE_ID; -import static org.openecomp.sdc.generator.data.GeneratorConstants.SERVICE_METRIC_BEGIN_TIMESTAMP; -import static org.openecomp.sdc.generator.data.GeneratorConstants.SERVICE_NAME; -import static org.openecomp.sdc.generator.data.GeneratorConstants.STATUS_CODE; -import static org.openecomp.sdc.generator.data.GeneratorConstants.TARGET_ENTITY; -import static org.openecomp.sdc.generator.data.GeneratorConstants.TARGET_SERVICE_NAME; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INTERNAL_SERVER_ERROR; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_CLIENT_CONFIGURATION; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_ID_VALUE; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_RESOURCE_VERSION; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_SERVICE_VERSION; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_TOSCA_YAML; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MANDATORY_ATTRIBUTE_MISSING; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_CONFIG_PROPERTIES_FILE; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_PRO_SERVICE; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_PRO_SERVICE_METADATA; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_RESOURCE_VERSION; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_SERVICE_VERSION; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_SYSTME_PROPERY_CONFIGURATION; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_WIDGET_CONFIGURATION; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.RESOURCE_TOSCA_MISSING; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.SERVICE_TOSCA_MISSING; -import static org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode.UNABLE_TO_GENERATE_ARTIFACT; +import static org.onap.sdc.generator.data.GeneratorConstants.BEGIN_TIMESTAMP; +import static org.onap.sdc.generator.data.GeneratorConstants.BE_FQDN; +import static org.onap.sdc.generator.data.GeneratorConstants.CATEGORY_LOG_LEVEL; +import static org.onap.sdc.generator.data.GeneratorConstants.CLIENT_IP; +import static org.onap.sdc.generator.data.GeneratorConstants.ELAPSED_TIME; +import static org.onap.sdc.generator.data.GeneratorConstants.END_TIMESTAMP; +import static org.onap.sdc.generator.data.GeneratorConstants.ERROR_CATEGORY; +import static org.onap.sdc.generator.data.GeneratorConstants.ERROR_CODE; +import static org.onap.sdc.generator.data.GeneratorConstants.ERROR_DESCRIPTION; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_TOSCA_MSG; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION_MSG; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_RESOURCE_TOSCA; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA_MSG; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED_MSG; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION_MSG; +import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_PARTNER_NAME; +import static org.onap.sdc.generator.data.GeneratorConstants.INSTANCE_UUID; +import static org.onap.sdc.generator.data.GeneratorConstants.LOCAL_ADDR; +import static org.onap.sdc.generator.data.GeneratorConstants.MDC_SDC_INSTANCE_UUID; +import static org.onap.sdc.generator.data.GeneratorConstants.PARTNER_NAME; +import static org.onap.sdc.generator.data.GeneratorConstants.REMOTE_HOST; +import static org.onap.sdc.generator.data.GeneratorConstants.REQUEST_ID; +import static org.onap.sdc.generator.data.GeneratorConstants.RESPONSE_CODE; +import static org.onap.sdc.generator.data.GeneratorConstants.RESPONSE_DESCRIPTION; +import static org.onap.sdc.generator.data.GeneratorConstants.SERVICE_INSTANCE_ID; +import static org.onap.sdc.generator.data.GeneratorConstants.SERVICE_METRIC_BEGIN_TIMESTAMP; +import static org.onap.sdc.generator.data.GeneratorConstants.SERVICE_NAME; +import static org.onap.sdc.generator.data.GeneratorConstants.STATUS_CODE; +import static org.onap.sdc.generator.data.GeneratorConstants.TARGET_ENTITY; +import static org.onap.sdc.generator.data.GeneratorConstants.TARGET_SERVICE_NAME; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INTERNAL_SERVER_ERROR; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_CLIENT_CONFIGURATION; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_ID_VALUE; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_RESOURCE_VERSION; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_SERVICE_VERSION; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_TOSCA_YAML; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MANDATORY_ATTRIBUTE_MISSING; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_CONFIG_PROPERTIES_FILE; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_PRO_SERVICE; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_PRO_SERVICE_METADATA; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_RESOURCE_VERSION; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_SERVICE_VERSION; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_SYSTME_PROPERY_CONFIGURATION; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_WIDGET_CONFIGURATION; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.RESOURCE_TOSCA_MISSING; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.SERVICE_TOSCA_MISSING; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.UNABLE_TO_GENERATE_ARTIFACT; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.generator.data.Artifact; -import org.openecomp.sdc.generator.logging.ArtifactGeneratorLogResponseCode; -import org.openecomp.sdc.generator.logging.CategoryLogLevel; -import org.openecomp.sdc.generator.logging.StatusCode; +import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode; +import org.onap.sdc.generator.logging.CategoryLogLevel; +import org.onap.sdc.generator.logging.StatusCode; import org.slf4j.MDC; import java.io.PrintWriter; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java index 2de7535a8b..e6f1abd796 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java @@ -18,38 +18,29 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator; - -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION; -import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION; +package org.onap.sdc.generator; import org.apache.commons.io.FileUtils; -import org.openecomp.sdc.generator.aai.model.Resource; -import org.openecomp.sdc.generator.aai.model.Service; -import org.openecomp.sdc.generator.aai.model.Widget; -import org.openecomp.sdc.generator.aai.tosca.GroupDefinition; -import org.openecomp.sdc.generator.aai.tosca.NodeTemplate; -import org.openecomp.sdc.generator.aai.tosca.ToscaTemplate; -import org.openecomp.sdc.generator.data.AdditionalParams; -import org.openecomp.sdc.generator.aai.xml.Model; -import org.openecomp.sdc.generator.aai.xml.ModelElement; -import org.openecomp.sdc.generator.aai.xml.ModelElements; -import org.openecomp.sdc.generator.aai.xml.ModelVer; -import org.openecomp.sdc.generator.aai.xml.Relationship; -import org.openecomp.sdc.generator.aai.xml.RelationshipData; -import org.openecomp.sdc.generator.data.Artifact; -import org.openecomp.sdc.generator.data.ArtifactType; -import org.openecomp.sdc.generator.data.GenerationData; -import org.openecomp.sdc.generator.data.GeneratorConstants; -import org.openecomp.sdc.generator.data.GeneratorUtil; -import org.openecomp.sdc.generator.data.GroupType; -import org.openecomp.sdc.generator.impl.ArtifactGenerationServiceImpl; +import org.onap.sdc.generator.aai.tosca.GroupDefinition; +import org.onap.sdc.generator.data.AdditionalParams; +import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.data.GeneratorConstants; +import org.onap.sdc.generator.impl.ArtifactGenerationServiceImpl; +import org.onap.sdc.generator.aai.model.Resource; +import org.onap.sdc.generator.aai.model.Service; +import org.onap.sdc.generator.aai.model.Widget; +import org.onap.sdc.generator.aai.tosca.NodeTemplate; +import org.onap.sdc.generator.aai.tosca.ToscaTemplate; +import org.onap.sdc.generator.aai.xml.Model; +import org.onap.sdc.generator.aai.xml.ModelElement; +import org.onap.sdc.generator.aai.xml.ModelElements; +import org.onap.sdc.generator.aai.xml.ModelVer; +import org.onap.sdc.generator.aai.xml.Relationship; +import org.onap.sdc.generator.aai.xml.RelationshipData; +import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.GeneratorUtil; +import org.onap.sdc.generator.data.GroupType; import org.testng.Assert; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; @@ -328,7 +319,8 @@ public class ArtifactGenerationServiceTest { ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl(); GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals( - data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_INVALID_ID, + data.getErrorData().get("AAI").get(0),String.format( + GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "invariantUUID",inputArtifacts.get(0).getName())); } catch (Exception e) { @@ -362,7 +354,8 @@ public class ArtifactGenerationServiceTest { ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl(); GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals( - data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_INVALID_ID, + data.getErrorData().get("AAI").get(0),String.format( + GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "UUID",inputArtifacts.get(0).getName())); } catch (Exception e) { @@ -431,7 +424,8 @@ public class ArtifactGenerationServiceTest { ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl(); GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals( - data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_INVALID_ID, + data.getErrorData().get("AAI").get(0),String.format( + GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "vfModuleModelInvariantUUID", inputArtifacts.get(1).getName() )); } catch (Exception e) { @@ -505,7 +499,8 @@ public class ArtifactGenerationServiceTest { ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl(); GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals( - data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_INVALID_ID, + data.getErrorData().get("AAI").get(0),String.format( + GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "vfModuleModelUUID", inputArtifacts.get(1).getName() )); } catch (Exception e) { @@ -543,7 +538,7 @@ public class ArtifactGenerationServiceTest { GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals(false,data.getErrorData().isEmpty()); Assert.assertEquals(data.getErrorData(). - get("AAI").get(0),GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND); + get("AAI").get(0), GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND); } catch (Exception e) { Assert.fail(e.getMessage()); } @@ -579,7 +574,7 @@ public class ArtifactGenerationServiceTest { List<Artifact> inputArtifacts = init(aaiResourceBasePaths); GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals(false,data.getErrorData().isEmpty()); - String errMsg = String.format(GENERATOR_AAI_CONFIGLPROP_NOT_FOUND,assertMsg); + String errMsg = String.format(GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND,assertMsg); Assert.assertEquals(data.getErrorData().get("AAI").get(0),errMsg); } catch (Exception e) { Assert.fail(e.getMessage()); @@ -604,7 +599,8 @@ public class ArtifactGenerationServiceTest { List<Artifact> inputArtifacts = init(aaiResourceBasePaths); GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); - Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_CONFIGFILE_NOT_FOUND,System.getProperty + Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format( + GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND,System.getProperty ("artifactgenerator.config"))); } catch (Exception e) { Assert.fail(e.getMessage()); @@ -625,7 +621,7 @@ public class ArtifactGenerationServiceTest { GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); Assert.assertEquals(data.getErrorData().get("AAI").get(0), - GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION); + GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION); } catch (Exception e) { Assert.fail(e.getMessage()); } @@ -690,19 +686,19 @@ public class ArtifactGenerationServiceTest { GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); Assert.assertEquals(data.getErrorData().get("AAI").get(0), - GENERATOR_AAI_INVALID_SERVICE_VERSION); + GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION); additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.1"); data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); Assert.assertEquals(data.getErrorData().get("AAI").get(0), - GENERATOR_AAI_INVALID_SERVICE_VERSION); + GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION); additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.0"); data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); Assert.assertEquals(data.getErrorData().get("AAI").get(0), - GENERATOR_AAI_INVALID_SERVICE_VERSION); + GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION); } catch (Exception e) { Assert.fail(e.getMessage()); @@ -823,7 +819,7 @@ public class ArtifactGenerationServiceTest { GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format - (GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING, "707b2850-e830-4b00-9902-879f44ac05a4")); + (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING, "707b2850-e830-4b00-9902-879f44ac05a4")); } catch (Exception e) { Assert.fail(e.getMessage()); } @@ -838,7 +834,7 @@ public class ArtifactGenerationServiceTest { GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format - (GENERATOR_AAI_PROVIDING_SERVICE_MISSING, "a54a5235-b69d-4f8a-838b-d011e6783fa5")); + (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING, "a54a5235-b69d-4f8a-838b-d011e6783fa5")); } catch (Exception e) { Assert.fail(e.getMessage()); } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai/service_vmme_template_1.yml index c740f67b51..c740f67b51 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai/vf_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai/vf_vmme_template_1.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai/vf_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai/vf_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai2/resource-AllottedResource-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai2/resource-AllottedResource-template.yml index c80e701913..c80e701913 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai2/resource-AllottedResource-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai2/resource-AllottedResource-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai2/resource-Extvl-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai2/resource-Extvl-template.yml index 512d62bdaa..512d62bdaa 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai2/resource-Extvl-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai2/resource-Extvl-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai2/service-ServiceWithAllotedVfAndExvl-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai2/service-ServiceWithAllotedVfAndExvl-template.yml index dbd039669c..dbd039669c 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai2/service-ServiceWithAllotedVfAndExvl-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai2/service-ServiceWithAllotedVfAndExvl-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/resource-IpMuxDemux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/resource-IpMuxDemux-template.yml index 4549306475..4549306475 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/resource-IpMuxDemux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/resource-IpMuxDemux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/resource-ServiceAdmin-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/resource-ServiceAdmin-template.yml index 549c18b55b..549c18b55b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/resource-ServiceAdmin-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/resource-ServiceAdmin-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/resource-TunnelXconn-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/resource-TunnelXconn-template.yml index cf97321035..cf97321035 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/resource-TunnelXconn-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/resource-TunnelXconn-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/resource-VhnfNonHeat-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/resource-VhnfNonHeat-template.yml index 8ec1c192ee..8ec1c192ee 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/resource-VhnfNonHeat-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/resource-VhnfNonHeat-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/service-SdWan-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/service-SdWan-template.yml index bc3ab6dabb..bc3ab6dabb 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/aai3/service-SdWan-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/aai3/service-SdWan-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/config/Artifact-Generator.properties b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/config/Artifact-Generator.properties index 1d7e5fa01a..1d7e5fa01a 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/config/Artifact-Generator.properties +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/config/Artifact-Generator.properties diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/logback.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/logback.xml index 68438967b1..68438967b1 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/logback.xml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/logback.xml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/missingResourceTosca/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/missingResourceTosca/service_vmme_template_1.yml index 822484eda4..822484eda4 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/missingResourceTosca/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/missingResourceTosca/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/missingVLTosca/resource-AllottedResource-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/missingVLTosca/resource-AllottedResource-template.yml index 8c85966229..8c85966229 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/missingVLTosca/resource-AllottedResource-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/missingVLTosca/resource-AllottedResource-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/missingVLTosca/service-ServiceWithAllotedVfAndExvl-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/missingVLTosca/service-ServiceWithAllotedVfAndExvl-template.yml index dbd039669c..dbd039669c 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/missingVLTosca/service-ServiceWithAllotedVfAndExvl-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/missingVLTosca/service-ServiceWithAllotedVfAndExvl-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_InvalidVfModInvUuIdAttr.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_InvalidVfModInvUuIdAttr.yml index f57a7d2300..f57a7d2300 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_InvalidVfModInvUuIdAttr.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_InvalidVfModInvUuIdAttr.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_InvalidVfModUuIdAttr.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_InvalidVfModUuIdAttr.yml index f57a7d2300..f57a7d2300 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_InvalidVfModUuIdAttr.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_InvalidVfModUuIdAttr.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModInvUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModInvUUID.yml index 4d50982f63..4d50982f63 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModInvUUID.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModInvUUID.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelName.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelName.yml index 4d50982f63..4d50982f63 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelName.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelName.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelUUID.yml index 4d50982f63..4d50982f63 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelUUID.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelUUID.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelVersion.yml index 4d50982f63..4d50982f63 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelVersion.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/service_vmme_template_ModelVersion.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testAllotedResourceWithDependingSerWithGroups/resource-AllottedResource-template_IpMux_WithGroups.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testAllotedResourceWithDependingSerWithGroups/resource-AllottedResource-template_IpMux_WithGroups.yml index 282750351c..282750351c 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testAllotedResourceWithDependingSerWithGroups/resource-AllottedResource-template_IpMux_WithGroups.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testAllotedResourceWithDependingSerWithGroups/resource-AllottedResource-template_IpMux_WithGroups.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testAllotedResourceWithDependingSerWithGroups/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testAllotedResourceWithDependingSerWithGroups/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml index 1fba2e727f..1fba2e727f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testAllotedResourceWithDependingSerWithGroups/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testAllotedResourceWithDependingSerWithGroups/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration10/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration10/service_vmme_template_1.yml index 4a16e555ff..4a16e555ff 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration10/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration10/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/resource-IpMuxDemux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/resource-IpMuxDemux-template.yml index 5b4ffd971e..5b4ffd971e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/resource-IpMuxDemux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/resource-IpMuxDemux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/resource-TunnelXconn-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/resource-TunnelXconn-template.yml index 434757d30e..434757d30e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/resource-TunnelXconn-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/resource-TunnelXconn-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/service-Allottedipmux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/service-Allottedipmux-template.yml index 449e0925d5..449e0925d5 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/service-Allottedipmux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration15/service-Allottedipmux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration16/resource-AllottedResource-template_IpMux.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration16/resource-AllottedResource-template_IpMux.yml index 84b412d591..84b412d591 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration16/resource-AllottedResource-template_IpMux.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration16/resource-AllottedResource-template_IpMux.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration16/service-ServiceWithAllottedResourceIpmux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration16/service-ServiceWithAllottedResourceIpmux-template.yml index 1fba2e727f..1fba2e727f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration16/service-ServiceWithAllottedResourceIpmux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration16/service-ServiceWithAllottedResourceIpmux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/resource-AllottedResource1SameInvariant-IpMux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/resource-AllottedResource1SameInvariant-IpMux-template.yml index 2852d03568..2852d03568 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/resource-AllottedResource1SameInvariant-IpMux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/resource-AllottedResource1SameInvariant-IpMux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/resource-AllottedResource2SameInvariant-IpMux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/resource-AllottedResource2SameInvariant-IpMux-template.yml index 0986300436..0986300436 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/resource-AllottedResource2SameInvariant-IpMux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/resource-AllottedResource2SameInvariant-IpMux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml index efd2dea67a..efd2dea67a 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration17/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration18/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration18/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml index 2852d03568..2852d03568 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration18/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration18/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration18/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration18/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml index 08c5329212..08c5329212 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration18/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration18/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration2/Resource0-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration2/Resource0-template.yml index 49666f9bae..49666f9bae 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration2/Resource0-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration2/Resource0-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration4/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration4/service_vmme_template_1.yml index 76bb35ceec..76bb35ceec 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration4/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration4/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration5/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration5/service_vmme_template_1.yml index 338f5511bf..338f5511bf 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration5/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration5/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration6/Resource0-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration6/Resource0-template.yml index 49666f9bae..49666f9bae 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration6/Resource0-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration6/Resource0-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration6/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration6/service_vmme_template_1.yml index 4daeca3972..4daeca3972 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration6/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration6/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration8/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration8/service_vmme_template_1.yml index ff9e604bf3..ff9e604bf3 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration8/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration8/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration9/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration9/service_vmme_template_1.yml index 403ad87be0..403ad87be0 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration9/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGeneration9/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-IpMuxDemux-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-IpMuxDemux-template_AllRes_VF.yml index d8885bb84b..d8885bb84b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-IpMuxDemux-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-IpMuxDemux-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-ServiceAdmin-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-ServiceAdmin-template_AllRes_VF.yml index 549c18b55b..549c18b55b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-ServiceAdmin-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-ServiceAdmin-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-TunnelXconn-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-TunnelXconn-template_AllRes_VF.yml index 1eb97a0976..1eb97a0976 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-TunnelXconn-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-TunnelXconn-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-VhnfNonHeat-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-VhnfNonHeat-template_AllRes_VF.yml index 8ec1c192ee..8ec1c192ee 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-VhnfNonHeat-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/resource-VhnfNonHeat-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/service-SdWan-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/service-SdWan-template_AllRes_VF.yml index bc3ab6dabb..bc3ab6dabb 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/service-SdWan-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testArtifactGenerationAllottedResourceWithVF/service-SdWan-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-IpMuxDemux-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-IpMuxDemux-template_WithOutDepSerId.yml index 2e06cf467b..2e06cf467b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-IpMuxDemux-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-IpMuxDemux-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-ServiceAdmin-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-ServiceAdmin-template_WithOutDepSerId.yml index c8a641d1ac..c8a641d1ac 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-ServiceAdmin-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-ServiceAdmin-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-TunnelXconn-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-TunnelXconn-template_WithOutDepSerId.yml index eb248d1d65..eb248d1d65 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-TunnelXconn-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-TunnelXconn-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-VhnfNonHeat-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-VhnfNonHeat-template_WithOutDepSerId.yml index 8ec1c192ee..8ec1c192ee 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-VhnfNonHeat-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/resource-VhnfNonHeat-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/service-SdWan-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/service-SdWan-template_WithOutDepSerId.yml index 51d8c2d8ba..51d8c2d8ba 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/service-SdWan-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenAllottedResourceWithOutDependingServiceId/service-SdWan-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidInvId/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidInvId/service_vmme_template_1.yml index 50c4c8230a..50c4c8230a 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidInvId/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidInvId/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion1/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion1/service_vmme_template_1.yml index fbb1e62a89..fbb1e62a89 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion1/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion1/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion1/vf_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion1/vf_vmme_template_1.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion1/vf_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion1/vf_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion2/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion2/service_vmme_template_1.yml index 94b6c9b29b..94b6c9b29b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion2/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion2/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion2/vf_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion2/vf_vmme_template_1.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion2/vf_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidResourceVersion2/vf_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidUuId/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidUuId/service_vmme_template_1.yml index 5edb3bf8af..5edb3bf8af 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidUuId/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenInvalidUuId/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenNoResourceVersion/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenNoResourceVersion/service_vmme_template_1.yml index d50b285b70..d50b285b70 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenNoResourceVersion/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenNoResourceVersion/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenNoResourceVersion/vf_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenNoResourceVersion/vf_vmme_template_1.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testErrorWhenNoResourceVersion/vf_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testErrorWhenNoResourceVersion/vf_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-AllottedResource-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-AllottedResource-template.yml index c80e701913..c80e701913 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-AllottedResource-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-AllottedResource-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-Extvl-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-Extvl-template.yml index aa32d4ae01..aa32d4ae01 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-Extvl-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-Extvl-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-Extvl-template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-Extvl-template_1.yml index e474f9a637..e474f9a637 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-Extvl-template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/resource-Extvl-template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/service_vmme_template_1.yml index c2b2875c75..c2b2875c75 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/vf_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/vf_vmme_template_1.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/vf_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testSameVLdifferentVersion/vf_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testWidgetinServiceTosca/ServiceMock-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testWidgetinServiceTosca/ServiceMock-template.yml index 84ba6c9298..84ba6c9298 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testWidgetinServiceTosca/ServiceMock-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testWidgetinServiceTosca/ServiceMock-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testWidgetinServiceTosca/VadtranDemo-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testWidgetinServiceTosca/VadtranDemo-template.yml index bddcf9f284..bddcf9f284 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/testWidgetinServiceTosca/VadtranDemo-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/testWidgetinServiceTosca/VadtranDemo-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_InvalidVfModInvUuIdAttr.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_InvalidVfModInvUuIdAttr.yml index 7d3a420a00..7d3a420a00 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_InvalidVfModInvUuIdAttr.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_InvalidVfModInvUuIdAttr.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_InvalidVfModUuIdAttr.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_InvalidVfModUuIdAttr.yml index a2d65041b0..a2d65041b0 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_InvalidVfModUuIdAttr.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_InvalidVfModUuIdAttr.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModInvUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModInvUUID.yml index 0961302ead..0961302ead 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModInvUUID.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModInvUUID.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelName.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelName.yml index 2f5f4267b5..2f5f4267b5 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelName.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelName.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelUUID.yml index 7dec66c31b..7dec66c31b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelUUID.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelUUID.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelVersion.yml index 5ae33ed8ab..5ae33ed8ab 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelVersion.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/vf_vmme_template_ModelVersion.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml index 202028269f..4bdf5bc81e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/pom.xml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <artifactId>openecomp-sdc-artifact-generator-test</artifactId> + <artifactId>onap-sdc-artifact-generator-test</artifactId> <parent> - <artifactId>openecomp-common-lib</artifactId> - <groupId>org.openecomp.sdc.common</groupId> + <artifactId>onap-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> @@ -52,14 +52,14 @@ <version>4.11</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-core</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java index 38462d05bb..b11c33ec9f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java @@ -18,16 +18,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator; - -import org.openecomp.sdc.generator.aai.model.*; -import org.openecomp.sdc.generator.aai.model.Service; -import org.openecomp.sdc.generator.aai.tosca.GroupDefinition; -import org.openecomp.sdc.generator.aai.tosca.NodeTemplate; -import org.openecomp.sdc.generator.aai.tosca.ToscaTemplate; -import org.openecomp.sdc.generator.aai.xml.*; -import org.openecomp.sdc.generator.aai.xml.Model; -import org.openecomp.sdc.generator.data.*; +package org.onap.sdc.generator; + +import org.onap.sdc.generator.aai.model.*; +import org.onap.sdc.generator.aai.model.Service; +import org.onap.sdc.generator.aai.tosca.GroupDefinition; +import org.onap.sdc.generator.aai.tosca.NodeTemplate; +import org.onap.sdc.generator.aai.tosca.ToscaTemplate; +import org.onap.sdc.generator.aai.xml.*; +import org.onap.sdc.generator.aai.xml.Model; +import org.onap.sdc.generator.data.*; import org.junit.Assert; import javax.xml.bind.JAXBContext; @@ -41,8 +41,6 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.openecomp.sdc.generator.SampleJUnitTest.additionalParams; - @SuppressWarnings("Duplicates") public class ArtifactGenerationServiceTest { @@ -367,7 +365,8 @@ public class ArtifactGenerationServiceTest { if (serviceTosca == null) { org.testng.Assert.fail("Service Tosca not found"); } - serviceTosca.getMetadata().put("version", additionalParams.get(AdditionalParams + serviceTosca.getMetadata().put("version", SampleJUnitTest.additionalParams.get( + AdditionalParams .ServiceVersion.getName())); Service service = new Service(); service.populateModelIdentificationInformation(serviceTosca.getMetadata()); @@ -434,7 +433,8 @@ public class ArtifactGenerationServiceTest { private static void validateWidgetIds(List<ModelElement> matchedServiceBaseWidgetElements, String widgetName, String widgetInvUuId) { org.testng.Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0) - .getRelationshipData().get(0).getRelationshipValue(), properties.getProperty(ArtifactType.AAI.name() + .getRelationshipData().get(0).getRelationshipValue(), properties.getProperty( + ArtifactType.AAI.name() + ".model-version-id."+ widgetName)); org.testng.Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0) diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/SampleJUnitTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java index 089d773f94..9c4def4808 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/SampleJUnitTest.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java @@ -18,13 +18,20 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.generator; - -import org.openecomp.sdc.generator.aai.model.Widget; -import org.openecomp.sdc.generator.aai.tosca.ToscaTemplate; -import org.openecomp.sdc.generator.aai.xml.Model; -import org.openecomp.sdc.generator.data.*; -import org.openecomp.sdc.generator.impl.ArtifactGenerationServiceImpl; +package org.onap.sdc.generator; + +import org.onap.sdc.generator.data.AdditionalParams; +import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.data.GeneratorConstants; +import org.onap.sdc.generator.data.GeneratorUtil; +import org.onap.sdc.generator.data.GroupType; +import org.onap.sdc.generator.impl.ArtifactGenerationServiceImpl; +import org.onap.sdc.generator.aai.model.Widget; +import org.onap.sdc.generator.aai.tosca.ToscaTemplate; +import org.onap.sdc.generator.aai.xml.Model; +import org.onap.sdc.generator.data.*; import junit.framework.TestCase; import org.junit.Assert; @@ -33,8 +40,7 @@ import org.junit.Test; import java.io.*; import java.util.*; -import static org.openecomp.sdc.generator.ArtifactGenerationServiceTest.*; -import static org.openecomp.sdc.generator.data.GeneratorConstants.*; +import static org.onap.sdc.generator.ArtifactGenerationServiceTest.*; public class SampleJUnitTest extends TestCase { @@ -1167,7 +1173,8 @@ public class SampleJUnitTest extends TestCase { GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, new HashMap<String, String>()); Assert.assertEquals(data.getErrorData().isEmpty(),false); - Assert.assertEquals(data.getErrorData().get("AAI").get(0),GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION); + Assert.assertEquals(data.getErrorData().get("AAI").get(0), + GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION); } catch (Exception e) { Assert.fail(e.getMessage()); } @@ -1185,21 +1192,22 @@ public class SampleJUnitTest extends TestCase { additionalParams.put(AdditionalParams.ServiceVersion.getName(),"1"); GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); - Assert.assertEquals(data.getErrorData().get("AAI").get(0),GENERATOR_AAI_INVALID_SERVICE_VERSION); + Assert.assertEquals(data.getErrorData().get("AAI").get(0), + GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION); additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.1"); GenerationData data2 = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams); Assert.assertEquals(data2.getErrorData().isEmpty(),false); Assert.assertEquals(data2.getErrorData().get("AAI").get(0), - GENERATOR_AAI_INVALID_SERVICE_VERSION); + GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION); additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.0"); GenerationData data3 = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams); Assert.assertEquals(data3.getErrorData().isEmpty(),false); Assert.assertEquals(data3.getErrorData().get("AAI").get(0), - GENERATOR_AAI_INVALID_SERVICE_VERSION); + GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION); } catch (Exception e) { Assert.fail(e.getMessage()); } finally{ @@ -1263,7 +1271,8 @@ public class SampleJUnitTest extends TestCase { GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); Assert.assertEquals(data.getErrorData().get("AAI").get(0), - String.format(GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA, + String.format( + GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA, toscas.get(0).getMetadata().get("UUID"))); inputArtifacts.remove(1); @@ -1273,7 +1282,8 @@ public class SampleJUnitTest extends TestCase { additionalParams); Assert.assertEquals(data2.getErrorData().isEmpty(),false); Assert.assertEquals(data2.getErrorData().get("AAI").get(0), - String.format(GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA, + String.format( + GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA, toscas.get(0).getMetadata().get("UUID"))); } catch (Exception e) { @@ -1296,7 +1306,8 @@ public class SampleJUnitTest extends TestCase { GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); - Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA,toscas.get(0).getMetadata().get("UUID"))); + Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format( + GeneratorConstants.GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA,toscas.get(0).getMetadata().get("UUID"))); } catch (Exception e) { Assert.fail(e.getMessage()); } @@ -1321,7 +1332,7 @@ public class SampleJUnitTest extends TestCase { Assert.assertEquals(data.getErrorData().isEmpty(),false); Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format - (GENERATOR_AAI_PROVIDING_SERVICE_MISSING, toscas.get(1).getModelId())); + (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING, toscas.get(1).getModelId())); } catch (Exception e) { Assert.fail(e.getMessage()); @@ -1498,7 +1509,7 @@ public class SampleJUnitTest extends TestCase { GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams); Assert.assertEquals(data.getErrorData().isEmpty(),false); Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format - (GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING, toscas.get(2).getModelId())); + (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING, toscas.get(2).getModelId())); } catch (Exception e) { Assert.fail(e.getMessage()); } @@ -1570,10 +1581,12 @@ public class SampleJUnitTest extends TestCase { try { return GeneratorUtil.translateTosca(new String(decodedInput), ToscaTemplate.class); } catch (Exception e) { - throw new IllegalArgumentException(String.format(GENERATOR_AAI_ERROR_INVALID_TOSCA, input.getName())); + throw new IllegalArgumentException(String.format( + GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_TOSCA, input.getName())); } } else { - throw new SecurityException(String.format(GENERATOR_AAI_ERROR_CHECKSUM_MISMATCH, input.getName())); + throw new SecurityException(String.format( + GeneratorConstants.GENERATOR_AAI_ERROR_CHECKSUM_MISMATCH, input.getName())); } } diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/CMAUI_VF.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VF.yaml index 72bbca9a61..72bbca9a61 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/CMAUI_VF.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VF.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/CMAUI_VFInvalidFormat.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFInvalidFormat.yaml index 72bbca9a61..72bbca9a61 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/CMAUI_VFInvalidFormat.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFInvalidFormat.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/CMAUI_VFMissingVFModule.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFMissingVFModule.yaml index 72bbca9a61..72bbca9a61 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/CMAUI_VFMissingVFModule.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/CMAUI_VFMissingVFModule.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VF.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VF.yaml index 2cbc0e9b86..2cbc0e9b86 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VF.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VF.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFInvalidFormat.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFInvalidFormat.yaml index 5ef3805c30..5ef3805c30 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFInvalidFormat.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFInvalidFormat.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFMissingVFModule.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFMissingVFModule.yaml index 2cbc0e9b86..2cbc0e9b86 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFMissingVFModule.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFMissingVFModule.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFOrphan.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFOrphan.yaml index d27bc63c35..d27bc63c35 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFOrphan.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ECA_OAM_VFOrphan.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16.yaml index 62daf34eab..62daf34eab 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16InvalidFormat.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16InvalidFormat.yaml index 1df7c177fe..1df7c177fe 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16InvalidFormat.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16InvalidFormat.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16MissingVFModule.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16MissingVFModule.yaml index 31d95200ad..31d95200ad 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16MissingVFModule.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_Sevice_07_25_16MissingVFModule.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_VF.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VF.yaml index 7398e45e95..7398e45e95 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_VF.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VF.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_VFInvalidFormat.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFInvalidFormat.yaml index 4e99ade400..4e99ade400 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_VFInvalidFormat.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFInvalidFormat.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_VFMissingVFModule.yaml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFMissingVFModule.yaml index 4e99ade400..4e99ade400 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/MMSC_VFMissingVFModule.yaml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/MMSC_VFMissingVFModule.yaml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/Resource0-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource0-template.yml index 49666f9bae..49666f9bae 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/Resource0-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource0-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/Resource1-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource1-template.yml index 3152660125..3152660125 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/Resource1-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Resource1-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/Service0-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-template.yml index 0ddab00927..0ddab00927 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/Service0-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/Service0-templateMoreThan256.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-templateMoreThan256.yml index 0411603163..0411603163 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/Service0-templateMoreThan256.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/Service0-templateMoreThan256.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ServiceWithNodetemplate.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ServiceWithNodetemplate.yml index b28bda56f9..b28bda56f9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/ServiceWithNodetemplate.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/ServiceWithNodetemplate.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/aai/service_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/service_vmme_template_1.yml index b3b7889453..b3b7889453 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/aai/service_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/service_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/aai/vf_vmme_template_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/vf_vmme_template_1.yml index 2a169e69f8..2a169e69f8 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/aai/vf_vmme_template_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/aai/vf_vmme_template_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux.yml index 030fa24603..030fa24603 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux_WithGroups.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux_WithGroups.yml index 282750351c..282750351c 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux_WithGroups.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_IpMux_WithGroups.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDiffVersionOfSameL3Network.yml index c80e701913..c80e701913 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDiffVersionOfSameL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDiffVersionOfSameL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDupL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDupL3Network.yml index c80e701913..c80e701913 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDupL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithDupL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3Network.yml index c80e701913..c80e701913 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3NetworkInVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3NetworkInVFMod.yml index c80e701913..c80e701913 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3NetworkInVFMod.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource-template_WithL3NetworkInVFMod.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource1SameInvariant-IpMux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource1SameInvariant-IpMux-template.yml index 76ae589dd9..76ae589dd9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource1SameInvariant-IpMux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource1SameInvariant-IpMux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource2SameInvariant-IpMux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource2SameInvariant-IpMux-template.yml index afd085df89..afd085df89 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource2SameInvariant-IpMux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResource2SameInvariant-IpMux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml index 2852d03568..2852d03568 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-AllottedResourceSameInvariantSameVers-IpMux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_1_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_1_WithDiffVersionOfSameL3Network.yml index e474f9a637..e474f9a637 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_1_WithDiffVersionOfSameL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_1_WithDiffVersionOfSameL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDiffVersionOfSameL3Network.yml index aa32d4ae01..aa32d4ae01 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDiffVersionOfSameL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDiffVersionOfSameL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDupL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDupL3Network.yml index 512d62bdaa..512d62bdaa 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDupL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithDupL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithL3Network.yml index 512d62bdaa..512d62bdaa 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-Extvl-template_WithL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template.yml index 5b4ffd971e..5b4ffd971e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_AllRes_VF.yml index d8885bb84b..d8885bb84b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_WithOutDepSerId.yml index 2e06cf467b..2e06cf467b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-IpMuxDemux-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_AllRes_VF.yml index 549c18b55b..549c18b55b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_WithOutDepSerId.yml index c8a641d1ac..c8a641d1ac 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-ServiceAdmin-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template.yml index 434757d30e..434757d30e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_AllRes_VF.yml index 1eb97a0976..1eb97a0976 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_WithOutDepSerId.yml index eb248d1d65..eb248d1d65 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-TunnelXconn-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_AllRes_VF.yml index 8ec1c192ee..8ec1c192ee 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_WithOutDepSerId.yml index 8ec1c192ee..8ec1c192ee 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/resource-VhnfNonHeat-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-Allottedipmux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-Allottedipmux-template.yml index 449e0925d5..449e0925d5 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-Allottedipmux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-Allottedipmux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_AllRes_VF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_AllRes_VF.yml index bc3ab6dabb..bc3ab6dabb 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_AllRes_VF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_AllRes_VF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_WithOutDepSerId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_WithOutDepSerId.yml index 51d8c2d8ba..51d8c2d8ba 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_WithOutDepSerId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-SdWan-template_WithOutDepSerId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template.yml index 1fba2e727f..1fba2e727f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml index 1fba2e727f..1fba2e727f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourceIpmux-template_WithGroups.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml index efd2dea67a..efd2dea67a 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariant-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml index 08c5329212..08c5329212 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service-ServiceWithAllottedResourcesIpMuxSameInvariantSameVers-template.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVF.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVF.yml index 6a5af0d56b..6a5af0d56b 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVF.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVF.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVFModWithSameInvId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVFModWithSameInvId.yml index 11ab6e1343..11ab6e1343 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVFModWithSameInvId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DiffVerOfSameVFModWithSameInvId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFModUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFModUUID.yml index e75f7ab1a8..e75f7ab1a8 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFModUUID.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFModUUID.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFUUID.yml index f92b048f5e..f92b048f5e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFUUID.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_DupVFUUID.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFInServiceTOSCA.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFInServiceTOSCA.yml index d112817569..d112817569 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFInServiceTOSCA.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFInServiceTOSCA.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFTemplate.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFTemplate.yml index 81982bdf50..81982bdf50 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFTemplate.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MissingVFTemplate.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulComp.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulComp.yml index dd0a8eba3d..dd0a8eba3d 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulComp.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulComp.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulVFVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulVFVFMod.yml index 353a233d74..353a233d74 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulVFVFMod.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_MulVFVFMod.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NoSystemPropConfigured.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NoSystemPropConfigured.yml index 11ab6e1343..11ab6e1343 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NoSystemPropConfigured.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NoSystemPropConfigured.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NullFields.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NullFields.yml index 2ca342cd46..2ca342cd46 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NullFields.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_NullFields.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_Orphan.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_Orphan.yml index 6ca0957b8f..6ca0957b8f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_Orphan.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_Orphan.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget1.yml index d83e44be1c..d83e44be1c 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget2.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget2.yml index 989c623fd3..989c623fd3 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget2.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SameWidget2.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SingleVFVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SingleVFVFMod.yml index 0d586db1a8..0d586db1a8 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SingleVFVFMod.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_SingleVFVFMod.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterResourceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterResourceVersion.yml index 2d92782ce4..2d92782ce4 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterResourceVersion.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterResourceVersion.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterServiceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterServiceVersion.yml index 0d586db1a8..0d586db1a8 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterServiceVersion.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyMandatoryParameterServiceVersion.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat1.yml index 2e0d2d4bc7..2e0d2d4bc7 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat2.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat2.yml index 9ab98f3c01..9ab98f3c01 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat2.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyResourceVersionFormat2.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersion.yml index 0d586db1a8..0d586db1a8 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersion.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersion.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersionFormat.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersionFormat.yml index 0d586db1a8..0d586db1a8 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersionFormat.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyServiceVersionFormat.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithInvalidNo.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithInvalidNo.yml index ae7d9cec4a..ae7d9cec4a 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithInvalidNo.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithInvalidNo.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithoutVNFC.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithoutVNFC.yml index 7789017a68..7789017a68 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithoutVNFC.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_VerifyVFModWithoutVNFC.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDiffVersionOfSameL3Network.yml index e4139550fe..e4139550fe 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDiffVersionOfSameL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDiffVersionOfSameL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDupL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDupL3Network.yml index c72aab10bc..c72aab10bc 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDupL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithDupL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml index 37bada7396..37bada7396 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml index 15157e9076..15157e9076 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3Network.yml index f262ef6e82..f262ef6e82 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3NetworkInVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3NetworkInVFMod.yml index 1853802b80..1853802b80 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3NetworkInVFMod.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithL3NetworkInVFMod.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithUpdatedUUIDInConfig.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithUpdatedUUIDInConfig.yml index 11ab6e1343..11ab6e1343 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithUpdatedUUIDInConfig.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/service_vmme_template_WithUpdatedUUIDInConfig.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVFModWithSameInvId.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVFModWithSameInvId.yml index b6076b177d..b6076b177d 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVFModWithSameInvId.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVFModWithSameInvId.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_1.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_2.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_2.yml index 1e67b68c8c..1e67b68c8c 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_2.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DiffVerOfSameVF_2.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFModUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFModUUID.yml index b8e80df3eb..b8e80df3eb 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFModUUID.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFModUUID.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFUUID.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFUUID.yml index ef95a248b4..ef95a248b4 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFUUID.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_DupVFUUID.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulComp.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulComp.yml index 62dee771dd..62dee771dd 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulComp.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulComp.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulVFVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulVFVFMod.yml index cef49ec97d..cef49ec97d 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulVFVFMod.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_MulVFVFMod.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NoSystemPropConfigured.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NoSystemPropConfigured.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NoSystemPropConfigured.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NoSystemPropConfigured.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NullFields.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NullFields.yml index 25f6310896..25f6310896 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NullFields.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_NullFields.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_Orphan.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_Orphan.yml index 652b487f60..652b487f60 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_Orphan.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_Orphan.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets1.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets1.yml index 8edeb07ad5..8edeb07ad5 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets1.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets1.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets2.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets2.yml index cba91b2b3e..cba91b2b3e 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets2.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SameWidgets2.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SingleVFVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SingleVFVFMod.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SingleVFVFMod.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_SingleVFVFMod.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterResourceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterResourceVersion.yml index 63fafc0fc1..63fafc0fc1 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterResourceVersion.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterResourceVersion.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterServiceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterServiceVersion.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterServiceVersion.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyMandatoryParameterServiceVersion.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyResourceVersionFormat.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyResourceVersionFormat.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyResourceVersionFormat.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyResourceVersionFormat.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersion.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersion.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersion.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersion.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersionFormat.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersionFormat.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersionFormat.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyServiceVersionFormat.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithInvalidNo.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithInvalidNo.yml index 9cb7291603..9cb7291603 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithInvalidNo.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithInvalidNo.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithoutVNFC.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithoutVNFC.yml index b1784cf81f..b1784cf81f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithoutVNFC.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_VerifyVFModWithoutVNFC.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDiffVersionOfSameL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDiffVersionOfSameL3Network.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDiffVersionOfSameL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDiffVersionOfSameL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDupL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDupL3Network.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDupL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithDupL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdGreaterThanSpecifiedLimit.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithInvIdLesserThanSpecifiedLimit.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3Network.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3Network.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3Network.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3Network.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3NetworkInVFMod.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3NetworkInVFMod.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3NetworkInVFMod.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithL3NetworkInVFMod.yml diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithUpdatedUUIDInConfig.yml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithUpdatedUUIDInConfig.yml index 6aee48b9d9..6aee48b9d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithUpdatedUUIDInConfig.yml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/resources/vf_vmme_template_WithUpdatedUUIDInConfig.yml diff --git a/common/onap-sdc-artifact-generator-lib/pom.xml b/common/onap-sdc-artifact-generator-lib/pom.xml new file mode 100644 index 0000000000..05a01c2407 --- /dev/null +++ b/common/onap-sdc-artifact-generator-lib/pom.xml @@ -0,0 +1,24 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>onap-sdc-artifact-generator-lib</name> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-lib</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-common-lib</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + + + <modules> + <module>onap-sdc-artifact-generator-api</module> + <module>onap-sdc-artifact-generator-core</module> + <module>onap-sdc-artifact-generator-test</module> + </modules> + +</project> diff --git a/common/openecomp-tosca-datatype/pom.xml b/common/onap-tosca-datatype/pom.xml index 27a13c6a21..b183d06aec 100644 --- a/common/openecomp-tosca-datatype/pom.xml +++ b/common/onap-tosca-datatype/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <parent> - <artifactId>openecomp-common-lib</artifactId> - <groupId>org.openecomp.sdc.common</groupId> + <artifactId>onap-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> <version>1.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ActivityDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ActivityDefinition.java index 47800a4c2a..538ed37409 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ActivityDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ActivityDefinition.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; public class ActivityDefinition { diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ArtifactDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ArtifactDefinition.java index 0eaabc4334..b3aae7e75e 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ArtifactDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ArtifactDefinition.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ArtifactType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ArtifactType.java index 64428d3920..1dff6b9e8d 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ArtifactType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ArtifactType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/AttributeDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java index 97a1add3b0..aefe987402 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/AttributeDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.Objects; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityAssignment.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityAssignment.java index 072c532ae6..bed4e8c6b0 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityAssignment.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityAssignment.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityDefinition.java index 61abeb09a0..0eb205b3fd 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityDefinition.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; -import org.openecomp.sdc.tosca.services.DataModelCloneUtil; +import org.onap.sdc.tosca.services.DataModelCloneUtil; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityFilterDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityFilterDefinition.java index f600a2fbfa..83f9d2576b 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityFilterDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityFilterDefinition.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityType.java index 671d84369b..a6368f8a6f 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Constraint.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Constraint.java index d6653fdae1..a21e31b387 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Constraint.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Constraint.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.ArrayList; import java.util.List; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Credential.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Credential.java index 19138ca69f..fdfbcbe280 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Credential.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Credential.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/DataType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DataType.java index 84ec4cb030..bf318a7d3e 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/DataType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DataType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/DefinitionOfDataType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java index a963598ad9..e249cd5335 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/DefinitionOfDataType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Directive.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Directive.java index af9215f54e..749044bf8e 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Directive.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Directive.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/EntrySchema.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/EntrySchema.java index ec5bb3b3fa..0b826e22cd 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/EntrySchema.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/EntrySchema.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; -import org.openecomp.sdc.tosca.services.DataModelCloneUtil; +import org.onap.sdc.tosca.services.DataModelCloneUtil; import java.util.List; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/EventFilter.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/EventFilter.java index 794997050f..273a64f5af 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/EventFilter.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/EventFilter.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; public class EventFilter { diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/GroupDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/GroupDefinition.java index 0da5207479..e2002bf22e 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/GroupDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/GroupDefinition.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/GroupType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/GroupType.java index 81badd2af9..611b1bf447 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/GroupType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/GroupType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Implementation.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Implementation.java index b14e49a012..00c0833956 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Implementation.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Implementation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.HashSet; import java.util.List; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Import.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Import.java index 451d76ee11..604607c11e 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Import.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Import.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/InterfaceDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinition.java index 3a35b46907..28e871a454 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/InterfaceDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinition.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/InterfaceDefinitionTemplate.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinitionTemplate.java index efa86f0ced..a39221fe39 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/InterfaceDefinitionTemplate.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinitionTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import org.apache.commons.collections4.MapUtils; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/InterfaceDefinitionType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinitionType.java index 4860b3a2ac..800786c1af 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/InterfaceDefinitionType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinitionType.java @@ -15,7 +15,7 @@ */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import org.apache.commons.collections4.MapUtils; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/InterfaceType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceType.java index f32ebc39dd..d89aa9fd82 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/InterfaceType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import org.apache.commons.collections4.MapUtils; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/NodeFilter.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeFilter.java index 9174262138..692d7e47ee 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/NodeFilter.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeFilter.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/NodeTemplate.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeTemplate.java index 6ce1ce03d8..258a7ec2cd 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/NodeTemplate.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeTemplate.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/NodeType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeType.java index f12345e1f4..767e8a6668 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/NodeType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/OperationDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/OperationDefinition.java index bdfe937b1e..c166588985 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/OperationDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/OperationDefinition.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.Objects; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/OperationDefinitionTemplate.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/OperationDefinitionTemplate.java index 6710e271b6..16e45393cf 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/OperationDefinitionTemplate.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/OperationDefinitionTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.Map; import java.util.Objects; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/OperationDefinitionType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/OperationDefinitionType.java index 7043812fc7..5b87d49055 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/OperationDefinitionType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/OperationDefinitionType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.Map; import java.util.Objects; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ParameterDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ParameterDefinition.java index f579c5364f..7426c33010 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ParameterDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ParameterDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; public class ParameterDefinition extends DefinitionOfDataType { diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PolicyDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PolicyDefinition.java index 6907ea6480..e1c2fb468c 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PolicyDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PolicyDefinition.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PolicyType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PolicyType.java index 55a13d5a6c..54d52cceec 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PolicyType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PolicyType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PreconditionDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PreconditionDefinition.java index adbb335f6a..8bd5c540b0 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PreconditionDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PreconditionDefinition.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; public class PreconditionDefinition { diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PropertyDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java index 9472b539ab..58c4a75347 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PropertyDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; -import org.openecomp.sdc.tosca.services.DataModelCloneUtil; +import org.onap.sdc.tosca.services.DataModelCloneUtil; import java.util.Objects; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PropertyType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java index 02c4b7fde4..d08a1271e3 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/PropertyType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.Collections; import java.util.HashMap; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/RelationshipTemplate.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/RelationshipTemplate.java index d354807c2f..d9a81137f0 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/RelationshipTemplate.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/RelationshipTemplate.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/RelationshipType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/RelationshipType.java index 463d3d2364..dacd5bcddf 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/RelationshipType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/RelationshipType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Repository.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Repository.java index 3d3a5924d1..a9328234d1 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Repository.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Repository.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; public class Repository { diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/RequirementAssignment.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/RequirementAssignment.java index b94cc67f13..0cd15e5549 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/RequirementAssignment.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/RequirementAssignment.java @@ -18,11 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; -import java.util.Arrays; - public class RequirementAssignment { private String capability; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/RequirementDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/RequirementDefinition.java index a9b20736dc..cc8b6f6166 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/RequirementDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/RequirementDefinition.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; public class RequirementDefinition { diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Scalar.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Scalar.java index 9073ff3d7b..302ba4808c 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Scalar.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Scalar.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ServiceTemplate.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ServiceTemplate.java index c02679d2af..8ffc1f601e 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ServiceTemplate.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/ServiceTemplate.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import org.apache.commons.collections4.MapUtils; -import org.openecomp.sdc.tosca.datatypes.model.heatextend.AnnotationType; +import org.onap.sdc.tosca.datatypes.model.heatextend.AnnotationType; import java.util.HashMap; import java.util.List; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Status.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java index 79c6df81cd..c0f6d874d7 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Status.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/StepDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/StepDefinition.java index 7a5c7b7884..660b31c5e4 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/StepDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/StepDefinition.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/SubstitutionMapping.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/SubstitutionMapping.java index 51373e484e..3669ae1df4 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/SubstitutionMapping.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/SubstitutionMapping.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Template.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Template.java index 128bb3c0a9..490881688e 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Template.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Template.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; public interface Template { } diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/TimeInterval.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/TimeInterval.java index efce557fd5..6e39ec67e3 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/TimeInterval.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/TimeInterval.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.sql.Timestamp; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/TopologyTemplate.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/TopologyTemplate.java index fe1b2ea313..fde5f41bd2 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/TopologyTemplate.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/TopologyTemplate.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.HashMap; import java.util.List; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Trigger.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Trigger.java index 615630fa88..92f3b30183 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Trigger.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Trigger.java @@ -1,6 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; - -import java.sql.Time; +package org.onap.sdc.tosca.datatypes.model; public class Trigger { diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/WorkflowDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/WorkflowDefinition.java index 20f0863d2e..deacc77767 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/WorkflowDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/WorkflowDefinition.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.tosca.datatypes.model; +package org.onap.sdc.tosca.datatypes.model; import java.util.List; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/AnnotationDefinition.java index 24b5dec416..8734dbcf07 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationDefinition.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/AnnotationDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model.heatextend; +package org.onap.sdc.tosca.datatypes.model.heatextend; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/AnnotationType.java index b76966e1f8..f2d124ac18 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationType.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/AnnotationType.java @@ -14,9 +14,9 @@ * limitations under the License. */ - package org.openecomp.sdc.tosca.datatypes.model.heatextend; + package org.onap.sdc.tosca.datatypes.model.heatextend; - import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; + import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; import java.util.Map; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java index 58ee1cadd0..dccb200148 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.datatypes.model.heatextend; +package org.onap.sdc.tosca.datatypes.model.heatextend; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; import java.util.Map; public class ParameterDefinitionExt extends ParameterDefinition { diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/PropertyTypeExt.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/PropertyTypeExt.java index f92d674070..34d91cbb51 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/PropertyTypeExt.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/PropertyTypeExt.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.datatypes.model.heatextend; +package org.onap.sdc.tosca.datatypes.model.heatextend; import java.util.Collections; import java.util.HashMap; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/services/DataModelCloneUtil.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/DataModelCloneUtil.java index e6beb7a3cb..f2868449c7 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/services/DataModelCloneUtil.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/DataModelCloneUtil.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.tosca.services; +package org.onap.sdc.tosca.services; -import org.openecomp.sdc.tosca.datatypes.model.AttributeDefinition; -import org.openecomp.sdc.tosca.datatypes.model.Constraint; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.AttributeDefinition; +import org.onap.sdc.tosca.datatypes.model.Constraint; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; import java.util.HashMap; import java.util.List; diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/services/ToscaExtensionYamlUtil.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/ToscaExtensionYamlUtil.java index ebdc28fd16..efd4982541 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/services/ToscaExtensionYamlUtil.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/ToscaExtensionYamlUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.services; +package org.onap.sdc.tosca.services; import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.introspector.Property; @@ -44,9 +44,9 @@ public class ToscaExtensionYamlUtil extends YamlUtil { Class<? extends Object> classType = type; try { if (type - .equals(Class.forName("org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition"))) { + .equals(Class.forName("org.onap.sdc.tosca.datatypes.model.ParameterDefinition"))) { classType = Class - .forName("org.openecomp.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt"); + .forName("org.onap.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt"); } } catch (ClassNotFoundException ex) { throw new RuntimeException(ex); @@ -67,9 +67,9 @@ public class ToscaExtensionYamlUtil extends YamlUtil { Class type = node.getType(); try { if (type.equals( - Class.forName("org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition"))) { + Class.forName("org.onap.sdc.tosca.datatypes.model.ParameterDefinition"))) { Class extendHeatClass = Class.forName( - "org.openecomp.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt"); + "org.onap.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt"); Object extendHeatObject = extendHeatClass.newInstance(); // create JavaBean return super.constructJavaBean2ndStep(node, extendHeatObject); diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/services/YamlUtil.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/YamlUtil.java index 3d7715a8db..4030d3acd1 100644 --- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/services/YamlUtil.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/YamlUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openecomp.sdc.tosca.services; +package org.onap.sdc.tosca.services; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.TypeDescription; diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/_index.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/_index.yml index 145766b3b0..145766b3b0 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/_index.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/_index.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml index 3a7104fd9d..3a7104fd9d 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/data.yml index de251c3843..de251c3843 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/data.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/data.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml index 643f731f09..643f731f09 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml index a8230c5b56..a8230c5b56 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/_index.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/_index.yml index fa37f50d8a..fa37f50d8a 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/_index.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/_index.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml index bc1f5efd68..bc1f5efd68 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml index ded2373e50..ded2373e50 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml index 9abb964661..9abb964661 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/_index.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/_index.yml index 244a048653..244a048653 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/_index.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/_index.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/capabilities.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/capabilities.yml index 823e131761..823e131761 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/capabilities.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/capabilities.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/data.yml index 4bbd1335af..4bbd1335af 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/data.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/data.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/nodes.yml index 19db291648..19db291648 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/nodes.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/nodes.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/relationships.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/relationships.yml index cf86be62a6..cf86be62a6 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/relationships.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-inventory/relationships.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml index 02c4f76f62..02c4f76f62 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml index 962522ca90..962522ca90 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml index 12cecb94b0..12cecb94b0 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml index 47d424f407..47d424f407 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml index 10d2121c18..10d2121c18 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml index 457770845f..457770845f 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml index d15c56e079..d15c56e079 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/_index.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/_index.yml index 418744cdcd..418744cdcd 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/_index.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/_index.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/artifacts.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/artifacts.yml index a98c176265..a98c176265 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/artifacts.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/artifacts.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/capabilities.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/capabilities.yml index 1b642cdcb1..1b642cdcb1 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/capabilities.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/capabilities.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml index a799d0d25b..a799d0d25b 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/data.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/groups.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/groups.yml index 0ddc15175c..0ddc15175c 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/groups.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/groups.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/interfaces.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/interfaces.yml index 32a6d43381..32a6d43381 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/interfaces.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/interfaces.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/nodes.yml index af68802eaf..af68802eaf 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/nodes.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/nodes.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/policies.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/policies.yml index da9c14a230..da9c14a230 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/policies.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/policies.yml diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/relationships.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/relationships.yml index 233b59be44..233b59be44 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/tosca/relationships.yml +++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/tosca/relationships.yml diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/META-INF/services/org.openecomp.config.api.ConfigurationManager b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/META-INF/services/org.openecomp.config.api.ConfigurationManager deleted file mode 100644 index 2a6c217345..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/resources/META-INF/services/org.openecomp.config.api.ConfigurationManager +++ /dev/null @@ -1 +0,0 @@ -org.openecomp.config.impl.CliConfigurationImpl
\ No newline at end of file diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/dependency-reduced-pom.xml b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/dependency-reduced-pom.xml deleted file mode 100644 index b1c35cf3a9..0000000000 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/dependency-reduced-pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>openecomp-common-lib</artifactId>
- <groupId>org.openecomp.sdc.common</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openecomp-sdc-artifact-generator-test</artifactId>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${mvn.shade.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <excludes>
- <exclude>com.google.guava:*</exclude>
- </excludes>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/common/openecomp-sdc-artifact-generator-lib/pom.xml b/common/openecomp-sdc-artifact-generator-lib/pom.xml deleted file mode 100644 index 7f3b7a95d6..0000000000 --- a/common/openecomp-sdc-artifact-generator-lib/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>openecomp-sdc-artifact-generator-lib</name> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-sdc-artifact-generator-lib</artifactId> - <packaging>pom</packaging> - - <parent> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-common-lib</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - - - <modules> - <module>openecomp-sdc-artifact-generator-api</module> - <module>openecomp-sdc-artifact-generator-core</module> - <module>openecomp-sdc-artifact-generator-test</module> - </modules> - -</project> diff --git a/common/pom.xml b/common/pom.xml index 54d3a1b3c3..ad2638ae3a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.sdc.common</groupId> - <name>openecomp-common-lib</name> - <artifactId>openecomp-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> + <name>onap-common-lib</name> + <artifactId>onap-common-lib</artifactId> <packaging>pom</packaging> <parent> @@ -20,9 +20,9 @@ </properties> <modules> - <module>openecomp-sdc-artifact-generator-lib</module> - <module>openecomp-common-configuration-management</module> - <module>openecomp-tosca-datatype</module> + <module>onap-sdc-artifact-generator-lib</module> + <module>onap-common-configuration-management</module> + <module>onap-tosca-datatype</module> </modules> <dependencies> diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml index 2b4057802e..d68e7ccc57 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml @@ -15,8 +15,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <version>${openecomp.sdc.common.version}</version> <scope>runtime</scope> <exclusions> @@ -27,8 +27,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationUploadFactory.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationUploadFactory.java index 52913c9f82..b1fb84c1f3 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationUploadFactory.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationUploadFactory.java @@ -16,8 +16,8 @@ package org.openecomp.sdc.vendorsoftwareproduct.impl.orchestration; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.core.utilities.CommonMethods; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationProcessFactory.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationProcessFactory.java index 64edf86dc7..d220fcfeb4 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationProcessFactory.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationProcessFactory.java @@ -16,8 +16,8 @@ package org.openecomp.sdc.vendorsoftwareproduct.impl.orchestration.process; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.core.utilities.CommonMethods; import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImplTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImplTest.java index 9385d4a10c..7ea07a6a31 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImplTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImplTest.java @@ -26,8 +26,8 @@ import org.mockito.MockitoAnnotations; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Component; import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionData; diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml index 9ceba92f7f..2dfa28bddf 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml @@ -17,8 +17,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/ConfigurationManager.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/ConfigurationManager.java index 898bed08b3..f1930d16dc 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/ConfigurationManager.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/ConfigurationManager.java @@ -24,7 +24,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.FileInputStream; import java.io.IOException; diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/utilities/Yaml/YamlUtilTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/utilities/Yaml/YamlUtilTest.java index 578f3e4c4a..a166e41cda 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/utilities/Yaml/YamlUtilTest.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/utilities/Yaml/YamlUtilTest.java @@ -22,7 +22,7 @@ package org.openecomp.core.utilities.Yaml; import org.junit.Before; import org.junit.Test; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import testobjects.yaml.YamlFile; diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml index 2be5fd82de..712e9d88fe 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml @@ -14,8 +14,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java index b341a52c56..159586ac23 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java @@ -7,7 +7,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonPrimitive; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; import java.lang.reflect.Type; import java.util.Objects; diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileUtils.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileUtils.java index f510febbcf..25d920f471 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileUtils.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileUtils.java @@ -19,7 +19,7 @@ package org.openecomp.core.utilities.file; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.openecomp.core.utilities.json.JsonUtil; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.ByteArrayInputStream; import java.io.File; @@ -27,9 +27,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java index 413425d714..190eba16d6 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java @@ -36,7 +36,7 @@ import org.openecomp.core.utilities.CommonMethods; import org.openecomp.core.utilities.deserializers.RequirementDefinitionDeserializer; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; import java.io.BufferedReader; import java.io.IOException; diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml index fa3533fde9..d05214c50f 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml @@ -14,8 +14,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <version>${openecomp.sdc.common.version}</version> <scope>runtime</scope> <exclusions> @@ -26,8 +26,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-heat-lib/pom.xml b/openecomp-be/lib/openecomp-heat-lib/pom.xml index ad5cfd74d7..4c737cc91e 100644 --- a/openecomp-be/lib/openecomp-heat-lib/pom.xml +++ b/openecomp-be/lib/openecomp-heat-lib/pom.xml @@ -15,8 +15,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <version>${openecomp.sdc.common.version}</version> <scope>runtime</scope> <exclusions> @@ -27,8 +27,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/tree/HeatTreeManager.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/tree/HeatTreeManager.java index df46ef048d..2b368a9f82 100644 --- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/tree/HeatTreeManager.java +++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/tree/HeatTreeManager.java @@ -33,7 +33,7 @@ import org.openecomp.sdc.heat.datatypes.structure.Artifact; import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.InputStream; import java.util.HashMap; diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/EnvironmentTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/EnvironmentTest.java index 6312e5a575..67d3408b7c 100644 --- a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/EnvironmentTest.java +++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/EnvironmentTest.java @@ -21,7 +21,7 @@ package org.openecomp.sdc.heat.datatypes.model; import org.junit.Test; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.IOException; import java.io.InputStream; diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/HeatOrchestrationTemplateTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/HeatOrchestrationTemplateTest.java index dd8abdc0b9..af8ce15c41 100644 --- a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/HeatOrchestrationTemplateTest.java +++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/HeatOrchestrationTemplateTest.java @@ -24,7 +24,7 @@ import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.IOException; import java.io.InputStream; diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml index 3cd38158b1..0afd7d9a88 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml @@ -34,8 +34,8 @@ <version>${commons.lang.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java index 89917fc73f..d95b648bcd 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java @@ -20,7 +20,7 @@ package org.openecomp.sdc.datatypes.configuration; -import org.openecomp.config.api.Config; +import org.onap.config.api.Config; import java.util.Map; diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml index af1b8fceb7..851e9a3896 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml @@ -20,8 +20,8 @@ <version>${logback.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImplTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImplTest.java index acd25dd7bc..d5e3f0bb41 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImplTest.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImplTest.java @@ -25,8 +25,8 @@ import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.tosca.services.ToscaFileOutputService; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; import org.testng.Assert; diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml index 3a4ae67125..8ad29395ee 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml @@ -20,8 +20,8 @@ <version>${logback.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java index c8d13f868d..2746ea1296 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java @@ -37,9 +37,9 @@ import org.openecomp.sdc.enrichment.inter.ExternalArtifactEnricherInterface; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.Directive; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Directive; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentArtifactDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao; diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java index e414b31b76..639579ccd0 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java @@ -19,11 +19,11 @@ import org.apache.commons.lang3.StringUtils; import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.tosca.datatypes.ToscaElementTypes; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaConstants; diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java index 9acf80d22c..c8084ba9f3 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java @@ -23,10 +23,10 @@ import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.enrichment.impl.tosca.model.PortMirroringConnectionPointDescription; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.tosca.services.ToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java index 65444b9c46..d932f7df4c 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java @@ -34,10 +34,10 @@ import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.sdc.enrichment.EnrichmentInfo; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentArtifactDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity; diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/BaseToscaEnrichmentTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/BaseToscaEnrichmentTest.java index 363e171c6c..1ca9e82a19 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/BaseToscaEnrichmentTest.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/BaseToscaEnrichmentTest.java @@ -24,8 +24,8 @@ import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.tosca.services.ToscaFileOutputService; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml index 906f3d8761..c65bcb0398 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml @@ -21,8 +21,8 @@ <version>${logback.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java index 965bc89ca8..3d1c4553b3 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java @@ -30,9 +30,9 @@ import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.Import; import org.openecomp.sdc.tosca.datatypes.model.Old1610ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.versioning.dao.VersionableDao; import org.openecomp.sdc.versioning.dao.types.Version; @@ -71,7 +71,7 @@ public class AbstractServiceModelDao implements VersionableDao { FileContentHandler artifactFiles = getArtifacts(vspId, version); - Map<String, org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate> serviceTemplates = + Map<String, org.onap.sdc.tosca.datatypes.model.ServiceTemplate> serviceTemplates = getTemplates(vspId, version); String entryDefinitionServiceTemplate = getServiceBase(vspId, version); @@ -107,7 +107,7 @@ public class AbstractServiceModelDao implements VersionableDao { ServiceTemplate entityTmp; String yaml; - for (Map.Entry<String, org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate> + for (Map.Entry<String, org.onap.sdc.tosca.datatypes.model.ServiceTemplate> entryTemplate : toscaServiceModel.getServiceTemplates().entrySet()) { entityTmp = new ServiceTemplate(); @@ -153,7 +153,7 @@ public class AbstractServiceModelDao implements VersionableDao { return templateDao.getBase(vspId, version); } - private Map<String, org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate> getTemplates( + private Map<String, org.onap.sdc.tosca.datatypes.model.ServiceTemplate> getTemplates( String vspId, Version version) { @@ -165,13 +165,13 @@ public class AbstractServiceModelDao implements VersionableDao { template -> getServiceTemplate(template.getContent()))); } - private org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate getServiceTemplate( + private org.onap.sdc.tosca.datatypes.model.ServiceTemplate getServiceTemplate( InputStream content) { String serviceTemplateContent = new String(FileUtils.toByteArray(content)); try{ return new ToscaExtensionYamlUtil().yamlToObject(serviceTemplateContent, - org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate.class); + org.onap.sdc.tosca.datatypes.model.ServiceTemplate.class); }catch (Exception e){ log.debug("",e); System.out.println("Found vsp with old-versioned tosca service template"); @@ -183,9 +183,9 @@ public class AbstractServiceModelDao implements VersionableDao { } } - private static org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate mapOldSTToCurrentST(Old1610ServiceTemplate oldServiceTemplate){ - org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate - serviceTemplate = new org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate(); + private static org.onap.sdc.tosca.datatypes.model.ServiceTemplate mapOldSTToCurrentST(Old1610ServiceTemplate oldServiceTemplate){ + org.onap.sdc.tosca.datatypes.model.ServiceTemplate + serviceTemplate = new org.onap.sdc.tosca.datatypes.model.ServiceTemplate(); serviceTemplate.setArtifact_types(oldServiceTemplate.getArtifact_types()); serviceTemplate.setCapability_types(oldServiceTemplate.getCapability_types()); diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml index e08ef57937..b8a295407d 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml @@ -16,8 +16,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/zusammen/ServiceModelDaoZusammenImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/zusammen/ServiceModelDaoZusammenImpl.java index 7bc3436f22..ca6585c841 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/zusammen/ServiceModelDaoZusammenImpl.java +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/zusammen/ServiceModelDaoZusammenImpl.java @@ -23,8 +23,8 @@ import org.openecomp.sdc.datatypes.model.ElementType; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.versioning.dao.types.Version; import org.openecomp.types.ElementPropertyName; diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/java/org/openecomp/sdc/notification/config/ConfigurationManager.java b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/java/org/openecomp/sdc/notification/config/ConfigurationManager.java index d960b8b9dc..9c63451356 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/java/org/openecomp/sdc/notification/config/ConfigurationManager.java +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/java/org/openecomp/sdc/notification/config/ConfigurationManager.java @@ -22,7 +22,7 @@ package org.openecomp.sdc.notification.config; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.FileInputStream; import java.io.IOException; diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml index 287957a2bc..cbdac92cfd 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml @@ -42,8 +42,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <version>${openecomp.sdc.common.version}</version> <scope>runtime</scope> <exclusions> @@ -54,8 +54,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml index 6aef2ede47..4888fa8f73 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml @@ -16,8 +16,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java index ab5750684d..76717f37e3 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java @@ -18,19 +18,20 @@ package org.openecomp.sdc.generator.core.services; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; -import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; import org.openecomp.sdc.generator.core.utils.GeneratorUtils; import org.openecomp.sdc.generator.datatypes.tosca.MultiFlavorVfcImage; import org.openecomp.sdc.generator.datatypes.tosca.VspModelInfo; +import org.openecomp.sdc.generator.util.GeneratorConstants; +import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyType; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyType; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaConstants; @@ -49,22 +50,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import static org.openecomp.sdc.generator.util.GeneratorConstants.ALLOWED_FLAVORS_PROPERTY; -import static org.openecomp.sdc.generator.util.GeneratorConstants.DISK_SIZE; -import static org.openecomp.sdc.generator.util.GeneratorConstants.DISK_SIZE_PROP_DESC_PREFIX; -import static org.openecomp.sdc.generator.util.GeneratorConstants.IMAGES_PROPERTY; -import static org.openecomp.sdc.generator.util.GeneratorConstants.MEM_SIZE; -import static org.openecomp.sdc.generator.util.GeneratorConstants.MEM_SIZE_PROP_DESC_PREFIX; -import static org.openecomp.sdc.generator.util.GeneratorConstants.NUM_CPUS; -import static org.openecomp.sdc.generator.util.GeneratorConstants.NUM_CPUS_PROP_DESC_PREFIX; -import static org.openecomp.sdc.generator.util.GeneratorConstants.PORT_NODE_TEMPLATE_ID_SUFFIX; -import static org.openecomp.sdc.generator.util.GeneratorConstants.PORT_TYPE_EXTERNAL_NODE_TEMPLATE_SUFFIX; -import static org.openecomp.sdc.generator.util.GeneratorConstants.PORT_TYPE_INTERNAL_NODE_TEMPLATE_SUFFIX; -import static org.openecomp.sdc.generator.util.GeneratorConstants.RELEASE_VENDOR; -import static org.openecomp.sdc.generator.util.GeneratorConstants.TOSCA_SERVICE_TEMPLATE_FILE_NAME_SUFFIX; -import static org.openecomp.sdc.generator.util.GeneratorConstants.VNF_CONFIG_NODE_TEMPLATE_ID_SUFFIX; -import static org.openecomp.sdc.generator.util.GeneratorConstants.VNF_NODE_TEMPLATE_ID_SUFFIX; - /** * The type Manual vsp tosca generator. */ @@ -89,7 +74,7 @@ public class ManualVspToscaGenerationService { .getGlobalTypesServiceTemplate(OnboardingTypesEnum.MANUAL)); toscaServiceModel.setServiceTemplates(serviceTemplates); toscaServiceModel.setEntryDefinitionServiceTemplate(Constants.MAIN_TEMPLATE_NAME - + TOSCA_SERVICE_TEMPLATE_FILE_NAME_SUFFIX); + + GeneratorConstants.TOSCA_SERVICE_TEMPLATE_FILE_NAME_SUFFIX); createToscaFromVspData(vspModelInfo, toscaServiceModel); for (Map.Entry<String, ServiceTemplate> serviceTemplateEntry : generatedServiceTemplates.entrySet()) { @@ -150,10 +135,10 @@ public class ManualVspToscaGenerationService { vnfConfigurationNodeTemplate.setType(ToscaNodeType.VNF_CONFIG_NODE_TYPE); if (Objects.nonNull(vspModelInfo.getAllowedFlavors())) { Map<String, Object> properties = new LinkedHashMap<>(); - properties.put(ALLOWED_FLAVORS_PROPERTY, vspModelInfo.getAllowedFlavors()); + properties.put(GeneratorConstants.ALLOWED_FLAVORS_PROPERTY, vspModelInfo.getAllowedFlavors()); vnfConfigurationNodeTemplate.setProperties(properties); } - String nodeTemplateId = componentName.get() + VNF_CONFIG_NODE_TEMPLATE_ID_SUFFIX; + String nodeTemplateId = componentName.get() + GeneratorConstants.VNF_CONFIG_NODE_TEMPLATE_ID_SUFFIX; DataModelUtil.addNodeTemplate(mainServiceTemplate, nodeTemplateId, vnfConfigurationNodeTemplate); } @@ -175,7 +160,7 @@ public class ManualVspToscaGenerationService { //Enable below if we need "abstract_" as prefix like we have in Unified model //String nodeTemplateId = // Constants.ABSTRACT_NODE_TEMPLATE_ID_PREFIX + componentName + "VNF_NODE_TEMPLATE_ID_SUFFIX"; - String nodeTemplateId = componentName.get() + VNF_NODE_TEMPLATE_ID_SUFFIX; + String nodeTemplateId = componentName.get() + GeneratorConstants.VNF_NODE_TEMPLATE_ID_SUFFIX; DataModelUtil.addNodeTemplate(mainServiceTemplate, nodeTemplateId, vnfNodeTemplate); abstractSubstitutionIdTypes.put(componentName.get(), ToscaNodeType @@ -194,14 +179,14 @@ public class ManualVspToscaGenerationService { componentImages.stream() .forEach(multiFlavorVfcImage -> vfcImages.put(multiFlavorVfcImage.getSoftware_version(), multiFlavorVfcImage)); - properties.put(IMAGES_PROPERTY, vfcImages); + properties.put(GeneratorConstants.IMAGES_PROPERTY, vfcImages); } } return properties; } private String getSubstitutionServiceTemplateFileName(String componentName) { - return componentName + TOSCA_SERVICE_TEMPLATE_FILE_NAME_SUFFIX; + return componentName + GeneratorConstants.TOSCA_SERVICE_TEMPLATE_FILE_NAME_SUFFIX; } private String getNodeTemplateId(String componentName, String idPrefix, String idSuffix) { @@ -217,7 +202,7 @@ public class ManualVspToscaGenerationService { Map<String, String> templateMetadata = new HashMap<>(); templateMetadata.put(ToscaConstants.ST_METADATA_TEMPLATE_NAME, Constants.MAIN_TEMPLATE_NAME); if (Objects.nonNull(releaseVendor)) { - templateMetadata.put(RELEASE_VENDOR, releaseVendor); + templateMetadata.put(GeneratorConstants.RELEASE_VENDOR, releaseVendor); } mainServiceTemplate.setTosca_definitions_version(ToscaConstants.TOSCA_DEFINITIONS_VERSION); mainServiceTemplate.setMetadata(templateMetadata); @@ -302,11 +287,11 @@ public class ManualVspToscaGenerationService { StringBuilder builder = new StringBuilder(); builder.append(nicName); if (nicNetworkType == NetworkType.External) { - builder.append(PORT_TYPE_EXTERNAL_NODE_TEMPLATE_SUFFIX); + builder.append(GeneratorConstants.PORT_TYPE_EXTERNAL_NODE_TEMPLATE_SUFFIX); } else if (nicNetworkType == NetworkType.Internal) { - builder.append(PORT_TYPE_INTERNAL_NODE_TEMPLATE_SUFFIX); + builder.append(GeneratorConstants.PORT_TYPE_INTERNAL_NODE_TEMPLATE_SUFFIX); } - builder.append(PORT_NODE_TEMPLATE_ID_SUFFIX); + builder.append(GeneratorConstants.PORT_NODE_TEMPLATE_ID_SUFFIX); return builder.toString(); } @@ -403,23 +388,23 @@ public class ManualVspToscaGenerationService { //Create num_cpus property PropertyDefinition numCpus = new PropertyDefinition(); numCpus.setType(PropertyType.INTEGER.getDisplayName()); - numCpus.setDescription(NUM_CPUS_PROP_DESC_PREFIX + componentName); + numCpus.setDescription(GeneratorConstants.NUM_CPUS_PROP_DESC_PREFIX + componentName); numCpus.setRequired(true); //Create disk_size property PropertyDefinition diskSize = new PropertyDefinition(); diskSize.setType(PropertyType.SCALAR_UNIT_SIZE.getDisplayName()); - diskSize.setDescription(DISK_SIZE_PROP_DESC_PREFIX + componentName); + diskSize.setDescription(GeneratorConstants.DISK_SIZE_PROP_DESC_PREFIX + componentName); diskSize.setRequired(true); //Create mem_size property PropertyDefinition memSize = new PropertyDefinition(); memSize.setType(PropertyType.SCALAR_UNIT_SIZE.getDisplayName()); - memSize.setDescription(MEM_SIZE_PROP_DESC_PREFIX + componentName); + memSize.setDescription(GeneratorConstants.MEM_SIZE_PROP_DESC_PREFIX + componentName); memSize.setRequired(true); Map<String, PropertyDefinition> manualVspProperties = new LinkedHashMap<>(); - manualVspProperties.put(NUM_CPUS, numCpus); - manualVspProperties.put(DISK_SIZE, diskSize); - manualVspProperties.put(MEM_SIZE, memSize); + manualVspProperties.put(GeneratorConstants.NUM_CPUS, numCpus); + manualVspProperties.put(GeneratorConstants.DISK_SIZE, diskSize); + manualVspProperties.put(GeneratorConstants.MEM_SIZE, memSize); return manualVspProperties; } diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/utils/GeneratorUtils.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/utils/GeneratorUtils.java index 168cc1ff30..9ea8ba752a 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/utils/GeneratorUtils.java +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/utils/GeneratorUtils.java @@ -2,15 +2,15 @@ package org.openecomp.sdc.generator.core.utils; import org.openecomp.sdc.tosca.datatypes.ToscaElementTypes; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml index 1c38efe144..dc134b4abc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml @@ -47,8 +47,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <version>${openecomp.sdc.common.version}</version> <scope>runtime</scope> <exclusions> @@ -59,8 +59,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml index 0535d9dba1..84696e4ae3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml @@ -16,8 +16,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java index 7c55c37d53..c1a4168a74 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java @@ -19,8 +19,8 @@ package org.openecomp.sdc.translator.datatypes.heattotosca; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import org.apache.commons.collections.MapUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.core.utilities.CommonMethods; import org.openecomp.core.utilities.file.FileContentHandler; import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; @@ -29,8 +29,8 @@ import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; import org.openecomp.sdc.heat.datatypes.manifest.FileData; import org.openecomp.sdc.heat.datatypes.manifest.ManifestFile; import org.openecomp.sdc.heat.datatypes.model.Resource; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslatedHeatResource; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionEntity; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/to/TranslateTo.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/to/TranslateTo.java index 56ba9d120d..15ae8b4cd2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/to/TranslateTo.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/to/TranslateTo.java @@ -23,7 +23,7 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.to; import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.Resource; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; public class TranslateTo { diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/NodeTemplateInformation.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/NodeTemplateInformation.java index cbcf02e9a6..63f5e02232 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/NodeTemplateInformation.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/NodeTemplateInformation.java @@ -1,6 +1,6 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; /** * Created by Talio on 4/4/2017. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/UnifiedSubstitutionData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/UnifiedSubstitutionData.java index 7b461d2903..9c284e0360 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/UnifiedSubstitutionData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/UnifiedSubstitutionData.java @@ -1,7 +1,7 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition; import org.apache.commons.collections4.MapUtils; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import java.util.Collection; import java.util.HashMap; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/commands/impl/PortNewNodeTemplateIdGenerator.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/commands/impl/PortNewNodeTemplateIdGenerator.java index e70ac165e2..1e134c0343 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/commands/impl/PortNewNodeTemplateIdGenerator.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/commands/impl/PortNewNodeTemplateIdGenerator.java @@ -19,7 +19,7 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composit import static org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionUtil.getConnectedComputeConsolidationData; import static org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionUtil.getNewPortNodeTemplateId; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.commands.UnifiedSubstitutionNodeTemplateIdGenerator; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to.UnifiedCompositionTo; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/commands/impl/SubInterfaceNewNodeTemplateIdGenerator.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/commands/impl/SubInterfaceNewNodeTemplateIdGenerator.java index 5aafa1aac5..a30b8d252f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/commands/impl/SubInterfaceNewNodeTemplateIdGenerator.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/commands/impl/SubInterfaceNewNodeTemplateIdGenerator.java @@ -19,7 +19,7 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composit import static org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionUtil.getConnectedComputeConsolidationData; import static org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionUtil.getNewSubInterfaceNodeTemplateId; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.commands.UnifiedSubstitutionNodeTemplateIdGenerator; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java index 8927149dfc..6ae6785f3e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java @@ -16,8 +16,8 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/ComputeTemplateConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/ComputeTemplateConsolidationData.java index c6721ce18f..a40944a13b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/ComputeTemplateConsolidationData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/ComputeTemplateConsolidationData.java @@ -1,6 +1,6 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; import java.util.ArrayList; import java.util.HashMap; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/EntityConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/EntityConsolidationData.java index 4545d5cdbd..0b4b454adf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/EntityConsolidationData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/EntityConsolidationData.java @@ -1,6 +1,6 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; import java.util.ArrayList; import java.util.HashMap; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/RequirementAssignmentData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/RequirementAssignmentData.java index a2fffd5a3b..2202dbc035 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/RequirementAssignmentData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/RequirementAssignmentData.java @@ -1,6 +1,6 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; /** * The type Requirement assignment data. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/SubInterfaceTemplateConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/SubInterfaceTemplateConsolidationData.java index 9b80b91ce5..261231a5c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/SubInterfaceTemplateConsolidationData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/SubInterfaceTemplateConsolidationData.java @@ -16,7 +16,7 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java index 282c444a57..34fccc05fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java @@ -24,9 +24,9 @@ import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes; import org.openecomp.sdc.heat.datatypes.model.Resource; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationService.java index 9fe2ea0fbd..7f3ab7384d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationService.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationService.java @@ -23,8 +23,8 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaConstants; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/FunctionTranslation.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/FunctionTranslation.java index dbbc63ece1..0c2ea4b80d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/FunctionTranslation.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/FunctionTranslation.java @@ -22,8 +22,8 @@ package org.openecomp.sdc.translator.services.heattotosca; import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.Template; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Template; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/FunctionTranslationFactory.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/FunctionTranslationFactory.java index 07e8fcdad6..90abc1b5c4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/FunctionTranslationFactory.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/FunctionTranslationFactory.java @@ -21,8 +21,8 @@ package org.openecomp.sdc.translator.services.heattotosca; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.core.utilities.CommonMethods; import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java index 016b4b2873..600aa52742 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java @@ -50,25 +50,25 @@ import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.AttributeDefinition; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.Template; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.AttributeDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Template; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaConstants; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedPropertyVal; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ResourceTranslation.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ResourceTranslation.java index 634e703f5e..3aa0565a24 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ResourceTranslation.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ResourceTranslation.java @@ -23,7 +23,7 @@ package org.openecomp.sdc.translator.services.heattotosca; import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.Resource; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import java.util.Optional; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ResourceTranslationFactory.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ResourceTranslationFactory.java index ab8230d946..d5157debce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ResourceTranslationFactory.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ResourceTranslationFactory.java @@ -21,8 +21,8 @@ package org.openecomp.sdc.translator.services.heattotosca; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.core.utilities.CommonMethods; import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; import org.openecomp.sdc.heat.datatypes.model.Resource; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java index 7ca4f78b37..ee0cee6bab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java @@ -30,17 +30,17 @@ import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaGroupType; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyType; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; -import org.openecomp.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt; +import org.onap.sdc.tosca.datatypes.model.GroupDefinition; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyType; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.tosca.services.ToscaFileOutputService; import org.openecomp.sdc.tosca.services.ToscaUtil; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; @@ -57,7 +57,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; public class TranslationService { diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedComposition.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedComposition.java index d72915c843..40e88ebdd5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedComposition.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedComposition.java @@ -20,7 +20,7 @@ package org.openecomp.sdc.translator.services.heattotosca; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionManager.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionManager.java index b335e0005c..fdcad28f6e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionManager.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionManager.java @@ -1,8 +1,8 @@ package org.openecomp.sdc.translator.services.heattotosca; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java index 57f3d7351b..358fe26998 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java @@ -47,8 +47,8 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.core.utilities.CommonMethods; import org.openecomp.sdc.common.togglz.ToggleableFeature; import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; @@ -57,21 +57,21 @@ import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; import org.openecomp.sdc.tosca.datatypes.ToscaGroupType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.AttributeDefinition; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.Constraint; -import org.openecomp.sdc.tosca.datatypes.model.EntrySchema; -import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyType; -import org.openecomp.sdc.tosca.datatypes.model.RelationshipTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.SubstitutionMapping; -import org.openecomp.sdc.tosca.datatypes.model.heatextend.PropertyTypeExt; +import org.onap.sdc.tosca.datatypes.model.AttributeDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.Constraint; +import org.onap.sdc.tosca.datatypes.model.EntrySchema; +import org.onap.sdc.tosca.datatypes.model.GroupDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyType; +import org.onap.sdc.tosca.datatypes.model.RelationshipTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.SubstitutionMapping; +import org.onap.sdc.tosca.datatypes.model.heatextend.PropertyTypeExt; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaConstants; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java index 528dc5e0e2..8729ca590e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionUtil.java @@ -19,8 +19,8 @@ package org.openecomp.sdc.translator.services.heattotosca; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import org.apache.commons.collections4.MapUtils; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java index ecc0a5f06c..1aea5607ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java @@ -17,8 +17,8 @@ package org.openecomp.sdc.translator.services.heattotosca.globaltypes; import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; import java.util.ArrayList; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplates.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplates.java index 99f550e8e4..f53cf59c95 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplates.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplates.java @@ -20,8 +20,8 @@ import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.translator.utils.ResourceWalker; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/ContrailV2VirtualMachineInterfaceHelper.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/ContrailV2VirtualMachineInterfaceHelper.java index 622f3c1be3..37a79a5cb1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/ContrailV2VirtualMachineInterfaceHelper.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/ContrailV2VirtualMachineInterfaceHelper.java @@ -26,8 +26,8 @@ import org.openecomp.sdc.heat.services.HeatConstants; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/VolumeTranslationHelper.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/VolumeTranslationHelper.java index 0f6eeafb61..64ddd9cbe1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/VolumeTranslationHelper.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/VolumeTranslationHelper.java @@ -26,7 +26,7 @@ import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.Output; import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.logging.api.Logger; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.to.ResourceFileDataAndIDs; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetAttrImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetAttrImpl.java index 686a9c89a9..38dcc54f73 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetAttrImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetAttrImpl.java @@ -23,10 +23,10 @@ import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.heat.services.HeatConstants; import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.Template; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Template; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.EntityConsolidationData; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetFileImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetFileImpl.java index 374f8a9ebe..73ca52051a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetFileImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetFileImpl.java @@ -23,10 +23,10 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.functiontranslati import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.tosca.datatypes.ToscaArtifactType; import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; -import org.openecomp.sdc.tosca.datatypes.model.ArtifactDefinition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.Template; +import org.onap.sdc.tosca.datatypes.model.ArtifactDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Template; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.tosca.services.ToscaFileOutputService; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetParamImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetParamImpl.java index 184aa52424..a9f8e5975e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetParamImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetParamImpl.java @@ -23,8 +23,8 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.functiontranslati import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.HeatPseudoParameters; import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.Template; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Template; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.services.heattotosca.FunctionTranslation; import org.openecomp.sdc.translator.services.heattotosca.FunctionTranslationFactory; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetResourceImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetResourceImpl.java index ce160cee49..ffb0b7212c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetResourceImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetResourceImpl.java @@ -21,8 +21,8 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.functiontranslation; import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.Template; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Template; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.services.heattotosca.FunctionTranslation; import org.openecomp.sdc.translator.services.heattotosca.helper.FunctionTranslationHelper; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java index 587b731a3e..065092b00f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java @@ -29,14 +29,14 @@ import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailPortToNetResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailPortToNetResourceConnection.java index eb84f3f105..c3b55a9646 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailPortToNetResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailPortToNetResourceConnection.java @@ -30,9 +30,9 @@ import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnection.java index d906ff1401..7f80f47522 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnection.java @@ -28,9 +28,9 @@ import org.openecomp.sdc.heat.services.HeatConstants; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnection.java index 69983e4b9e..d5fb91a8a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnection.java @@ -27,9 +27,9 @@ import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnection.java index 78021f3ba5..ee65581ac5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnection.java @@ -30,9 +30,9 @@ import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/PortToNetResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/PortToNetResourceConnection.java index 06d338d6d6..4a9cd92329 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/PortToNetResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/PortToNetResourceConnection.java @@ -27,9 +27,9 @@ import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingCapabilityHelper.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingCapabilityHelper.java index 2bc0de6888..15af3c0771 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingCapabilityHelper.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingCapabilityHelper.java @@ -22,12 +22,12 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslati import org.openecomp.sdc.heat.datatypes.manifest.FileData; import org.openecomp.sdc.heat.datatypes.model.Resource; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslatedHeatResource; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingRequirementHelper.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingRequirementHelper.java index 9d16502689..ff6521c4fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingRequirementHelper.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceConnectionUsingRequirementHelper.java @@ -21,10 +21,10 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation; import org.openecomp.sdc.heat.datatypes.manifest.FileData; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationBase.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationBase.java index 6809ce39cf..92ce4c19ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationBase.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationBase.java @@ -23,8 +23,8 @@ import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; import org.openecomp.sdc.tosca.datatypes.ToscaTopologyTemplateElements; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeAttachmentImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeAttachmentImpl.java index 72f96c744b..73debf02a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeAttachmentImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeAttachmentImpl.java @@ -30,9 +30,9 @@ import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; import org.openecomp.sdc.tosca.datatypes.ToscaTopologyTemplateElements; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RelationshipTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RelationshipTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java index 6593cfbb9f..5b36d39ec0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationCinderVolumeImpl.java @@ -23,7 +23,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslati import org.openecomp.sdc.heat.datatypes.HeatBoolean; import org.openecomp.sdc.heat.services.HeatConstants; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailAttachPolicyImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailAttachPolicyImpl.java index c6719afa92..2bee60dbda 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailAttachPolicyImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailAttachPolicyImpl.java @@ -27,8 +27,8 @@ import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; import org.openecomp.sdc.tosca.datatypes.ToscaTopologyTemplateElements; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailNetworkPolicyImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailNetworkPolicyImpl.java index 5d90b4bf68..3bab225b54 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailNetworkPolicyImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailNetworkPolicyImpl.java @@ -23,7 +23,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslati import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.mapping.TranslatorHeatToToscaPropertyConverter; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceInstanceImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceInstanceImpl.java index 72251fa85c..c9c6b5ab03 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceInstanceImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceInstanceImpl.java @@ -32,18 +32,18 @@ import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; import org.openecomp.sdc.tosca.datatypes.ToscaGroupType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.AttributeDefinition; -import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.SubstitutionMapping; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.AttributeDefinition; +import org.onap.sdc.tosca.datatypes.model.GroupDefinition; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.SubstitutionMapping; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaConstants; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceTemplateImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceTemplateImpl.java index b4e0d839d7..d9867c0626 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceTemplateImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailServiceTemplateImpl.java @@ -23,8 +23,8 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslati import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaTopologyTemplateElements; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2NetworkPolicyImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2NetworkPolicyImpl.java index d7342fca7d..bb6fa9054c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2NetworkPolicyImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2NetworkPolicyImpl.java @@ -23,7 +23,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslati import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.mapping.TranslatorHeatToToscaPropertyConverter; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VirtualNetworkImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VirtualNetworkImpl.java index 5d44ba1555..5bc36c242e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VirtualNetworkImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VirtualNetworkImpl.java @@ -28,8 +28,8 @@ import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImpl.java index 43e80a4962..a83bf3217c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImpl.java @@ -26,7 +26,7 @@ import org.openecomp.sdc.heat.services.HeatConstants; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VmInterfaceImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VmInterfaceImpl.java index 310cb2b4e3..1bb1df4899 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VmInterfaceImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VmInterfaceImpl.java @@ -21,7 +21,7 @@ import org.openecomp.sdc.heat.services.HeatConstants; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailVirtualNetworkImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailVirtualNetworkImpl.java index c8f81d035f..cd92fe3f6c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailVirtualNetworkImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailVirtualNetworkImpl.java @@ -21,7 +21,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.mapping.TranslatorHeatToToscaPropertyConverter; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNestedImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNestedImpl.java index 1da1738101..e3e585a02f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNestedImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNestedImpl.java @@ -27,10 +27,10 @@ import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronNetImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronNetImpl.java index 2b96b7f714..b1ad847db6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronNetImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronNetImpl.java @@ -22,7 +22,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslati import org.openecomp.sdc.heat.services.HeatConstants; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronPortImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronPortImpl.java index d140197da7..bce0ada230 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronPortImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronPortImpl.java @@ -25,8 +25,8 @@ import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSecurityGroupImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSecurityGroupImpl.java index b3eed8e8d6..74cf8a3a54 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSecurityGroupImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSecurityGroupImpl.java @@ -21,7 +21,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.mapping.TranslatorHeatToToscaPropertyConverter; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSubnetImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSubnetImpl.java index 264232b770..9cebdd2ccc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSubnetImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronSubnetImpl.java @@ -26,9 +26,9 @@ import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyType; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyType; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerGroupsImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerGroupsImpl.java index 9259218049..81301920f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerGroupsImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerGroupsImpl.java @@ -25,8 +25,8 @@ import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.tosca.datatypes.ToscaGroupType; import org.openecomp.sdc.tosca.datatypes.ToscaPolicyType; import org.openecomp.sdc.tosca.datatypes.ToscaTopologyTemplateElements; -import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PolicyDefinition; +import org.onap.sdc.tosca.datatypes.model.GroupDefinition; +import org.onap.sdc.tosca.datatypes.model.PolicyDefinition; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; import org.openecomp.sdc.translator.services.heattotosca.mapping.TranslatorHeatToToscaPropertyConverter; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImpl.java index 2eb1040795..09439e2ea1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImpl.java @@ -27,12 +27,12 @@ import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RelationshipTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.GroupDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RelationshipTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImpl.java index 68e3062a64..7c50fd16e6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImpl.java @@ -24,7 +24,7 @@ import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes; import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.heat.services.HeatConstants; import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.tosca.services.ToscaUtil; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/SecurityRulesToPortResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/SecurityRulesToPortResourceConnection.java index a74d410dfb..b42c7f7132 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/SecurityRulesToPortResourceConnection.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/SecurityRulesToPortResourceConnection.java @@ -27,10 +27,10 @@ import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId; import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionCatalogInstance.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionCatalogInstance.java index ad7deb9797..85a3f1df27 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionCatalogInstance.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionCatalogInstance.java @@ -16,7 +16,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.unifiedcomposition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; import org.openecomp.sdc.translator.services.heattotosca.UnifiedComposition; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java index 7bd9106078..78bdc7b5a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java @@ -1,7 +1,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.unifiedcomposition; import org.apache.commons.collections4.CollectionUtils; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to.UnifiedCompositionTo; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionScalingInstances.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionScalingInstances.java index 6f53249542..2d6360d5ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionScalingInstances.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionScalingInstances.java @@ -17,7 +17,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.unifiedcomposition; import org.apache.commons.collections4.CollectionUtils; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; import org.openecomp.sdc.translator.services.heattotosca.UnifiedComposition; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionSingleSubstitution.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionSingleSubstitution.java index ee5d465d3c..45326d0727 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionSingleSubstitution.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionSingleSubstitution.java @@ -17,7 +17,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.unifiedcomposition; import org.apache.commons.collections4.CollectionUtils; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; import org.openecomp.sdc.translator.services.heattotosca.UnifiedComposition; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java index 3b9497644c..9ed95bf084 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java @@ -17,14 +17,18 @@ package org.openecomp.sdc.translator.services.heattotosca.mapping; import org.apache.commons.collections4.MapUtils; +import org.onap.sdc.tosca.datatypes.model.Constraint; +import org.onap.sdc.tosca.datatypes.model.EntrySchema; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; import org.openecomp.sdc.heat.datatypes.model.Output; import org.openecomp.sdc.heat.datatypes.model.Parameter; import org.openecomp.sdc.tosca.datatypes.extend.ToscaAnnotationType; -import org.openecomp.sdc.tosca.datatypes.model.*; -import org.openecomp.sdc.tosca.datatypes.model.heatextend.AnnotationDefinition; -import org.openecomp.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt; +import org.onap.sdc.tosca.datatypes.model.*; +import org.onap.sdc.tosca.datatypes.model.heatextend.AnnotationDefinition; +import org.onap.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaPropertyConverter.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaPropertyConverter.java index e22d21dae0..654e630957 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaPropertyConverter.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaPropertyConverter.java @@ -21,8 +21,8 @@ package org.openecomp.sdc.translator.services.heattotosca.mapping; import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.Template; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Template; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.services.heattotosca.ConfigConstants; import org.openecomp.sdc.translator.services.heattotosca.Constants; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java index 7a07d78c10..6ddc2eda43 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java @@ -26,14 +26,14 @@ import org.openecomp.sdc.common.utils.SdcCommon; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.GroupDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeConsolidationData; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ConsolidationData; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java index 9a36499956..521b41f5ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java @@ -34,7 +34,7 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.Spy; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.SubInterfaceConsolidationDataTestInfo; import org.openecomp.sdc.translator.TestUtils; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java index 1a31b52331..4eeecea3d1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java @@ -23,17 +23,16 @@ import static org.mockito.Matchers.anyString; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.translator.TestUtils; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java index 9353de7eb1..5c7bc209c9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java @@ -36,11 +36,11 @@ import org.junit.Assert; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.GroupDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java index 23915601d1..1a51b002b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java @@ -20,7 +20,7 @@ import static org.openecomp.sdc.translator.services.heattotosca.globaltypes.Glob import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
import org.openecomp.sdc.common.errors.CoreException;
-import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
import org.junit.Assert;
import org.junit.Test;
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetFileImplTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetFileImplTest.java index 2a633da55b..023c0f5937 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetFileImplTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetFileImplTest.java @@ -24,7 +24,7 @@ import org.junit.Assert; import org.junit.Test; import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.tosca.services.ToscaFileOutputService; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java index 8820bc1b40..80c20360d2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java @@ -49,7 +49,7 @@ import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.heat.datatypes.manifest.FileData; import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent; import org.openecomp.sdc.heat.datatypes.manifest.ManifestFile; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; import org.openecomp.sdc.translator.TestUtils; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java index 1c44a30ed1..f591b15931 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java @@ -18,13 +18,12 @@ package org.openecomp.sdc.translator.services.heattotosca.unifiedmodel.commands; import static org.openecomp.sdc.translator.TestUtils.createInitServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.commands.UnifiedSubstitutionNodeTemplateIdGenerator; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.commands.impl.ComputeNewNodeTemplateIdGenerator; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to.UnifiedCompositionTo; -import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseResourceTranslationTest; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java index c00a9b28c2..0c5005779e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java @@ -21,17 +21,16 @@ import static org.openecomp.sdc.translator.TestUtils.createInitServiceTemplate; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.commands.UnifiedSubstitutionNodeTemplateIdGenerator; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.commands.impl.PortNewNodeTemplateIdGenerator; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to.UnifiedCompositionTo; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData; -import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseResourceTranslationTest; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java index b33df907d9..97cc35fbae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java @@ -17,7 +17,7 @@ package org.openecomp.sdc.translator.services.heattotosca.unifiedmodel.commands; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.TestUtils; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; @@ -29,7 +29,6 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolida import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.FilePortConsolidationData; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.PortTemplateConsolidationData; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.SubInterfaceTemplateConsolidationData; -import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseResourceTranslationTest; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml index cedb850165..858d3b1355 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml @@ -60,8 +60,8 @@ <version>${mockito.all.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <version>${openecomp.sdc.common.version}</version> <scope>runtime</scope> <exclusions> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/services/ValidationFactory.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/services/ValidationFactory.java index b290e7cda9..3eea6f1595 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/services/ValidationFactory.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/services/ValidationFactory.java @@ -1,8 +1,8 @@ package org.openecomp.sdc.validation.services; import org.apache.commons.collections4.CollectionUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.core.utilities.CommonMethods; import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; import org.openecomp.sdc.logging.api.Logger; diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HeatValidationService.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HeatValidationService.java index e9a265d7bc..b672e7e9a5 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HeatValidationService.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HeatValidationService.java @@ -29,7 +29,7 @@ import org.openecomp.sdc.heat.datatypes.model.Resource; import org.openecomp.sdc.heat.services.HeatStructureUtil; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.validation.impl.validators.HeatValidator; import org.openecomp.sdc.validation.type.HeatResourceValidationContext; diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ContrailValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ContrailValidator.java index 1bdde24253..453bb91efa 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ContrailValidator.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ContrailValidator.java @@ -30,7 +30,7 @@ import org.openecomp.sdc.heat.services.HeatConstants; import org.openecomp.sdc.heat.services.manifest.ManifestUtil; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.validation.Validator; import org.openecomp.sdc.validation.tos.ContrailResourcesMappingTo; import org.openecomp.sdc.validation.util.ValidationUtil; diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java index d35a4842d3..6a2a0a9528 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java @@ -38,7 +38,7 @@ import org.openecomp.sdc.heat.services.HeatStructureUtil; import org.openecomp.sdc.heat.services.manifest.ManifestUtil; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.validation.Validator; import org.openecomp.sdc.validation.impl.util.HeatValidationService; import org.openecomp.sdc.validation.util.ValidationUtil; diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/YamlValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/YamlValidator.java index b542c5d1a4..273e523f1d 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/YamlValidator.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/YamlValidator.java @@ -21,7 +21,7 @@ import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder; import org.openecomp.core.validation.types.GlobalValidationContext; import org.openecomp.sdc.common.errors.Messages; import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.validation.Validator; import org.openecomp.sdc.validation.impl.util.YamlValidatorUtil; diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationUtil.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationUtil.java index a2826e4871..ef72c0886a 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationUtil.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationUtil.java @@ -18,7 +18,7 @@ import org.openecomp.sdc.heat.datatypes.model.ResourceReferenceFunctions; import org.openecomp.sdc.heat.services.HeatStructureUtil; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.InputStream; import java.util.Map; diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml index ef5ff185b0..d031f0a960 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml @@ -14,8 +14,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> @@ -68,8 +68,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <version>${openecomp.sdc.common.version}</version> <scope>runtime</scope> <exclusions> @@ -80,8 +80,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImpl.java index 413c9c0adf..e314f5cad8 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/composition/CompositionDataExtractorImpl.java @@ -31,16 +31,16 @@ import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.errors.ToscaInvalidEntryNotFoundErrorBuilder; import org.openecomp.sdc.tosca.errors.ToscaInvalidSubstituteNodeTemplateErrorBuilder; import org.openecomp.sdc.tosca.errors.ToscaMissingSubstitutionMappingForReqCapErrorBuilder; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaConstants; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl; import org.openecomp.sdc.vendorsoftwareproduct.services.composition.CompositionDataExtractor; import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Component; diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java index a7d1c570a4..dbf5ad9bf9 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java @@ -44,8 +44,8 @@ import org.openecomp.sdc.common.session.SessionContextProviderFactory; import org.openecomp.sdc.datatypes.model.ElementType; import org.openecomp.sdc.model.impl.zusammen.ServiceModelDaoZusammenImpl; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.sdc.versioning.dao.types.Version; import org.testng.Assert; import org.testng.annotations.AfterMethod; diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml index cd1d2a82e7..90cc96a071 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml @@ -5,8 +5,8 @@ <modelVersion>4.0.0</modelVersion> <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>1.2.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/GlobalSubstitutionServiceTemplate.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/GlobalSubstitutionServiceTemplate.java index 4a1f7c53cc..cad026d7a6 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/GlobalSubstitutionServiceTemplate.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/GlobalSubstitutionServiceTemplate.java @@ -22,9 +22,9 @@ import org.apache.commons.collections4.MapUtils; import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.services.heattotosca.globaltypes.GlobalTypesGenerator; import java.util.ArrayList; diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java index a625bb6fc2..e896094df8 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java @@ -23,7 +23,6 @@ import static org.openecomp.core.converter.datatypes.Constants.globalStName; import static org.openecomp.core.converter.datatypes.Constants.globalSubstitution; import static org.openecomp.core.converter.datatypes.Constants.inputs; import static org.openecomp.core.converter.datatypes.Constants.mainStName; -import static org.openecomp.core.converter.datatypes.Constants.manifestFileName; import static org.openecomp.core.converter.datatypes.Constants.metadataFile; import static org.openecomp.core.converter.datatypes.Constants.nodeType; import static org.openecomp.core.converter.datatypes.Constants.openecompHeatIndex; @@ -46,23 +45,22 @@ import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ArtifactDefinition; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityAssignment; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.NodeFilter; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.SubstitutionMapping; +import org.onap.sdc.tosca.datatypes.model.ArtifactDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityAssignment; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.NodeFilter; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.SubstitutionMapping; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; import org.openecomp.sdc.translator.services.heattotosca.globaltypes.GlobalTypesGenerator; import org.yaml.snakeyaml.error.YAMLException; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java index ee39af98c9..030d742d69 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java @@ -1,7 +1,7 @@ package org.openecomp.core.impl.services; import org.openecomp.core.converter.ServiceTemplateReaderService; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.util.HashMap; import java.util.Map; diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/ToscaConverterImplTest.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/ToscaConverterImplTest.java index df34b89cbb..1907c04c53 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/ToscaConverterImplTest.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/ToscaConverterImplTest.java @@ -9,13 +9,13 @@ import org.openecomp.core.utilities.file.FileContentHandler; import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.core.utilities.json.JsonUtil; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.File; import java.io.FileInputStream; diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/ToscaConvertorDefinitionsTest.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/ToscaConvertorDefinitionsTest.java index 0fec361561..96b3156ae0 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/ToscaConvertorDefinitionsTest.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/ToscaConvertorDefinitionsTest.java @@ -18,7 +18,7 @@ import org.openecomp.core.impl.ToscaConverterImpl; import org.openecomp.core.utilities.file.FileContentHandler; import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import java.net.URL; import java.util.Map; diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index eedc6cb521..d05731cbce 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -16,8 +16,8 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> @@ -64,8 +64,8 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> <version>${openecomp.sdc.common.version}</version> <scope>runtime</scope> <exclusions> @@ -76,8 +76,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-api</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> <version>${openecomp.sdc.common.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaArtifactType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaArtifactType.java index fd382b7899..c43fcaa2bb 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaArtifactType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaArtifactType.java @@ -21,8 +21,8 @@ package org.openecomp.sdc.tosca.datatypes; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.sdc.tosca.services.ConfigConstants; public class ToscaArtifactType { diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaCapabilityType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaCapabilityType.java index 33dd9e142c..8cb21cce1f 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaCapabilityType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaCapabilityType.java @@ -21,8 +21,8 @@ package org.openecomp.sdc.tosca.datatypes; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.sdc.tosca.services.ConfigConstants; public class ToscaCapabilityType { diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaDataType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaDataType.java index 3d5453ac0d..cfef81b9f8 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaDataType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaDataType.java @@ -21,8 +21,8 @@ package org.openecomp.sdc.tosca.datatypes; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.sdc.tosca.services.ConfigConstants; public class ToscaDataType { diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaGroupType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaGroupType.java index a4a083b5c7..fae028981e 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaGroupType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaGroupType.java @@ -20,8 +20,8 @@ package org.openecomp.sdc.tosca.datatypes; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.sdc.tosca.services.ConfigConstants; public class ToscaGroupType { diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaInterfaceType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaInterfaceType.java index 6a74f765e6..5c597adb1b 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaInterfaceType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaInterfaceType.java @@ -16,8 +16,8 @@ package org.openecomp.sdc.tosca.datatypes; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; public class ToscaInterfaceType { diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java index 9afe8e5521..2f6ed59e24 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java @@ -16,8 +16,8 @@ package org.openecomp.sdc.tosca.datatypes; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.sdc.tosca.services.ConfigConstants; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaPolicyType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaPolicyType.java index ad24e260b1..3faad75a24 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaPolicyType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaPolicyType.java @@ -20,8 +20,8 @@ package org.openecomp.sdc.tosca.datatypes; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.sdc.tosca.services.ConfigConstants; public class ToscaPolicyType { diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaRelationshipType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaRelationshipType.java index 0fcdc3a590..b178cf8e0f 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaRelationshipType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaRelationshipType.java @@ -20,8 +20,8 @@ package org.openecomp.sdc.tosca.datatypes; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.sdc.tosca.services.ConfigConstants; public class ToscaRelationshipType { diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaServiceModel.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaServiceModel.java index b1a0976b36..58fbc4ffb4 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaServiceModel.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaServiceModel.java @@ -23,7 +23,7 @@ package org.openecomp.sdc.tosca.datatypes; import org.apache.commons.collections.MapUtils; import org.openecomp.core.utilities.file.FileContentHandler; import org.openecomp.sdc.datatypes.model.AsdcModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.DataModelUtil; import java.util.Collections; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/extend/ToscaAnnotationType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/extend/ToscaAnnotationType.java index 5fc5c1f710..c66896d771 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/extend/ToscaAnnotationType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/extend/ToscaAnnotationType.java @@ -16,8 +16,8 @@ package org.openecomp.sdc.tosca.datatypes.extend; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; import org.openecomp.sdc.tosca.services.ConfigConstants; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Old1610ServiceTemplate.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Old1610ServiceTemplate.java index c4aa4ec6aa..429b1d158f 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Old1610ServiceTemplate.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Old1610ServiceTemplate.java @@ -1,6 +1,15 @@ package org.openecomp.sdc.tosca.datatypes.model; import java.util.Map; +import org.onap.sdc.tosca.datatypes.model.ArtifactType; +import org.onap.sdc.tosca.datatypes.model.CapabilityType; +import org.onap.sdc.tosca.datatypes.model.DataType; +import org.onap.sdc.tosca.datatypes.model.GroupType; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.PolicyType; +import org.onap.sdc.tosca.datatypes.model.RelationshipType; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; /** * Created by Talio on 3/30/2017. diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java index ecd182f384..ff04196a11 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import org.openecomp.core.utilities.CommonMethods; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.utils.CommonUtil; @@ -32,33 +34,33 @@ import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType; import org.openecomp.sdc.tosca.datatypes.ToscaFunctions; import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType; -import org.openecomp.sdc.tosca.datatypes.model.AttributeDefinition; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityAssignment; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.Constraint; -import org.openecomp.sdc.tosca.datatypes.model.EntrySchema; -import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinition; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinitionTemplate; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinitionType; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.OperationDefinition; -import org.openecomp.sdc.tosca.datatypes.model.OperationDefinitionTemplate; -import org.openecomp.sdc.tosca.datatypes.model.OperationDefinitionType; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PolicyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.RelationshipTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.Status; -import org.openecomp.sdc.tosca.datatypes.model.SubstitutionMapping; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; -import org.openecomp.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt; +import org.onap.sdc.tosca.datatypes.model.AttributeDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityAssignment; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.Constraint; +import org.onap.sdc.tosca.datatypes.model.EntrySchema; +import org.onap.sdc.tosca.datatypes.model.GroupDefinition; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.InterfaceDefinition; +import org.onap.sdc.tosca.datatypes.model.InterfaceDefinitionTemplate; +import org.onap.sdc.tosca.datatypes.model.InterfaceDefinitionType; +import org.onap.sdc.tosca.datatypes.model.InterfaceType; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.OperationDefinition; +import org.onap.sdc.tosca.datatypes.model.OperationDefinitionTemplate; +import org.onap.sdc.tosca.datatypes.model.OperationDefinitionType; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.PolicyDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.RelationshipTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.Status; +import org.onap.sdc.tosca.datatypes.model.SubstitutionMapping; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt; import org.openecomp.sdc.tosca.errors.CreateInterfaceObjectErrorBuilder; import org.openecomp.sdc.tosca.errors.CreateInterfaceOperationObjectErrorBuilder; import org.openecomp.sdc.tosca.errors.InvalidAddActionNullEntityErrorBuilder; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java index d4e7813ea2..e4d75c1296 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java @@ -18,15 +18,15 @@ package org.openecomp.sdc.tosca.services; import org.openecomp.sdc.tosca.datatypes.ToscaElementTypes; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.DefinitionOfDataType; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinitionType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.DefinitionOfDataType; +import org.onap.sdc.tosca.datatypes.model.InterfaceDefinitionType; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import java.util.Collection; import java.util.List; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaUtil.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaUtil.java index 3b7db49fee..f083384e9e 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaUtil.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaUtil.java @@ -22,8 +22,8 @@ package org.openecomp.sdc.tosca.services; import org.apache.commons.collections4.MapUtils; import org.openecomp.core.utilities.file.FileUtils; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import java.util.Collections; import java.util.HashMap; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java index 411c50db5b..4428fc6301 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java @@ -23,21 +23,21 @@ import org.openecomp.core.utilities.CommonMethods; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.tosca.datatypes.ToscaElementTypes; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.AttributeDefinition; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityType; -import org.openecomp.sdc.tosca.datatypes.model.DefinitionOfDataType; -import org.openecomp.sdc.tosca.datatypes.model.DataType; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinitionType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.AttributeDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityType; +import org.onap.sdc.tosca.datatypes.model.DefinitionOfDataType; +import org.onap.sdc.tosca.datatypes.model.DataType; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.InterfaceDefinitionType; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.errors.ToscaElementTypeNotFoundErrorBuilder; import org.openecomp.sdc.tosca.errors.ToscaInvalidEntryNotFoundErrorBuilder; import org.openecomp.sdc.tosca.errors.ToscaInvalidSubstituteNodeTemplatePropertiesErrorBuilder; @@ -45,7 +45,7 @@ import org.openecomp.sdc.tosca.errors.ToscaInvalidSubstitutionServiceTemplateErr import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaConstants; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import org.openecomp.sdc.tosca.services.ToscaUtil; import java.lang.reflect.InvocationTargetException; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java index eaf1e20227..9bd9af4c33 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java @@ -23,7 +23,7 @@ import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.exceptions.CsarCreationErrorBuilder; import org.openecomp.sdc.tosca.exceptions.CsarMissingEntryPointErrorBuilder; import org.openecomp.sdc.tosca.services.ToscaFileOutputService; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/TestUtil.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/TestUtil.java index ef82e6f354..4f3c26e525 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/TestUtil.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/TestUtil.java @@ -23,10 +23,10 @@ package org.openecomp.sdc.tosca; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import java.io.File; import java.io.FileInputStream; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/PropertyTypeTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/PropertyTypeTest.java index 820d79184e..b8b6d8dbcb 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/PropertyTypeTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/PropertyTypeTest.java @@ -22,7 +22,7 @@ package org.openecomp.sdc.tosca.datatypes; import org.junit.Assert; import org.junit.Test; -import org.openecomp.sdc.tosca.datatypes.model.PropertyType; +import org.onap.sdc.tosca.datatypes.model.PropertyType; public class PropertyTypeTest { @Test diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java index 4b58c838e0..7405f50829 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java @@ -22,37 +22,37 @@ package org.openecomp.sdc.tosca.datatypes; import org.junit.Assert; import org.junit.Test; -import org.openecomp.sdc.tosca.datatypes.model.ArtifactType; -import org.openecomp.sdc.tosca.datatypes.model.AttributeDefinition; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityAssignment; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.Constraint; -import org.openecomp.sdc.tosca.datatypes.model.Directive; -import org.openecomp.sdc.tosca.datatypes.model.Implementation; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinition; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinitionTemplate; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinitionType; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceType; -import org.openecomp.sdc.tosca.datatypes.model.NodeFilter; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.OperationDefinition; -import org.openecomp.sdc.tosca.datatypes.model.OperationDefinitionTemplate; -import org.openecomp.sdc.tosca.datatypes.model.OperationDefinitionType; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyType; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.SubstitutionMapping; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; -import org.openecomp.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt; +import org.onap.sdc.tosca.datatypes.model.ArtifactType; +import org.onap.sdc.tosca.datatypes.model.AttributeDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityAssignment; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.Constraint; +import org.onap.sdc.tosca.datatypes.model.Directive; +import org.onap.sdc.tosca.datatypes.model.Implementation; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.InterfaceDefinition; +import org.onap.sdc.tosca.datatypes.model.InterfaceDefinitionTemplate; +import org.onap.sdc.tosca.datatypes.model.InterfaceDefinitionType; +import org.onap.sdc.tosca.datatypes.model.InterfaceType; +import org.onap.sdc.tosca.datatypes.model.NodeFilter; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.OperationDefinition; +import org.onap.sdc.tosca.datatypes.model.OperationDefinitionTemplate; +import org.onap.sdc.tosca.datatypes.model.OperationDefinitionType; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyType; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.SubstitutionMapping; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt; import org.openecomp.sdc.tosca.services.DataModelUtil; import org.openecomp.sdc.tosca.services.ToscaConstants; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.IOException; import java.io.InputStream; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinitionTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinitionTest.java index 32e15172c1..aaef020f31 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinitionTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinitionTest.java @@ -22,8 +22,16 @@ package org.openecomp.sdc.tosca.datatypes.model; import org.junit.Assert; import org.junit.Test; +import org.onap.sdc.tosca.datatypes.model.ArtifactDefinition; +import org.onap.sdc.tosca.datatypes.model.AttributeDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.Constraint; +import org.onap.sdc.tosca.datatypes.model.EntrySchema; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.Status; import org.openecomp.sdc.tosca.services.ToscaConstants; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.services.YamlUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/RequirementDefinitionTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/RequirementDefinitionTest.java index 3620cf071a..a5c8fde25a 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/RequirementDefinitionTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/RequirementDefinitionTest.java @@ -22,7 +22,9 @@ package org.openecomp.sdc.tosca.datatypes.model; import org.junit.Assert; import org.junit.Test; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.services.YamlUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java index e15f59dac4..419951d684 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java @@ -26,13 +26,13 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; import org.openecomp.sdc.common.errors.CoreException; -import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.PolicyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.RelationshipTemplate; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.SubstitutionMapping; +import org.onap.sdc.tosca.datatypes.model.GroupDefinition; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.PolicyDefinition; +import org.onap.sdc.tosca.datatypes.model.RelationshipTemplate; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.SubstitutionMapping; import java.util.ArrayList; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java index 713e8d2eaa..83ed525c4c 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java @@ -31,25 +31,25 @@ import org.openecomp.sdc.tosca.TestUtil; import org.openecomp.sdc.tosca.datatypes.ToscaElementTypes; import org.openecomp.sdc.tosca.datatypes.ToscaNodeType; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.CapabilityDefinition; -import org.openecomp.sdc.tosca.datatypes.model.DataType; -import org.openecomp.sdc.tosca.datatypes.model.DefinitionOfDataType; -import org.openecomp.sdc.tosca.datatypes.model.DataType; -import org.openecomp.sdc.tosca.datatypes.model.Import; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinitionType; -import org.openecomp.sdc.tosca.datatypes.model.InterfaceType; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment; -import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.SubstitutionMapping; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition; +import org.onap.sdc.tosca.datatypes.model.DataType; +import org.onap.sdc.tosca.datatypes.model.DefinitionOfDataType; +import org.onap.sdc.tosca.datatypes.model.DataType; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.InterfaceDefinitionType; +import org.onap.sdc.tosca.datatypes.model.InterfaceType; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.RequirementDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.SubstitutionMapping; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; import org.openecomp.sdc.tosca.services.ToscaAnalyzerService; import org.openecomp.sdc.tosca.services.ToscaConstants; -import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil; +import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; import java.io.IOException; import java.io.InputStream; diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java index 445915f4f8..23a8373035 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java @@ -24,7 +24,7 @@ import org.junit.Assert; import org.junit.Test; import org.openecomp.core.utilities.file.FileContentHandler; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.ToscaConstants; import org.openecomp.sdc.tosca.services.ToscaUtil; |