Skip to content

Commit e66d584

Browse files
author
Tom Barnes
committed
introspector test updates - use 'add' instead of 'replace' custom-sit-cfg verbs for unset fields, plus minor tweaks
1 parent c40226d commit e66d584

File tree

9 files changed

+106
-53
lines changed

9 files changed

+106
-53
lines changed

‎integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ public void test1CreateFirstOperatorAndDomain() throws Exception {
138138
if (!SMOKETEST) domain1.testWlsLivenessProbe();
139139
testCompletedSuccessfully = true;
140140
} finally {
141-
142-
if (domain1 != null && (JENKINS || testCompletedSuccessfully))
141+
if (domain1 != null && !SMOKETEST && (JENKINS || testCompletedSuccessfully))
143142
domain1.shutdownUsingServerStartPolicy();
144143
}
145144

‎src/integration-tests/introspector/checkBeans.inputt

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
/Servers/${ADMIN_NAME},ListenAddress,,${DOMAIN_UID}-${ADMIN_NAME}
22
/Servers/${ADMIN_NAME}/Log/${ADMIN_NAME},FileName,logs/${ADMIN_NAME}.log,/shared/logs/${ADMIN_NAME}.log
3-
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel,ListenAddress,,${DOMAIN_UID}-${ADMIN_NAME}
4-
# /Servers/${ADMIN_NAME},MaxMessageSize,10000000,78787878 TBD Waiting on bug fix to WL 19.1
5-
# /Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel,PublicAddress,,${TEST_HOST} TBD Waiting on bug fix to WL 19.1
3+
4+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel1,ListenAddress,unresolvable-dns-name,${DOMAIN_UID}-${ADMIN_NAME}
5+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel2,ListenAddress,junk,${DOMAIN_UID}-${ADMIN_NAME}
6+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel3,ListenAddress,,${DOMAIN_UID}-${ADMIN_NAME}
7+
8+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel1,PublicAddress,unresolvable-dns-name,${TEST_HOST}
9+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel2,PublicAddress,junk,${TEST_HOST}
10+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel3,PublicAddress,,${TEST_HOST}
11+
12+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel1,PublicPort,22222,40012
13+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel2,PublicPort,22222,40013
14+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel3,PublicPort,30014,40014
15+
16+
/Servers/${ADMIN_NAME},MaxMessageSize,999999,78787878
17+
/Servers/standalone1,MaxMessageSize,7777777,1111111
18+
/Servers/standalone2,MaxMessageSize,10000000,2222222
19+
620
/JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS,Url,jdbc:oracle:thin:@myoriginalhostname:1521:myoriginalsid,jdbc:oracle:thin:@mynewhost:1521:mynewsid

‎src/integration-tests/introspector/checkBeans.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def addError(err):
9595
overriddenExpected=words[3]
9696

