diff options
5 files changed, 106 insertions, 48 deletions
diff --git a/volumes/so/config/bpmn-infra/onapheat/override.yaml b/volumes/so/config/bpmn-infra/onapheat/override.yaml index a06903a..a1e178c 100644 --- a/volumes/so/config/bpmn-infra/onapheat/override.yaml +++ b/volumes/so/config/bpmn-infra/onapheat/override.yaml @@ -1,8 +1,8 @@ aai: - auth: 2630606608347B7124C244AB0FE34F6F + auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885 dme2: timeout: '30000' - endpoint: https://aai.api.simpledemo.onap.org:8443 + endpoint: http://aai.api.simpledemo.onap.org:8443 workflowAaiDistributionDelay: PT30S pnfEntryNotificationTimeout: P14D camunda: @@ -31,6 +31,7 @@ pnf: consumerGroup: consumerGroup consumerId: consumerId topicListenerDelayInSeconds: 5 +bpelURL: http://bpmn-infra.so.testlab.onap.org:8081 mso: msoKey: 07a7159d3bf51a0e53be7a8f89699be7 config: @@ -44,42 +45,47 @@ mso: queue-capacity: 500 adapters: completemsoprocess: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/CompleteMsoProcess + endpoint: http://bpmn-infra:8081/CompleteMsoProcess requestDb: endpoint: http://request-db-adapter:8083 auth: Basic YnBlbDpwYXNzd29yZDEk db: - auth: 33293332AEC4930F655D8E2E8BB08937 + auth: A3745B5DBE165EFCF101D85A6FC81C211AB8BF604F8861B6C413D5DC90F8F30E0139DE44B8A342F4EF70AF password: wLg4sjrAFUS8rfVfdvTXeQ== - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter + endpoint: http://request-db-adapter:8083/services/RequestsDbAdapter spring: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083 + endpoint: http://request-db-adapter:8083 network: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/NetworkAdapter + endpoint: http://openstack-adapter:8087/services/NetworkAdapter rest: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/networks + endpoint: http://openstack-adapter:8087/services/rest/v1/networks openecomp: db: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter + endpoint: http://request-db-adapter:8083/services/RequestsDbAdapter po: - auth: 33293332AEC4930F655D8E2E8BB08937 - password: B8EBDE0311F0AF355CF3F2FD505A8CAD + auth: A3745B5DBE165EFCF101D85A6FC81C211AB8BF604F8861B6C413D5DC90F8F30E0139DE44B8A342F4EF70AF sdnc: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/SDNCAdapter + endpoint: http://sdnc-adapter:8086/adapters/SDNCAdapter rest: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/v1/sdnc + endpoint: http://sdnc-adapter:8086/adapters/rest/v1/sdnc timeout: PT60M tenant: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/TenantAdapter + endpoint: http://openstack-adapter:8087/services/TenantAdapter vnf: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapter + endpoint: http://openstack-adapter:8087/services/VnfAdapter rest: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/vnfs + endpoint: http://openstack-adapter:8087/services/rest/v1/vnfs volume-groups: rest: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/volume-groups + endpoint: http://openstack-adapter:8087/services/rest/v1/volume-groups vnf-async: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapterAsync + endpoint: http://openstack-adapter:8087/services/VnfAdapterAsync + vfc: + rest: + endpoint: http://vfc-adapter:8084/services/v1/vfcadapter + workflow: + message: + endpoint: http://bpmn-infra:8081/mso/WorkflowMessage bpmn: process: historyTimeToLive: '30' @@ -88,7 +94,7 @@ mso: db: endpoint: http://catalog-db-adapter:8082/ecomp/mso/catalog spring: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082 + endpoint: http://catalog-db-adapter:8082 db: auth: Basic YnBlbDpwYXNzd29yZDEk default: @@ -104,10 +110,10 @@ mso: timeout: PT60M request: db: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/ + endpoint: http://request-db-adapter:8083/ rollback: 'true' sdnc: - password: 3141634BF7E070AA289CF2892C986C0B + password: 1D78CFC35382B6938A989066A7A7EAEF4FE933D2919BABA99EB4763737F39876C333EE5F service: agnostic: sniro: @@ -116,12 +122,12 @@ mso: site-name: CamundaEngine sniro: auth: test:testpwd - callback: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/SDNCNotify + callback: http://sdnc-adapter:8086/adapters/rest/SDNCNotify endpoint: http://replaceme:28090/optimizationInstance/V1/create timeout: PT30M oof: auth: test:testpwd - callbackEndpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage + callbackEndpoint: http://bpmn-infra:8081/mso/WorkflowMessage endpoint: http://oof.api.simpledemo.openecomp.org:8698/api/oof/v1/placement timeout: PT30M workflow: @@ -220,20 +226,23 @@ mso: namespace: http://org.onap.aai.inventory/ version: 14 message: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage + endpoint: http://bpmn-infra:8081/mso/WorkflowMessage notification: name: GenericNotificationServiceATT sdncadapter: - callback: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/SDNCAdapterCallbackService + callback: http://bpmn-infra:8081/mso/SDNCAdapterCallbackService vnfadapter: create: - callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify + callback: http://openstack-adapter:8087/mso/vnfAdapterNotify delete: - callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify + callback: http://openstack-adapter:8087/mso/vnfAdapterNotify query: - callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify + callback: http://openstack-adapter:8087/mso/vnfAdapterNotify rollback: - callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify + callback: http://openstack-adapter:8087/mso/vnfAdapterNotify + use: + qualified: + host: false global: dmaap: username: testuser @@ -264,8 +273,7 @@ appc: timeout: 360000 write: APPC-LCM-READ sdnc: - read: - name: SDNC-LCM-WRITE + read: SDNC-LCM-WRITE write: SDNC-LCM-READ response: timeout: 360000 @@ -314,3 +322,32 @@ spring: username: mso_admin password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' role: ACTUATOR +resource-config: + SiteResourceV3: + operation-type: SDWANSite + activation-required: true + siteresourcev3..VfcInstanceGroup..1: + operation-type: SDWANSite + activation-required: true + siteresourcev3..VfcInstanceGroup..2: + operation-type: SDWANPort + activation-required: true + siteresourcev3..VfcInstanceGroup..0: + operation-type: SDWANDevice + activation-required: true + SiteResourceV2: + operation-type: SDWANSite + activation-required: true + siteresourcev2..VfcInstanceGroup..0: + operation-type: SDWANSite + activation-required: true + siteresourcev2..VfcInstanceGroup..1: + operation-type: SDWANPort + activation-required: true + siteresourcev2..VfcInstanceGroup..2: + operation-type: SDWANDevice + activation-required: true + vpnresourceV2: + operation-type: SDWANVpn + activation-required: true + diff --git a/volumes/so/config/catalog-db-adapter/onapheat/override.yaml b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml index 67226bf..fcb7952 100644 --- a/volumes/so/config/catalog-db-adapter/onapheat/override.yaml +++ b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml @@ -9,7 +9,7 @@ mso: catalog: db: spring: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082 + endpoint: http://catalog-db-adapter:8082 db: auth: Basic YnBlbDpwYXNzd29yZDEk spring: diff --git a/volumes/so/config/openstack-adapter/onapheat/override.yaml b/volumes/so/config/openstack-adapter/onapheat/override.yaml index 7292177..8e2ca2b 100644 --- a/volumes/so/config/openstack-adapter/onapheat/override.yaml +++ b/volumes/so/config/openstack-adapter/onapheat/override.yaml @@ -48,7 +48,7 @@ org: default_keystone_url_version: /v2.0 default_keystone_reg_ex: "/[vV][0-9]" vnf: - bpelauth: A7FC9B308B7AF7A269072BA729A345625E0381E3071DE7EE50603677CB69C515 + bpelauth: D1A67FA93B6A6419132D0F83CC771AF774FD3C60853C50C22C8C6FC5088CC79E9E81EDE9EA39F22B2F66A0068E checkRequiredParameters: true addGetFilesOnVolumeReq: false sockettimeout: 30 @@ -59,12 +59,13 @@ org: valet_enabled: false fail_requests_on_valet_failure: false network: - bpelauth: A7FC9B308B7AF7A269072BA729A345625E0381E3071DE7EE50603677CB69C515 + bpelauth: D1A67FA93B6A6419132D0F83CC771AF774FD3C60853C50C22C8C6FC5088CC79E9E81EDE9EA39F22B2F66A0068E sockettimeout: 5 connecttimeout: 5 retrycount: 5 retryinterval: -15 retrylist: 408,429,500,502,503,504,900 + encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7 tenant: default_keystone_url_version: /v2.0 default_keystone_reg_ex: "/[vV][0-9]" @@ -87,11 +88,13 @@ ecomp: pollInterval: 15 mso: + auth: BEA8637716A7EB617DF472BA6552D22F68C1CB17B0D094D77DDA562F4ADAAC4457CAB848E1A4 + msoKey: 07a7159d3bf51a0e53be7a8f89699be7 logPath: ./logs/openstack catalog: db: spring: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082 + endpoint: http://catalog-db-adapter:8082 db: auth: Basic YnBlbDpwYXNzd29yZDEk site-name: localDevEnv diff --git a/volumes/so/config/sdc-controller/onapheat/override.yaml b/volumes/so/config/sdc-controller/onapheat/override.yaml index e4edd8e..43dc3b6 100644 --- a/volumes/so/config/sdc-controller/onapheat/override.yaml +++ b/volumes/so/config/sdc-controller/onapheat/override.yaml @@ -1,6 +1,5 @@ aai: - auth: 2630606608347B7124C244AB0FE34F6F - + auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586 server: port: 8085 @@ -29,7 +28,7 @@ spring: request: datasource: - url: jdbc:mariadb://mariadb:3306/requestdb + jdbc-url: jdbc:mariadb://mariadb:3306/requestdb username: requestuser password: request123 driver-class-name: org.mariadb.jdbc.Driver @@ -45,11 +44,11 @@ mso: catalog: db: spring: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082 - camundaURL: http://bpmn-infra:8081/ + 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 @@ -63,10 +62,11 @@ mso: consumerId: SO-COpenSource-Env11 environmentName: AUTO asdcAddress: c2.vm1.sdc.simpledemo.onap.org:8443 - password: 613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247 + password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F pollingInterval: 60 pollingTimeout: 60 relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL + useHttpsWithDmaap: false activateServerTLSAuth: false keyStorePassword: keyStorePath: diff --git a/volumes/so/config/sdnc-adapter/onapheat/override.yaml b/volumes/so/config/sdnc-adapter/onapheat/override.yaml index abb06e4..d5e4b64 100644 --- a/volumes/so/config/sdnc-adapter/onapheat/override.yaml +++ b/volumes/so/config/sdnc-adapter/onapheat/override.yaml @@ -10,7 +10,7 @@ mso: catalog: db: spring: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082 + endpoint: http://catalog-db-adapter:8082 db: auth: Basic YnBlbDpwYXNzd29yZDEk site-name: onapheat @@ -24,6 +24,13 @@ org: query: GET|60000|sdncurl2| restdelete: DELETE|60000|sdncurl5| '': + brg-topology-operation: + activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + create: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + delete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource contrail-route-topology-operation: activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource @@ -64,6 +71,16 @@ org: activate: POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi assign: POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi delete: POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi + vnf-topology-aic-operation: + activate: POST|270000|sdncurl11|sdnc-request-header|com:att:sdnctl:vnftopologyaic + assign: POST|270000|sdncurl11|sdnc-request-header|com:att:sdnctl:vnftopologyaic + tunnelxconn-topology-operation: + activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + create: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + delete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource + unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource vnf-topology-operation: activate: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf assign: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf @@ -71,8 +88,8 @@ org: changedelete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf delete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf rollback: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf - bpelauth: 023A0244AB819A0DE0131DBC3AC5FAB4D8544E1CB1A7FE3CE60F6E3292AC0D93 - bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/SDNCAdapterCallbackService + bpelauth: 4C18603C5AE7E3A42A6CED95CDF9C0BA9B2109B3725747662E5D34E5FDF63DA9ADEBB08185098F14699195FDE9475100 + bpelurl: http://bpmn-infra:8081/mso/SDNCAdapterCallbackService generic-resource: network-topology-operation: create: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource @@ -107,10 +124,10 @@ org: mobility: '': query: GET|60000|sdncurl5| - myurl: http://c1.vm1.mso.simpledemo.onap.org:8081/adapters/rest/SDNCNotify + myurl: http://bpmn-infra:8081/adapters/rest/SDNCNotify rest: - bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage - sdncauth: 263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73 + bpelurl: http://bpmn-infra:8081/mso/WorkflowMessage + sdncauth: ED07A7EE5F099FA53369C3DF2240AD68A00154676EEDBC6F8C16BAA83B1912941B8941ABD48683D2C1072DA7040659692DE936A59BBF42A038CF71DE67B4A375190071EC76EA657801B033C135 sdncconnecttime: 5000 sdncurl10: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/GENERIC-RESOURCE-API:' sdncurl11: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/VNFTOPOLOGYAIC-API:' @@ -128,7 +145,8 @@ org: vfmodule: '': query: GET|60000|sdncurl12| - + network: + encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7 spring: security: usercredentials: |