Integrate AAF 87/50687/4
authorxg353y <xg353y@intl.att.com>
Wed, 6 Jun 2018 13:50:33 +0000 (15:50 +0200)
committerSébastien Determe <sd378r@intl.att.com>
Mon, 11 Jun 2018 12:34:59 +0000 (12:34 +0000)
Update aaf dependency version; fix a bug in UI; remove logout page;
update default certificates

Issue-ID: CLAMP-103
Change-Id: I3bdd45730f616165d7a484033c5102241f872c1d
Signed-off-by: xg353y <xg353y@intl.att.com>
15 files changed:
pom.xml
src/main/java/org/onap/clamp/clds/config/SSLConfiguration.java
src/main/java/org/onap/clamp/clds/config/spring/CldsSecurityConfigUsers.java [deleted file]
src/main/resources/META-INF/resources/designer/invalid_login.html
src/main/resources/META-INF/resources/designer/logout.html [deleted file]
src/main/resources/META-INF/resources/designer/partials/menu.html
src/main/resources/META-INF/resources/designer/scripts/app.js
src/main/resources/META-INF/resources/designer/scripts/authcontroller.js
src/main/resources/META-INF/resources/designer/timeout.html [deleted file]
src/main/resources/application-noaaf.properties
src/main/resources/application.properties
src/main/resources/clds/aaf/clamp@clamp.onap.org.p12 [deleted file]
src/main/resources/clds/aaf/org.onap.clamp.p12 [new file with mode: 0644]
src/main/resources/clds/aaf/truststoreONAP.p12 [deleted file]
src/main/resources/clds/aaf/truststoreONAPall.jks [new file with mode: 0644]

diff --git a/pom.xml b/pom.xml
index c8dd223..6a58cb7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
                                <dependency>
                                        <groupId>org.onap.aaf.authz</groupId>
                                        <artifactId>aaf-cadi-aaf</artifactId>
-                                       <version>2.1.0</version>
+                                       <version>2.1.1</version>
                                        <exclusions>
                                                <exclusion>
                                                        <groupId>javax.servlet</groupId>
