Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
65ff8ab
Delete desmos
oriolcanades Feb 20, 2024
62bd439
Merge branch 'main' into feature/migrate-blockchain-connector-to-desmos
wistefan Feb 20, 2024
0257655
Merge branch 'main' into feature/migrate-blockchain-connector-to-desmos
wistefan Feb 20, 2024
3fbc52e
Update desmos values
oriolcanades Feb 20, 2024
4d78390
Updated DLT Adapter repository
alejandro-nieto-git Feb 21, 2024
f40be42
Merge remote-tracking branch 'alejandro.nieto/feature/migrate-blockch…
alejandro-nieto-git Feb 21, 2024
d4d062b
Deleted DLTAdapter local helm chart.
alejandro-nieto-git Feb 21, 2024
ee33593
Merge pull request #1 from alastria/update-dlt-adapter-helm-chart
oriolcanades Feb 21, 2024
d2dbe32
Update desmos chart config
oriolcanades Feb 21, 2024
60088ef
Fixed DLT Adapter version
alejandro-nieto-git Feb 28, 2024
7842088
Merge pull request #2 from alastria/feature/migrate-blockchain-connec…
oriolcanades Feb 28, 2024
459a53e
Merge remote-tracking branch 'origin/feature/migrate-blockchain-conne…
oriolcanades Feb 28, 2024
733c395
Update desmos values
oriolcanades Mar 6, 2024
1ea2078
Update desmos values
oriolcanades Mar 6, 2024
2db8536
Update provider values
oriolcanades Mar 6, 2024
95267c0
Update provider and consumer values
oriolcanades Mar 6, 2024
394aa53
Update pom.xml IT
oriolcanades Mar 6, 2024
d674350
Update files
oriolcanades Mar 11, 2024
cd2ddbe
Update files
oriolcanades Mar 11, 2024
4290852
Fixed private key for IT test environment.
alejandro-nieto-git Mar 12, 2024
844fdea
Added updated deployment script.
alejandro-nieto-git Mar 21, 2024
278cdea
Merge pull request #3 from alastria/feature/migrate-blockchain-connec…
oriolcanades Mar 21, 2024
48027fe
Update files
oriolcanades Mar 21, 2024
780214a
Relaunch pipeline.
alejandro-nieto-git Mar 22, 2024
3cf3978
Deleted chain id to use ganache default one.
alejandro-nieto-git Mar 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: Test

on:
pull_request:
types:
- opened
- synchronize
- reopened
- labeled
- unlabeled
push:

