Seperating usecase test suite dependencies

  # Refactoring BulkPM Dataplane test suite

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I4b2ad0dc5147e10ffc55f4ec210a29f073cd865b
Issue-ID: INT-832
Signed-off-by: efiacor <fiachra.corcoran@est.tech>

8 files changed, 0 insertions, 781 deletions

diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/api-handler-infra/onapheat/override.yaml b/plans/usecases/pnf-sw-upgrade/so/config/override-files/api-handler-infra/onapheat/override.yaml
deleted file mode 100755
index 10a3ec21..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/config/override-files/api-handler-infra/onapheat/override.yaml
+++ /dev/null
@@ -1,133 +0,0 @@
-server:
-    port: 8080
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-
-mso:
-  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  logPath: logs
-  site-name: onapheat
-  adapters:
-    requestDb:
-      endpoint: http://request-db-adapter:8083
-      auth: Basic YnBlbDpwYXNzd29yZDEk
-  catalog:
-    db:
-      spring:
-        endpoint: http://catalog-db-adapter:8082
-  db:
-    auth: Basic YnBlbDpwYXNzd29yZDEk
-  config:
-    path: /src/main/resources/
-  infra:
-    default:
-      alacarte:
-        orchestrationUri: /mso/async/services/ALaCarteOrchestrator
-        recipeTimeout: 180
-        testApi: VNF_API
-      service:
-        macro:
-          default:
-            testApi: GR_API
-  camundaURL: http://bpmn-infra:8081
-  camundaAuth: AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A
-  async:
-    core-pool-size: 50
-    max-pool-size: 50
-    queue-capacity: 500
-  sdc:
-    client:
-      auth: F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862
-    activate:
-      instanceid: test
-      userid: cs0008
-    endpoint: http://c1.vm1.mso.simpledemo.onap.org:28090
-  tenant:
-    isolation:
-      retry:
-        count: 3
-  aai:
-    endpoint: https://aai-simulator:9993
-    auth: 2630606608347B7124C244AB0FE34F6F
-  extApi:
-    endpoint: http://nbi.onap:8080/nbi/api/v3
-  so:
-    operational-environment:
-      dmaap:
-        username: testuser
-        password: VjR5NDcxSzA=
-        host: http://c1.vm1.mso.simpledemo.onap.org:28090
-        auth: 51EA5414022D7BE536E7516C4D1A6361416921849B72C0D6FC1C7F262FD9F2BBC2AD124190A332D9845A188AD80955567A4F975C84C221EEA8243BFD92FFE6896CDD1EA16ADD34E1E3D47D4A
-      publisher:
-        topic: com.att.ecomp.mso.operationalEnvironmentEvent
-  health:
-    auth: Basic bXNvX2FkbWlufHBhc3N3b3JkMSQ=
-    endpoints:
-      - subsystem: apih
-        uri: http://bpmn-infra:8081
-      - subsystem: catalogdb
-        uri: http://catalog-db-adapter:8082
-
-spring:
-  datasource:
-    hikari:
-      jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb
-      username: cataloguser
-      password: catalog123
-      driver-class-name: org.mariadb.jdbc.Driver
-      pool-name: catdb-pool
-      registerMbeans: true
-  jpa:
-      show-sql: true
-      hibernate:
-        dialect: org.hibernate.dialect.MySQL5Dialect
-        ddl-auto: validate
-        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-        enable-lazy-load-no-trans: true
-  jersey:
-    type: filter
-
-  security:
-    usercredentials:
-    -
-      username: sitecontrol
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: SiteControl-Client
-    -
-      username: gui
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: GUI-Client
-    -
-      username: infraportal
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: InfraPortal-Client
-    -
-      username: InfraPortalClient
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: InfraPortal-Client
-    -
-      username: bpel
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: BPEL-Client
-    -
-      username: mso_admin
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: ACTUATOR
-
-request:
-  datasource:
-    hikari:
-      jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb
-      username: requestuser
-      password: request123
-      driver-class-name: org.mariadb.jdbc.Driver
-      pool-name: reqdb-pool
-      registerMbeans: true
-org:
-  onap:
-    so:
-      cloud-owner: CloudOwner
-      adapters:
-        network:
-          encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/bpmn-infra/onapheat/override.yaml b/plans/usecases/pnf-sw-upgrade/so/config/override-files/bpmn-infra/onapheat/override.yaml
deleted file mode 100755
index 4dd959a1..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/config/override-files/bpmn-infra/onapheat/override.yaml
+++ /dev/null
@@ -1,337 +0,0 @@
-aai:
-  auth:  221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
-  dme2:
-    timeout: '30000'
-  endpoint: https://aai-simulator:9993
-  workflowAaiDistributionDelay: PT30S
-  pnfEntryNotificationTimeout: P14D
-camunda:
-  bpm:
-    admin-user:
-      id: admin
-      password: so_Admin123
-    history-level: full
-    job-execution:
-      max-pool-size: 30
-      core-pool-size: 3
-cds:
-    endpoint: blueprints-processor
-    port: 9111
-    auth: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-    timeout: 60
-entitymanager:
-  packagesToScan: com
-pnf:
-  dmaap:
-    host: message-router
-    port: 3904
-    protocol: http
-    uriPathPrefix: events
-    topicName: pnfReady
-    consumerGroup: consumerGroup
-    consumerId: consumerId
-    topicListenerDelayInSeconds: 5
-mso:
-  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  config:
-    path: /var/csar/
-  correlation:
-    timeout: 60
-  logPath: logs
-  async:
-    core-pool-size: 50
-    max-pool-size: 50
-    queue-capacity: 500
-  aai:
-    endpoint: https://aai-simulator:9993
-  adapters:
-    completemsoprocess:
-      endpoint:  http://bpmn-infra:8081/CompleteMsoProcess
-    requestDb:
-      endpoint: http://request-db-adapter:8083
-      auth: Basic YnBlbDpwYXNzd29yZDEk
-    db:
-      auth: 33293332AEC4930F655D8E2E8BB08937
-      password: wLg4sjrAFUS8rfVfdvTXeQ==
-      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter
-      spring:
-        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083
-    network:
-      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/NetworkAdapter
-      rest:
-        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/networks
-    openecomp:
-      db:
-        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter
-    po:
-      auth: 33293332AEC4930F655D8E2E8BB08937
-      password: B8EBDE0311F0AF355CF3F2FD505A8CAD
-    sdnc:
-      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/SDNCAdapter
-      rest:
-        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/v1/sdnc
-      timeout: PT60M
-    tenant:
-      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/TenantAdapter
-    vnf:
-      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapter
-      rest:
-        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/vnfs
-    volume-groups:
-      rest:
-        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/volume-groups
-    vnf-async:
-      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapterAsync
-  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://c1.vm1.mso.simpledemo.onap.org:8083/
-  rollback: 'true'
-  sdnc:
-    password: 3141634BF7E070AA289CF2892C986C0B
-  service:
-    agnostic:
-      sniro:
-        endpoint: /sniro/api/v2/placement
-        host: http://c1.vm1.mso.simpledemo.onap.org:30253
-  site-name: CamundaEngine
-  sniro:
-    auth: test:testpwd
-    callback: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/SDNCNotify
-    endpoint: http://replaceme:28090/optimizationInstance/V1/create
-    timeout: PT30M
-  oof:
-    auth: test:testpwd
-    callbackEndpoint: http://bpmn-infra:8081/mso/WorkflowMessage
-    endpoint: http://oof.api.simpledemo.openecomp.org: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
-    sdncadapter:
-      callback: http://bpmn-infra:8081/mso/SDNCAdapterCallbackService
-    vnfadapter:
-      create:
-        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
-      delete:
-        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
-      query:
-        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
-      rollback:
-        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
-  global:
-    dmaap:
-      username: testuser
-      password: alRyMzJ3NUNeakxl
-      host: http://10.42.111.36:904
-      auth: A4DE725B8B0D1A745049409B16762C16BC9B48555DC157272741D616323104442B3AAC052ED17E74EECA136B89C8C6615C8CC269ED5834EC47C6BE6A75DF39C6C07B07DF064CE268BE6510F472
-      publisher:
-        topic: replaceme
-policy:
-  auth: Basic dGVzdHBkcDphbHBoYTEyMw==
-  client:
-    auth: Basic bTAzNzQzOnBvbGljeVIwY2sk
-  endpoint: https://localhost:8081/pdp/api/
-  environment: TEST
-sdnc:
-  auth: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
-  host: http://sdnc:8282
-  path: /restconf/operations/GENERIC-RESOURCE-API
-  si:
-    svc:
-      types: PORT-MIRROR,PPROBE
-
-so:
-  vnfm:
-    adapter:
-      url: https://so-vnfm-adapter:9092/so/vnfm-adapter/v1/
-      auth: Basic dm5mbTpwYXNzd29yZDEk
-
-appc:
-  client:
-    topic:
-      read:
-        name: APPC-LCM-WRITE
-        timeout: 360000
-      write: APPC-LCM-READ
-      sdnc:
-        read:
-          name: SDNC-LCM-WRITE
-        write: SDNC-LCM-READ
-    response:
-      timeout: 360000
-    key: VIlbtVl6YLhNUrtU
-    secret: 64AG2hF4pYeG2pq7CT6XwUOT
-    service: ueb
-    poolMembers: ueb1.simpledemo.onap.org:3904,ueb2.simpledemo.onap.org:3904
-server:
-  port: 8081
-  tomcat:
-    max-threads: 50
-spring:
-  datasource:
-     driver-class-name: org.mariadb.jdbc.Driver
-     url: jdbc:mariadb://mariadb:3306/camundabpmn
-     username: camundauser
-     password: camunda123
-     dbcp2:
-      initial-size: 5
-      max-total: 20
-      validation-query: select 1
-      test-on-borrow: 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
-org:
-  onap:
-    so:
-      cloud-owner: CloudOwner
-rest:
-  http:
-    client:
-      configuration:
-        ssl:
-          keyStore: classpath:org.onap.so.p12
-          keyStorePassword: 'RLe5ExMWW;Kd6GTSt0WQz;.Y'
-          trustStore: classpath:org.onap.so.trust.jks
-          trustStorePassword: '6V%8oSU$,%WbYp3IUe;^mWt4'
diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/catalog-db-adapter/onapheat/override.yaml b/plans/usecases/pnf-sw-upgrade/so/config/override-files/catalog-db-adapter/onapheat/override.yaml
deleted file mode 100755
index 8ab96156..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/config/override-files/catalog-db-adapter/onapheat/override.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-server:
-    port: 8082
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-mso:
-  logPath: logs
-  site-name: onapheat
-  catalog:
-    db:
-      spring:
-        endpoint: http://catalog-db-adapter:8082
-  db:
-    auth: Basic YnBlbDpwYXNzd29yZDEk
-spring:
-  datasource:
-    hikari:
-      jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
-      username: cataloguser
-      password: catalog123
-      driver-class-name: org.mariadb.jdbc.Driver
-      pool-name: catdb-pool
-      registerMbeans: true
-  jpa:
-    generate-ddl: false
-    show-sql: false
-    hibernate:
-      ddl-auto: validate
-      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-      enable-lazy-load-no-trans: true
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-  security:
-    usercredentials:
-    -
-      username: bpel
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: BPEL-Client
-    -
-      username: mso_admin
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: ACTUATOR
-
-#Actuator
-management:
-  context-path: /manage
-
-flyway:
-  baseline-on-migrate: true
-  url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
-  user: cataloguser
-  password: catalog123
-  
-cloud_config:
-  identity_services:
-    DEFAULT_KEYSTONE:
-      identity_url: http://192.168.35.52:5000/v2.0
-      mso_id: admin
-      mso_pass: admin
-      admin_tenant: service
-      member_role: admin
-      tenant_metadata: true
-      identity_server_type: KEYSTONE
-      identity_authentication_type: USERNAME_PASSWORD
-      project_domain_name: service
-      user_domain_name: admin
-  cloud_sites:
-    RegionOne:
-      region_id: RegionOne
-      clli: RegionOne 
diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/request-db-adapter/onapheat/override.yaml b/plans/usecases/pnf-sw-upgrade/so/config/override-files/request-db-adapter/onapheat/override.yaml
deleted file mode 100755
index 65861167..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/config/override-files/request-db-adapter/onapheat/override.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-# will be used as entry in DB to say SITE OFF/ON for healthcheck
-
-server:
-    port: 8083
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-mso:
-  logPath: logs
-  site-name: localSite
-  adapters:
-    requestDb:
-      endpoint: http://request-db-adapter:8083
-      auth: Basic YnBlbDpwYXNzd29yZDEk
-spring:
-  datasource:
-    hikari:
-      jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb
-      username: requestuser
-      password: request123
-      driver-class-name: org.mariadb.jdbc.Driver
-      pool-name: reqdb-pool
-      registerMbeans: true
-  jpa:
-    generate-ddl: false
-    show-sql: false
-    hibernate:
-      ddl-auto: validate
-      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-      enable-lazy-load-no-trans: true
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-  security:
-    usercredentials:
-    -
-      username: bpel
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: BPEL-Client
-    -
-      username: mso_admin
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: ACTUATOR
-
-#Actuator
-management:
-  context-path: /manage
-
-flyway:
-  baseline-on-migrate: true
-  url: jdbc:mariadb://mariadb:3306/requestdb
-  user: reqeustuser
-  password: request123
diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/sdc-controller/onapheat/override.yaml b/plans/usecases/pnf-sw-upgrade/so/config/override-files/sdc-controller/onapheat/override.yaml
deleted file mode 100755
index ed8bd43f..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/config/override-files/sdc-controller/onapheat/override.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-aai:
-  auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
-server:
-  port: 8085
-
-spring:
-  datasource:
-    hikari:
-      jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb
-      username: cataloguser
-      password: catalog123
-      driver-class-name: org.mariadb.jdbc.Driver
-      pool-name: catdb-pool
-      registerMbeans: false
-
-  security:
-    usercredentials:
-    -
-      username: asdc
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: Asdc-Client
-    -
-      username: mso_admin
-      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-      role: ACTUATOR
-
-request:
-  datasource:
-    hikari:
-      jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb
-      username: requestuser
-      password: request123
-      driver-class-name: org.mariadb.jdbc.Driver
-      pool-name: reqdb-pool
-      registerMbeans: false
-
-mso:
-  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  logPath: ./logs/asdc
-  catalog:
-    db:
-      spring:
-        endpoint: http://catalog-db-adapter:8082
-  db:
-    auth: Basic YnBlbDpwYXNzd29yZDEk
-  site-name: onapheat
-  camundaURL: http://bpmn-infra:8081/
-  adapters:
-    requestDb:
-      endpoint: http://request-db-adapter:8083
-      auth: Basic YnBlbDpwYXNzd29yZDEk
-  aai:
-    endpoint: https://aai.api.simpledemo.onap.org:8443
-  asdc-connections:
-    asdc-controller1:
-      user: mso
-      consumerGroup: SO-OpenSource-Env11
-      consumerId: SO-COpenSource-Env11
-      environmentName: AUTO
-      asdcAddress: c2.vm1.sdc.simpledemo.onap.org:8443
-      password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
-      pollingInterval: 60
-      pollingTimeout: 60
-      relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL
-      useHttpsWithDmaap: false
-      activateServerTLSAuth: false
-      keyStorePassword:
-      keyStorePath:
-      watchDogTimeout: 100
-      isFitlerInEmptyResources: true
-      messageBusAddress: vm1.mr.simpledemo.onap.org,vm1.mr.simpledemo.onap.org
-  asdc:
-    config:
-      activity:
-        endpoint: http://sdc-wfd-be:8080
-      key: 566B754875657232314F5548556D3665
-      components:
-        count: 0,
-        componentNames:
-  scheduling:
-    enabled: false
diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/so-monitoring/onapheat/override.yaml b/plans/usecases/pnf-sw-upgrade/so/config/override-files/so-monitoring/onapheat/override.yaml
deleted file mode 100755
index 7e61c7d0..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/config/override-files/so-monitoring/onapheat/override.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-server:
-  port: 30224
-  tomcat:
-    max-threads: 4
-ssl-enable: false
-camunda:
-  rest:
-    api:
-      url: http://bpmn-infra:8081/sobpmnengine/engine/
-      engine: default
-      auth: Basic YXBpaEJwbW46cGFzc3dvcmQxJA==
-mso:
-  database:
-    rest:
-      api:
-        url: http://request-db-adapter:8083/infraActiveRequests/
-        auth: Basic YnBlbDpwYXNzd29yZDEk
-spring:
- security:
-   usercredentials:
-   -
-     username: gui
-     password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-     role: GUI-Client
diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/so-vnfm-adapter/onapheat/override.yaml b/plans/usecases/pnf-sw-upgrade/so/config/override-files/so-vnfm-adapter/onapheat/override.yaml
deleted file mode 100755
index bb715126..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/config/override-files/so-vnfm-adapter/onapheat/override.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-server:
-    port: 9092
-    tomcat:
-        max-threads: 4
-    ssl:
-        key-alias: so@so.onap.org
-        key--store-password: 'ywsqCy:EEo#j}HJHM7z^Rk[L'
-        key-store: classpath:so-vnfm-adapter.p12
-        key-store-type: PKCS12
-        client-auth: need
-
-http:
-  client:
-    ssl:
-      trust-store: classpath:org.onap.so.trust.jks
-      trust-store-password: ',sx#.C*W)]wVgJC6ccFHI#:H'
-aai:
-  auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
-  version: v15
-  endpoint:  https://aai-simulator:9993
-mso:
-  key: 07a7159d3bf51a0e53be7a8f89699be7
-sdc:
-  username: mso
-  password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
-  key: 566B754875657232314F5548556D3665
-  endpoint: http://sdc-simulator:9991/
-  toscametapath: Artifacts/Deployment/OTHER/TOSCA.meta
-vnfmadapter:
-  endpoint: https://so-vnfm-adapter:9092
diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/vnfm-simulator/onapheat/override.yaml b/plans/usecases/pnf-sw-upgrade/so/config/override-files/vnfm-simulator/onapheat/override.yaml
deleted file mode 100755
index 05cb1e56..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/config/override-files/vnfm-simulator/onapheat/override.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-spring:
- h2:
-  console:
-  enabled: true
-  path: console
- datasource:
-  url: jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
-  username: admin
-  password: admin
- http:
-  converters:
-   preferred-json-mapper: gson
- security:
-  usercredentials:
-   - username: vnfm
-     password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-     role: BPEL-Client
-
-server:
-  port: 9093
-  tomcat:
-    max-threads: 50
-  ssl:
-    client-auth: need
-    key-alias: so@so.onap.org
-    key--store-password: '7Em3&j4.19xYiMelhD5?xbQ.'
-    key-store: classpath:so-vnfm-simulator.p12
-    key-store-type: PKCS12
-  request:
-    grant:
-      auth: twowaytls
-  dns:
-    name: so-vnfm-simulator
-
-vnfds:
-  vnfdlist:
-  -  vnfdid: sgsn-mme_12df452s04131
-     vnfclist:
-     - vnfcid: VNFC1
-       resourceTemplateId: vnfd1_vnfc1
-       vduId: vnfd1_vduForVnfc1
-       type: COMPUTE
-     - vnfcid: VNFC2
-       resourceTemplateId: vnfd1_vnfc2
-       vduId: vnfd1_vduForVnfc2
-       type: COMPUTE
-  -  vnfdid: 2
-     vnfclist:
-     - vnfcid: VNFC3
-       resourceTemplateId: vnfd2_vnfc3
-       vduId: vnfd2_vduForVnfc3
-       type: COMPUTE
-     - vnfcid: VNFC4
-       resourceTemplateId: vnfd2_vnfc4
-       vduId: vnfd2_vduForVnfc4
-       type: COMPUTE