Skip to content

Commit 6d49745

Browse files
pascalwilbrinkpascalwilbrink
authored
Merge pull request #91 from com-pas/bitname-image
Updated Config for new OpenSCD container using Bitnami
2 parents 12d0852 + 681dbaf commit 6d49745

File tree

6 files changed

+95
-45
lines changed

6 files changed

+95
-45
lines changed

‎RELEASE.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ For information about CoMPAS go to this [site](https://com-pas.github.io/).
1010

1111
## Release notes
1212

13+
### Release 0.14.1
14+
15+
Next release for testing the CoMPAS System with all components.
16+
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.24.0.4):
17+
- Save current project as version to an existing SCL File in CoMPAS;
18+
- Switch to other base image (Bitnami) for container image;
19+
1320
### Release 0.14.0
1421

1522
Next release for testing the CoMPAS System with all components.

‎compas/docker-compose-basex.yml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,12 @@ services:
144144
open-scd:
145145
labels:
146146
compas: true
147-
image: "lfenergy/compas-open-scd:v0.24.0.3"
148-
healthcheck:
149-
test: ["CMD", "curl", "-f", "http://localhost/"]
150-
interval: 30s
151-
timeout: 10s
152-
retries: 5
147+
image: "lfenergy/compas-open-scd:v0.24.0.4"
153148
depends_on:
154149
- scl-data-service
155150
- cim-mapping
151+
- scl-auto-alignment
152+
- scl-validator
156153

157154
reverse-proxy:
158155
labels:
@@ -163,15 +160,12 @@ services:
163160
COMPAS_HOSTNAME: ${COMPAS_HOSTNAME}
164161
ports:
165162
- "80:80"
166-
healthcheck:
167-
test: ["CMD", "curl", "-f", "http://localhost/"]
168-
interval: 30s
169-
timeout: 10s
170-
retries: 5
171163
depends_on:
172164
- keycloak
173165
- scl-data-service
174166
- cim-mapping
167+
- scl-auto-alignment
168+
- scl-validator
175169
- open-scd
176170

177171
volumes:

‎compas/docker-compose-postgresql.yml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
postgresql:
99
labels:
1010
compas: true
11-
image: "postgres:14.4"
11+
image: "postgres:14.5"
1212
ports:
1313
- "5432:5432"
1414
environment:
@@ -151,12 +151,7 @@ services:
151151
open-scd:
152152
labels:
153153
compas: true
154-
image: "lfenergy/compas-open-scd:v0.24.0.3"
155-
healthcheck:
156-
test: ["CMD", "curl", "-f", "http://localhost/"]
157-
interval: 30s
158-
timeout: 10s
159-
retries: 5
154+
image: "lfenergy/compas-open-scd:v0.24.0.4"
160155
depends_on:
161156
- scl-data-service
162157
- cim-mapping
@@ -172,11 +167,6 @@ services:
172167
COMPAS_HOSTNAME: ${COMPAS_HOSTNAME}
173168
ports:
174169
- "80:80"
175-
healthcheck:
176-
test: ["CMD", "curl", "-f", "http://localhost/"]
177-
interval: 30s
178-
timeout: 10s
179-
retries: 5
180170
depends_on:
181171
- keycloak
182172
- scl-data-service