index f1d50c7..6a97f23 100644 (file)
@@ -34,11 +34,11 @@ public class SSLConfiguration {
     private static final String TRUST_STORE_PW = "javax.net.ssl.trustStorePassword";
     private static final String TRUST_STORE_TYPE = "javax.net.ssl.trustStoreType";
 
-    @Value("${server.ssl.trust:/opt/app/osaaf/client/local/truststoreONAP.p12}")
+    @Value("${server.ssl.trust:none}")
     private String sslTruststoreFile;
-    @Value("${server.ssl.trust-password:changeit}")
+    @Value("${server.ssl.trust-password:none}")
     private String sslTruststorePw;
-    @Value("${server.ssl.trust-type:PKCS12}")
+    @Value("${server.ssl.trust-type:none}")
     private String sslTruststoreType;
 
     @PostConstruct
diff --git a/src/main/java/org/onap/clamp/clds/config/spring/CldsSecurityConfigUsers.java b/src/main/java/org/onap/clamp/clds/config/spring/CldsSecurityConfigUsers.java
deleted file mode 100644 (file)
index e69de29..0000000
index 5d6e955..eb7d828 100644 (file)
@@ -32,9 +32,9 @@
 <head>
        <title>CLDS</title>
 </head>
-<div>
+<div id='main'>
        <div class="divRow"><b>Login Failed!</b></div>
-       <div class="divRow"><b>You are not authorized to access CLAMP UI, please contact CLAMP administrator.</b></div>
-
-       <div class="divRow">To login again, please click <a href="/designer/index.html"/>Login</a></div>
+       <div class="divRow">You are not authorized to access CLAMP UI, please contact CLAMP administrator.</div>
+       <div class="divRow">Please <a href="/designer/index.html"/>Login</a> again.</div>
+</div>
 </div>
diff --git a/src/main/resources/META-INF/resources/designer/logout.html b/src/main/resources/META-INF/resources/designer/logout.html
deleted file mode 100644 (file)
index e175928..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ONAP CLAMP
-  ================================================================================
-  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============================================
-  ===================================================================
-  
-  -->
-<style>
-.divRow {
-       margin-left: 5px;
-       font-size: 13px;
-       font-weight: normal;
-       margin-top:10px;
-}
-</style>
-
-<head>
-       <title>CLDS</title>
-</head>
-<div ng-controller="AuthenticateCtrl" ng-init="logout()"> 
-       <div id='main'>
-               <div class="divRow"><b>You have been Logged Out successfully!</b></div>
-               <div class="divRow">To login again, please click <a href="/designer/index.html"/>Login</a></div>
-       </div>
-</div>
index 2aea316..036402c 100644 (file)
                                                        id="{{section.name}}" role="presentation"
                                                        ng-click="emptyMenuClick(section.link,section.name)">{{section.name}}</a>
                                                </li>
-                                               
-                                               <li ng-repeat="section in tabs[dropDownName]"
-                                                       ng-if="section.name==='Log Out'"><a
-                                                       id="{{section.name}}" role="presentation"
-                                                       ng-click="emptyMenuClick(section.link,section.name)">{{section.name}}</a>
-                                               </li>
 
                                                <li ng-repeat="section in tabs[dropDownName]"
                                                        ng-if="section.name != 'Create CL' && section.name != 'Open CL' && section.name != 'ECOMP User Guide - Design Overview' && section.name != 'ECOMP User Guide - Closed Loop Design' && section.name != 'ECOMP User Guide - CLAMP' && section.name != 'User Info'"><a
index 63d44d5..7953ccc 100644 (file)
@@ -325,8 +325,6 @@ var app = angular.module('clds-app', ['ngRoute',
               window.open(value);
             } else if (name == "Contact Us") {
               $rootScope.contactUs();
-            } else if (name == "Log Out") {
-              $scope.logout();
             } else if (name == "Revert Model Changes") {
               $scope.cldsRevertModel();
             } else if (name == "Close Model") {
@@ -446,10 +444,6 @@ var app = angular.module('clds-app', ['ngRoute',
           }, {
             link: "/extraUserInfo",
             name: "User Info"
-          }],
-          "Log Out": [{
-            link: "/log_out.html",
-            name: "Log Out"
           }]
         };
 
@@ -1416,4 +1410,5 @@ function updateDecisionLabel(originalLabel, newLabel) {
 window.onunload = function() {
   window.localStorage.removeItem("isAuth");
   window.localStorage.removeItem("loginuser");
+  window.localStorage.removeItem("invalidUser");
 };
index c1a52f9..5992138 100644 (file)
@@ -30,7 +30,7 @@ function AuthenticateCtrl($scope, $rootScope, $window, $resource, $http, $locati
     var invalidUser = $window.localStorage.getItem("invalidUser");
     var isAuth = $window.localStorage.getItem("isAuth");
     if (invalidUser == 'true')
-       return "invalid_login.html";
+      return "invalid_login.html";
     else if (isAuth == null || isAuth == 'false') {
       return "authenticate.html";
     }
@@ -44,17 +44,13 @@ function AuthenticateCtrl($scope, $rootScope, $window, $resource, $http, $locati
       if (data) {
         $window.localStorage.setItem("isAuth", true);
         $rootScope.loginuser = data;
-      } 
+      }
+      window.localStorage.removeItem("invalidUser");
       callback && callback();
     }).error(function() {
       $window.localStorage.setItem("invalidUser", true);
       callback && callback();
     });
   };
-  
-  $scope.logout = function() {
-      window.localStorage.removeItem("isAuth");
-      window.localStorage.removeItem("loginuser");
-  };
 
 }
