Fixing broken connection between api & bpmn-infra

Change-Id: I3ac58fe0e49aa1fb16d8f240120e093a2d78de95
Issue-ID: SO-3674
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

3 files changed, 35 insertions, 490 deletions

diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/CamundaDBConfig.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/CamundaDBConfig.java
deleted file mode 100644
index 686b377727..0000000000
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/CamundaDBConfig.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * ============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.onap.so.bpmn.infrastructure;
-
-
-import javax.persistence.EntityManagerFactory;
-import javax.sql.DataSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.jmx.export.MBeanExporter;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-
-@Configuration
-@EnableTransactionManagement
-@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory",
-        basePackages = {"org.onap.so.db.catalog.data.repository"})
-@Profile({"!test"})
-public class CamundaDBConfig {
-
-    @Autowired(required = false)
-    private MBeanExporter mBeanExporter;
-
-    @Bean
-    @ConfigurationProperties(prefix = "spring.datasource.hikari")
-    public HikariConfig camundaDbConfig() {
-        return new HikariConfig();
-    }
-
-    @Primary
-    @Bean(name = "dataSource")
-    public DataSource dataSource() {
-        if (mBeanExporter != null) {
-            mBeanExporter.addExcludedBean("dataSource");
-        }
-        HikariConfig hikariConfig = this.camundaDbConfig();
-        return new HikariDataSource(hikariConfig);
-    }
-
-    @Primary
-    @Bean(name = "entityManagerFactory")
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder,
-            @Qualifier("dataSource") DataSource dataSource) {
-        return builder.dataSource(dataSource).packages("org.onap.so.db.catalog.beans").persistenceUnit("catalogDB")
-                .build();
-    }
-
-    @Primary
-    @Bean(name = "transactionManager")
-    public PlatformTransactionManager transactionManager(
-            @Qualifier("entityManagerFactory") EntityManagerFactory entityManagerFactory) {
-        return new JpaTransactionManager(entityManagerFactory);
-    }
-
-}
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/SecurityConfig.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/SecurityConfig.java
deleted file mode 100644
index 77f35d13d3..0000000000
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/SecurityConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.onap.so.bpmn.infrastructure;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        // super.configure(http);
-        http.authorizeRequests().anyRequest().permitAll().and().logout().permitAll();
-        http.csrf().disable();
-    }
-}
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
index f94471d4e7..e68d1bad80 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
@@ -1,372 +1,41 @@
-# Copyright © 2018 AT&T USA
-#
-# 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.
-aai:
-  auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
-  dme2:
-    timeout: '30000'
-  endpoint: https://aai.onap:8443
-  workflowAaiDistributionDelay: PT30S
-  pnfEntryNotificationTimeout: P14D
-cds:
-  endpoint: cds-blueprints-processor-grpc
-  port: 9111
-  auth: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-  timeout: 600
+server: 
+  port: 8080  
+  tomcat:
+    max-threads: 50
+mso:
+  infra:
+    auditInventory: false
+  camundaAuth: AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A
+spring: 
+  http:
+    multipart:
+      enabled: false
+  main:
+    allow-bean-definition-overriding: true
 camunda:
   bpm:
-    admin-user:
-      id: admin
-      password: admin
-    history-level: full
+    application:
+      delete-upon-undeploy: false
+      scan-for-process-definitions: true
+      deploy-changed-only: true
     job-execution:
