diff options
author | Brinda Santh <bs2796@att.com> | 2020-01-16 11:21:50 -0500 |
---|---|---|
committer | Brinda Santh <bs2796@att.com> | 2020-01-16 13:58:05 -0500 |
commit | 8029f8e5332f107267ec11293c3099e54e87c67b (patch) | |
tree | 5341184c90a8a0013ea207dae2ed59d1ba3fa80b /ms/blueprintsprocessor/application/src | |
parent | f52cf7ce4451fd5fa1bbc6cf30e5b2a0acab7276 (diff) |
Prioritization Optional NATS consumer support
Add prioritization NATS consumer service and configuration data beans.
Optimizing message prioritization service interface.
Added Integration testing for NATS simulation.
Updated sample docker compose for NATS support
Issue-ID: CCSDK-1917
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: Icd21e5e2ab7b64d6e6e4b0610599ca947555ee15
Diffstat (limited to 'ms/blueprintsprocessor/application/src')
-rw-r--r-- | ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml | 19 | ||||
-rwxr-xr-x | ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml | 21 |
2 files changed, 37 insertions, 3 deletions
diff --git a/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml b/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml index 020038c26..7159534ba 100644 --- a/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml +++ b/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml @@ -22,13 +22,17 @@ services: image: nats-streaming:latest container_name: nats hostname: nats - command: "-cid cds-cluster --auth tokenAuth -store file -dir store-nats-0 --cluster_node_id nats-0" + command: "-cid cds-cluster --auth tokenAuth -store file -dir /opt/app/onap/nats/store --cluster_node_id nats-0" networks: - cds-network ports: - "8222:8222" - "4222:4222" restart: always + volumes: + - target: /opt/app/onap/nats/store + type: volume + source: nats-store cds-controller-0: depends_on: - db @@ -57,6 +61,7 @@ services: CLUSTER_MEMBERS: cds-controller-0,resource-resolution-0 CLUSTER_STORAGE_PATH: /opt/app/onap/config/cluster #CLUSTER_CONFIG_FILE: /opt/app/onap/config/atomix/atomix-multicast.conf + NATS_CLUSTER_ID: cds-cluster NATS_HOSTS: nats://nats:4222 APPLICATIONNAME: cds-controller BUNDLEVERSION: 1.0.0 @@ -90,6 +95,7 @@ services: CLUSTER_MEMBERS: cds-controller-0,resource-resolution-0 CLUSTER_STORAGE_PATH: /opt/app/onap/config/cluster #CLUSTER_CONFIG_FILE: /opt/app/onap/config/atomix/atomix-multicast.conf + NATS_CLUSTER_ID: cds-cluster NATS_HOSTS: nats://nats:4222 APPLICATIONNAME: resource-resolution BUNDLEVERSION: 1.0.0 @@ -116,6 +122,7 @@ services: CLUSTER_ID: cds-cluster CLUSTER_NODE_ID: py-executor-0 CLUSTER_MEMBERS: cds-controller-0,resource-resolution-0,py-executor-0 + NATS_CLUSTER_ID: cds-cluster NATS_HOSTS: nats://nats:4222 APPLICATIONNAME: py-executor BUNDLEVERSION: 1.0.0 @@ -132,6 +139,12 @@ volumes: type: none device: /opt/app/cds/mysql/data o: bind + nats-store: + driver: local + driver_opts: + type: none + device: /opt/app/cds/nats/nats-0/store + o: bind blueprints-deploy: driver: local driver_opts: @@ -142,13 +155,13 @@ volumes: driver: local driver_opts: type: none - device: /opt/app/cds/cds-controller/config + device: /opt/app/cds/cds-controller/cds-controller-0/config o: bind resource-resolution-config: driver: local driver_opts: type: none - device: /opt/app/cds/resource-resolution/config + device: /opt/app/cds/resource-resolution/resource-resolution-0/config o: bind networks: diff --git a/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml b/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml index 20b17bc90..8f2a78639 100755 --- a/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml +++ b/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml @@ -18,6 +18,21 @@ services: MYSQL_DATABASE: sdnctl MYSQL_USER: sdnctl MYSQL_PASSWORD: sdnctl + nats: + image: nats-streaming:latest + container_name: nats + hostname: nats + command: "-cid cds-cluster --auth tokenAuth -store file -dir /opt/app/onap/nats/store --cluster_node_id nats" + networks: + - cds-network + ports: + - "8222:8222" + - "4222:4222" + restart: always + volumes: + - target: /opt/app/onap/nats/store + type: volume + source: nats-store cds-controller-default: depends_on: - db @@ -89,6 +104,12 @@ volumes: type: none device: /opt/app/cds/mysql/data o: bind + nats-store: + driver: local + driver_opts: + type: none + device: /opt/app/cds/nats/store + o: bind blueprints-deploy: driver: local driver_opts: |