summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asdc-tests/pom.xml1
-rw-r--r--asdctool/pom.xml1
-rw-r--r--catalog-be/pom.xml33
-rw-r--r--catalog-ui/pom.xml1
-rw-r--r--common-app-api/pom.xml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java6
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java16
-rw-r--r--sdc-os-chef/pom.xml33
-rw-r--r--security-utils/pom.xml1
-rw-r--r--test-apis-ci/pom.xml1
-rw-r--r--ui-ci/pom.xml1
11 files changed, 45 insertions, 50 deletions
diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index 7e7476253a..de800cfcf7 100644
--- a/asdc-tests/pom.xml
+++ b/asdc-tests/pom.xml
@@ -306,7 +306,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.5</version>
<executions>
<execution>
<id>create.jar.with.dependencies</id>
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 88031c8e44..633360d8f8 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -539,7 +539,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<id>create.jar.with.dependencies</id>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 870bf09be6..6d34402ac5 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -682,28 +682,6 @@
</configuration>
</execution>
- <execution>
- <id>copy-static-configuration-files</id>
- <phase>install</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</outputDirectory>
- <resources>
- <resource>
- <directory>${project.parent.basedir}/catalog-be/src/main/resources/config</directory>
- <includes>
- <include>Artifact-Generator.properties</include>
- <include>error-configuration.yaml</include>
- <include>ecomp-error-configuration.yaml</include>
- <include>logback.xml</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
-
<execution>
<id>copy-tosca-folder</id>
<!-- here the phase you need -->
@@ -741,16 +719,6 @@
<directory>${project.parent.basedir}/asdctool/tosca</directory>
<followSymlinks>false</followSymlinks>
</fileset>
- <!-- static configuration files -->
- <fileset>
- <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory>
- <includes>
- <include>Artifact-Generator.properties</include>
- <include>error-configuration.yaml</include>
- <include>ecomp-error-configuration.yaml</include>
- <include>logback.xml</include>
- </includes>
- </fileset>
</filesets>
</configuration>
</execution>
@@ -760,7 +728,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<id>normatives</id>
diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index 80d534c669..8d93c4bd50 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -3,7 +3,6 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.sdc</groupId>
<artifactId>catalog-ui</artifactId>
<packaging>pom</packaging>
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 70ddd5cfee..d7e3f5beb2 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -3,7 +3,6 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.sdc</groupId>
<artifactId>common-app-api</artifactId>
<parent>
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 a5d1ac1ba2..44c1ef8c72 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
@@ -35,6 +35,8 @@ import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.enrichment.EnrichmentInfo;
import org.openecomp.sdc.enrichment.inter.ExternalArtifactEnricherInterface;
import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
+import org.openecomp.sdc.tosca.datatypes.ToscaNodeType;
+import org.openecomp.sdc.tosca.services.DataModelUtil;
import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentArtifactDao;
import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao;
import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDaoFactory;
@@ -143,7 +145,9 @@ public class MonitoringMibEnricher implements ExternalArtifactEnricherInterface
if (!artifact.isPresent()) {
return;
}
- path = componentName + File.separator + ArtifactCategory.DEPLOYMENT.getDisplayName()
+ String unifiedComponentNodeType =
+ ToscaNodeType.ABSTRACT_NODE_TYPE_PREFIX + DataModelUtil.getNamespaceSuffix(componentName);
+ path = unifiedComponentNodeType + File.separator + ArtifactCategory.DEPLOYMENT.getDisplayName()
+ File.separator + type.name();
MonitoringArtifactInfo monitoringArtifactInfo = new MonitoringArtifactInfo();
monitoringArtifactInfo.setName(path);
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 5f1a67138d..3730a15465 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
@@ -31,6 +31,8 @@ import org.openecomp.core.model.dao.EnrichedServiceModelDao;
import org.openecomp.core.model.types.ServiceArtifact;
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.services.DataModelUtil;
import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentArtifactDao;
import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao;
import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductDao;
@@ -52,11 +54,6 @@ import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.times;
-/**
- * @author shiria
- * @since November 06, 2016.
- */
-
public class MonitoringMibEnricherTest {
@Mock
private ComponentArtifactDao componentArtifactDaoMock;
@@ -89,15 +86,16 @@ public class MonitoringMibEnricherTest {
monitoringMibEnricher.enrichComponent(componentEntity, vspId, version);
String componentName = componentEntity.getComponentCompositionData().getName();
-
+ String unifiedComponentName =
+ ToscaNodeType.ABSTRACT_NODE_TYPE_PREFIX + DataModelUtil.getNamespaceSuffix(componentName);
ArgumentCaptor<ServiceArtifact> expectedServiceArtifact =
ArgumentCaptor.forClass(ServiceArtifact.class);
Mockito.verify(enrichedServiceModelDaoMock, atLeastOnce())
.storeExternalArtifact(expectedServiceArtifact.capture());
- Assert
- .assertEquals(expectedServiceArtifact.getValue().getName().startsWith(componentName), true);
+ Assert.assertEquals(expectedServiceArtifact.getValue().getName()
+ .startsWith(unifiedComponentName), true);
Assert.assertEquals(expectedServiceArtifact.getValue().getName(),
- componentName + File.separator + ArtifactCategory.DEPLOYMENT.getDisplayName() +
+ unifiedComponentName + File.separator + ArtifactCategory.DEPLOYMENT.getDisplayName() +
File.separator + MonitoringUploadType.VES_EVENTS + File.separator + "mib1.yml");
}
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index d0131e4e55..79eab3502a 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -38,6 +38,16 @@
<include>**/default.rb</include>
</includes>
</fileset>
+ <!-- static configuration files -->
+ <fileset>
+ <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory>
+ <includes>
+ <include>Artifact-Generator.properties</include>
+ <include>error-configuration.yaml</include>
+ <include>ecomp-error-configuration.yaml</include>
+ <include>logback.xml</include>
+ </includes>
+ </fileset>
</filesets>
</configuration>
</execution>
@@ -109,6 +119,29 @@
</resources>
</configuration>
</execution>
+
+ <execution>
+ <id>copy-static-configuration-files</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.parent.basedir}/catalog-be/src/main/resources/config</directory>
+ <includes>
+ <include>Artifact-Generator.properties</include>
+ <include>error-configuration.yaml</include>
+ <include>ecomp-error-configuration.yaml</include>
+ <include>logback.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
<execution>
<id>copy-resources-be</id>
<phase>validate</phase>
diff --git a/security-utils/pom.xml b/security-utils/pom.xml
index 3e3c9fad76..5928020a2f 100644
--- a/security-utils/pom.xml
+++ b/security-utils/pom.xml
@@ -3,7 +3,6 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.sdc</groupId>
<artifactId>security-utils</artifactId>
<parent>
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index 0059e23de1..7184c8b06f 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -329,7 +329,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.5</version>
<executions>
<execution>
<id>create.jar.with.dependencies</id>
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index 06e3be24ff..9206348c3b 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -277,7 +277,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.5</version>
<executions>
<execution>
<id>create.jar.with.dependencies</id>