diff options
Diffstat (limited to 'packages')
19 files changed, 660 insertions, 402 deletions
diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml index a557f56f46..257e34b69a 100644 --- a/packages/arquillian-unit-tests/pom.xml +++ b/packages/arquillian-unit-tests/pom.xml @@ -1,336 +1,307 @@ <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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.openecomp.so</groupId> - <artifactId>packages</artifactId> - <version>1.1.0-SNAPSHOT</version> - </parent> - - <groupId>org.openecomp.so.packages</groupId> - <name>Arquillian Unit Testing on MSO</name> - <artifactId>arquillian-unit-tests</artifactId> - - <packaging>jar</packaging> - - <profiles> - <profile> - <id>default-tests</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <it-suite-to-execute>**/IntegrationTestsSuite.java</it-suite-to-execute> - <container-to-start>jboss-as</container-to-start> - <mso.project.version>${project.version}</mso.project.version> - </properties> - </profile> - - </profiles> - - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-bom</artifactId> - <version>1.1.11.Final</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.jboss.spec</groupId> - <artifactId>jboss-javaee-6.0</artifactId> - <version>3.0.2.Final</version> - <type>pom</type> - <scope>import</scope> - - </dependency> - - </dependencies> - - - </dependencyManagement> - - - <dependencies> - <!-- For testing --> - <dependency> - <groupId>org.jboss.marshalling</groupId> - <artifactId>jboss-marshalling</artifactId> - <version>1.3.16.GA</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <scope>test</scope> - - </dependency> - -<!-- <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-arquillian-container-remote</artifactId> - <version>7.2.0.Final</version> - <scope>test</scope> - </dependency>--> - - <dependency> - <groupId>org.wildfly.arquillian</groupId> - <artifactId>wildfly-arquillian-container-remote</artifactId> - <version>1.1.0.Final</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - <version>4.0.9.Final</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - <version>3.2.1.Final</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.protocol</groupId> - <artifactId>arquillian-protocol-servlet</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-bom</artifactId> - <version>2.1.0-alpha-1</version> - <scope>runtime</scope> - <type>pom</type> - </dependency> - - <!-- FOR DOCKER CONTROLLED BY ARQUILLIAN--> - <dependency> - <groupId>org.arquillian.cube</groupId> - <artifactId>arquillian-cube-openshift-parent</artifactId> - <version>1.0.0.Alpha15</version> - <type>pom</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.arquillian.cube</groupId> - <artifactId>arquillian-cube-docker</artifactId> - <version>1.0.0.Alpha15</version> - <scope>test</scope> - </dependency> - - <!-- <dependency> - <groupId>org.eu.ingwar.tools</groupId> - <artifactId>arquillian-suite-extension</artifactId> - <version>1.1.1</version> - <scope>test</scope> - </dependency> --> - - - <!-- For testing --> - - <!-- FOR JBOSS CODE --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>4.2.7.SP1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>4.2.7.SP1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.9</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>7.2.0.Final</version> - <scope>test</scope> - </dependency> - - - <dependency> - <groupId>com.smartbear.soapui</groupId> - <artifactId>soapui</artifactId> - <version>5.1.0</version> - <type>jar</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>thoughtworks</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>gnu.cajo</groupId> - <artifactId>cajo</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.4</version> - <type>jar</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-java</artifactId> - <version>2.45.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-firefox-driver</artifactId> - <version>2.45.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-server</artifactId> - <version>2.45.0</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </dependency> - - <dependency> - <groupId>org.openecomp.so</groupId> - <artifactId>asdc-controller</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>classes</classifier> - </dependency> - - <!-- <dependency> - <groupId>org.openecomp.so.adapters</groupId> - <artifactId>mso-appc-adapter</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>classes</classifier> - </dependency> --> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.openecomp.sdc.sdc-distribution-client</groupId> - <artifactId>sdc-distribution-client</artifactId> - <version>1.1.6-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.openecomp.so</groupId> - <artifactId>mso-catalog-db</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <!-- FOR JMETER --> - <dependency> - <groupId>org.apache.jmeter</groupId> - <artifactId>ApacheJMeter_core</artifactId> - <version>2.13</version> - - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>commons-math3</artifactId> - <groupId>commons-math3</groupId> - </exclusion> - <exclusion> - <artifactId>commons-pool2</artifactId> - <groupId>commons-pool2</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.jmeter</groupId> - <artifactId>ApacheJMeter_http</artifactId> - <version>2.13</version> - - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>commons-math3</artifactId> - <groupId>commons-math3</groupId> - </exclusion> - <exclusion> - <artifactId>commons-pool2</artifactId> - <groupId>commons-pool2</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.jmeter</groupId> - <artifactId>ApacheJMeter_jdbc</artifactId> - <version>2.13</version> - - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>commons-math3</artifactId> - <groupId>commons-math3</groupId> - </exclusion> - <exclusion> - <artifactId>commons-pool2</artifactId> - <groupId>commons-pool2</groupId> - </exclusion> - </exclusions> - </dependency> - - <!-- END FOR JMETER --> - </dependencies> - - <build> - <finalName>arquillian-tests</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.openecomp.so</groupId> + <artifactId>packages</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + + <groupId>org.openecomp.so.packages</groupId> + <name>Arquillian Unit Testing on MSO</name> + <artifactId>arquillian-unit-tests</artifactId> + + <packaging>jar</packaging> + + <profiles> + <profile> + <id>default-tests</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <it-suite-to-execute>**/IntegrationTestsSuite.java</it-suite-to-execute> + <container-to-start>jboss-as</container-to-start> + <mso.project.version>${project.version}</mso.project.version> + </properties> + </profile> + + </profiles> + + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-bom</artifactId> + <version>1.1.13.Final</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <version>3.0.2.Final</version> + <type>pom</type> + <scope>import</scope> + + </dependency> + + </dependencies> + + + </dependencyManagement> + + + <dependencies> + <!-- For testing --> + <dependency> + <groupId>org.jboss.marshalling</groupId> + <artifactId>jboss-marshalling</artifactId> + <version>1.3.16.GA</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> + + </dependency> + + <dependency> + <groupId>org.wildfly.arquillian</groupId> + <artifactId>wildfly-arquillian-container-remote</artifactId> + <version>1.1.0.Final</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <version>4.0.9.Final</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.2.1.Final</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-impl-maven</artifactId> + <version>2.2.6</version> + <scope>test</scope> + </dependency> + + <!-- FOR DOCKER CONTROLLED BY ARQUILLIAN --> + <dependency> + <groupId>org.arquillian.cube</groupId> + <artifactId>arquillian-cube-docker</artifactId> + <version>1.9.0</version> + <scope>test</scope> + </dependency> + + <!-- For testing --> + + <!-- FOR JBOSS CODE --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>4.2.7.SP1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>4.2.7.SP1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-ejb3</artifactId> + <version>7.2.0.Final</version> + <scope>test</scope> + </dependency> + + + <dependency> + <groupId>com.smartbear.soapui</groupId> + <artifactId>soapui</artifactId> + <version>5.1.0</version> + <type>jar</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>thoughtworks</groupId> + <artifactId>xstream</artifactId> + </exclusion> + <exclusion> + <groupId>gnu.cajo</groupId> + <artifactId>cajo</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.4</version> + <type>jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> + <version>2.45.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-firefox-driver</artifactId> + <version>2.45.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-server</artifactId> + <version>2.45.0</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + + <dependency> + <groupId>org.openecomp.so</groupId> + <artifactId>asdc-controller</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>classes</classifier> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <scope>test</scope> + <version>2.8.7</version> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.openecomp.sdc.sdc-distribution-client</groupId> + <artifactId>sdc-distribution-client</artifactId> + <version>1.1.6-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.openecomp.so</groupId> + <artifactId>mso-catalog-db</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <!-- FOR JMETER --> + <dependency> + <groupId>org.apache.jmeter</groupId> + <artifactId>ApacheJMeter_core</artifactId> + <version>2.13</version> + + <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>commons-math3</artifactId> + <groupId>commons-math3</groupId> + </exclusion> + <exclusion> + <artifactId>commons-pool2</artifactId> + <groupId>commons-pool2</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.jmeter</groupId> + <artifactId>ApacheJMeter_http</artifactId> + <version>2.13</version> + + <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>commons-math3</artifactId> + <groupId>commons-math3</groupId> + </exclusion> + <exclusion> + <artifactId>commons-pool2</artifactId> + <groupId>commons-pool2</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.jmeter</groupId> + <artifactId>ApacheJMeter_jdbc</artifactId> + <version>2.13</version> + + <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>commons-math3</artifactId> + <groupId>commons-math3</groupId> + </exclusion> + <exclusion> + <artifactId>commons-pool2</artifactId> + <groupId>commons-pool2</groupId> + </exclusion> + </exclusions> + </dependency> + + <!-- END FOR JMETER --> + </dependencies> + + <build> + <finalName>arquillian-tests</finalName> + <plugins> + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> <source> if ( project.properties['docker.host'] != null ) { project.properties['docker.host.truncated']=project.properties['docker.host'].replaceFirst("^(http://|https://)",""); @@ -348,73 +319,73 @@ project.properties['mso.version']=project.properties['mso.project.version']; } </source> - </configuration> - </execution> - </executions> - </plugin> - - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>download-mariadb-connector</id> - <phase>pre-integration-test</phase> - <goals> - <goal>download-single</goal> - </goals> - <configuration> - <url>http://central.maven.org/</url> - <fromFile>maven2/org/mariadb/jdbc/mariadb-java-client/1.5.4/mariadb-java-client-1.5.4.jar</fromFile> - <toDir>${project.build.directory}/mariadb-connector</toDir> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>2.16</version> - - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - <configuration> - <skipAfterFailureCount>1</skipAfterFailureCount> - </configuration> - </execution> - </executions> - - <configuration> - <systemPropertyVariables> - <arquillian.launch>${container-to-start}</arquillian.launch> - <target.folder>${project.build.directory}</target.folder> - <docker.url>${docker.host}</docker.url> - <docker.hostname>${docker.host.truncated}</docker.hostname> - <images.version>${mso.version}</images.version> - </systemPropertyVariables> - <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> - <testFailureIgnore>true</testFailureIgnore> - <includes> - <include>${it-suite-to-execute}</include> - </includes> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> + </configuration> + </execution> + </executions> + </plugin> + + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <id>download-mariadb-connector</id> + <phase>pre-integration-test</phase> + <goals> + <goal>download-single</goal> + </goals> + <configuration> + <url>http://central.maven.org/</url> + <fromFile>maven2/org/mariadb/jdbc/mariadb-java-client/1.5.4/mariadb-java-client-1.5.4.jar</fromFile> + <toDir>${project.build.directory}/mariadb-connector</toDir> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.16</version> + + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + <configuration> + <skipAfterFailureCount>1</skipAfterFailureCount> + </configuration> + </execution> + </executions> + + <configuration> + <systemPropertyVariables> + <arquillian.launch>${container-to-start}</arquillian.launch> + <target.folder>${project.build.directory}</target.folder> + <docker.url>${docker.host}</docker.url> + <docker.hostname>${docker.host.truncated}</docker.hostname> + <images.version>${mso.version}</images.version> + </systemPropertyVariables> + <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> + <testFailureIgnore>true</testFailureIgnore> + <includes> + <include>${it-suite-to-execute}</include> + </includes> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/filesearching/LogFileSearching.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/filesearching/LogFileSearching.java index 2321b3fff0..fba28ac0fd 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/filesearching/LogFileSearching.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/filesearching/LogFileSearching.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.filesearching; import java.io.File; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/ArquillianPackagerForITCases.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/ArquillianPackagerForITCases.java index 9b80d25e47..200e1d2621 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/ArquillianPackagerForITCases.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/ArquillianPackagerForITCases.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests; import java.io.File; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java index f71d2e7fa8..e187be1427 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests; import org.junit.runner.RunWith; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java index d290f0d08a..27cfe6fa17 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests.asdc; import static org.junit.Assert.*; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java index bd22154b94..3cb5a97d09 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests.asdc.notif_emulator; import java.io.File; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfo.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfo.java index f37235bba4..90511033dd 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfo.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfo.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests.asdc.notif_emulator; import java.util.HashMap; import java.util.LinkedList; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfoDeserializer.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfoDeserializer.java index 6e24accc14..010c9ac2a7 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfoDeserializer.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonArtifactInfoDeserializer.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests.asdc.notif_emulator; import java.io.IOException; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonNotificationData.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonNotificationData.java index 02ed01d958..cf041afd6c 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonNotificationData.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonNotificationData.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests.asdc.notif_emulator; import java.io.IOException; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java index 79dcaed0c8..af49ee0d37 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests.asdc.notif_emulator; import java.util.HashMap; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfoDeserializer.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfoDeserializer.java index 5ff92f7533..5b18a2cbc9 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfoDeserializer.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfoDeserializer.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests.asdc.notif_emulator; import java.io.IOException; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonVfModuleMetaData.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonVfModuleMetaData.java index dbf953f955..08d9895a53 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonVfModuleMetaData.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonVfModuleMetaData.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests.asdc.notif_emulator; import java.util.HashMap; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/jmeter/JMeterITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/jmeter/JMeterITCase.java index ebbf657f2d..0bf9eac915 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/jmeter/JMeterITCase.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/jmeter/JMeterITCase.java @@ -1,3 +1,22 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ package org.openecomp.mso.global_tests.jmeter; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/logging/LogsCheckerITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/logging/LogsCheckerITCase.java index 68bd22205c..bae9af5cc1 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/logging/LogsCheckerITCase.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/logging/LogsCheckerITCase.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.mso.global_tests.logging; import static org.junit.Assert.*; diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java index abcb7d09a8..b7a3b04d96 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java @@ -1,3 +1,22 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ package org.openecomp.mso.global_tests.soapui; diff --git a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml b/packages/arquillian-unit-tests/src/test/resources/arquillian.xml index 7377d16729..649b3083fb 100644 --- a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml +++ b/packages/arquillian-unit-tests/src/test/resources/arquillian.xml @@ -12,7 +12,7 @@ <extension qualifier="docker"> - <property name="serverVersion">1.23</property> + <property name="serverVersion">1.24</property> <property name="serverUri">${docker.url}</property> <property name="definitionFormat">CUBE</property> diff --git a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json b/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json index 5552efe6a5..3d24819c2f 100644 --- a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json +++ b/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json @@ -59,7 +59,10 @@ "https://localhost:8443/restconf/operations/Firewall-API:", "https://localhost:8443/restconf/config", "https://localhost:8443/restconf/operations/VNF-API:", - "https://localhost:8443/restconf/operations/NBNC-API:" + "https://localhost:8443/restconf/operations/NBNC-API:", + "https://localhost:8443/restconf/operations/NORTHBOUND-API:service-topology-operation", + "https://localhost:8443/restconf/operations/GENERIC-RESOURCE-API:", + "https://localhost:8443/restconf/operations/VNFTOPOLOGYAIC-API:" ], "bpelurl": "http://mso:8080/mso/SDNCAdapterCallbackService", diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final index 2e227bef0d..8238923139 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final @@ -81,6 +81,12 @@ COPY ./maven/artifacts/* $JBOSS_HOME/standalone/deployments/ RUN mkdir -p /etc/mso/config.d/ASDC && chown -R jboss:jboss /etc/mso/config.d/ASDC && chmod u+xrw /etc/mso/config.d/ASDC +## Install heatbridge +RUN apt-get install -y python && apt-get install -y python-pip && echo 'PIP Installed, doing upgrade' && pip install --upgrade pip +RUN mkdir /opt/mso/heatbridge +COPY heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl /opt/mso/heatbridge +RUN pip install /opt/mso/heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl + ### Open Ports EXPOSE 8080 diff --git a/packages/docker/src/main/docker/docker-files/heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl b/packages/docker/src/main/docker/docker-files/heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl Binary files differnew file mode 100644 index 0000000000..357a669c1a --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl |