summaryrefslogtreecommitdiffstats
path: root/adapters/mso-adapter-utils
AgeCommit message (Collapse)AuthorFilesLines
2017-09-22Fix Blocker/Critical sonar issuesshashikanth1-3/+3
Fix Blocker/Critical sonar issues in so module https://sonar.onap.org/component_issues?id=org.openecomp.so%3Aso#resolved=false|severities=CRITICAL Fixed issue Remove this call to "equals"; comparisons between unrelated types always return false. Issue-Id:SO-118 Change-Id: I8e3594958a84efc933206655b7ff96a7d08c24e0 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-18Fixed Issues In adapter code.seshukm4-35/+56
Issue-Id : SO-141 Change-Id: I0e901537013634dfc3f0950921c2ebbc2afa411f Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2017-09-12Fix for SONAR critical issuesseshukm3-17/+30
Issue-Id : SO-117 Change-Id: Icdc64605b475e20af7e871135af327f7d0e38792 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2017-09-11Fix for SONAR critical issuesseshukm2-1/+20
Issue Id : SO-117 Change-Id: I7774a2d35f46398c3c3d6a9b4da97a0a52ef941e Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2017-09-11Change the header to SOSeshu-Kumar-M50-50/+50
IssueId: SO-120 Change-Id: I59982b12d5b538b3f9765410ac26cbdde1844957 Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2017-09-081710 Rebase - Second AttemptArthur Martella49-5051/+471
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit: 54483fc6606ddb1591a2e9da61bff8712325f924 Wed Sep 6 18:12:56 2017 -0400 Rebasing was done on a branch on top of this commit in so/master in ONAP: 93fbdfbe46104f8859d4754040f979cb7997c157 Thu Sep 7 16:42:59 2017 +0000 Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59 Issue-id: SO-107 Signed-off-by: Arthur Martella <amartell@research.att.com>
2017-08-04Failed to deploy so artifacts in nexus (again)Rob Daugherty1-4/+4
There are Linux Foundation rules (enforced by nexus) that I still don't really understand. I'm convinced this is absolutely true: The groupId of every artifact in a project MUST begin with: org.openecomp.<project> --or-- org.onap.<project> The top-level artifact is no exception. So for example, this is NOT allowed: <groupId>org.openecomp</groupId> <artifactId>so</groupId> Here's what I'm trying now. The top level pom will contain: <groupId>org.openecomp.so</groupId> <artifactId>so-parent</artifactId> Child modules will contain: <parent> <groupId>org.openecomp.so</groupId> <artifactId>so-parent</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> <artifactId>some-child-artifact</artifactId> Note that the groupId for the direct child module will be the same as the groupId for its parent. Issue: SO-21 Change-Id: I0d3cd2eb7a1883e23e3c0878ee7fa3dd4a7d55b2 Signed-off-by: Rob Daugherty <rd472p@att.com>
2017-08-01Failed to deploy so artifacts in nexusRob Daugherty1-4/+4
More problems encountered since mso repos were renamed. We now have found that this declaration in the top-level so pom causes the deploy to fail with a 403 Forbidden error: <groupId>org.openecomp</groupId> <artifactId>so</artifactId> We are changing this to: <groupId>org.openecomp.so</groupId> <artifactId>framework</artifactId> Issue: SO-21 Change-Id: I4e21d689c73c5071bde725127bb81482ce3d91f9 Signed-off-by: Rob Daugherty <rd472p@att.com>
2017-07-19Fix artifact group IDs (org.openecomp.so)Rob Daugherty1-8/+8
Since the repositories were renamed from "mso" to "so" the artifact group IDs in the poms must be updated to match. Issue: SO-39 Change-Id: I617fe738a77d0f6c1d1cc0ac9474fb753f4e234c Signed-off-by: Rob Daugherty <rd472p@att.com>
2017-05-09[MSO-8] Additional fixes for the second rebaseDeterme, Sebastien (sd378r)6-212/+383
DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file not reloaded properly when it's wrong (JSON error or model hierarchy mistake) at MSO startup Change-Id: I2853030b78499e2a761706b643ea210955e72de3 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com> [MSO-8] Restore files removed in patch set 2 Those groovy files must be there Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-05-02[MSO-8] Second step of the rebase for MSODeterme, Sebastien (sd378r)16-831/+842
Second rebase containing additional features for MSO + total reworking of the BPMN structure + Notification flow can now be added at the end of some BPMN flows Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-04-11Simplify MsoHeatEnvironmentParameter methodsGary Wu1-12/+3
Change-Id: I199008128f28903ea28ecfba437511c4c4a6c8e7 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-04-11[MSO-8] Update the maven dependencyxg353y28-514/+1615
Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes. Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc Signed-off-by: xg353y <xg353y@intl.att.com>
2017-04-10Remove unnecessary use of Calendar.getInstance()Gary Wu3-13/+7
Calendar.getInstance() is expensive and unnecessary when we only need the system time. This change replaces the uses of Calendar.getInstance() with System.currentTimeMillis(). Change-Id: I476f8850f5eb88d20cf7249cca5bb2e9b671b45a Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-03-13Update to version 1.1.0ChrisC1-13/+13
Change-Id: Id054e7a04ce88450c3cfe108c8259c4d287681c8 Signed-off-by: ChrisC <cc697w@intl.att.com>
2017-01-31Updating dependent artifact version in a few pom.xmlChrisC1-4/+4
Change-Id: I1b8d5e48da3ac4d1257214dab38706302d0acd10 Signed-off-by: ChrisC <cc697w@intl.att.com>
2017-01-31Initial OpenECOMP MSO commitChrisC91-0/+12380
Change-Id: Ia6a7574859480717402cc2f22534d9973a78fa6d Signed-off-by: ChrisC <cc697w@intl.att.com>
n>timestamp}</sdnc.build.timestamp> <ccsdk.docker.version>0.6.3</ccsdk.docker.version> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> <build> <plugins> <plugin> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> <executions> <execution> <phase>validate</phase> <goals> <goal>execute</goal> </goals> <configuration> <source>${basedir}/../TagVersion.groovy</source> </configuration> </execution> </executions> </plugin> <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <version>0.28.0</version> <inherited>false</inherited> <configuration> <images> <image> <name>${image.name}</name> <build> <cleanup>try</cleanup> <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> <dockerFile>Dockerfile</dockerFile> <tags> <tag>${project.docker.latestminortag.version}</tag> <tag>${project.docker.latestfulltag.version}</tag> <tag>${project.docker.latesttagtimestamp.version}</tag> </tags> </build> </image> </images> </configuration> <executions> <execution> <id>generate-images</id> <phase>process-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/onap/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> <execution> <id>copy-keystores</id> <goals> <goal>copy-resources</goal> </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory> <resources> <resource> <directory>../src/main/stores</directory> <includes> <include>*.p12</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/onap/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/onap/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/onap/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/onap/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>