Skip to content

Commit

Permalink
Merge pull request #146 from catenax-ng/release/v1.3.0-smc-testdata
Browse files Browse the repository at this point in the history
[7°] - Release/v1.3.0 smc testdata: prepare secondary material content (smc) use case testdata
  • Loading branch information
matbmoser authored Nov 3, 2023
2 parents ca8217e + 865ab5e commit 736a1bc
Show file tree
Hide file tree
Showing 17 changed files with 523 additions and 27 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [pre-released]
## [released]
## [v1.3.0] - 03-11-2023


Expand All @@ -43,6 +43,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
- Create visual tree of components
- Enabled drill down in tree of components
- Add IRS configuration to the helm values
- Added Secondary Material Content (SMC) json payloads, edc assets to test the SMC use case

## Updated
- Update dpp/irs test data edc assets and script to register them
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ In particular, the appliction is used to access the battery passport data provid

### Software Version
#### Helm Chart Version
<pre id="helm-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/digital-product-pass-1.2.1">1.2.1</a></pre>
<pre id="helm-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/digital-product-pass-1.3.0">1.3.0</a></pre>
#### Application Version
<pre id="app-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/v1.2.1">v1.2.1</a></pre>
<pre id="app-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/v1.3.0">v1.3.0</a></pre>


## Application Preview
Expand Down
4 changes: 2 additions & 2 deletions charts/digital-product-pass/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ type: application
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 1.2.1
version: 1.3.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.2.1"
appVersion: "1.3.0"
24 changes: 13 additions & 11 deletions charts/digital-product-pass/README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions charts/digital-product-pass/templates/secret-backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ metadata:
namespace: {{ .Values.namespace }}
type: Opaque
stringData:
xApiKey: {{ .Values.backend.avp.helm.xApiKey }}
participantId: {{ .Values.backend.avp.helm.participantId }}
xApiKey: {{ .Values.backend.edc.xApiKey }}
participantId: {{ .Values.backend.edc.participantId }}
8 changes: 4 additions & 4 deletions charts/digital-product-pass/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ frontend:
timeout: 90000
# -- delay from getting status
delay: 1000
# -- keycloak specific configuration for frontend authentication


# -- irs api timeouts
irs:
# -- request timeout delay
# -- request timeout delay
requestDelay: 30000
# -- maximum waiting time to get the irs job status
maxWaitingTime: 30

# -- keycloak specific configuration for frontend authentication
keycloak:
clientId: ""
realm: ""
Expand Down Expand Up @@ -148,7 +148,7 @@ backend:
enabled: false
bpn: false
edc: false
# -- irs configuration
# -- irs configuration
irs:
enabled: true # -- Enable search for children in the requests
endpoint: "https://<irs-server-url>" # -- IRS endpoint
Expand Down
4 changes: 2 additions & 2 deletions deployment/infrastructure/init-provider-dtr-irs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ echo "Create Battery module sample data..."
curl -X POST -H 'Content-Type: application/json' -s --data "@resources/irs/payloads/EVMODULE-TRJ712.json" $SUBMODEL_SERVER/provider_backend/data/${DT2_SUBMODEL_ID_1}
echo

echo "Create Battery module BomAsBuilt sample data..."
echo "Create Battery module BomAsUsage sample data..."
curl -X POST -H 'Content-Type: application/json' -s --data "@resources/irs/payloads/singleLevelUsageAsBuilt-EVMODULE-TRJ712.json" $SUBMODEL_SERVER/provider_backend/data/${DT2_SUBMODEL_ID_2}
echo

echo "Create Battery module BomAsUsage sample data..."
echo "Create Battery module BomAsBuilt sample data..."
curl -X POST -H 'Content-Type: application/json' -s --data "@resources/irs/payloads/singleLevelBomAsBuilt-EVMODULE-TRJ712.json" $SUBMODEL_SERVER/provider_backend/data/${DT2_SUBMODEL_ID_3}
echo

