Skip to content

Commit 00db323

Browse files
russgoldrussgold
committed
Adapt script domain tests for Helm
1 parent a3367fb commit 00db323

21 files changed

+1303
-72
lines changed

‎kubernetes/src/test/java/oracle/kubernetes/operator/create/ScriptedDomainYamlFactory.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import oracle.kubernetes.operator.utils.ParsedWeblogicDomainPersistentVolumeClaimYaml;
2828
import oracle.kubernetes.operator.utils.ParsedWeblogicDomainPersistentVolumeYaml;
2929
import oracle.kubernetes.operator.utils.UserProjects;
30+
import oracle.kubernetes.operator.utils.YamlGeneratorBase;
3031

3132
public class ScriptedDomainYamlFactory extends DomainYamlFactory {
3233

@@ -40,7 +41,7 @@ public GeneratedDomainYamlFiles generate(DomainValues values) throws Exception {
4041
return new YamlGenerator(values).getGeneratedDomainYamlFiles();
4142
}
4243

43-
static class YamlGenerator {
44+
static class YamlGenerator extends YamlGeneratorBase {
4445
private final DomainValues values;
4546
private DomainFiles domainFiles;
4647

@@ -52,7 +53,8 @@ static class YamlGenerator {
5253
assertThat(execCreateDomain(userProjects.getPath(), values), succeedsAndPrints("Completed"));
5354
}
5455

55-
GeneratedDomainYamlFiles getGeneratedDomainYamlFiles() throws Exception {
56+
@Override
57+
protected GeneratedDomainYamlFiles getGeneratedDomainYamlFiles() throws Exception {
5658
GeneratedDomainYamlFiles files =
5759
new GeneratedDomainYamlFiles(
5860
new ParsedCreateWeblogicDomainJobYaml(
@@ -75,33 +77,27 @@ private void definePersistentVolumeYaml(GeneratedDomainYamlFiles files) throws E
7577
domainFiles.getWeblogicDomainPersistentVolumeClaimYamlPath(), values));
7678
}
7779

78-
private void defineLoadBalancer(GeneratedDomainYamlFiles files) throws Exception {
79-
switch (this.values.getLoadBalancer()) {
80-
case DomainValues.LOAD_BALANCER_TRAEFIK:
81-
defineTraefikYaml(files);
82-
break;
83-
case DomainValues.LOAD_BALANCER_APACHE:
84-
defineApacheYaml(files);
85-
break;
86-
case DomainValues.LOAD_BALANCER_VOYAGER:
87-
defineYoyagerYaml(files);
88-
break;
89-
}
80+
@Override
81+
protected String getLoadBalancer() {
82+
return values.getLoadBalancer();
9083
}
9184

92-
private void defineTraefikYaml(GeneratedDomainYamlFiles files) throws Exception {
85+
@Override
86+
protected void defineTraefikYaml(GeneratedDomainYamlFiles files) throws Exception {
9387
files.defineTraefikYaml(
9488
new ParsedTraefikYaml(domainFiles.getTraefikYamlPath(), values),
9589
new ParsedTraefikSecurityYaml(domainFiles.getTraefikSecurityYamlPath(), values));
9690
}
9791

98-
private void defineApacheYaml(GeneratedDomainYamlFiles files) throws Exception {
92+
@Override
93+
protected void defineApacheYaml(GeneratedDomainYamlFiles files) throws Exception {
9994
files.defineApacheYaml(
10095
new ParsedApacheYaml(domainFiles.getApacheYamlPath(), values),
10196
new ParsedApacheSecurityYaml(domainFiles.getApacheSecurityYamlPath(), values));
10297
}
10398

104-
private void defineYoyagerYaml(GeneratedDomainYamlFiles files) throws Exception {
99+
@Override
100+
protected void defineYoyagerYaml(GeneratedDomainYamlFiles files) throws Exception {
105101
files.defineYoyagerYaml(
106102
new ParsedVoyagerOperatorYaml(domainFiles.getVoyagerOperatorYamlPath(), values),
107103
new ParsedVoyagerOperatorSecurityYaml(domainFiles.getVoyagerOperatorSecurityYamlPath()),

‎kubernetes/src/test/java/oracle/kubernetes/operator/helm/CreateDomainGeneratedFilesOptionalFeaturesDisabledIT.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at
3+
// http://oss.oracle.com/licenses/upl.
4+
5+
package oracle.kubernetes.operator.helm;
6+
7+
import oracle.kubernetes.operator.create.CreateDomainGeneratedFilesOptionalFeaturesDisabledTestBase;
8+
import org.junit.BeforeClass;
9+
10+
public class CreateDomainGeneratedFilesOptionalFeaturesDisabledIT
11+
extends CreateDomainGeneratedFilesOptionalFeaturesDisabledTestBase {
12+
13+
@BeforeClass
14+
public static void setup() throws Exception {
15+
defineDomainYamlFactory(new HelmDomainYamlFactory());
16+
}
17+
}

‎kubernetes/src/test/java/oracle/kubernetes/operator/helm/HelmDomainValues.java

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at
3+
// http://oss.oracle.com/licenses/upl.
4+
5+
package oracle.kubernetes.operator.helm;
6+
7+
import static oracle.kubernetes.operator.helm.MapUtils.addMapEntry;
8+
import static oracle.kubernetes.operator.helm.MapUtils.addStringMapEntry;
9+
import static oracle.kubernetes.operator.helm.MapUtils.integerValue;
10+
import static oracle.kubernetes.operator.helm.MapUtils.loadBooleanFromMap;
11+
import static oracle.kubernetes.operator.helm.MapUtils.loadFromMap;
12+
import static oracle.kubernetes.operator.helm.MapUtils.loadIntegerFromMap;
13+
14+
import java.util.HashMap;
15+
import java.util.Map;
16+
import oracle.kubernetes.operator.utils.DomainValues;
17+
18+
class HelmDomainValues extends DomainValues {
19+
HelmDomainValues() {}
20+
21+
HelmDomainValues(Map<String, Object> map) {
22+
loadFromMap(map, this::setAdminServerName, "adminServerName");
23+
loadFromMap(map, this::setDomainName, "domainName");
24+
loadFromMap(map, this::setDomainUID, "domainUID");
25+
loadFromMap(map, this::setClusterName, "clusterName");
26+
loadFromMap(map, this::setClusterType, "clusterType");
27+
loadFromMap(map, this::setStartupControl, "startupControl");
28+
loadFromMap(map, this::setManagedServerNameBase, "managedServerNameBase");
29+
loadFromMap(map, this::setWeblogicImage, "weblogicImage");
30+
loadFromMap(map, this::setWeblogicDomainStorageType, "weblogicDomainStorageType");
31+
loadFromMap(
32+
map, this::setWeblogicDomainStorageReclaimPolicy, "weblogicDomainStorageReclaimPolicy");
33+
loadFromMap(map, this::setWeblogicDomainStorageSize, "weblogicDomainStorageSize");
34+
loadFromMap(map, this::setWeblogicCredentialsSecretName, "weblogicCredentialsSecretName");
35+
loadFromMap(map, this::setT3PublicAddress, "t3PublicAddress");
36+
loadFromMap(map, this::setNamespace, "namespace");
37+
loadFromMap(map, this::setLoadBalancer, "loadBalancer");
38+
loadFromMap(map, this::setLoadBalancerAppPrepath, "loadBalancerAppPrepath");
39+
loadFromMap(map, this::setLoadBalancerVolumePath, "loadBalancerVolumePath");
40+
loadFromMap(map, this::setJavaOptions, "javaOptions");
41+
42+
loadBooleanFromMap(map, this::setProductionModeEnabled, "productionModeEnabled");
43+
loadBooleanFromMap(map, this::setExposeAdminT3Channel, "exposeAdminT3Channel");
44+
loadBooleanFromMap(map, this::setExposeAdminNodePort, "exposeAdminNodePort");
45+
loadBooleanFromMap(map, this::setLoadBalancerExposeAdminPort, "loadBalancerExposeAdminPort");
46+
47+
loadIntegerFromMap(map, this::setAdminPort, "adminPort");
48+
loadIntegerFromMap(map, this::setConfiguredManagedServerCount, "configuredManagedServerCount");
49+
loadIntegerFromMap(map, this::setInitialManagedServerReplicas, "initialManagedServerReplicas");
50+
loadIntegerFromMap(map, this::setManagedServerPort, "managedServerPort");
51+
loadIntegerFromMap(map, this::setT3ChannelPort, "t3ChannelPort");
52+
loadIntegerFromMap(map, this::setAdminNodePort, "adminNodePort");
53+
loadIntegerFromMap(map, this::setLoadBalancerWebPort, "loadBalancerWebPort");
54+
loadIntegerFromMap(map, this::setLoadBalancerDashboardPort, "loadBalancerDashboardPort");
55+
}
56+
57+
private void setProductionModeEnabled(Boolean enabled) {
58+
if (enabled != null) {
59+
setProductionModeEnabled(enabled.toString());
60+
}
61+
}
62+
63+
private void setExposeAdminT3Channel(Boolean enabled) {
64+
if (enabled != null) {
65+
setExposeAdminT3Channel(enabled.toString());
66+
}
67+
}
68+
69+
private void setExposeAdminNodePort(Boolean enabled) {
70+
if (enabled != null) {
71+
setExposeAdminNodePort(enabled.toString());
72+
}
73+
}
74+
75+
private void setLoadBalancerExposeAdminPort(Boolean enabled) {
76+
if (enabled != null) {
77+
setLoadBalancerExposeAdminPort(enabled.toString());
78+
}
79+
}
80+
81+
Map<String, Object> createMap() {
82+
HashMap<String, Object> map = new HashMap<>();
83+
84+
addStringMapEntry(map, this::getAdminServerName, "adminServerName");
85+
addStringMapEntry(map, this::getDomainName, "domainName");
86+
addStringMapEntry(map, this::getDomainUID, "domainUID");
87+
addStringMapEntry(map, this::getClusterName, "clusterName");
88+
addStringMapEntry(map, this::getClusterType, "clusterType");
89+
addStringMapEntry(map, this::getStartupControl, "startupControl");
90+
addStringMapEntry(map, this::getManagedServerNameBase, "managedServerNameBase");
91+
addStringMapEntry(map, this::getWeblogicImage, "weblogicImage");
92+
addStringMapEntry(map, this::getWeblogicDomainStorageType, "weblogicDomainStorageType");
93+
addStringMapEntry(
94+
map, this::getWeblogicDomainStorageReclaimPolicy, "weblogicDomainStorageReclaimPolicy");
95+
addStringMapEntry(map, this::getWeblogicDomainStorageSize, "weblogicDomainStorageSize");
96+
addStringMapEntry(map, this::getWeblogicCredentialsSecretName, "weblogicCredentialsSecretName");
97+
addStringMapEntry(map, this::getT3PublicAddress, "t3PublicAddress");
98+
addStringMapEntry(map, this::getNamespace, "namespace");
99+
addStringMapEntry(map, this::getLoadBalancer, "loadBalancer");
100+
addStringMapEntry(map, this::getLoadBalancerAppPrepath, "loadBalancerAppPrepath");
101+
addStringMapEntry(map, this::getLoadBalancerVolumePath, "loadBalancerVolumePath");
102+
addStringMapEntry(map, this::getJavaOptions, "javaOptions");
103+
104+
addMapEntry(map, this::isProductionModeEnabled, "productionModeEnabled");
105+
addMapEntry(map, this::isExposeAdminT3Channel, "exposeAdminT3Channel");
106+
addMapEntry(map, this::isExposeAdminNodePort, "exposeAdminNodePort");
107+
addMapEntry(map, this::isLoadBalancerExposeAdminPort, "loadBalancerExposeAdminPort");
108+
109+
addMapEntry(map, this::getAdminPortNum, "adminPort");
110+
addMapEntry(map, this::getConfiguredManagedServerCountValue, "configuredManagedServerCount");
111+
addMapEntry(map, this::getInitialManagedServerReplicasNum, "initialManagedServerReplicas");
112+
addMapEntry(map, this::getManagedServerPortNum, "managedServerPort");
113+
addMapEntry(map, this::getT3ChannelPortNum, "t3ChannelPort");
114+
addMapEntry(map, this::getAdminNodePortNum, "adminNodePort");
115+
addMapEntry(map, this::getLoadBalancerDashboardPortNum, "loadBalancerDashboardPort");
116+
addMapEntry(map, this::getLoadBalancerWebPortNum, "loadBalancerWebPort");
117+
118+
return map;
119+
}
120+
121+
private Boolean isProductionModeEnabled() {
122+
return MapUtils.valueOf(getProductionModeEnabled());
123+
}
124+
125+
private Boolean isExposeAdminT3Channel() {
126+
return MapUtils.valueOf(getExposeAdminT3Channel());
127+
}
128+
129+
private Boolean isExposeAdminNodePort() {
130+
return MapUtils.valueOf(getExposeAdminNodePort());
131+
}
132+
133+
private Boolean isLoadBalancerExposeAdminPort() {
134+
return MapUtils.valueOf(getLoadBalancerExposeAdminPort());
135+
}
136+
137+
private Integer getAdminPortNum() {
138+
return integerValue(getAdminPort());
139+
}
140+
141+
private Integer getConfiguredManagedServerCountValue() {
142+
return integerValue(getConfiguredManagedServerCount());
143+
}
144+
145+
private Integer getInitialManagedServerReplicasNum() {
146+
return integerValue(getInitialManagedServerReplicas());
147+
}
148+
149+
private Integer getManagedServerPortNum() {
150+
return integerValue(getManagedServerPort());
151+
}
152+
153+
private Integer getT3ChannelPortNum() {
154+
return integerValue(getT3ChannelPort());
155+
}
156+
157+
private Integer getAdminNodePortNum() {
158+
return integerValue(getAdminNodePort());
159+
}
160+
161+
private Integer getLoadBalancerWebPortNum() {
162+
return integerValue(getLoadBalancerWebPort());
163+
}
164+
165+
private Integer getLoadBalancerDashboardPortNum() {
166+
return integerValue(getLoadBalancerDashboardPort());
167+
}
168+
}

0 commit comments

Comments
 (0)