diff options
Diffstat (limited to 'common')
4 files changed, 19 insertions, 69 deletions
diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml deleted file mode 100644 index 6c03f26d52..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml +++ /dev/null @@ -1,67 +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-configuration-management</artifactId> - <groupId>org.openecomp.sdc.common</groupId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-cli</artifactId> - <name>openecomp-configuration-management-cli</name> - <build> - <plugins> - <plugin> - <artifactId>maven-shade-plugin</artifactId> - <version>1.5</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <transformers> - <transformer> - <mainClass>org.openecomp.config.gui.app.Configuration</mainClass> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.8.8</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>bsh</artifactId> - <groupId>org.beanshell</groupId> - </exclusion> - <exclusion> - <artifactId>jcommander</artifactId> - <groupId>com.beust</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>RELEASE</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>hamcrest-core</artifactId> - <groupId>org.hamcrest</groupId> - </exclusion> - </exclusions> - </dependency> - </dependencies> -</project> - 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/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java index 552e11e91d..c8e7be53d6 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/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java @@ -554,6 +554,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator { ToscaTemplate tosca = null; if (checksum.equalsIgnoreCase(input.getChecksum())) { try { + log.debug("Input yaml name " + input.getName() + "payload " + new String(decodedInput)); tosca = GeneratorUtil.translateTosca(new String(decodedInput), ToscaTemplate.class); tosca.getMetadata().put("version", serviceVersion); return tosca; 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/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java index 0ebe41c9a4..01029e8adc 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java @@ -863,7 +863,7 @@ public class ArtifactGenerationServiceTest { } } - //@Test +// @Test public void testErrorWhenAllottedResourceWithOutProvidingServiceId() { try { Map<String, Model> outputArtifactMap = new HashMap<>(); diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml index c9c11a7da3..fd1a8e5f9a 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml @@ -408,7 +408,23 @@ node_types: type: list entry_schema: type: org.openecomp.datatypes.network.IpRequirements - required: true + required: true + network_role: + description: identical to VL network_role + type: string + required: false + order: + description: The order of the CP on the compute instance (e.g. eth2). + type: integer + required: false + exCP_naming: + description: CP Name + type: org.openecomp.datatypes.Naming + required: false + subnetpoolid: + description: subnet pool id + type: string + required: false capabilities: network.incoming.packets.rate: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. |