diff options
39 files changed, 171 insertions, 400 deletions
diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index b5e43be92..a884cfc49 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -1,10 +1,10 @@ { "swagger" : "2.0", "info" : { - "version" : "5.1.5-SNAPSHOT", + "version" : "6.0.0-SNAPSHOT", "title" : "Clamp Rest API" }, - "host" : "localhost:38837", + "host" : "localhost:39481", "basePath" : "/restservices/clds/", "schemes" : [ "http" ], "paths" : { @@ -988,33 +988,30 @@ "asBoolean" : { "type" : "boolean" }, - "boolean" : { - "type" : "boolean" - }, - "number" : { - "type" : "boolean" - }, - "asString" : { - "type" : "string" - }, - "asFloat" : { + "asDouble" : { "type" : "number", - "format" : "float" + "format" : "double" }, "asLong" : { "type" : "integer", "format" : "int64" }, + "boolean" : { + "type" : "boolean" + }, + "number" : { + "type" : "boolean" + }, "asInt" : { "type" : "integer", "format" : "int32" }, - "asNumber" : { - "$ref" : "#/definitions/Number" + "asString" : { + "type" : "string" }, - "asDouble" : { + "asFloat" : { "type" : "number", - "format" : "double" + "format" : "float" }, "asByte" : { "type" : "string", @@ -1033,32 +1030,35 @@ "type" : "integer", "format" : "int32" }, + "asNumber" : { + "$ref" : "#/definitions/Number" + }, "string" : { "type" : "boolean" }, - "asJsonPrimitive" : { - "$ref" : "#/definitions/JsonPrimitive" + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" }, "asJsonArray" : { "$ref" : "#/definitions/JsonArray" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "jsonObject" : { + "type" : "boolean" }, "jsonNull" : { "type" : "boolean" }, - "jsonArray" : { + "jsonPrimitive" : { "type" : "boolean" }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" + "asJsonPrimitive" : { + "$ref" : "#/definitions/JsonPrimitive" }, - "jsonPrimitive" : { + "jsonArray" : { "type" : "boolean" }, - "jsonObject" : { - "type" : "boolean" + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" } } }, @@ -1137,24 +1137,9 @@ "asBoolean" : { "type" : "boolean" }, - "asJsonPrimitive" : { - "$ref" : "#/definitions/JsonPrimitive" - }, - "asString" : { - "type" : "string" - }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" - }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" - }, - "jsonNull" : { - "type" : "boolean" - }, - "asFloat" : { + "asDouble" : { "type" : "number", - "format" : "float" + "format" : "double" }, "asLong" : { "type" : "integer", @@ -1164,29 +1149,41 @@ "type" : "integer", "format" : "int32" }, - "jsonArray" : { + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" + }, + "asString" : { + "type" : "string" + }, + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" + }, + "jsonObject" : { "type" : "boolean" }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" + "jsonNull" : { + "type" : "boolean" }, "jsonPrimitive" : { "type" : "boolean" }, - "asNumber" : { - "$ref" : "#/definitions/Number" - }, - "asDouble" : { - "type" : "number", - "format" : "double" + "asJsonPrimitive" : { + "$ref" : "#/definitions/JsonPrimitive" }, - "jsonObject" : { + "jsonArray" : { "type" : "boolean" }, + "asFloat" : { + "type" : "number", + "format" : "float" + }, "asByte" : { "type" : "string", "format" : "byte" }, + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" + }, "asCharacter" : { "type" : "string" }, @@ -1199,6 +1196,9 @@ "asShort" : { "type" : "integer", "format" : "int32" + }, + "asNumber" : { + "$ref" : "#/definitions/Number" } }, "x-className" : { @@ -1335,24 +1335,9 @@ "asBoolean" : { "type" : "boolean" }, - "asJsonPrimitive" : { - "$ref" : "#/definitions/JsonPrimitive" - }, - "asString" : { - "type" : "string" - }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" - }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" - }, - "jsonNull" : { - "type" : "boolean" - }, - "asFloat" : { + "asDouble" : { "type" : "number", - "format" : "float" + "format" : "double" }, "asLong" : { "type" : "integer", @@ -1362,29 +1347,41 @@ "type" : "integer", "format" : "int32" }, - "jsonArray" : { + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" + }, + "asString" : { + "type" : "string" + }, + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" + }, + "jsonObject" : { "type" : "boolean" }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" + "jsonNull" : { + "type" : "boolean" }, "jsonPrimitive" : { "type" : "boolean" }, - "asNumber" : { - "$ref" : "#/definitions/Number" - }, - "asDouble" : { - "type" : "number", - "format" : "double" + "asJsonPrimitive" : { + "$ref" : "#/definitions/JsonPrimitive" }, - "jsonObject" : { + "jsonArray" : { "type" : "boolean" }, + "asFloat" : { + "type" : "number", + "format" : "float" + }, "asByte" : { "type" : "string", "format" : "byte" }, + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" + }, "asCharacter" : { "type" : "string" }, @@ -1397,6 +1394,9 @@ "asShort" : { "type" : "integer", "format" : "int32" + }, + "asNumber" : { + "$ref" : "#/definitions/Number" } } }, @@ -1406,12 +1406,9 @@ "asBoolean" : { "type" : "boolean" }, - "asString" : { - "type" : "string" - }, - "asFloat" : { + "asDouble" : { "type" : "number", - "format" : "float" + "format" : "double" }, "asLong" : { "type" : "integer", @@ -1421,12 +1418,12 @@ "type" : "integer", "format" : "int32" }, - "asNumber" : { - "$ref" : "#/definitions/Number" + "asString" : { + "type" : "string" }, - "asDouble" : { + "asFloat" : { "type" : "number", - "format" : "double" + "format" : "float" }, "asByte" : { "type" : "string", @@ -1445,29 +1442,32 @@ "type" : "integer", "format" : "int32" }, - "asJsonPrimitive" : { - "$ref" : "#/definitions/JsonPrimitive" + "asNumber" : { + "$ref" : "#/definitions/Number" + }, + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" }, "asJsonArray" : { "$ref" : "#/definitions/JsonArray" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "jsonObject" : { + "type" : "boolean" }, "jsonNull" : { "type" : "boolean" }, - "jsonArray" : { + "jsonPrimitive" : { "type" : "boolean" }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" + "asJsonPrimitive" : { + "$ref" : "#/definitions/JsonPrimitive" }, - "jsonPrimitive" : { + "jsonArray" : { "type" : "boolean" }, - "jsonObject" : { - "type" : "boolean" + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" } }, "x-className" : { diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf index 2502cf1e8..c3de4c5fe 100644 --- a/docs/swagger/swagger.pdf +++ b/docs/swagger/swagger.pdf @@ -4,8 +4,8 @@ << /Title (Clamp Rest API) /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) -/CreationDate (D:20201211130920+01'00') -/ModDate (D:20201211130920+01'00') +/CreationDate (D:20210106171942+01'00') +/ModDate (D:20210106171942+01'00') >> endobj 2 0 obj @@ -6791,7 +6791,7 @@ ET BT 85.136384765625 660.036 Td /F1.0 10.5 Tf -[<203a20352e312e352d534e415053484f> 20.01953125 <54>] TJ +[<203a20362e302e302d534e415053484f> 20.01953125 <54>] TJ ET 0.000 0.000 0.000 SCN @@ -6824,7 +6824,7 @@ ET BT 71.30850000000001 592.176 Td /F1.0 10.5 Tf -<203a206c6f63616c686f73743a3338383337> Tj +<203a206c6f63616c686f73743a3339343831> Tj ET 0.000 0.000 0.000 SCN diff --git a/extra/docker/clamp/docker-compose.yml b/extra/docker/clamp/docker-compose.yml index 3a06212ae..f4f5b2bdd 100644 --- a/extra/docker/clamp/docker-compose.yml +++ b/extra/docker/clamp/docker-compose.yml @@ -2,9 +2,9 @@ version: '3.1' services: clamp-frontend: - image: onap/clamp-frontend + image: onap/policy-clamp-frontend depends_on: - - clamp-backend + - policy-clamp-backend ports: - "2443:2443" db: @@ -19,7 +19,7 @@ services: - "3306:3306" clamp-backend: - image: onap/clamp-backend + image: onap/policy-clamp-backend depends_on: - db - third-party-proxy @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - ONAP CLAMP + ONAP POLICY-CLAMP ================================================================================ - Copyright (C) 2017-2019 AT&T Intellectual Property. All rights + Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,8 +24,8 @@ 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> - <groupId>org.onap.clamp</groupId> - <artifactId>clds</artifactId> + <groupId>org.onap.policy</groupId> + <artifactId>clamp</artifactId> <version>6.0.0-SNAPSHOT</version> <name>clamp</name> @@ -38,19 +38,19 @@ </parent> <description> - This is the MAVEN project that builds everything for ONAP CLAMP. + This is the MAVEN project that builds everything for ONAP POLICY-CLAMP. Docker engine is normally requires to perfom all possible tasks (including integration tests) It can build: - - The ONAP CLAMP JAR that contains CLAMP back-end code. + - The ONAP POLICY-CLAMP JAR that contains CLAMP back-end code. - The DOCKER images for: - * CLAMP backend (Java Spring) - * CLAMP frontend (Javscript React) + * POLICY-CLAMP backend (Java Spring) + * POLICY-CLAMP frontend (Javscript React) It can test: - - The CLAMP backend, JAVA unit testing - - The CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae emulator written in python) - - The CLAMP frontend, Javascrip tests (NodeJS(NPM) + JEST + Enzyme fro React) + - The POLICY-CLAMP backend, JAVA unit testing + - The POLICY-CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae emulator written in python) + - The POLICY-CLAMP frontend, Javascrip tests (NodeJS(NPM) + JEST + Enzyme fro React) The test coverage for dev's can be found after a "clean install" build in: - Clamp backend: target/jacoco-dev.exec (unit tests + integration tests merged) @@ -62,7 +62,7 @@ - mvn clean install -DskipITs=true: Build Clamp backend JAR + unit tests + NPM tests (+coverage for all), it does not require a DOCKER engine - mvn clean install -DskipTests -P docker: Build Clamp backend JAR + all docker images - To start CLAMP (Build it before): + To start POLICY-CLAMP (Build it before): - Use docker-compose file in ./extra/docker/clamp/docker-compose.yml - Use the script located in ./extra/bin/start-backend.sh + start-frontend.sh - Use your IDE to use the Jar or start NVM/NPM @@ -163,17 +163,17 @@ <distributionManagement> <repository> <id>ecomp-releases</id> - <name>Clamp Release Repository</name> + <name>ONAP Release Repository</name> <url>https://nexus.onap.org/content/repositories/releases/</url> </repository> <snapshotRepository> <id>ecomp-snapshots</id> - <name>Clamp Snapshot Repository</name> + <name>ONAP Snapshot Repository</name> <url>https://nexus.onap.org/content/repositories/snapshots/</url> </snapshotRepository> <site> <id>ecomp-site</id> - <url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url> + <url>dav:https://nexus.onap.org/content/sites/site/org/onap/policy/clamp/${project.version}</url> </site> </distributionManagement> @@ -545,7 +545,7 @@ </dependencies> <build> - <finalName>clamp</finalName> + <finalName>policy-clamp-backend</finalName> <testResources> <testResource> @@ -664,7 +664,7 @@ </goals> <configuration> <packages> - <param>org.onap.clamp</param> + <param>org.onap.policy.clamp</param> </packages> <dialects> <param>MARIADB53</param> @@ -827,7 +827,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/clamp-classes.jar</file> + <file>${project.build.directory}/policy-clamp-backend-classes.jar</file> <type>jar</type> <classifier>classes</classifier> </artifact> @@ -983,8 +983,8 @@ </run> </image> <image> - <name>onap/clamp-backend</name> - <alias>onap-clamp-backend</alias> + <name>onap/policy-clamp-backend</name> + <alias>onap-policy-clamp-backend</alias> <run> <skip>true</skip> </run> @@ -1000,13 +1000,13 @@ <dockerFile>backend/Dockerfile</dockerFile> <assembly> <descriptor>backend/backend-files.xml</descriptor> - <name>onap-clamp-backend</name> + <name>onap-policy-clamp-backend</name> </assembly> </build> </image> <image> - <name>onap/clamp-frontend</name> - <alias>onap-clamp-frontend</alias> + <name>onap/policy-clamp-frontend</name> + <alias>onap-policy-clamp-frontend</alias> <run> <skip>true</skip> </run> @@ -1022,7 +1022,7 @@ <dockerFile>frontend/Dockerfile</dockerFile> <assembly> <descriptor>frontend/frontend-files.xml</descriptor> - <name>onap-clamp-frontend</name> + <name>onap-policy-clamp-frontend</name> </assembly> </build> </image> @@ -1069,7 +1069,7 @@ <dumpOnExit>true</dumpOnExit> <append>true</append> <includes> - <include>org/onap/clamp/**</include> + <include>org/onap/policy/clamp/**</include> </includes> </configuration> <executions> diff --git a/releases/4.1.0.yaml b/releases/4.1.0.yaml deleted file mode 100644 index f71e3f935..000000000 --- a/releases/4.1.0.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '4.1.0' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/81/'
\ No newline at end of file diff --git a/releases/4.1.1.yaml b/releases/4.1.1.yaml deleted file mode 100644 index 38cafe669..000000000 --- a/releases/4.1.1.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '4.1.1' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/118/'
\ No newline at end of file diff --git a/releases/4.1.2-container.yaml b/releases/4.1.2-container.yaml deleted file mode 100644 index 9eae7d7cf..000000000 --- a/releases/4.1.2-container.yaml +++ /dev/null @@ -1,14 +0,0 @@ -distribution_type: 'container' -container_release_tag: '4.1.2' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/121/' -ref: 9fb87912f025e85b26c238d286d87e0e1c9c767a -containers: - - name: 'clamp-backend' - version: '4.1-STAGING-20190916T192828Z' - - name: 'clamp-frontend' - version: '4.1-STAGING-20190916T192828Z' - - name: 'clamp-dashboard-logstash' - version: '4.1-STAGING-20190916T192828Z' - - name: 'clamp-dashboard-kibana' - version: '4.1-STAGING-20190916T192828Z' diff --git a/releases/4.1.2.yaml b/releases/4.1.2.yaml deleted file mode 100644 index 845a675f7..000000000 --- a/releases/4.1.2.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '4.1.2' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/133/'
\ No newline at end of file diff --git a/releases/4.1.3-container.yaml b/releases/4.1.3-container.yaml deleted file mode 100644 index 3c8e3333d..000000000 --- a/releases/4.1.3-container.yaml +++ /dev/null @@ -1,14 +0,0 @@ -distribution_type: 'container' -container_release_tag: '4.1.3' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/156/' -ref: 13ab11a844d840025d153f7eac9109fbbe1c6b08 -containers: - - name: 'clamp-backend' - version: '4.1-STAGING-20191011T120231Z' - - name: 'clamp-frontend' - version: '4.1-STAGING-20191011T120231Z' - - name: 'clamp-dashboard-logstash' - version: '4.1-STAGING-20191011T120231Z' - - name: 'clamp-dashboard-kibana' - version: '4.1-STAGING-20191011T120231Z'
\ No newline at end of file diff --git a/releases/4.1.3.yaml b/releases/4.1.3.yaml deleted file mode 100644 index e7295a1e3..000000000 --- a/releases/4.1.3.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '4.1.3' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/168/' diff --git a/releases/5.0.0-container.yaml b/releases/5.0.0-container.yaml deleted file mode 100644 index 8755d9d88..000000000 --- a/releases/5.0.0-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.0.0' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/348/' -ref: a55638c236911d95ea0123a32321fcd9ed663fec -containers: - - name: 'clamp-backend' - version: '5.0-STAGING-20200325T162914Z' - - name: 'clamp-frontend' - version: '5.0-STAGING-20200325T162914Z'
\ No newline at end of file diff --git a/releases/5.0.0.yaml b/releases/5.0.0.yaml deleted file mode 100644 index f7e201b8b..000000000 --- a/releases/5.0.0.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.0.0' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/359/' diff --git a/releases/5.0.1-container.yaml b/releases/5.0.1-container.yaml deleted file mode 100644 index 1b3efa5c8..000000000 --- a/releases/5.0.1-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.0.1' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/358/' -ref: 1f613808ed283069fe6d0eaa55420c6166e88782 -containers: - - name: 'clamp-backend' - version: '5.0-STAGING-20200330T104105Z' - - name: 'clamp-frontend' - version: '5.0-STAGING-20200330T104105Z'
\ No newline at end of file diff --git a/releases/5.0.1.yaml b/releases/5.0.1.yaml deleted file mode 100644 index a8274da60..000000000 --- a/releases/5.0.1.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.0.1' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/369/' diff --git a/releases/5.0.2-container.yaml b/releases/5.0.2-container.yaml deleted file mode 100644 index a81ac8234..000000000 --- a/releases/5.0.2-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.0.2' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/366/' -ref: 847bc29e6bdcb987a7aabdc50c3a9609a65e2696 -containers: - - name: 'clamp-backend' - version: '5.0-STAGING-20200402T141610Z' - - name: 'clamp-frontend' - version: '5.0-STAGING-20200402T141610Z'
\ No newline at end of file diff --git a/releases/5.0.2.yaml b/releases/5.0.2.yaml deleted file mode 100644 index 326dfb182..000000000 --- a/releases/5.0.2.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.0.2' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/377/' diff --git a/releases/5.0.3-container.yaml b/releases/5.0.3-container.yaml deleted file mode 100644 index bda152288..000000000 --- a/releases/5.0.3-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.0.3' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/369/' -ref: cd46825cbd3a4ee82442ecc2873edd44cf4f4ccc -containers: - - name: 'clamp-backend' - version: '5.0-STAGING-20200403T163216Z' - - name: 'clamp-frontend' - version: '5.0-STAGING-20200403T163216Z'
\ No newline at end of file diff --git a/releases/5.0.3.yaml b/releases/5.0.3.yaml deleted file mode 100644 index c1e547132..000000000 --- a/releases/5.0.3.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.0.3' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/380/' diff --git a/releases/5.0.4-container.yaml b/releases/5.0.4-container.yaml deleted file mode 100644 index 94e8afaa1..000000000 --- a/releases/5.0.4-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.0.4' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/389/' -ref: 9698b59ab5eab72437d8a0f501b21da22b302df3 -containers: - - name: 'clamp-backend' - version: '5.0-STAGING-20200420T122047Z' - - name: 'clamp-frontend' - version: '5.0-STAGING-20200420T122047Z'
\ No newline at end of file diff --git a/releases/5.0.4.yaml b/releases/5.0.4.yaml deleted file mode 100644 index 335c79c77..000000000 --- a/releases/5.0.4.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.0.4' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/400/' diff --git a/releases/5.0.5-container.yaml b/releases/5.0.5-container.yaml deleted file mode 100644 index a808f11a9..000000000 --- a/releases/5.0.5-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.0.5' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/393/' -ref: 6c42be8a5b9a90c3a2c2907174d4264cf5606ac4 -containers: - - name: 'clamp-backend' - version: '5.0-STAGING-20200423T085725Z' - - name: 'clamp-frontend' - version: '5.0-STAGING-20200423T085725Z'
\ No newline at end of file diff --git a/releases/5.0.5.yaml b/releases/5.0.5.yaml deleted file mode 100644 index 8c6002412..000000000 --- a/releases/5.0.5.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.0.5' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/404/' diff --git a/releases/5.0.6-container.yaml b/releases/5.0.6-container.yaml deleted file mode 100644 index 640b407a2..000000000 --- a/releases/5.0.6-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.0.6' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/401/' -ref: 975dccc51b43b5a4019c45f448e63a110e3bd603 -containers: - - name: 'clamp-backend' - version: '5.0-STAGING-20200429T150857Z' - - name: 'clamp-frontend' - version: '5.0-STAGING-20200429T150857Z'
\ No newline at end of file diff --git a/releases/5.0.6.yaml b/releases/5.0.6.yaml deleted file mode 100644 index a85a8440d..000000000 --- a/releases/5.0.6.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.0.6' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/412/' diff --git a/releases/5.1.0-container.yaml b/releases/5.1.0-container.yaml deleted file mode 100644 index e3225a1da..000000000 --- a/releases/5.1.0-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.1.0' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/547/' -ref: 68af81034f311e6a25221648f48ae6db7c8e30b6 -containers: - - name: 'clamp-backend' - version: '5.1-STAGING-20200916T120440Z' - - name: 'clamp-frontend' - version: '5.1-STAGING-20200916T120440Z'
\ No newline at end of file diff --git a/releases/5.1.0.yaml b/releases/5.1.0.yaml deleted file mode 100644 index be1a674e1..000000000 --- a/releases/5.1.0.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.1.0' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/560/' diff --git a/releases/5.1.1-container.yaml b/releases/5.1.1-container.yaml deleted file mode 100644 index 9a3f2df57..000000000 --- a/releases/5.1.1-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.1.1' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/561/' -ref: f01d3e8377fa4e5a9c1b129fe446575d132f91c2 -containers: - - name: 'clamp-backend' - version: '5.1-STAGING-20200928T134358Z' - - name: 'clamp-frontend' - version: '5.1-STAGING-20200928T134358Z'
\ No newline at end of file diff --git a/releases/5.1.1.yaml b/releases/5.1.1.yaml deleted file mode 100644 index f824ca5dd..000000000 --- a/releases/5.1.1.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.1.1' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/574/' diff --git a/releases/5.1.2-container.yaml b/releases/5.1.2-container.yaml deleted file mode 100644 index e5e0d23ea..000000000 --- a/releases/5.1.2-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.1.2' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/567/' -ref: a0ca2c419569fb506def4d4403721e0c028eb445 -containers: - - name: 'clamp-backend' - version: '5.1-STAGING-20200930T164942Z' - - name: 'clamp-frontend' - version: '5.1-STAGING-20200930T164942Z'
\ No newline at end of file diff --git a/releases/5.1.2.yaml b/releases/5.1.2.yaml deleted file mode 100644 index 5a7c4b342..000000000 --- a/releases/5.1.2.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.1.2' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/580/' diff --git a/releases/5.1.3-container.yaml b/releases/5.1.3-container.yaml deleted file mode 100644 index 2ae7b26ae..000000000 --- a/releases/5.1.3-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.1.3' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/583/' -ref: b8e09541437ff14e9f89c2211aafdee348d07bc9 -containers: - - name: 'clamp-backend' - version: '5.1-STAGING-20201012T132336Z' - - name: 'clamp-frontend' - version: '5.1-STAGING-20201012T132336Z'
\ No newline at end of file diff --git a/releases/5.1.3.yaml b/releases/5.1.3.yaml deleted file mode 100644 index e50cdc1cd..000000000 --- a/releases/5.1.3.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.1.3' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/596/' diff --git a/releases/5.1.4-container.yaml b/releases/5.1.4-container.yaml deleted file mode 100644 index 39c8219c7..000000000 --- a/releases/5.1.4-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.1.4' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/600/' -ref: 011b25b15daebaf1e46d2b0d94c522f2dc9c67f5 -containers: - - name: 'clamp-backend' - version: '5.1-STAGING-20201023T130443Z' - - name: 'clamp-frontend' - version: '5.1-STAGING-20201023T130443Z'
\ No newline at end of file diff --git a/releases/5.1.4.yaml b/releases/5.1.4.yaml deleted file mode 100644 index 902c89214..000000000 --- a/releases/5.1.4.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.1.4' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/613/' diff --git a/releases/5.1.5-container.yaml b/releases/5.1.5-container.yaml deleted file mode 100644 index 28063f0cb..000000000 --- a/releases/5.1.5-container.yaml +++ /dev/null @@ -1,10 +0,0 @@ -distribution_type: 'container' -container_release_tag: '5.1.5' -project: 'clamp' -log_dir: 'clamp-maven-docker-stage-master/619/' -ref: 3dea3819d871c525facf246507b84fd04b468f11 -containers: - - name: 'clamp-backend' - version: '5.1-STAGING-20201110T120439Z' - - name: 'clamp-frontend' - version: '5.1-STAGING-20201110T120439Z'
\ No newline at end of file diff --git a/releases/5.1.5.yaml b/releases/5.1.5.yaml deleted file mode 100644 index e0a3e7b07..000000000 --- a/releases/5.1.5.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -distribution_type: 'maven' -version: '5.1.5' -project: 'clamp' -log_dir: 'clamp-maven-stage-master/632/' diff --git a/src/main/docker/backend/Dockerfile b/src/main/docker/backend/Dockerfile index 8712f1934..63268d805 100644 --- a/src/main/docker/backend/Dockerfile +++ b/src/main/docker/backend/Dockerfile @@ -24,7 +24,7 @@ FROM onap/integration-java11:7.1.0
MAINTAINER "The Onap Team"
-LABEL Description="This image contains alpine, openjdk 11 and clamp"
+LABEL Description="This image contains alpine, openjdk 11 and policy clamp"
ARG http_proxy
ARG https_proxy
@@ -32,14 +32,16 @@ ENV HTTP_PROXY=$http_proxy ENV HTTPS_PROXY=$https_proxy
ENV http_proxy=$HTTP_PROXY
ENV https_proxy=$HTTPS_PROXY
+
USER root
-RUN mkdir /opt/clamp
-RUN chown -R onap:onap /opt/clamp
-VOLUME /opt/clamp/config
+RUN mkdir -p /opt/policy/clamp && \
+ chown -R onap:onap /opt/policy/clamp
+
+VOLUME /opt/policy/clamp/config
-COPY --chown=onap:onap onap-clamp-backend/clamp.jar /opt/clamp/app.jar
+COPY --chown=onap:onap onap-policy-clamp-backend/policy-clamp-backend.jar /opt/policy/clamp/policy-clamp-backend.jar
USER onap
-WORKDIR /opt/clamp/
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=75","-jar" ,"./app.jar"]
\ No newline at end of file +WORKDIR /opt/policy/clamp/
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50.0", "-XX:MaxRAMPercentage=75.0","-jar" ,"./policy-clamp-backend.jar"]
\ No newline at end of file diff --git a/src/main/docker/frontend/Dockerfile b/src/main/docker/frontend/Dockerfile index 660fb8240..e67495350 100644 --- a/src/main/docker/frontend/Dockerfile +++ b/src/main/docker/frontend/Dockerfile @@ -25,9 +25,9 @@ FROM node:12.10.0-alpine as build
WORKDIR /app
#ENV PATH /app/node_modules/.bin:$PATH
-COPY onap-clamp-frontend/ /app/
-RUN npm install --silent
-RUN npm run build
+COPY onap-policy-clamp-frontend/ /app/
+RUN npm install --silent && \
+ npm run build
FROM nginx:1.17.0-alpine
@@ -41,14 +41,17 @@ ENV HTTPS_PROXY=$https_proxy ENV http_proxy=$HTTP_PROXY
ENV https_proxy=$HTTPS_PROXY
-RUN addgroup onap && adduser -D -G onap clamp
-RUN mkdir /var/log/onap
-RUN chmod a+rwx /var/log/onap
+RUN addgroup onap && \
+ adduser -D -G onap clamp && \
+ mkdir /var/log/onap && \
+ chmod a+rwx /var/log/onap
COPY --from=build /app/build /usr/share/nginx/html
COPY --from=build /app/ssl /etc/ssl
-RUN rm /etc/nginx/conf.d/default.conf
-RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log
+
+RUN rm /etc/nginx/conf.d/default.conf && \
+ ln -sf /dev/stdout /var/log/nginx/access.log && \
+ ln -sf /dev/stderr /var/log/nginx/error.log
COPY nginx/nginx.conf /etc/nginx/nginx.conf
COPY nginx/default.conf /etc/nginx/conf.d/default.conf
@@ -58,8 +61,8 @@ WORKDIR /app RUN chown -R clamp:onap /app && chmod -R 755 /app && \
chown -R clamp:onap /var/cache/nginx && \
chown -R clamp:onap /var/log/nginx && \
- chown -R clamp:onap /etc/nginx/conf.d
-RUN touch /var/run/nginx.pid && \
+ chown -R clamp:onap /etc/nginx/conf.d && \
+ touch /var/run/nginx.pid && \
chown -R clamp:onap /var/run/nginx.pid
USER clamp
diff --git a/src/main/resources/boot-message.txt b/src/main/resources/boot-message.txt index ef1478b93..b0d68e04c 100644 --- a/src/main/resources/boot-message.txt +++ b/src/main/resources/boot-message.txt @@ -1,12 +1,21 @@ - ____ ____ ____ ____ _________ ____ ____ ____ ____ ____ ____ -||O |||N |||A |||P ||| |||G |||u |||i |||l |||i |||n || -||__|||__|||__|||__|||_______|||__|||__|||__|||__|||__|||__|| -|/__\|/__\|/__\|/__\|/_______\|/__\|/__\|/__\|/__\|/__\|/__\| - _________ ____ ____ ____ ____ ____ - || |||C |||L |||A |||M |||P || - ||_______|||__|||__|||__|||__|||__|| - |/_______\|/__\|/__\|/__\|/__\|/__\| + ___ ____ ____ ____ __ __ ___ ____ ___ _ __ __ _ __ __ + / \ | \ / T| \ | T T / \ | \ / \ | T | T T| T | T T +Y Y| _ YY o || o ) | l |Y Y| _ YY Y| | | | || | | | | +| O || | || || _/ | _ || O || | || O || l___ | | || l___ | | | +| || | || _ || | | | || || | || || T| : || T| : | +l !| | || | || | | | |l !| | |l !| |l || |l | + \___/ l__j__jl__j__jl__j l__j__j \___/ l__j__j \___/ l_____j \__,_jl_____j \__,_j + + ____ ___ _ ____ __ __ __ __ _ ____ ___ ___ ____ +| \ / \ | T l j / ]| T T / ]| T / T| T T| \ +| o )Y Y| | | T / / | | | _____ / / | | Y o || _ _ || o ) +| _/ | O || l___ | | / / | ~ || | / / | l___ | || \_/ || _/ +| | | || T | |/ \_ l___, |l_____j/ \_ | T| _ || | || | +| | l !| | j l\ || ! \ || || | || | || | +l__j \___/ l_____j|____j\____jl____/ \____jl_____jl__j__jl___j___jl__j + + :: Starting ::
\ No newline at end of file |