-      max-pool-size: 30
-      core-pool-size: 3
-entitymanager:
-  packagesToScan: com
-pnf:
-  dmaap:
-    host: message-router
-    port: 3904
-    protocol: http
-    uriPathPrefix: events
-    topicName: unauthenticated.PNF_READY
-    consumerGroup: consumerGroup
-    consumerId: consumerId
-    topicListenerDelayInSeconds: 5
-bpelURL: http://bpmn-infra:8081
-msb-ip: msb-iag.onap
-msb-port: 80
-mso:
-  rainyDay:
-    retryDurationMultiplier: 2
-    maxRetries: 5
-  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  correlation:
-    timeout: 60
-  logPath: logs
-  async:
-    core-pool-size: 50
-    max-pool-size: 50
-    queue-capacity: 500
-  adapters:
-    completemsoprocess:
-      endpoint: http://so-openstack-adapter.onap:8087/CompleteMsoProcess
-    requestDb:
-      endpoint: http://request-db-adapter:8083
-      auth: Basic YnBlbDpwYXNzd29yZDEk
-    db:
-      auth: A3745B5DBE165EFCF101D85A6FC81C211AB8BF604F8861B6C413D5DC90F8F30E0139DE44B8A342F4EF70AF
-      password: wLg4sjrAFUS8rfVfdvTXeQ==
-      endpoint: http://request-db-adapter:8083/services/RequestsDbAdapter
-      spring:
-        endpoint: http://request-db-adapter:8083
-    network:
-      endpoint: http://so-openstack-adapter.onap:8087/services/NetworkAdapter
-      rest:
-        endpoint: http://so-openstack-adapter.onap:8087/services/rest/v1/networks
-    openecomp:
-      db:
-        endpoint: http://request-db-adapter:8083/services/RequestsDbAdapter
-    po:
-      auth: A3745B5DBE165EFCF101D85A6FC81C211AB8BF604F8861B6C413D5DC90F8F30E0139DE44B8A342F4EF70AF
-    sdnc:
-      endpoint: http://so-sdnc-adapter.onap:8086/adapters/SDNCAdapter
-      rest:
-        endpoint: http://so-sdnc-adapter.onap:8086/adapters/rest/v1/sdnc
-      timeout: PT60M
-    tenant:
-      endpoint: http://so-openstack-adapter.onap:8087/services/TenantAdapter
-    vnf:
-      endpoint: http://so-openstack-adapter.onap:8087/services/VnfAdapter
-      rest:
-        endpoint: http://so-openstack-adapter.onap:8087/services/rest/v1/vnfs
-    volume-groups:
-      rest:
-        endpoint: http://so-openstack-adapter.onap:8087/services/rest/v1/volume-groups
-    vnf-async:
-      endpoint: http://so-openstack-adapter.onap:8087/services/VnfAsync
-    vfc:
-      rest:
-        endpoint: http://so-vfc-adapter.onap:8084/services/v1/vfcadapter
-    workflow:
-      message:
-        endpoint: http://bpmn-infra:8081/mso/WorkflowMessage
-  bpmn:
-    process:
-      historyTimeToLive: '30'
-  callbackRetryAttempts: '5'
-  catalog:
-    db:
-      endpoint: http://catalog-db-adapter:8082/ecomp/mso/catalog
-      spring:
-        endpoint: http://catalog-db-adapter:8082
-  db:
-    auth: Basic YnBlbDpwYXNzd29yZDEk
-  default:
-    adapter:
-      namespace: http://org.onap.mso
-  healthcheck:
-    log:
-      debug: 'false'
-  infra:
-    customer:
-      id: testCustIdInfra
-  po:
-    timeout: PT60M
-  request:
-    db:
-      endpoint: http://request-db-adapter:8083/
-  rollback: 'true'
-  sdnc:
-    password: 1D78CFC35382B6938A989066A7A7EAEF4FE933D2919BABA99EB4763737F39876C333EE5F
-  service:
-    agnostic:
-      sniro:
-        endpoint: /sniro/api/v2/placement
-        host: http://sniro-emulator:80
-  site-name: CamundaEngine
-  sniro:
-    auth: test:testpwd
-    callback: http://so-openstack-adapter.onap:8087/adapters/rest/SDNCNotify
-    endpoint: http://replaceme:28090/optimizationInstance/V1/create
-    timeout: PT30M
-  oof:
-    auth: test:testpwd
-    callbackEndpoint: http://bpmn-infra:8081/mso/WorkflowMessage
-    endpoint: https://oof-osdf.onap:8698/api/oof/v1/placement
-    timeout: PT30M
-  workflow:
-    CreateGenericVNFV1:
-      aai:
-        volume-group:
-          uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group
-    default:
-      aai:
-        version: '14'
-        cloud-region:
-          version: '14'
-        generic-vnf:
-          version: '14'
-        v14:
-          customer:
-            uri: /aai/v14/business/customers/customer
-          generic-query:
-            uri: /aai/v14/search/generic-query
-          generic-vnf:
-            uri: /aai/v14/network/generic-vnfs/generic-vnf
-          l3-network:
-            uri: /aai/v14/network/l3-networks/l3-network
-          network-policy:
-            uri: /aai/v14/network/network-policies/network-policy
-          nodes-query:
-            uri: /aai/v14/search/nodes-query
-          route-table-reference:
-            uri: /aai/v14/network/route-table-references/route-table-reference
-          tenant:
-            uri: /aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant
-          vce:
-            uri: /aai/v14/network/vces/vce
-          vpn-binding:
-            uri: /aai/v14/network/vpn-bindings/vpn-binding
-          sp-partner:
-            uri: /aai/v14/business/sp-partners/sp-partner
-          device:
-            uri: /aai/v14/network/devices/device
-        v11:
-          customer:
-            uri: /aai/v11/business/customers/customer
-          generic-query:
-            uri: /aai/v11/search/generic-query
-          generic-vnf:
-            uri: /aai/v11/network/generic-vnfs/generic-vnf
-          l3-network:
-            uri: /aai/v11/network/l3-networks/l3-network
-          network-policy:
-            uri: /aai/v11/network/network-policies/network-policy
-          nodes-query:
-            uri: /aai/v11/search/nodes-query
-          route-table-reference:
-            uri: /aai/v11/network/route-table-references/route-table-reference
-          tenant:
-            uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant
-          vce:
-            uri: /aai/v11/network/vces/vce
-          vpn-binding:
-            uri: /aai/v11/network/vpn-bindings/vpn-binding
-        v8:
-          configuration:
-            uri: /aai/v11/network/configurations/configuration
-          customer:
-            uri: /aai/v8/business/customers/customer
-          generic-query:
-            uri: /aai/v8/search/generic-query
-          l3-network:
-            uri: /aai/v8/network/l3-networks/l3-network
-          network-policy:
-            uri: /aai/v8/network/network-policies/network-policy
-          nodes-query:
-            uri: /aai/v8/search/nodes-query
-          route-table-reference:
-            uri: /aai/v8/network/route-table-references/route-table-reference
-          tenant:
-            uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant
-          vce:
-            uri: /aai/v8/network/vces/vce
-          vpn-binding:
-            uri: /aai/v8/network/vpn-bindings/vpn-binding
-        v9:
-          cloud-region:
-            uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner
-          generic-vnf:
-            uri: /aai/v9/network/generic-vnfs/generic-vnf
-      retry:
-        attempts: '1'
-    deleteCinderVolumeV1:
-      aai:
-        volume-group:
-          uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group
-    global:
-      default:
-        aai:
-          namespace: http://org.onap.aai.inventory/
-          version: 14
-    message:
-      endpoint: http://bpmn-infra:8081/mso/WorkflowMessage
-    notification:
-      name: GenericNotificationServiceATT
-    sdnc:
-      replication:
-        delay: PT60S
-    sdncadapter:
-      callback: http://bpmn-infra:8081/mso/SDNCAdapterCallbackService
-    vnfadapter:
-      create:
-        callback: http://bpmn-infra:8081/mso/vnfAdapterNotify
-      delete:
-        callback: http://bpmn-infra:8081/mso/vnfAdapterNotify
-      query:
-        callback: http://bpmn-infra:8081/mso/vnfAdapterNotify
-      rollback:
-        callback: http://bpmn-infra:8081/mso/vnfAdapterNotify
-  use:
-    qualified:
-      host: false
-  global:
-    dmaap:
-      username: testuser
-      password: alRyMzJ3NUNeakxl
-      host: http://10.42.111.36:904
-      publisher:
-        topic: replaceme
-  naming:
-    endpoint: http://naming.demo.onap.com:8081/web/service/v1/genNetworkElementName
-    auth: Basic bTA0NzY4QG5vbi1wcm9kLm1zby5lY29tcC5hdHQuY29tOkF0dG0wNDc2OExpZmUhQA==
-policy:
-  auth: Basic dGVzdHBkcDphbHBoYTEyMw==
-  default:
-    disposition: Skip
-  client:
-    auth: Basic bTAzNzQzOnBvbGljeVIwY2sk
-  endpoint: http://pdp.onap:8081/pdp/api/
-  environment: TEST
-sdnc:
-  auth: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
-  host: http://sdnc.onap:8282
-  path: /restconf/operations/GENERIC-RESOURCE-API
-  si:
-    svc:
-      types: PORT-MIRROR,PPROBE
-appc:
-  client:
-    topic:
-      read:
-        name: APPC-LCM-WRITE
-        timeout: 360000
-      write: APPC-LCM-READ
-      sdnc:
-        read: SDNC-LCM-WRITE
-        write: SDNC-LCM-READ
-    response:
-      timeout: 360000
-    key: VIlbtVl6YLhNUrtU
-    secret: 64AG2hF4pYeG2pq7CT6XwUOT
-    service: ueb
-    poolMembers: message-router.onap:3904,message-router.onap:3904
-sniro:
-  conductor:
-    enabled: true
-    host: http://sniro-emulator:80
-    uri: /v1/release-orders
-    headers.auth: Basic dGVzdDp0ZXN0cHdk
-  manager:
-    timeout: PT30M
-    host: http://sniro-emulator:80
-    uri.v1: /sniro/api/v2/placement
-    uri.v2: /sniro/api/placement/v2
-    headers.auth: Basic dGVzdDp0ZXN0cHdk
-    headers.patchVersion: 1
-    headers.minorVersion: 1
-    headers.latestVersion: 2
-server:
-  port: 8081
-  tomcat:
-    max-threads: 50
-spring:
-  datasource:
-    hikari:
-      jdbcUrl: jdbc:mariadb://${DB_HOST}:3306/camundabpmn
-      username: ${DB_ADMIN_USERNAME}
-      password: ${DB_ADMIN_PASSWORD}
-      driver-class-name: org.mariadb.jdbc.Driver
-      pool-name: bpmn-pool
-      registerMbeans: true
-  security:
-    usercredentials:
-    -
-      username: apihBpmn
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: BPMN-Client
-    -
-      username: sdncaBpmn
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: BPMN-Client
-    -
-      username: poBpmn
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: BPMN-Client
-    -
-      username: wmaBpmn
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: BPMN-Client
-    -
-      username: sniro
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: SNIRO-Client
-    -
-      username: mso_admin
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: ACTUATOR
-so:
-  vnfm:
-    adapter:
-      url: https://so-vnfm-adapter.onap:9092/so/vnfm-adapter/v1/
-      auth: Basic dm5mbTpwYXNzd29yZDEk
+      deployment-aware: true
+#Actuator
+management:
+  endpoints:
+    web:
+      base-path: /manage
+      exposure:
+        include: "*"
+  metrics:
+    se-global-registry: false
+    export:
+      prometheus:
+        enabled: true # Whether exporting of metrics to Prometheus is enabled.
+        step: 1m # Step size (i.e. reporting frequency) to use.
 org:
   onap:
     so:
-      cloud-owner: CloudOwner
-logging:
-  level:
-    org:
-      onap: debug
+      adapters:
+        network:
+          encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7