Skip to content

Commit eca6360

Browse files
committed
Region Tests and Config Samples
On-behalf-of: SAP nils.gondermann@sap.com
1 parent c5ab30a commit eca6360

18 files changed

Lines changed: 23 additions & 45 deletions

config/samples/openstack_v1alpha1_region.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ metadata:
55
name: region-sample
66
spec:
77
cloudCredentialsRef:
8-
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
9-
cloudName: openstack
8+
cloudName: openstack-admin
109
secretName: openstack-clouds
1110
managementPolicy: managed
1211
resource:
12+
name: SampleRegion
1313
description: Sample Region
14-
# TODO(scaffolding): Add all fields the resource supports

internal/controllers/region/tests/region-create-full/00-assert.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ status:
77
resource:
88
name: region-create-full-override
99
description: Region from "create full" test
10-
# TODO(scaffolding): Add all fields the resource supports
1110
conditions:
1211
- type: Available
1312
status: "True"
@@ -25,4 +24,4 @@ resourceRefs:
2524
ref: region
2625
assertAll:
2726
- celExpr: "region.status.id != ''"
28-
# TODO(scaffolding): Add more checks
27+
- celExpr: "region.status.id == region.status.resource.name"

internal/controllers/region/tests/region-create-full/00-create-resource.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ metadata:
55
name: region-create-full
66
spec:
77
cloudCredentialsRef:
8-
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
9-
cloudName: openstack
8+
cloudName: openstack-admin
109
secretName: openstack-clouds
1110
managementPolicy: managed
1211
resource:
1312
name: region-create-full-override
1413
description: Region from "create full" test
15-
# TODO(scaffolding): Add all fields the resource supports

internal/controllers/region/tests/region-create-minimal/00-assert.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ metadata:
55
name: region-create-minimal
66
status:
77
resource:
8-
name: region-create-minimal
9-
# TODO(scaffolding): Add all fields the resource supports
8+
name: TestRegion
109
conditions:
1110
- type: Available
1211
status: "True"
@@ -24,4 +23,4 @@ resourceRefs:
2423
ref: region
2524
assertAll:
2625
- celExpr: "region.status.id != ''"
27-
# TODO(scaffolding): Add more checks
26+
- celExpr: "region.status.id == region.status.resource.name"

internal/controllers/region/tests/region-create-minimal/00-create-resource.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ metadata:
55
name: region-create-minimal
66
spec:
77
cloudCredentialsRef:
8-
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
9-
cloudName: openstack
8+
cloudName: openstack-admin
109
secretName: openstack-clouds
1110
managementPolicy: managed
12-
# TODO(scaffolding): Only add the mandatory fields. It's possible the resource
13-
# doesn't have mandatory fields, in that case, leave it empty.
14-
resource: {}
11+
resource:
12+
name: TestRegion

internal/controllers/region/tests/region-import-error/00-create-resources.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,22 @@ metadata:
55
name: region-import-error-external-1
66
spec:
77
cloudCredentialsRef:
8-
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
9-
cloudName: openstack
8+
cloudName: openstack-admin
109
secretName: openstack-clouds
1110
managementPolicy: managed
1211
resource:
12+
name: region-import-error-external-1
1313
description: Region from "import error" test
14-
# TODO(scaffolding): add any required field
1514
---
1615
apiVersion: openstack.k-orc.cloud/v1alpha1
1716
kind: Region
1817
metadata:
1918
name: region-import-error-external-2
2019
spec:
2120
cloudCredentialsRef:
22-
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
23-
cloudName: openstack
21+
cloudName: openstack-admin
2422
secretName: openstack-clouds
2523
managementPolicy: managed
2624
resource:
25+
name: region-import-error-external-2
2726
description: Region from "import error" test
28-
# TODO(scaffolding): add any required field

internal/controllers/region/tests/region-import-error/01-import-resource.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: region-import-error
66
spec:
77
cloudCredentialsRef:
8-
cloudName: openstack
8+
cloudName: openstack-admin
99
secretName: openstack-clouds
1010
managementPolicy: unmanaged
1111
import:

internal/controllers/region/tests/region-import/00-import-resource.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ metadata:
55
name: region-import
66
spec:
77
cloudCredentialsRef:
8-
cloudName: openstack
8+
cloudName: openstack-admin
99
secretName: openstack-clouds
1010
managementPolicy: unmanaged
1111
import:
1212
filter:
1313
name: region-import-external
1414
description: Region region-import-external from "region-import" test
15-
# TODO(scaffolding): Add all fields supported by the filter

internal/controllers/region/tests/region-import/01-assert.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ status:
1616
resource:
1717
name: region-import-external-not-this-one
1818
description: Region region-import-external from "region-import" test
19-
# TODO(scaffolding): Add fields necessary to match filter
2019
---
2120
apiVersion: openstack.k-orc.cloud/v1alpha1
2221
kind: Region

internal/controllers/region/tests/region-import/01-create-trap-resource.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ metadata:
88
name: region-import-external-not-this-one
99
spec:
1010
cloudCredentialsRef:
11-
# TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
12-
cloudName: openstack
11+
cloudName: openstack-admin
1312
secretName: openstack-clouds
1413
managementPolicy: managed
1514
resource:
15+
name: region-import-external-not-this-one
1616
description: Region region-import-external from "region-import" test
17-
# TODO(scaffolding): Add fields necessary to match filter

0 commit comments

Comments
 (0)