diff --git a/src/main/resources/META-INF/resources/designer/timeout.html b/src/main/resources/META-INF/resources/designer/timeout.html
deleted file mode 100644 (file)
index ce3002b..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ONAP CLAMP
-  ================================================================================
-  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============================================
-  ===================================================================
-  
-  -->
-<style>
-.divRow {
-       margin-left: 5px;
-       font-size: 13px;
-       font-weight: normal;
-       margin-top:10px;
-}
-</style>
-
-<head>
-       <title>CLDS</title>
-       <script language="javascript">
-               function buttonVilibility()  
-               {
-                       if (window.opener && window.opener !== window) {
-                                       document.getElementById("boton1").style.visibility="visible";  
-                       } else {
-                                       document.getElementById("boton1").style.visibility="hidden";  
-                       }
-               }
-       </script>
-</head>
-<body onload='buttonVilibility()'>
-<div ng-controller="AuthenticateCtrl" ng-init="logout()"> 
-       <div id='main'>
-               <div class="divRow"><b>Your session is timeout.</b></div>
-               <div class="divRow">Please <a href="/designer/index.html"/>Login</a> again.</div>
-       </div>
-       <div>
-               <button id="boton1" ng-click="close(true)" class="btn btn-primary">Close</button>
-       </div>
-</div>
-</body>
index 197f003..8d0395b 100644 (file)
-###\r
-# ============LICENSE_START=======================================================\r
-# ONAP CLAMP\r
-# ================================================================================\r
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights\r
-#                             reserved.\r
-# ================================================================================\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-# http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-# ============LICENSE_END============================================\r
-# ===================================================================\r
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
-###\r
-\r
-info.build.artifact=@project.artifactId@\r
-info.build.name=@project.name@\r
-info.build.description=@project.description@\r
-info.build.version=@project.version@\r
-### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time).\r
-### (See below for the parameter 'server.http.port' if you want to have both enabled)\r
-### To have only HTTP, keep the lines server.ssl.* commented\r
-### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location\r
-#server.port=8080\r
-### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port')\r
-#server.ssl.key-store=file:/tmp/mykey.jks\r
-#server.ssl.key-store-password=pass\r
-#server.ssl.key-password=pass\r
-\r
-### In order to be user friendly when HTTPS is enabled,\r
-### you can add another HTTP port that will be automatically redirected to HTTPS\r
-### by enabling this parameter (server.http.port) and set it to another port (80 or 8080, 8090, etc ...)\r
-#server.http-to-https-redirection.port=8090\r
-\r
-### HTTP Example:\r
-###--------------\r
-server.port=8080\r
-\r
-\r
-### HTTP (Redirected to HTTPS) and HTTPS Example:\r
-### --------------------------------------------\r
-### server.port=8443           <-- The HTTPS port\r
-### server.ssl.key-store=file:/tmp/mykey.jks\r
-### server.ssl.key-store-password=mypass\r
-### server.ssl.key-password=mypass\r
-### server.http-to-https-redirection.port=8080\r
-\r
-server.contextPath=/\r
-#Modified engine-rest applicationpath\r
-spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller\r
-\r
-#The max number of active threads in this pool\r
-server.tomcat.max-threads=200\r
-#The minimum number of threads always kept alive\r
-server.tomcat.min-Spare-Threads=25\r
-#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads\r
-server.tomcat.max-idle-time=60000\r
-server.tomcat.clientAuth=want\r
-#Servlet context parameters\r
-server.context_parameters.p-name=value #context parameter with p-name as key and value as value.\r
-\r
-camel.springboot.consumer-template-cache-size=1000\r
-camel.springboot.producer-template-cache-size=1000\r
-camel.springboot.jmx-enabled=false\r
-camel.defaultthreadpool.poolsize=10\r
-camel.defaultthreadpool.maxpoolsize=20\r
-camel.defaultthreadpool.maxqueuesize=1000\r
-camel.defaultthreadpool.keepaliveTime=60\r
-camel.defaultthreadpool.rejectpolicy=CallerRuns\r
-#camel.springboot.xmlRoutes = false\r
-camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml\r
-#camel.springboot.typeConversion = false\r
-\r
-#clds datasource connection details\r
-spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver\r
-spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3\r
-spring.datasource.cldsdb.username=clds\r
-spring.datasource.cldsdb.password=4c90a0b48204383f4283448d23e0b885a47237b2a23588e7c4651604f51c1067\r
-spring.datasource.cldsdb.validationQuery=SELECT 1\r
-spring.datasource.cldsdb.validationQueryTimeout=20000\r
-spring.datasource.cldsdb.validationInterval=30000\r
-spring.datasource.cldsdb.testWhileIdle = true\r
-spring.datasource.cldsdb.minIdle = 0\r
-spring.datasource.cldsdb.initialSize=0\r
-# Automatically test whether a connection provided is good or not\r
-spring.datasource.cldsdb.testOnBorrow=true\r
-spring.datasource.cldsdb.ignoreExceptionOnPreLoad=true\r
-\r
-#Async Executor default Parameters\r
-async.core.pool.size=10\r
-async.max.pool.size=20\r
-async.queue.capacity=500\r
-\r
-clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties\r
-clamp.config.files.cldsUsers=classpath:/clds/clds-users.json\r
-clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json\r
-clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json\r
-\r
-# Properties for Clamp\r
-# DCAE request build properties\r
-#\r
-clamp.config.dcae.template=classpath:/clds/templates/dcae-template.json\r
-clamp.config.dcae.decode.service_ids=classpath:/clds/templates/dcae-decode-service_ids.json\r
-clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment-template.json\r
-#\r
-# SDC request blueprint properties\r
-#\r
-clamp.config.sdc.template=classpath:/clds/templates/sdc-template.json\r
-clamp.config.sdc.decode.service_ids=classpath:/clds/templates/sdc-decode-service_ids.json\r
-#\r
-#\r
-# Configuration Settings for Policy Engine Components\r
-clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
-clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
-clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123\r
-clamp.config.policy.notificationType=websocket\r
-clamp.config.policy.notificationUebServers=localhost\r
-clamp.config.policy.notificationTopic=\r
-clamp.config.policy.clientId=myclientid\r
-# base64 encoding\r
-\r
-clamp.config.policy.clientKey=5CE79532B3A2CB4D132FC0C04BF916A7\r
-#DEVL for development\r
-#TEST for Test environments\r
-#PROD for prod environments\r
-clamp.config.policy.policyEnvironment=TEST\r
-# General Policy request properties\r
-#\r
-clamp.config.policy.onap.name=DCAE\r
-clamp.config.policy.pdp.group=default\r
-clamp.config.policy.ms.type=MicroService\r
-clamp.config.policy.ms.policyNamePrefix=Config_MS_\r
-clamp.config.policy.op.policyNamePrefix=Config_BRMS_Param_\r
-clamp.config.policy.base.policyNamePrefix=Config_\r
-clamp.config.policy.op.type=BRMS_Param\r
-\r
-\r
-# TCA MicroService Policy request build properties\r
-#\r
-clamp.config.tca.policyid.prefix=DCAE.Config_\r
-clamp.config.tca.policy.template=classpath:/clds/templates/tca-policy-template.json\r
-clamp.config.tca.template=classpath:/clds/templates/tca-template.json\r
-clamp.config.tca.thresholds.template=classpath:/clds/templates/tca-thresholds-template.json\r
-\r
-#\r
-#\r
-# Operational Policy request build properties\r
-#\r
-clamp.config.op.policyDescription=from clds\r
-# default\r
-clamp.config.op.templateName=ClosedLoopvUSP\r
-clamp.config.op.operationTopic=APPC-CL\r
-clamp.config.op.notificationTopic=POLICY-CL-MGT\r
-clamp.config.op.controller=amsterdam\r
-clamp.config.op.policy.appc=APPC\r
-# by service: vSCP\r
-clamp.config.op.templateName.vSCP=ClosedLoopTemplate\r
-clamp.config.op.controller.vSCP=1607-f5fw\r
-clamp.config.op.eNodeB.templateName=ClosedLoopControlName\r
-clamp.config.op.eNodeB.operationTopic=com.onap.sdnr.RanCLRequest-v00\r
-clamp.config.op.eNodeB.notificationTopic=com.onap-policy.IST-ENODEB-CL\r
-clamp.config.op.eNodeB.controller=amsterdam\r
-clamp.config.op.eNodeB.recipe=classpath:/clds/templates/op-eNodeB-recipe.json\r
-clamp.config.op.eNodeB.timeWindow=35\r
-clamp.config.op.eNodeB.limit=2\r
-clamp.config.op.eNodeB.period=10s\r
-#\r
-# Sdc service properties\r
-clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/\r
-clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080\r
-clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services\r
-clamp.config.sdc.serviceUsername=clamp\r
-clamp.config.sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981\r
-clamp.config.sdc.artifactLabel=blueprintclampcockpit\r
-clamp.config.sdc.sdcX-InstanceID=CLAMP\r
-clamp.config.sdc.artifactType=DCAE_INVENTORY_BLUEPRINT\r
-clamp.config.sdc.locationArtifactLabel=locationclampcockpit\r
-clamp.config.sdc.locationArtifactType=DCAE_INVENTORY_JSON\r
-clamp.config.sdc.InstanceID=X-ECOMP-InstanceID\r
-clamp.config.sdc.header.requestId = X-ECOMP-RequestID\r
-#\r
-clamp.config.sdc.csarFolder = /tmp/sdc-controllers\r
-clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json\r
-#\r
-clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json\r
-clamp.config.ui.alarm.default=classpath:/clds/templates/ui-alarm-default.json\r
-#\r
-# if action.test.override is true, then any action will be marked as test=true (even if incoming action request had test=false); otherwise, test flag will be unchanged on the action request\r
-clamp.config.action.test.override=false\r
-# if action.insert.test.event is true, then insert event even if the action is set to test\r
-clamp.config.action.insert.test.event=false\r
-clamp.config.clds.service.cache.invalidate.after.seconds=120\r
-\r
-#DCAE Inventory Url Properties\r
-clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080\r
-clamp.config.dcae.intentory.retry.interval=10000\r
-clamp.config.dcae.intentory.retry.limit=3\r
-\r
-#DCAE Dispatcher Url Properties\r
-clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8080\r
-clamp.config.dcae.header.requestId = X-ECOMP-RequestID\r
-\r
-clamp.config.security.permission.instance=dev\r
-\r
-#AAF related parameters\r
-clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl\r
-clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage\r
-clamp.config.security.permission.type.cl.event=org.onap.clds.cl.event\r
-clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf\r
-clamp.config.security.permission.type.template=org.onap.clamp.clds.template\r
-\r
+###
+# ============LICENSE_START=======================================================
+# ONAP CLAMP
+# ================================================================================
+# Copyright (C) 2017-2018 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============================================
+# ===================================================================
+#
+###
+
+info.build.artifact=@project.artifactId@
+info.build.name=@project.name@
+info.build.description=@project.description@
+info.build.version=@project.version@
+
+### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time).
+### (See below for the parameter 'server.http.port' if you want to have both enabled)
+### To have only HTTP, keep the lines server.ssl.* commented
+### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location
+### server.port=8080
+### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port')
+#server.ssl.key-store=file:/tmp/mykey.jks
+#server.ssl.key-store-password=pass
+#server.ssl.key-password=pass
+
+### In order to be user friendly when HTTPS is enabled,
+### you can add another HTTP port that will be automatically redirected to HTTPS
+### by enabling this parameter (server.http.port) and set it to another port (80 or 8080, 8090, etc ...)
+#server.http-to-https-redirection.port=8090
+
+### HTTP Example:
+###--------------
+### server.port=8080
+
+### HTTPS Example:
+### --------------
+### server.port=8443
+### server.ssl.key-store=file:/tmp/mykey.jks
+### server.ssl.key-store-password=mypass
+### server.ssl.key-password=mypass
+server.port=8443
+server.ssl.client-auth=want
+server.ssl.key-store=file:/opt/clamp/config/org.onap.clamp.p12
+server.ssl.key-store-password=China in the Spring
+server.ssl.key-password=China in the Spring
+server.ssl.key-store-type=PKCS12
+server.ssl.trust=/opt/clamp/config/truststoreONAPall.jks
+server.ssl.trust-pass=changeit
+server.ssl.trust-type=JKS
+server.ssl.key-alias=clamp@clamp.onap.org
+server.http-to-https-redirection.port=8080
+
+server.contextPath=/
+#Modified engine-rest applicationpath
+spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller
+
+#The max number of active threads in this pool
+server.tomcat.max-threads=200
+#The minimum number of threads always kept alive
+server.tomcat.min-Spare-Threads=25
+#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads
+server.tomcat.max-idle-time=60000
+
+#Servlet context parameters
+server.context_parameters.p-name=value #context parameter with p-name as key and value as value.
+
+camel.springboot.consumer-template-cache-size=1000
+camel.springboot.producer-template-cache-size=1000
+camel.springboot.jmx-enabled=false
+camel.defaultthreadpool.poolsize=10
+camel.defaultthreadpool.maxpoolsize=20
+camel.defaultthreadpool.maxqueuesize=1000
+camel.defaultthreadpool.keepaliveTime=60
+camel.defaultthreadpool.rejectpolicy=CallerRuns
+#camel.springboot.xmlRoutes = false
+camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml
+#camel.springboot.typeConversion = false
+
+#clds datasource connection details
+spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver
+spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3
+spring.datasource.cldsdb.username=clds
+spring.datasource.cldsdb.password=4c90a0b48204383f4283448d23e0b885a47237b2a23588e7c4651604f51c1067
+spring.datasource.cldsdb.validationQuery=SELECT 1
+spring.datasource.cldsdb.validationQueryTimeout=20000
+spring.datasource.cldsdb.validationInterval=30000
+spring.datasource.cldsdb.testWhileIdle = true
+spring.datasource.cldsdb.minIdle = 0
+spring.datasource.cldsdb.initialSize=0
+# Automatically test whether a connection provided is good or not
+spring.datasource.cldsdb.testOnBorrow=true
+spring.datasource.cldsdb.ignoreExceptionOnPreLoad=true
+
+#Async Executor default Parameters
+async.core.pool.size=10
+async.max.pool.size=20
+async.queue.capacity=500
+
+clamp.config.log.path=/var/log/onap
+clamp.config.files.systemProperties=classpath:/system.properties
+clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
+clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
+clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
+
+# Properties for Clamp
+# DCAE request build properties
+#
+clamp.config.dcae.template=classpath:/clds/templates/dcae-template.json
+clamp.config.dcae.decode.service_ids=classpath:/clds/templates/dcae-decode-service_ids.json
+clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment-template.json
+#
+# SDC request blueprint properties
+#
+clamp.config.sdc.template=classpath:/clds/templates/sdc-template.json
+clamp.config.sdc.decode.service_ids=classpath:/clds/templates/sdc-decode-service_ids.json
+#
+#
+# Configuration Settings for Policy Engine Components
+clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
+clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
+clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123
+clamp.config.policy.notificationType=websocket
+clamp.config.policy.notificationUebServers=localhost
+clamp.config.policy.notificationTopic=PDPD-CONFIGURATION
+clamp.config.policy.clientId=python
+# base64 encoding
+
+clamp.config.policy.clientKey=dGVzdA==
+#DEVL for development
+#TEST for Test environments
+#PROD for prod environments
+clamp.config.policy.policyEnvironment=TEST
+# General Policy request properties
+#
+clamp.config.policy.onap.name=DCAE
+clamp.config.policy.pdp.group=default
+clamp.config.policy.ms.type=MicroService
+clamp.config.policy.ms.policyNamePrefix=Config_MS_
+clamp.config.policy.op.policyNamePrefix=Config_BRMS_Param_
+clamp.config.policy.base.policyNamePrefix=Config_
+clamp.config.policy.op.type=BRMS_Param
+
+
+# TCA MicroService Policy request build properties
+#
+clamp.config.tca.policyid.prefix=DCAE.Config_
+clamp.config.tca.policy.template=classpath:/clds/templates/tca-policy-template.json
+clamp.config.tca.template=classpath:/clds/templates/tca-template.json
+clamp.config.tca.thresholds.template=classpath:/clds/templates/tca-thresholds-template.json
+
+#
+#
+# Operational Policy request build properties
+#
+clamp.config.op.policyDescription=from clds
+# default
+clamp.config.op.templateName=ClosedLoopControlName
+clamp.config.op.operationTopic=APPC-CL
+clamp.config.op.notificationTopic=POLICY-CL-MGT
+clamp.config.op.controller=amsterdam
+clamp.config.op.policy.appc=APPC
+#
+# Sdc service properties
+clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/
+clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080
+clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services
+clamp.config.sdc.serviceUsername=clamp
+clamp.config.sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981
+clamp.config.sdc.artifactLabel=blueprintclampcockpit
+clamp.config.sdc.sdcX-InstanceID=CLAMP
+clamp.config.sdc.artifactType=DCAE_INVENTORY_BLUEPRINT
+clamp.config.sdc.locationArtifactLabel=locationclampcockpit
+clamp.config.sdc.locationArtifactType=DCAE_INVENTORY_JSON
+clamp.config.sdc.InstanceID=X-ECOMP-InstanceID
+clamp.config.sdc.header.requestId = X-ECOMP-RequestID
+#
+clamp.config.sdc.csarFolder = /tmp/sdc-controllers
+clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json
+#
+clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json
+clamp.config.ui.alarm.default=classpath:/clds/templates/ui-alarm-default.json
+#
+# if action.test.override is true, then any action will be marked as test=true (even if incoming action request had test=false); otherwise, test flag will be unchanged on the action request
+clamp.config.action.test.override=false
+# if action.insert.test.event is true, then insert event even if the action is set to test
+clamp.config.action.insert.test.event=false
+clamp.config.clds.service.cache.invalidate.after.seconds=120
+
+#DCAE Inventory Url Properties
+clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080
+clamp.config.dcae.intentory.retry.interval=10000
+clamp.config.dcae.intentory.retry.limit=3
+
+#DCAE Dispatcher Url Properties
+clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8188
+clamp.config.dcae.dispatcher.retry.interval=10000
+clamp.config.dcae.dispatcher.retry.limit=10
+clamp.config.dcae.header.requestId = X-ECOMP-RequestID
+
+#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !
+clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl
+clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage
+clamp.config.security.permission.type.cl.event=org.onap.clds.cl.event
+clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf
+clamp.config.security.permission.type.template=org.onap.clamp.clds.template
+#This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
+clamp.config.security.permission.instance=dev
index fd61bad..9a9bd28 100644 (file)
@@ -56,13 +56,13 @@ info.build.version=@project.version@
 ### --------------------------------------------\r
 server.port=8443\r
 server.ssl.client-auth=want\r
