summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/arquillian-unit-tests/pom.xml10
-rw-r--r--packages/deliveries/pom.xml4
-rw-r--r--packages/docker/pom.xml8
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.aria29
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.jacoco2
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian4
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final4
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update2
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-104
-rw-r--r--packages/pom.xml6
-rw-r--r--packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql3
11 files changed, 54 insertions, 22 deletions
diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml
index 9ec7a0aacf..a557f56f46 100644
--- a/packages/arquillian-unit-tests/pom.xml
+++ b/packages/arquillian-unit-tests/pom.xml
@@ -2,12 +2,12 @@
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.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>packages</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.mso.packages</groupId>
+ <groupId>org.openecomp.so.packages</groupId>
<name>Arquillian Unit Testing on MSO</name>
<artifactId>arquillian-unit-tests</artifactId>
@@ -225,7 +225,7 @@
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>asdc-controller</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -233,7 +233,7 @@
</dependency>
<!-- <dependency>
- <groupId>org.openecomp.mso.adapters</groupId>
+ <groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-appc-adapter</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -255,7 +255,7 @@
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>mso-catalog-db</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/packages/deliveries/pom.xml b/packages/deliveries/pom.xml
index a67e0a36c0..e083a28656 100644
--- a/packages/deliveries/pom.xml
+++ b/packages/deliveries/pom.xml
@@ -2,12 +2,12 @@
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.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>packages</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.mso.packages</groupId>
+ <groupId>org.openecomp.so.packages</groupId>
<artifactId>mso-deliveries</artifactId>
<packaging>pom</packaging>
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 5f271a9fac..c37d68a5ed 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>packages</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>docker</artifactId>
<name>MSO Docker Deliveries</name>
@@ -22,8 +22,8 @@
i.e: mvn clean install -P docker -Dmso.git.url=https://gerrit.openecomp.org/r-->
<mso.chef.git.url.prefix>${env.GIT_NO_PROJECT}</mso.chef.git.url.prefix>
<mso.chef.git.branchname>master</mso.chef.git.branchname>
- <mso.chef.git.url.suffix.chef.repo>mso/chef-repo</mso.chef.git.url.suffix.chef.repo>
- <mso.chef.git.url.suffix.chef.config>mso/mso-config</mso.chef.git.url.suffix.chef.config>
+ <mso.chef.git.url.suffix.chef.repo>so/chef-repo</mso.chef.git.url.suffix.chef.repo>
+ <mso.chef.git.url.suffix.chef.config>so/so-config</mso.chef.git.url.suffix.chef.config>
<mso.project.version>${project.version}</mso.project.version>
</properties>
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.aria b/packages/docker/src/main/docker/docker-files/Dockerfile.aria
new file mode 100644
index 0000000000..43371b5fa1
--- /dev/null
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.aria
@@ -0,0 +1,29 @@
+#
+# ============LICENSE_START===================================================
+# Copyright (c) 2017 Cloudify.co. 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====================================================
+#
+
+FROM httpd:alpine
+
+RUN apk update
+RUN apk add python2 py2-pip gcc python2-dev linux-headers musl-dev git curl
+
+RUN pip install apache-ariatosca==0.1.0 jinja2==2.8
+RUN curl -sL http://github.com/dfilppi/aria-rest/archive/master.tar.gz|tar xzf -
+WORKDIR aria-rest-master
+RUN pip install .
+
+CMD aria-rest
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco b/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco
index 744916258d..cd70b373f7 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco
@@ -2,7 +2,7 @@
FROM ubuntu:14.04
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
+MAINTAINER "The ONAP Team"
LABEL Description="This image is used to get jacoco result from a jboss image" Version="1.0"
ARG http_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
index b07c8c9472..c279597d34 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
@@ -2,8 +2,8 @@ FROM openecomp/wildfly:1.0
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
-LABEL Description="This image contains the OpenECOMP MSO base for arquillian" Version="1.0"
+MAINTAINER "The ONAP Team"
+LABEL Description="This image contains the ONAP SO base for arquillian" Version="1.0"
ENV CHEF_REPO_NAME="chef-repo"
ENV CHEF_CONFIG_NAME="mso-config"
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 ff7f44bcfd..16d062ec82 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
@@ -2,8 +2,8 @@ FROM openecomp/wildfly:1.0
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
-LABEL Description="This image contains the OpenECOMP MSO" Version="1.0"
+MAINTAINER "The ONAP Team"
+LABEL Description="This image contains the ONAP SO" Version="1.0"
ARG http_proxy
ARG https_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update b/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update
index 2e8f268f19..8ed710745a 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update
@@ -1,7 +1,7 @@
FROM ubuntu:16.04
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
+MAINTAINER "The ONAP Team"
LABEL Description="This image contains an updated version of ubuntu 16.04" Version="1.0"
ARG http_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10 b/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10
index fff753217d..0e766e2658 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10
@@ -1,8 +1,8 @@
FROM openecomp/ubuntu-update:1.0
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
-LABEL Description="This image contains OpenECOMP MSO ubuntu base" Version="1.0"
+MAINTAINER "The ONAP Team"
+LABEL Description="This image contains ONAP SO ubuntu base" Version="1.0"
ARG http_proxy
ARG https_proxy
diff --git a/packages/pom.xml b/packages/pom.xml
index 92d8c3e6c2..e632f82d62 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -2,12 +2,12 @@
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>
- <artifactId>mso</artifactId>
- <groupId>org.openecomp</groupId>
+ <groupId>org.openecomp.so</groupId>
+ <artifactId>so</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>packages</artifactId>
<packaging>pom</packaging>
<name>MSO Packages</name>
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql
index 2165041f5c..34deb08782 100644
--- a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql
+++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql
@@ -84,8 +84,11 @@ INSERT INTO `VNF_COMPONENTS_RECIPE`
UNLOCK TABLES;
INSERT INTO service (id, SERVICE_NAME, VERSION_STR, DESCRIPTION, SERVICE_NAME_VERSION_ID) VALUES ('4', 'VID_DEFAULT', '1.0', 'Default service for VID to use for infra APIH orchestration', 'MANUAL_RECORD');
+INSERT INTO service (id, SERVICE_NAME, VERSION_STR, DESCRIPTION, SERVICE_NAME_VERSION_ID) VALUES ('5', '*', '1.0', 'Default service to use for infra APIH orchestration', 'MANUAL_RECORD');
INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'createInstance', '1', 'VID_DEFAULT recipe to create service-instance if no custom BPMN flow is found', '/mso/async/services/CreateGenericALaCarteServiceInstance', '180');
INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete service-instance if no custom BPMN flow is found', '/mso/async/services/DeleteGenericALaCarteServiceInstance', '180');
+INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('5', 'createInstance', '1', 'DEFAULT recipe to create service-instance if no custom BPMN flow is found', '/mso/async/services/CreateGenericALaCarteServiceInstance', '180');
+INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('5', 'deleteInstance', '1', 'DEFAULT recipe to delete service-instance if no custom BPMN flow is found', '/mso/async/services/DeleteGenericALaCarteServiceInstance', '180');
INSERT INTO vnf_recipe (VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'createInstance', '1', 'VID_DEFAULT recipe to create VNF if no custom BPMN flow is found', '/mso/async/services/CreateVnfInfra', '180');
INSERT INTO vnf_recipe (VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete VNF if no custom BPMN flow is found', '/mso/async/services/DeleteVnfInfra', '180');
INSERT INTO vnf_components_recipe (VNF_TYPE, VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_ID) VALUES (NULL, 'volumeGroup', 'createInstance', '1', 'VID_DEFAULT recipe to create volume-group if no custom BPMN flow is found', '/mso/async/services/CreateVfModuleVolumeInfraV1', '180', 'VID_DEFAULT');