jobs:
Expand All @@ -23,4 +30,4 @@ jobs:
id: test
run: |
cd it
mvn clean test integration-test
mvn clean test integration-test
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
it/*.class
it/bin/src/test/java/org/dome/accessnode/it/*.class
it/bin/src/test/java/org/dome/accessnode/*.class
it/bin/target/
it/target/
8 changes: 4 additions & 4 deletions charts/access-node/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ appVersion: 0.0.1
dependencies:
- name: desmos
condition: desmos.enabled
repository: https://dome-marketplace.github.io/access-node
version: 0.1.0
repository: https://in2workspace.github.io/helm-charts
version: 0.5.0
- name: dlt-adapter
condition: dlt-adapter.enabled
repository: https://dome-marketplace.github.io/access-node
version: 1.0.3
repository: https://alastria.github.io/helm-charts
version: 1.0.0
- name: kafka
condition: kafka.enabled
repository: oci://registry-1.docker.io/bitnamicharts
Expand Down
88 changes: 39 additions & 49 deletions charts/access-node/values.yaml
Original file line number Diff line number Diff line change
@@ -1,61 +1,51 @@
## configuration for the blockchain-connector - see https://DOME-Marketplace.github.io/access-node/blockchain-connector for configuration documentation
## configuration for the desmos - see https://DOME-Marketplace.github.io/access-node for configuration documentation
desmos:
# -- should the desmos-blockchain-connector be enabled
enabled: true
## deployment specific configuration
deployment:
app:
## configuration to connect to the dlt-adapter
dlt-adapter:
dltAdapter:
# -- provider of the dlt-adapter component
provider: digitelts
# -- (local) address of the dlt-adapter
internalDomain: http://dlt-adapter:8080
# -- (external) address of the dlt-adapter
externalDomain: http://localhost:8080
# -- paths to be used for the dlt-adapter
paths:
publication: /api/v1/publishEvent
subscription: /api/v1/subscribe
events: /api/v1/events
## configuration of subscriptions at the blockchain
event-subscription:
# -- local address of the dlt-adapter notification endpoint for dlt events
notificationEndpoint: http://desmos:8080/notifications/dlt
# -- a list of entity-types the connector is interested in
eventTypes: product-offering
## connection information for the context broker
broker:
# -- provider of the broker
provider: scorpio
# -- internal address of the context broker to be used by the connector
externalDomain: https://my-scorpio.org
# -- external address of the broker. Will included in the hashlink and used by other access-nodes to retrieve the actual entities
internalDomain: http://scorpio:9090
# -- paths to be used for the broker
paths:
entities: /ngsi-ld/v1/entities
subscriptions: /ngsi-ld/v1/subscriptions
temporal: /ngsi-ld/v1/temporal/entities
## configuration of ngsi-ld entities to listen for
ngsi-subscription:
# -- local address of the blockchain-connectors notification endpoint for ngsi-ld events
notificationEndpoint: http://blockchain-connector:8080/notifications/broker
# -- a list of entity-types the connector is interested in
entityTypes: catalog,individual,organization,product,product-offering,category,service-specification,product-offering-price,resource-specification,product-specification
## information about the access-node operator
client:
# -- did of the organization running the node
organizationId: did:web:my-marketplace-operator.org
## configuration of the database to be used by the blockchain-connector
db:
# -- host of the db
host: postgresql-connector
# -- password to be used
password: postgres
# -- username to be used
username: postgres
# -- overrides the generated name, provides stable service names - this should be avoided if multiple instances are available in the same namespace
fullnameOverride: desmos
externalDomain: http://dlt-adapter:8080
## configuration of subscriptions at the blockchain
eventSubscription:
# -- local address of the blockchain-connectors notification endpoint for dlt events
notificationEndpoint: http://desmos:8080/notifications/dlt
# -- a list of entity-types the connector is interested in
eventTypes: catalog,product-offering,category
## connection information for the context broker
broker:
# -- provider of the broker
provider: scorpio
# -- internal address of the context broker to be used by the connector
internalDomain: http://scorpio:9090
# -- external address of the broker. Will be included in the hashlink and used by other access-nodes to retrieve the actual entities
externalDomain: https://my-scorpio.org
## configuration of ngsi-ld entities to listen for
ngsiSubscription:
# -- local address of the blockchain-connectors notification endpoint for ngsi-ld events
notificationEndpoint: http://desmos:8080/notifications/broker
# -- a list of entity-types the connector is interested in
entityTypes: catalog,product-offering,category
## information about the access-node operator
client:
# -- did of the organization running the node
organizationId: did:web:my-marketplace-operator.org
## configuration of the database to be used by the blockchain-connector
db:
# -- host of the db
host: postgresql-connector
# -- password to be used
password: postgres
# -- username to be used
username: postgres
# -- overrides the generated name, provides stable service names - this should be avoided if multiple instances are available in the same namespace
fullnameOverride: desmos

## configuration for the dlt-adapter - see https://DOME-Marketplace.github.io/access-node/dlt-adapter for configuration documentation
dlt-adapter:
Expand Down Expand Up @@ -174,4 +164,4 @@ tm-forum-api:
## configuration for the api proxy, to serve all apis through one kubernetes service
apiProxy:
# -- should the proxy be enabled
enabled: true
enabled: true
31 changes: 0 additions & 31 deletions charts/desmos/Chart.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions charts/desmos/templates/NOTES.txt

This file was deleted.

62 changes: 0 additions & 62 deletions charts/desmos/templates/_helpers.tpl

This file was deleted.

Loading