-server.ssl.key-store=file:/opt/clamp/config/clamp@clamp.onap.org.p12\r
+server.ssl.key-store=file:/opt/clamp/config/org.onap.clamp.p12\r
 server.ssl.key-store-password=China in the Spring\r
 server.ssl.key-password=China in the Spring\r
 server.ssl.key-store-type=PKCS12\r
-server.ssl.trust=/opt/clamp/config/truststoreONAP.p12\r
+server.ssl.trust=/opt/clamp/config/truststoreONAPall.jks\r
 server.ssl.trust-pass=changeit\r
-server.ssl.trust-type=PKCS12\r
+server.ssl.trust-type=JKS\r
 server.ssl.key-alias=clamp@clamp.onap.org\r
 server.http-to-https-redirection.port=8080\r
 \r
diff --git a/src/main/resources/clds/aaf/clamp@clamp.onap.org.p12 b/src/main/resources/clds/aaf/clamp@clamp.onap.org.p12
deleted file mode 100644 (file)
index bf3de7a..0000000
Binary files a/src/main/resources/clds/aaf/clamp@clamp.onap.org.p12 and /dev/null differ
diff --git a/src/main/resources/clds/aaf/org.onap.clamp.p12 b/src/main/resources/clds/aaf/org.onap.clamp.p12
new file mode 100644 (file)
index 0000000..5cd7594
Binary files /dev/null and b/src/main/resources/clds/aaf/org.onap.clamp.p12 differ
diff --git a/src/main/resources/clds/aaf/truststoreONAP.p12 b/src/main/resources/clds/aaf/truststoreONAP.p12
deleted file mode 100644 (file)
index d01e856..0000000
Binary files a/src/main/resources/clds/aaf/truststoreONAP.p12 and /dev/null differ
diff --git a/src/main/resources/clds/aaf/truststoreONAPall.jks b/src/main/resources/clds/aaf/truststoreONAPall.jks
new file mode 100644 (file)
index 0000000..2da1dcc
Binary files /dev/null and b/src/main/resources/clds/aaf/truststoreONAPall.jks differ