Merge "Added r-app catalogue to demo test case"

diff --git a/docker-compose/rapp/docker-compose.yml b/docker-compose/rapp/docker-compose.yml
new file mode 100644 (file)
index 0000000..1e4763a
--- /dev/null
+++ b/docker-compose/rapp/docker-compose.yml
@@ -0,0 +1,35 @@
+#  Copyright (C) 2020 Nordix Foundation. 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=================================================
+#
+version: '3.5'
+
+networks:
+  default:
+    driver: bridge
+    name: nonrtric-docker-net
+
+services:
+  r-app:
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-r-app-catalogue:1.0.0
+    container_name: r-app
+    networks:
+      default:
+        aliases:
+          - r-app-catalogue
+    ports:
+      - 8080:8080
+      - 8433:8433
+
+

diff --git a/r-app-catalogue/pom.xml b/r-app-catalogue/pom.xml
index a2a2dfc..110f2d0 100644 (file)
--- a/r-app-catalogue/pom.xml
+++ b/r-app-catalogue/pom.xml
@@ -159,6 +159,10 @@
 \r
     <build>\r
         <plugins>\r
+            <plugin>\r
+                <groupId>org.springframework.boot</groupId>\r
+                <artifactId>spring-boot-maven-plugin</artifactId>\r
+            </plugin>\r
             <plugin>\r
                 <groupId>org.openapitools</groupId>\r
                 <artifactId>openapi-generator-maven-plugin</artifactId>\r
@@ -173,6 +177,7 @@
                             <generatorName>spring</generatorName>\r
                             <apiPackage>org.oransc.rappcatalogue.api</apiPackage>\r
                             <modelPackage>org.oransc.rappcatalogue.model</modelPackage>\r
+                            <invokerPackage>org.oransc.rappcatalogue</invokerPackage>\r
                             <configOptions>\r
                                 <delegatePattern>true</delegatePattern>\r
                             </configOptions>\r