Skip to content

Commit 521ff1d

Browse files
author
Rob Tjalma
authored
Merge pull request #46 from com-pas/update-docker-image-17jan
Updated docker images to latest versions.
2 parents 28e74ec + ad60b8c commit 521ff1d

File tree

3 files changed

+25
-12
lines changed

3 files changed

+25
-12
lines changed

‎compas/docker-compose-basex.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ services:
3939
scl-data-service:
4040
labels:
4141
compas: true
42-
image: "lfenergy/compas-scl-data-service:0.9.1-basex"
42+
image: "lfenergy/compas-scl-data-service:0.9.2-basex"
4343
environment:
4444
- BASEX_HOST=basex
4545
- BASEX_PORT=1984
@@ -67,7 +67,7 @@ services:
6767
cim-mapping:
6868
labels:
6969
compas: true
70-
image: "lfenergy/compas-cim-mapping:0.7.7"
70+
image: "lfenergy/compas-cim-mapping:0.8.0"
7171
environment:
7272
- JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
7373
- JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -89,7 +89,7 @@ services:
8989
scl-auto-alignment:
9090
labels:
9191
compas: true
92-
image: "lfenergy/compas-scl-auto-alignment:0.0.2"
92+
image: "lfenergy/compas-scl-auto-alignment:0.1.0"
9393
environment:
9494
- JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
9595
- JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -111,7 +111,7 @@ services:
111111
open-scd:
112112
labels:
113113
compas: true
114-
image: "lfenergy/compas-open-scd:v0.8.0-compas-1"
114+
image: "lfenergy/compas-open-scd:v0.8.2-compas-1"
115115
healthcheck:
116116
test: ["CMD", "curl", "-f", "http://localhost/"]
117117
interval: 30s

‎compas/docker-compose-postgresql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
scl-data-service:
4747
labels:
4848
compas: true
49-
image: "lfenergy/compas-scl-data-service:0.9.1-postgresql"
49+
image: "lfenergy/compas-scl-data-service:0.9.2-postgresql"
5050
environment:
5151
- POSTGRESQL_HOST=postgresql
5252
- POSTGRESQL_DB=compas
@@ -74,7 +74,7 @@ services:
7474
cim-mapping:
7575
labels:
7676
compas: true
77-
image: "lfenergy/compas-cim-mapping:0.7.7"
77+
image: "lfenergy/compas-cim-mapping:0.8.0"
7878
environment:
7979
- JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
8080
- JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -96,7 +96,7 @@ services:
9696
scl-auto-alignment:
9797
labels:
9898
compas: true
99-
image: "lfenergy/compas-scl-auto-alignment:0.0.2"
99+
image: "lfenergy/compas-scl-auto-alignment:0.1.0"
100100
environment:
101101
- JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
102102
- JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -118,7 +118,7 @@ services:
118118
open-scd:
119119
labels:
120120
compas: true
121-
image: "lfenergy/compas-open-scd:v0.8.0-compas-1"
121+
image: "lfenergy/compas-open-scd:v0.8.2-compas-1"
122122
healthcheck:
123123
test: ["CMD", "curl", "-f", "http://localhost/"]
124124
interval: 30s

‎integration-testing/TestSuite004-auto-alignment.robot‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ Test Setup Initialize and Start OpenSCD
1010
Test Teardown Make screenshot and Stop OpenSCD
1111

1212
*** Variables ***
13-
${substation1VoltageLevel} _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4>S1 110kV
14-
${substation3VoltageLevel} _974565b1-ac55-4901-9f48-afc7ef5486df>S3 110kV
13+
${substation1} _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4
14+
${substation1VoltageLevel} ${substation1}>S1 110kV
15+
${substation3} _974565b1-ac55-4901-9f48-afc7ef5486df
16+
${substation3VoltageLevel} ${substation3}>S3 110kV
1517

1618
*** Keywords ***
1719
Execute SCL Auto Alignment
@@ -24,10 +26,17 @@ Execute SCL Auto Alignment
2426
Wait for dialog is closed
2527
Close Menu
2628

29+
Select SLD Substation
30+
[Arguments] ${id}
31+
# First click on the selectbox to open the dropdown box, to make the values visible.
32+
Click single-line-diagram-plugin mwc-select[id="substationSelector"]
33+
# Now we can select the correct substation.
34+
Click single-line-diagram-plugin mwc-select[id="substationSelector"] > mwc-list-item[value="${id}"]
35+
2736
Check X/Y Coordinates
2837
[Arguments] ${id} ${x} ${y}
29-
Get Attribute single-line-diagram-plugin svg > g[id="${id}"] sxy:x == ${x}
30-
Get Attribute single-line-diagram-plugin svg > g[id="${id}"] sxy:y == ${y}
38+
Get Attribute single-line-diagram-plugin svg g[id="${id}"] sxy:x == ${x}
39+
Get Attribute single-line-diagram-plugin svg g[id="${id}"] sxy:y == ${y}
3140

3241
*** Test Cases ***
3342
TestCase004-01
@@ -44,7 +53,9 @@ TestCase004-01
4453
Execute SCL Auto Alignment Sub1
4554

4655
Select Tab Single Line Diagram
56+
Select SLD Substation ${substation1}
4757
Check X/Y Coordinates ${substation1VoltageLevel} 36 10
58+
Select SLD Substation ${substation3}
4859
Check X/Y Coordinates ${substation3VoltageLevel} 0 0
4960

5061
TestCase004-02
@@ -61,6 +72,8 @@ TestCase004-02
6172
Execute SCL Auto Alignment Sub1 Sub3
6273

6374
Select Tab Single Line Diagram
75+
Select SLD Substation ${substation1}
6476
Check X/Y Coordinates ${substation1VoltageLevel} 36 10
77+
Select SLD Substation ${substation3}
6578
Check X/Y Coordinates ${substation3VoltageLevel} 12 8
6679

0 commit comments

Comments
 (0)