Expand Down
19 changes: 19 additions & 0 deletions deployment/infrastructure/resources/smc/smc_asset.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"@context": {},
"asset": {
"@type": "Asset",
"@id": "urn:uuid:d0724e94-6fa5-4551-9e07-abba7a1ecd8b",
"properties": {
"description": "SMC EDC Test Asset"
}
},
"dataAddress": {
"@type": "DataAddress",
"type": "HttpData",
"baseUrl": "https://materialpass.int.demo.catena-x.net/provider_backend",
"proxyPath": "true",
"proxyBody": "false",
"proxyMethod": "false",
"proxyQueryParams": "false"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"@context": {},
"@id": "urn:uuid:b7cf9f3e-0f94-49fd-8ecb-30a6e72118c3",
"@type": "ContractDefinition",
"accessPolicyId": "urn:uuid:577766e7-c54e-485f-9371-b31f0f6d68cf",
"contractPolicyId": "urn:uuid:577766e7-c54e-485f-9371-b31f0f6d68cf",
"assetsSelector" : {
"@type" : "CriterionDto",
"operandLeft": "https://w3id.org/edc/v0.0.1/ns/id",
"operator": "=",
"operandRight": "urn:uuid:d0724e94-6fa5-4551-9e07-abba7a1ecd8b"
}
}
128 changes: 128 additions & 0 deletions deployment/infrastructure/resources/smc/smc_digital-twin.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
{
"description": [
{
"language": "en",
"text": "Secondary Material Content"
}
],
"displayName": [],
"globalAssetId": "urn:uuid:54850364-0837-41df-b839-0a06f48595de",
"idShort": "SMC_KLZ-90-8564-96",
"id": "urn:uuid:479ceed8-0eef-4c28-a74f-4eac9e01335b",
"specificAssetIds": [
{
"name": "manufacturerPartId",
"value": "XYZ78901",
"externalSubjectId": {
"type": "ExternalReference",
"keys": [
{
"type": "GlobalReference",
"value": "BPNL00000000CBA5"
},
{
"type": "GlobalReference",
"value": "BPNL00000003AYRE"
},
{
"type": "GlobalReference",
"value": "PUBLIC_READABLE"
}
]
}
},
{
"name": "orderNumber",
"value": "KLZ-90-8564-96",
"externalSubjectId": {
"type": "ExternalReference",
"keys": [
{
"type": "GlobalReference",
"value": "BPNL00000000CBA5"
},
{
"type": "GlobalReference",
"value": "BPNL00000003AYRE"
}
]
}
}
],
"submodelDescriptors": [
{
"endpoints": [
{
"interface": "SUBMODEL-3.0",
"protocolInformation": {
"href": "https://materialpass.int.demo.catena-x.net/BPNL000000000000/api/public/data/urn:uuid:d1707d00-d714-40a6-8229-11b14086029f",
"endpointProtocol": "HTTP",
"endpointProtocolVersion": [
"1.1"
],
"subprotocol": "DSP",
"subprotocolBody": "id=urn:uuid:d0724e94-6fa5-4551-9e07-abba7a1ecd8b;dspEndpoint=https://materialpass.int.demo.catena-x.net/BPNL000000000000",
"subprotocolBodyEncoding": "plain",
"securityAttributes": [
{
"type": "NONE",
"key": "NONE",
"value": "NONE"
}
]
}
}
],
"idShort": "SerialPart",
"id": "urn:uuid:d1707d00-d714-40a6-8229-11b14086029f",
"semanticId": {
"type": "ExternalReference",
"keys": [
{
"type": "Submodel",
"value": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart"
}
]
},
"description": [],
"displayName": []
},
{
"endpoints": [
{
"interface": "SUBMODEL-3.0",
"protocolInformation": {
"href": "https://materialpass.int.demo.catena-x.net/BPNL000000000000/api/public/data/urn:uuid:88d6d37e-4bac-4770-8583-f9a50a8b4a87",
"endpointProtocol": "HTTP",
"endpointProtocolVersion": [
"1.1"
],
"subprotocol": "DSP",
"subprotocolBody": "id=urn:uuid:d0724e94-6fa5-4551-9e07-abba7a1ecd8b;dspEndpoint=https://materialpass.int.demo.catena-x.net/BPNL000000000000",
"subprotocolBodyEncoding": "plain",
"securityAttributes": [
{
"type": "NONE",
"key": "NONE",
"value": "NONE"
}
]
}
}
],
"idShort": "secondaryMaterialContent",
"id": "urn:uuid:88d6d37e-4bac-4770-8583-f9a50a8b4a87",
"semanticId": {
"type": "ExternalReference",
"keys": [
{
"type": "Submodel",
"value": "urn:samm:io.catenax.secondary_material_content:1.0.0#SecondaryMaterialContent"
}
]
},
"description": [],
"displayName": []
}
]
}
Loading

0 comments on commit 736a1bc

Please sign in to comment.