summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src
AgeCommit message (Collapse)AuthorFilesLines
2019-01-04HttpClientFactory to create HttpClient instancesMichal Kabaj21-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-13Merge "Add junit tests for CatalogDBUtils"Steve Smokowski4-62/+203
2018-12-13Merge "Add the query to AAI for SI with customer info"Rob Daugherty1-1/+6
2018-12-13Add junit tests for CatalogDBUtilsLukasz Muszkieta4-62/+203
Change-Id: I1ea3e92b6dcb3fbca837513e11451be47d8c488b Issue-ID: SO-784 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-12-12Merge "Fixed vlan xml and host routes"Steve Smokowski1-394/+25
2018-12-12Add the query to AAI for SI with customer infoKalkere 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-12Merge "vfc adapter authentication bug fix"Steve Smokowski1-2/+5
2018-12-12Merge "fixed aai response code in updateAAIVfModule"Steve Smokowski3-1/+12
2018-12-12Merge "removed the AAIPropertiesConfiguration file"Steve Smokowski2-89/+0
2018-12-12Merge "ConfirmVolumeGroupNameTest improvements"Steve Smokowski5-74/+269
2018-12-12Merge "fix lookup of si if customer exists"Steve Smokowski1-2/+7
2018-12-12Merge "Changed sdncRequestId to SDNCA_requestId"Steve Smokowski2-4/+4
2018-12-12ConfirmVolumeGroupNameTest improvementsJoanna Jeremicz5-74/+269
Change-Id: I3e611f2577e66932d8337d1768ba803c25d01b39 Issue-ID: SO-784 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
2018-12-11Fixed vlan xml and host routesKalkere 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-11fix lookup of si if customer existsKalkere 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-11Changed sdncRequestId to SDNCA_requestIdKalkere 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-11fix issue with instance groups and unassign reqKalkere 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-10removed the AAIPropertiesConfiguration fileKalkere 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>
018-12-05Resolve Security ExploitsSmokowski, Steve (ss835w)1-1/+2 normalize all file paths before using them Change-Id: I67aaa00d7218b95dde96f3679efe92c3c0cd33f9 Issue-ID: SO-1275 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com> 2018-12-04Updated Network LogicSmokowski, Steve (ss835w)2-18/+24 Added logic to get aggregate route, updated unit test, fixed bugs, refactored select code. Change-Id: I3269da1967ba903dd11459f76030c3fc2aad797a Issue-ID: SO-1270 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com> 2018-12-04Fix BuxSmokowski, Steve (ss835w)2-2/+29 Fix Bug with mapping of VNFC Instance Groups Change-Id: Idb35d33f47f9e4854d68590d665553f8385123ab Issue-ID: SO-1267 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com> 2018-11-29vfc adapter authentication bug fixYulian Han1-2/+5 update OperationStatus Based On ResourceStatus add Authorization header to get csar from db Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064414 Issue-ID: SO-1256 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com> 2018-11-28Add support for naming serviceBenjamin, Max (mb388a)1-1/+2 Moved client and builder to namingservice package Renamed file to NamingRequestObjectBuilder and updated packages Updated namespaces for namingservice beans Removed unused test resource files Added endpoint and authentication information to yaml Added NamingMapperTest for mapper layer Added NamingMapper for mapping requests and responses Began adding NamingClient for assign and unassign requests Added maven dependency for namingmS client beans Describe NamingClientResponseValidator as a Bean Fix a JUnit for delete tasks for Naming Service. Change NamingClient to return a String with the result and throw an exception. Add delete/create tasks for NamingService interaction and related JUnits. ResponseValidator for NamingClient and Resources class to support Naming Service interactions. removed naming service dependency added serializable flag for naming service model gen Change-Id: I0d9efe4009207f3739a3b6515592e67cfeedf822 Issue-ID: SO-1260 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com> 2018-11-27Use spring auto deploymentBenjamin, Max (mb388a)2-5/+0 remove processes.xml from application in favor of spring properties removed the last @EnableProcessApplication annotation removed remaining processes.xml from code modified JEL expression with explicit getVariable calls update application.yaml defaults for camunda deployment Update camunda configuration to run history clean up Change-Id: If9a5cf03a8cdc33c32eeb790656f925d2f0b6d7b Issue-ID: SO-1232 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com> 2018-11-22isBase value - bug fixingLukasz Muszkieta1-16/+1 isBase json value is boolean type, not an integer Change-Id: Ic6d148c65a910bace6940770ee01e6836ab47e0d Issue-ID: SO-1244 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com> 2018-11-21Add unit tests for ExternalAPIUtilMichal Kabaj3-18/+247 -Add unit tests for ExternalAPIUtil -Add dependency injection via constructor -Add factory for creating ExternalAPIUtil and RESTClient Change-Id: Ied89afa3612de8d51424c95239341a57387ad94f Issue-ID: SO-1195 Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com> 2018-11-17Fix invocation of resource receipesubhash kumar singh1-1/+1 Fix invocation of resource receipe. Change-Id: I4ab14fa4924d7480b167138091de33f657286dde Issue-ID: SO-689 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com> (cherry picked from commit 9600bc37864e33e503001a4740fd5628a1069678) 2018-11-15Merge "accept a la carte create instance group request"Rob Daugherty1-0/+1 2018-11-15Merge "separate error status from progression status"Rob Daugherty1-0/+15