‎compas/reverse-proxy/nginx.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ http {
4545
# Added Header back to browser to get JWT Content for Debugging, should not do this in production.
4646
add_header X-Debug-Bearer "Bearer ${access_token}" always;
4747

48-
proxy_pass http://open-scd:80/;
48+
proxy_pass http://open-scd:8080/;
4949

5050
proxy_set_header Host $http_host;
5151
proxy_cache_bypass $http_upgrade;

‎integration-testing/TestSuite001-basic-compas.robot‎

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,24 @@
55
*** Settings ***
66
Documentation Basic test cases for opening and saving SCL files to/from Local File and CoMPAS.
77
Resource ./include/general-compas.robot
8+
Resource include/general-compas.robot
89

910
Test Setup Initialize and Start OpenSCD
1011
Test Teardown Make screenshot and Stop OpenSCD
1112

1213
*** Test Cases ***
1314
TestCase001-01
1415
[Documentation] Open project from Local File
15-
Set Test Variable ${sclname} MiniGrid
16-
Set Test Variable ${scltype} SCD
17-
1816
Open Menu Open project
19-
Open local file ${sclname} ${scltype}
17+
Open local file MiniGrid SCD
2018

2119
Select Tab Substation
2220
Get Text ${substation-editor-selector} section > h1:has-text("Sub1")
2321

2422
TestCase001-02
2523
[Documentation] Open project from Local File and Add to CoMPAS
26-
Set Test Variable ${sclname} MiniGrid
27-
Set Test Variable ${scltype} SCD
28-
2924
Open Menu Open project
30-
Open local file ${sclname} ${scltype}
25+
Open local file MiniGrid SCD
3126

3227
Set Test Variable ${sclname} ${TEST NAME}
3328
Set Test Variable ${scltype} CID
@@ -41,11 +36,8 @@ TestCase001-02
4136
TestCase001-03
4237
[Documentation] Open project from CoMPAS
4338
# First we need to add a project to CoMPAS to be able to open it from CoMPAS.
44-
Set Test Variable ${sclname} MiniGrid
45-
Set Test Variable ${scltype} SCD
46-
4739
Open Menu Open project
48-
Open local file ${sclname} ${scltype}
40+
Open local file MiniGrid SCD
4941

5042
Set Test Variable ${sclname} ${TEST NAME}
5143
Set Test Variable ${scltype} CID
@@ -65,11 +57,8 @@ TestCase001-03
6557
TestCase001-04
6658
[Documentation] Open project from CoMPAS and Save to Local File
6759
# First we need to add a project to CoMPAS to be able to open it from CoMPAS.
68-
Set Test Variable ${sclname} MiniGrid
69-
Set Test Variable ${scltype} SCD
70-
7160
Open Menu Open project
72-
Open local file ${sclname} ${scltype}
61+
Open local file MiniGrid SCD
7362

7463
Set Test Variable ${sclname} ${TEST NAME}
7564
Set Test Variable ${scltype} CID
@@ -81,13 +70,43 @@ TestCase001-04
8170
Save to local file ${sclname} ${scltype}
8271

8372
TestCase001-05
73+
[Documentation] Save a existing project from CoMPAS as new project
74+
# First we need to add a project to CoMPAS to be able to open it from CoMPAS.
75+
Open Menu Open project
76+
Open local file MiniGrid SCD
77+
78+
Set Test Variable ${sclname} ${TEST NAME}
79+
Set Test Variable ${scltype} CID
80+
81+
Open Menu Save project
82+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
83+
84+
Open Menu Save project as
85+
Save as to CoMPAS ${sclname}-${current-date}-1.0.0 ${sclname}-as ${scltype} 1.0.0
86+
87+
TestCase001-06
88+
[Documentation] Save local project as new version to existing project in CoMPAS
89+
# First we need to add a project to CoMPAS to be able to open it from CoMPAS.
90+
Open Menu Open project
91+
Open local file MiniGrid SCD
92+
93+
Set Test Variable ${sclname} ${TEST NAME}
94+
Set Test Variable ${scltype} CID
95+
96+
Open Menu Save project
97+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
98+
99+
Open Menu Open project
100+
Open local file MiniGrid SCD
101+
102+
Open Menu Save as version
103+
Save version to CoMPAS MINOR ${sclname} ${scltype} 1.1.0
104+
105+
TestCase001-10
84106
[Documentation] Trying saving local file to CoMPAS with invalid name
85107
# First we will open the local file to be saved.
86-
Set Test Variable ${sclname} MiniGrid
87-
Set Test Variable ${scltype} SCD
88-
89108
Open Menu Open project
90-
Open local file ${sclname} ${scltype}
109+
Open local file MiniGrid SCD
91110

92111
# Try saving the file with a invalid name
93112
Set Test Variable ${sclname} invalid/*name
@@ -107,4 +126,3 @@ TestCase001-05
107126
# Check if the expected error message is found
108127
Set Test Variable ${secondaryMessage} ApplicationError: Name is not a correct name to be used later as filename. (CORE-8000) (400)
109128
Check CoMPAS Error ${secondaryMessage}
110-

‎integration-testing/include/general-compas.robot‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Resource ./general-openscd.robot
1111
Open from CoMPAS
1212
[Arguments] ${name} ${type} ${expectedVersion}
1313
Click mwc-dialog#compas-open-dlg > compas-open compas-scltype-list > mwc-list > mwc-list-item >> span:has-text("${type.upper()}")
14+
Select label mwc-dialog#compas-open-dlg > compas-open ${type}_${current-date}
1415
Click mwc-dialog#compas-open-dlg > compas-open compas-scl-list > filtered-list > mwc-list-item:has-text("${name}-${current-date}")
1516
Wait for dialog is closed
1617
Close Menu
@@ -24,21 +25,49 @@ Add to CoMPAS
2425
Fill Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input ${name}-${current-date}
2526
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select
2627
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select > mwc-list-item[value="${type.upper()}"]
28+
Add label mwc-dialog#compas-save-dlg > compas-save ${type}_${current-date}
2729
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
2830
Wait for dialog is closed
2931
Close Menu
3032
# check if the title (filename) changed to the new expected one.
3133
Check Title Filename ${name}-${current-date}-${expectedVersion} ${type}
3234

35+
Save as to CoMPAS
36+
[Arguments] ${initialValue} ${name} ${type} ${expectedVersion}
37+
# Make sure the initial value is entered. so we can continue.
38+
Get Text mwc-dialog#compas-save-as-dlg > compas-save mwc-textfield#name label > input == ${initialValue}
39+
Fill Text mwc-dialog#compas-save-as-dlg > compas-save mwc-textfield#name label > input ${name}-${current-date}
40+
Click mwc-dialog#compas-save-as-dlg > compas-save compas-scltype-select mwc-select
41+
Click mwc-dialog#compas-save-as-dlg > compas-save compas-scltype-select mwc-select > mwc-list-item[value="${type.upper()}"]
42+
Add label mwc-dialog#compas-save-as-dlg > compas-save ${type}_as_${current-date}
43+
Click mwc-dialog#compas-save-as-dlg > mwc-button[slot="primaryAction"] > button
44+
Wait for dialog is closed
45+
Close Menu
46+
# check if the title (filename) changed to the new expected one.
47+
Check Title Filename ${name}-${current-date}-${expectedVersion} ${type}
48+
3349
Update in CoMPAS
3450
[Arguments] ${changeType} ${name} ${type} ${expectedVersion}
3551
Click mwc-dialog#compas-save-dlg > compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
52+
Add label mwc-dialog#compas-save-dlg > compas-save ${type}_${current-date}_${expectedVersion.replace('.', '')}
3653
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
3754
Wait for dialog is closed
3855
Close Menu
3956
# check if the title (filename) changed to the new expected one.
4057
Check Title Filename ${name}-${current-date}-${expectedVersion} ${type}
4158

59+
Save version to CoMPAS
60+
[Arguments] ${changeType} ${name} ${type} ${expectedVersion}
61+
Click mwc-dialog#compas-save-as-version-dlg > compas-open compas-scltype-list > mwc-list > mwc-list-item >> span:has-text("${type.upper()}")
62+
Click mwc-dialog#compas-save-as-version-dlg > compas-open compas-scl-list > filtered-list > mwc-list-item:has-text("${name}-${current-date}")
63+
Click mwc-dialog#compas-save-as-version-dlg > compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
64+
Click mwc-dialog#compas-save-as-version-dlg > mwc-button[slot="primaryAction"] > button
65+
Wait for dialog is closed
66+
Close Menu
67+
# check if the title (filename) changed to the new expected one.
68+
Check Title Filename ${name}-${current-date}-${expectedVersion} ${type}
69+
70+
4271
Change Websockets setting
4372
[Arguments] ${checked}
4473
Open Menu CoMPAS Settings
@@ -55,3 +84,15 @@ Check CoMPAS Error
5584
[Arguments] ${secondaryMessage}
5685
Set Test Variable ${primaryMessage} Error communicating with CoMPAS Ecosystem
5786
Check Log ${primaryMessage} ${secondaryMessage}
87+
88+
Add label
89+
[Arguments] ${dialog} ${label}
90+
Fill Text ${dialog} compas-labels-field wizard-textfield#newLabel label > input ${label}
91+
Click ${dialog} compas-labels-field mwc-icon-button[icon="new_label"] > button
92+
93+
Select label
94+
[Arguments] ${dialog} ${label}
95+
Click ${dialog} compas-scl-list oscd-filter-button#labelsFilter > mwc-icon-button > button
96+
Click ${dialog} compas-scl-list oscd-filter-button#labelsFilter > mwc-dialog#filterDialog mwc-formfield > mwc-checkbox
97+
Click ${dialog} compas-scl-list oscd-filter-button#labelsFilter > mwc-check-list-item[value="${label}"]
98+
Click ${dialog} compas-scl-list oscd-filter-button#labelsFilter > mwc-dialog#filterDialog > mwc-button[slot="primaryAction"] > button

0 commit comments

Comments
 (0)