Skip to content

Commit c69a6b5

Browse files
authored
Getting default flag for versions (#4466)
* Getting default flag for versions * Tests update
1 parent b4bd951 commit c69a6b5

File tree

4 files changed

+22
-0
lines changed

4 files changed

+22
-0
lines changed

pkg/api/admin/openshiftversion.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ type OpenShiftVersionProperties struct {
3030
OpenShiftPullspec string `json:"openShiftPullspec,omitempty" mutable:"true"`
3131
InstallerPullspec string `json:"installerPullspec,omitempty" mutable:"true"`
3232
Enabled bool `json:"enabled" mutable:"true"`
33+
Default bool `json:"default" mutable:"true"`
3334
}

pkg/api/admin/openshiftversion_convert.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ func (openShiftVersionConverter) ToExternal(v *api.OpenShiftVersion) interface{}
2121
OpenShiftPullspec: v.Properties.OpenShiftPullspec,
2222
InstallerPullspec: v.Properties.InstallerPullspec,
2323
Enabled: v.Properties.Enabled,
24+
Default: v.Properties.Default,
2425
},
2526
Name: v.Name,
2627
Type: v.Type,
@@ -62,6 +63,7 @@ func (c openShiftVersionConverter) ToInternal(_new interface{}, out *api.OpenShi
6263
out.Properties.InstallerPullspec = new.Properties.InstallerPullspec
6364
out.Properties.OpenShiftPullspec = new.Properties.OpenShiftPullspec
6465
out.Properties.Version = new.Properties.Version
66+
out.Properties.Default = new.Properties.Default
6567
out.Name = new.Properties.Version
6668
out.Type = api.OpenShiftVersionsType
6769
}

pkg/frontend/admin_openshiftversion_list_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func TestOpenShiftVersionList(t *testing.T) {
4343
Properties: api.OpenShiftVersionProperties{
4444
Version: "4.10.0",
4545
Enabled: true,
46+
Default: true,
4647
OpenShiftPullspec: "a:a/b",
4748
},
4849
},
@@ -53,6 +54,7 @@ func TestOpenShiftVersionList(t *testing.T) {
5354

5455
Version: "4.9.9",
5556
Enabled: true,
57+
Default: false,
5658
OpenShiftPullspec: "a:a/b",
5759
InstallerPullspec: "b:b/c",
5860
},
@@ -64,6 +66,7 @@ func TestOpenShiftVersionList(t *testing.T) {
6466

6567
Version: "4.10.1",
6668
Enabled: false,
69+
Default: false,
6770
OpenShiftPullspec: "a:a/b",
6871
InstallerPullspec: "b:b/c",
6972
},
@@ -78,6 +81,7 @@ func TestOpenShiftVersionList(t *testing.T) {
7881
Properties: admin.OpenShiftVersionProperties{
7982
Version: "4.9.9",
8083
Enabled: true,
84+
Default: false,
8185
OpenShiftPullspec: "a:a/b",
8286
InstallerPullspec: "b:b/c",
8387
},
@@ -88,6 +92,7 @@ func TestOpenShiftVersionList(t *testing.T) {
8892
Properties: admin.OpenShiftVersionProperties{
8993
Version: "4.10.0",
9094
Enabled: true,
95+
Default: true,
9196
OpenShiftPullspec: "a:a/b",
9297
},
9398
Name: "4.10.0",
@@ -97,6 +102,7 @@ func TestOpenShiftVersionList(t *testing.T) {
97102
Properties: admin.OpenShiftVersionProperties{
98103
Version: "4.10.1",
99104
Enabled: false,
105+
Default: false,
100106
OpenShiftPullspec: "a:a/b",
101107
InstallerPullspec: "b:b/c",
102108
},

pkg/frontend/admin_openshiftversion_put_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
3737
Properties: api.OpenShiftVersionProperties{
3838
Version: "4.10.0",
3939
Enabled: true,
40+
Default: false,
4041
OpenShiftPullspec: "a:a/b",
4142
},
4243
},
@@ -47,6 +48,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
4748
Properties: admin.OpenShiftVersionProperties{
4849
Version: "4.10.0",
4950
Enabled: false,
51+
Default: false,
5052
OpenShiftPullspec: "c:c/d",
5153
InstallerPullspec: "d:d/e",
5254
},
@@ -58,6 +60,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
5860
Properties: admin.OpenShiftVersionProperties{
5961
Version: "4.10.0",
6062
Enabled: false,
63+
Default: false,
6164
OpenShiftPullspec: "c:c/d",
6265
InstallerPullspec: "d:d/e",
6366
},
@@ -71,6 +74,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
7174
Properties: api.OpenShiftVersionProperties{
7275
Version: "4.10.0",
7376
Enabled: false,
77+
Default: false,
7478
OpenShiftPullspec: "c:c/d",
7579
InstallerPullspec: "d:d/e",
7680
},
@@ -89,6 +93,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
8993
Properties: api.OpenShiftVersionProperties{
9094
Version: "4.15.0",
9195
Enabled: true,
96+
Default: false,
9297
OpenShiftPullspec: "a:a/b",
9398
},
9499
Name: "4.15.0",
@@ -101,6 +106,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
101106
Properties: admin.OpenShiftVersionProperties{
102107
Version: "4.15.0",
103108
Enabled: false,
109+
Default: false,
104110
OpenShiftPullspec: "c:c/d",
105111
InstallerPullspec: "d:d/e",
106112
},
@@ -112,6 +118,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
112118
Properties: admin.OpenShiftVersionProperties{
113119
Version: "4.15.0",
114120
Enabled: false,
121+
Default: false,
115122
OpenShiftPullspec: "c:c/d",
116123
InstallerPullspec: "d:d/e",
117124
},
@@ -125,6 +132,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
125132
Properties: api.OpenShiftVersionProperties{
126133
Version: "4.15.0",
127134
Enabled: false,
135+
Default: false,
128136
OpenShiftPullspec: "c:c/d",
129137
InstallerPullspec: "d:d/e",
130138
},
@@ -143,6 +151,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
143151
Properties: api.OpenShiftVersionProperties{
144152
Version: "4.10.0",
145153
Enabled: true,
154+
Default: false,
146155
OpenShiftPullspec: "a:a/b",
147156
},
148157
},
@@ -153,6 +162,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
153162
Properties: admin.OpenShiftVersionProperties{
154163
Version: "4.10.1",
155164
Enabled: true,
165+
Default: false,
156166
OpenShiftPullspec: "f:f/g",
157167
InstallerPullspec: "g:g/h",
158168
},
@@ -162,6 +172,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
162172
Properties: admin.OpenShiftVersionProperties{
163173
Version: "4.10.1",
164174
Enabled: true,
175+
Default: false,
165176
OpenShiftPullspec: "f:f/g",
166177
InstallerPullspec: "g:g/h",
167178
},
@@ -175,6 +186,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
175186
Properties: api.OpenShiftVersionProperties{
176187
Version: "4.10.0",
177188
Enabled: true,
189+
Default: false,
178190
OpenShiftPullspec: "a:a/b",
179191
},
180192
},
@@ -185,6 +197,7 @@ func TestOpenShiftVersionPut(t *testing.T) {
185197
Properties: api.OpenShiftVersionProperties{
186198
Version: "4.10.1",
187199
Enabled: true,
200+
Default: false,
188201
OpenShiftPullspec: "f:f/g",
189202
InstallerPullspec: "g:g/h",
190203
},

0 commit comments

Comments
 (0)