Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2019-01-04 | HttpClientFactory to create HttpClient instances | Michal Kabaj | 21 | -31/+73 | |
-Replace constructor calls with existing factory -Add create methods to factory for each required Media Type Change-Id: Ibd03c10230c87a0413c0ec529e0ea9ac800444f9 Issue-ID: SO-1344 Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com> | |||||
2018-12-13 | Merge "Add junit tests for CatalogDBUtils" | Steve Smokowski | 4 | -62/+203 | |
2018-12-13 | Merge "Add the query to AAI for SI with customer info" | Rob Daugherty | 1 | -1/+6 | |
2018-12-13 | Add junit tests for CatalogDBUtils | Lukasz Muszkieta | 4 | -62/+203 | |
Change-Id: I1ea3e92b6dcb3fbca837513e11451be47d8c488b Issue-ID: SO-784 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com> | |||||
2018-12-12 | Merge "Fixed vlan xml and host routes" | Steve Smokowski | 1 | -394/+25 | |
2018-12-12 | Add the query to AAI for SI with customer info | Kalkere Ramesh, Sharan (sk720x) | 1 | -1/+6 | |
added in the same block of code to getSIHelper method Change-Id: I512898d86b5bfd10d1cbbdfeaaa5f2b8cf71510a Issue-ID: SO-1326 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | |||||
2018-12-12 | Merge "vfc adapter authentication bug fix" | Steve Smokowski | 1 | -2/+5 | |
2018-12-12 | Merge "fixed aai response code in updateAAIVfModule" | Steve Smokowski | 3 | -1/+12 | |
2018-12-12 | Merge "removed the AAIPropertiesConfiguration file" | Steve Smokowski | 2 | -89/+0 | |
2018-12-12 | Merge "ConfirmVolumeGroupNameTest improvements" | Steve Smokowski | 5 | -74/+269 | |
2018-12-12 | Merge "fix lookup of si if customer exists" | Steve Smokowski | 1 | -2/+7 | |
2018-12-12 | Merge "Changed sdncRequestId to SDNCA_requestId" | Steve Smokowski | 2 | -4/+4 | |
2018-12-12 | ConfirmVolumeGroupNameTest improvements | Joanna Jeremicz | 5 | -74/+269 | |
Change-Id: I3e611f2577e66932d8337d1768ba803c25d01b39 Issue-ID: SO-784 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com> | |||||
2018-12-11 | Fixed vlan xml and host routes | Kalkere Ramesh, Sharan (sk720x) | 1 | -394/+25 | |
Fixed parse error in build vlan xml and host routes, removed dead code. Change-Id: Id3f4e6400434c77f9a942f7e64e03aed91e24c9f Issue-ID: SO-1322 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | |||||
2018-12-11 | fix lookup of si if customer exists | Kalkere Ramesh, Sharan (sk720x) | 2 | -3/+7 | |
fix lookup of service instance in aai if customer exists remove the unwanted mock in the bb input setup test Change-Id: I12a666fef771c127a69eef254228753204cadd73 Issue-ID: SO-1321 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | |||||
2018-12-11 | Changed sdncRequestId to SDNCA_requestId | Kalkere Ramesh, Sharan (sk720x) | 2 | -4/+4 | |
Updated junit groovy test for sdnc adapter Changed to set sdncRequestId to be set to SDNCA_requestId so correlation happens during callback. Change-Id: I6532a676caa4332a32c89ef0ff2e2739d7e8cb56 Issue-ID: SO-1320 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | |||||
2018-12-11 | fix issue with instance groups and unassign req | Kalkere Ramesh, Sharan (sk720x) | 2 | -4/+14 | |
fixed issue where instance groups were added on an Unassign request Change-Id: I0bec76d17730553c4ff5c750dfe1d88edabd7837 Issue-ID: SO-1319 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | |||||
2018-12-10 | removed the AAIPropertiesConfiguration file | Kalkere Ramesh, Sharan (sk720x)
}
<?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>
<groupId>org.openecomp.sdnc.oam</groupId>
<artifactId>installation</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.openecomp.sdnc.oam</groupId>
<artifactId>installation-admportal</artifactId>
<version>1.1.0-SNAPSHOT</version>
<name>Installation - admportal</name>
<description>Creates admportal Docker container</description>
<properties>
<image.name>openecomp/admportal-sdnc-image</image.name>
</properties>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.16.5</version>
<inherited>false</inherited>
<configuration>
<images>
<image>
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
<tags>
<tag>${project.version}</tag>
<tag>latest</tag>
</tags>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>generate-images</id>
<phase>generate-sources</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
<execution>
<id>push-images</id>
<phase>deploy</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>copy-dockerfile</id>
<goals>
<goal>copy-resources</goal>
</goals><!-- here the phase you need -->
<phase>validate</phase>
<configuration>
<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
<resources>
<resource>
<directory>src/main/docker</directory>
<includes>
<include>Dockerfile</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-properties</id>
<goals>
<goal>copy-resources</goal>
</goals><!-- here the phase you need -->
<phase>validate</phase>
<configuration>
<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory>
<resources>
<resource>
<directory>../src/main/properties</directory>
<includes>
<include>*.properties</include>
<include>*.properties.sdnctldb01</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<version>1.5.0</version>
<executions>
<execution>
<id>Unzip admportal</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>/usr/bin/unzip</executable>
<arguments>
<argument>-d</argument>
<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
<argument>../../admportal/target/*.zip</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>Copy admportal config</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>/bin/cp</executable>
<arguments>
<argument>../../admportal/config/admportal.json</argument>
<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>Copy admportal config1</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>/bin/cp</executable>
<arguments>
<argument>../../admportal/config/admportal.log4js.json</argument>
<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>change shell permissions</id>
<phase>process-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>/usr/bin/find</executable>
<arguments>
<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
<argument>-name</argument>
<argument>*.sh</argument>
<argument>-exec</argument>
<argument>chmod</argument>
<argument>+x</argument>
<argument>{}</argument>
<argument>;</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<organization>
<name>openECOMP</name>
</organization>
</project>
|