9797
print(
98-
"Info: Checking bean_path='" + bean_path + "'"
98+
"Info: Checking line#=" + str(line_no) + " bean_path='" + bean_path + "'"
9999
+ " attr='" + attr + "'"
100100
+ " originalExpected='" + originalExpected + "'"
101101
+ " overriddenExpected='" + overriddenExpected + "'"
@@ -107,11 +107,10 @@ def addError(err):
107107
serverConfig()
108108
cd(bean_path)
109109
overriddenActual=str(get(attr))
110-
111-
print("Info: originalActual='" + originalActual + "'")
112-
print("Info: overriddenActual='" + overriddenActual + "'")
110+
checkStatus='SUCCESS'
113111

114112
if originalExpected != '*' and originalActual != originalExpected:
113+
checkStatus='FAILED'
115114
addError(
116115
"Error: got '" + originalActual + "'"
117116
+ " but expected value '" + originalExpected + "'"
@@ -120,12 +119,20 @@ def addError(err):
120119
)
121120

122121
if overriddenActual != overriddenExpected:
122+
checkStatus='FAILED'
123123
addError(
124124
"Error: got '" + overriddenActual + "'"
125125
+ " but expected value '" + overriddenExpected + "'"
126126
+ " for bean_path=serverConfig/" + bean_path
127127
+ " attr='" + attr + "'. "
128128
)
129+
130+
print(
131+
"Info: Checked line#=" + str(line_no) + " status=" + checkStatus + " bean_path='" + bean_path + "'"
132+
+ " attr='" + attr + "'"
133+
+ " originalExpected/Actual='" + originalExpected + "'/'" + originalActual + "'"
134+
+ " overriddenExpected/Actual='" + overriddenExpected + "'/'" + overriddenActual + "'"
135+
)
129136
file.close()
130137

131138
if len(errors) > 0:

‎src/integration-tests/introspector/createDomain.pyt

Lines changed: 48 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,70 @@ setOption('DomainName', '${DOMAIN_NAME}')
4141
# Configure the Administration Server
4242
# ===================================
4343
cd('/Servers/AdminServer')
44-
#set('ListenAddress', '${DOMAIN_UID}-${ADMIN_NAME}')
45-
#set('ListenAddress', 'invalid-${DOMAIN_UID}-${ADMIN_NAME}')
44+
#set('ListenAddress', '${DOMAIN_UID}-${ADMIN_NAME}') # what override should set the value too
45+
#set('ListenAddress', 'unresolvable-dns-name') # an invalid value, unesolvable as a DNS name
46+
#set('ListenAddress', 'junk') # an invalid value, unesolvable as a DNS name
4647
set('ListenPort', ${ADMIN_PORT})
4748
set('Name', '${ADMIN_NAME}')
4849

49-
create('T3Channel', 'NetworkAccessPoint')
50-
cd('/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel')
51-
set('PublicPort', ${T3_CHANNEL_PORT})
52-
#set('PublicAddress', '${T3_PUBLIC_ADDRESS}')
53-
#set('PublicAddress', 'invalid-${T3_PUBLIC_ADDRESS}')
54-
#set('ListenAddress', '${DOMAIN_UID}-${ADMIN_NAME}')
55-
#set('ListenAddress', 'invalid-${DOMAIN_UID}-${ADMIN_NAME}')
56-
set('ListenPort', ${T3_CHANNEL_PORT})
50+
cd('/Servers/${ADMIN_NAME}')
51+
set('MaxMessageSize',999999)
52+
create('T3Channel1', 'NetworkAccessPoint')
53+
cd('/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel1')
54+
set('ListenAddress', 'unresolvable-dns-name') #an invalid value, and an unresolvable DNS name
55+
set('ListenPort', ${T3CHANNEL1_PORT})
56+
set('PublicPort', 22222)
57+
set('PublicAddress', 'unresolvable-dns-name') #an invalid value, and an unresolvable DNS name
58+
59+
cd('/Servers/${ADMIN_NAME}')
60+
create('T3Channel2', 'NetworkAccessPoint')
61+
cd('/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel2')
62+
set('ListenAddress', 'junk') #an invalid value, but a resolvable DNS name
63+
set('ListenPort', ${T3CHANNEL2_PORT})
64+
set('PublicPort', 22222)
65+
set('PublicAddress', 'junk') #an invalid value, but a resolvable DNS name
66+
67+
cd('/Servers/${ADMIN_NAME}')
68+
create('T3Channel3', 'NetworkAccessPoint')
69+
cd('/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel3')
70+
#set('ListenAddress', 'junk') #not setting this value at all, commented out on purpose
71+
set('ListenPort', ${T3CHANNEL3_PORT})
72+
#set('PublicPort', 40014) #not setting this value at all, commented out on purpose
73+
#set('PublicAddress', 'junk') #not setting this value at all, commented out on purpose
5774

5875
#cd('/Servers/${ADMIN_NAME}')
5976
#create('${ADMIN_NAME}', 'Log')
6077
#cd('/Servers/${ADMIN_NAME}/Log/${ADMIN_NAME}')
6178
#set('FileName', '${LOG_HOME}/${ADMIN_NAME}.log')
6279

80+
6381
# Set the admin user's username and password
6482
# ==========================================
6583
# Password required - otherwise script will fail.
6684
cd('/Security/${DOMAIN_NAME}/User/weblogic')
6785
cmo.setName(admin_username)
6886
cmo.setPassword(admin_password)
6987

88+
89+
# Configure a couple of non-clustered managed servers
90+
# ==========================================
91+
cd('/')
92+
mname='standalone1'
93+
create(mname, 'Server')
94+
cd('/Servers/%s/' % mname )
95+
# set('ListenAddress', '${DOMAIN_UID}-%s' % mname)
96+
set('ListenPort', 6123)
97+
set('MaxMessageSize', 7777777)
98+
99+
cd('/')
100+
mname='standalone2'
101+
create(mname, 'Server')
102+
cd('/Servers/%s/' % mname )
103+
# set('ListenAddress', '${DOMAIN_UID}-%s' % mname)
104+
set('ListenPort', 6124)
105+
# set('MaxMessageSize', 7777777) # deliberately unset, so should be at the default of 10000000
106+
107+
70108
# Write the domain and close the domain template
71109
# ==============================================
72110
setOption('OverwriteDomain', 'true')

‎src/integration-tests/introspector/introspectTest.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ export CLUSTER_NAME="${CLUSTER_NAME:-mycluster}"
123123
export MANAGED_SERVER_PORT=${MANAGED_SERVER_PORT:-8001}
124124
export CONFIGURED_MANAGED_SERVER_COUNT=${CONFIGURED_MANAGED_SERVER_COUNT:-2}
125125
export CLUSTER_TYPE="${CLUSTER_TYPE:-DYNAMIC}"
126-
export T3_CHANNEL_PORT=${T3_CHANNEL_PORT:-30012}
126+
export T3CHANNEL1_PORT=${T3CHANNEL1_PORT:-30012}
127+
export T3CHANNEL2_PORT=${T3CHANNEL2_PORT:-30013}
128+
export T3CHANNEL3_PORT=${T3CHANNEL3_PORT:-30014}
127129
export T3_PUBLIC_ADDRESS=${T3_PUBLIC_ADDRESS:-}
128130
export PRODUCTION_MODE_ENABLED=${PRODUCTION_MODE_ENABLED:-true}
129131

‎src/integration-tests/introspector/override--config.xmlt

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<domain xmlns="http://xmlns.oracle.com/weblogic/domain" xmlns:f="http://xmlns.oracle.com/weblogic/domain-fragment" xmlns:s="http://xmlns.oracle.com/weblogic/situational-config">
33
<server>
4-
<name>${ADMIN_NAME}</name>
5-
<network-access-point>
6-
<name>T3Channel</name>
7-
<public-address f:combine-mode="replace">${TEST_HOST}</public-address>
8-
</network-access-point>
9-
</server>
4+
<name>${ADMIN_NAME}</name>
5+
<max-message-size f:combine-mode="replace">78787878</max-message-size>
6+
<network-access-point>
7+
<name>T3Channel1</name>
8+
<public-address f:combine-mode="replace">${TEST_HOST}</public-address>
9+
<public-port f:combine-mode="replace">40012</public-port>
10+
</network-access-point>
11+
<network-access-point>
12+
<name>T3Channel2</name>
13+
<public-address f:combine-mode="replace">${TEST_HOST}</public-address>
14+
<public-port f:combine-mode="replace">40013</public-port>
15+
</network-access-point>
16+
<network-access-point>
17+
<name>T3Channel3</name>
18+
<public-address f:combine-mode="add">${TEST_HOST}</public-address>
19+
<public-port f:combine-mode="add">40014</public-port>
20+
</network-access-point>
21+
</server>
22+
<server>
23+
<name>standalone1</name>
24+
<max-message-size f:combine-mode="replace">1111111</max-message-size>
25+
</server>
26+
<server>
27+
<name>standalone2</name>
28+
<max-message-size f:combine-mode="add">2222222</max-message-size>
29+
</server>
1030
</domain>

‎src/integration-tests/introspector/override--config.xmlt.old1

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/integration-tests/introspector/override--config.xmlt.old2

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/integration-tests/introspector/override--config.xmlt.old3

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)