Skip to content

Commit 7696dfc

Browse files
committed
refactor: use VM_HOST env var instead of hardcoded RAC VM IPs
Replace all hardcoded 192.168.122.x IPs with ${VM_HOST} env var. VM IP is auto-detected by vm-env.sh via virsh — no manual update needed when VM IP changes (e.g. new VM deployment). - .properties files: use Quarkus ${VM_HOST} substitution - docker-compose: use ${VM_HOST} in commands - rac.sh: fail-fast with ${VM_HOST:?} instead of silent default - db-check.py: require ORACLE_HOST, no fallback IP - .env: remove DB_CONN (set by rac driver) - vm-env.sh: remove stale IP mismatch validation
1 parent 7087cc6 commit 7696dfc

12 files changed

Lines changed: 22 additions & 44 deletions

tests/dbz-twin/rac/config/application-logminer-kafka.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ debezium.format.key.schemas.enable=false
1313

1414
debezium.source.connector.class=io.debezium.connector.oracle.OracleConnector
1515
debezium.source.database.connection.adapter=logminer
16-
debezium.source.database.hostname=192.168.122.130
16+
debezium.source.database.hostname=${VM_HOST}
1717
debezium.source.database.port=1521
1818
debezium.source.database.user=c##dbzuser
1919
debezium.source.database.password=dbz

tests/dbz-twin/rac/config/application-logminer.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ debezium.format.key.schemas.enable=false
1010

1111
debezium.source.connector.class=io.debezium.connector.oracle.OracleConnector
1212
debezium.source.database.connection.adapter=logminer
13-
debezium.source.database.hostname=192.168.122.130
13+
debezium.source.database.hostname=${VM_HOST}
1414
debezium.source.database.port=1521
1515
debezium.source.database.user=c##dbzuser
1616
debezium.source.database.password=dbz

tests/dbz-twin/rac/config/application-olr-kafka.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ debezium.format.key.schemas.enable=false
1414
debezium.source.connector.class=io.debezium.connector.oracle.OracleConnector
1515
debezium.source.database.connection.adapter=olr
1616
debezium.source.openlogreplicator.source=ORCLCDB
17-
debezium.source.openlogreplicator.host=192.168.122.130
17+
debezium.source.openlogreplicator.host=${VM_HOST}
1818
debezium.source.openlogreplicator.port=5000
19-
debezium.source.database.hostname=192.168.122.130
19+
debezium.source.database.hostname=${VM_HOST}
2020
debezium.source.database.port=1521
2121
debezium.source.database.user=c##dbzuser
2222
debezium.source.database.password=dbz

tests/dbz-twin/rac/config/application-olr.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ debezium.format.key.schemas.enable=false
1111
debezium.source.connector.class=io.debezium.connector.oracle.OracleConnector
1212
debezium.source.database.connection.adapter=olr
1313
debezium.source.openlogreplicator.source=ORCLCDB
14-
debezium.source.openlogreplicator.host=192.168.122.130
14+
debezium.source.openlogreplicator.host=${VM_HOST}
1515
debezium.source.openlogreplicator.port=5000
16-
debezium.source.database.hostname=192.168.122.130
16+
debezium.source.database.hostname=${VM_HOST}
1717
debezium.source.database.port=1521
1818
debezium.source.database.user=c##dbzuser
1919
debezium.source.database.password=dbz

tests/dbz-twin/rac/db-check.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
Environment variables:
88
SQLITE_DB — SQLite database path (default: /app/data/fuzz.db)
9-
ORACLE_HOST — Oracle host (default: 192.168.122.130)
9+
ORACLE_HOST — Oracle host (required, set by fuzz-test.sh from VM_HOST)
1010
ORACLE_DSN — Full Oracle DSN (overrides ORACLE_HOST)
1111
"""
1212

@@ -314,7 +314,10 @@ def print_results(name, matched, missing, extra, diffs):
314314

315315
def main():
316316
sqlite_path = os.environ.get('SQLITE_DB', '/app/data/fuzz.db')
317-
oracle_host = os.environ.get('ORACLE_HOST', '192.168.122.130')
317+
oracle_host = os.environ.get('ORACLE_HOST')
318+
if not oracle_host and not os.environ.get('ORACLE_DSN'):
319+
print("ERROR: ORACLE_HOST or ORACLE_DSN must be set", file=sys.stderr)
320+
sys.exit(1)
318321
oracle_dsn = os.environ.get('ORACLE_DSN',
319322
f"olr_test/olr_test@{oracle_host}:1521/ORCLPDB")
320323

tests/dbz-twin/rac/perf/config/application-logminer.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ debezium.format.key.schemas.enable=false
99

1010
debezium.source.connector.class=io.debezium.connector.oracle.OracleConnector
1111
debezium.source.database.connection.adapter=logminer
12-
debezium.source.database.hostname=192.168.122.130
12+
debezium.source.database.hostname=${VM_HOST}
1313
debezium.source.database.port=1521
1414
debezium.source.database.user=c##dbzuser
1515
debezium.source.database.password=dbz

tests/dbz-twin/rac/perf/config/application-olr.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ debezium.format.key.schemas.enable=false
1010
debezium.source.connector.class=io.debezium.connector.oracle.OracleConnector
1111
debezium.source.database.connection.adapter=olr
1212
debezium.source.openlogreplicator.source=ORCLCDB
13-
debezium.source.openlogreplicator.host=192.168.122.130
13+
debezium.source.openlogreplicator.host=${VM_HOST}
1414
debezium.source.openlogreplicator.port=5000
15-
debezium.source.database.hostname=192.168.122.130
15+
debezium.source.database.hostname=${VM_HOST}
1616
debezium.source.database.port=1521
1717
debezium.source.database.user=c##dbzuser
1818
debezium.source.database.password=dbz
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
# Auto-generated by perf/run.sh — do not edit manually.
2+
# VM_HOST is substituted at runtime from vm-env.sh.
13
global:
24
scrape_interval: 5s
35

46
scrape_configs:
57
- job_name: 'node-exporter'
68
static_configs:
7-
- targets: ['192.168.122.130:9100']
9+
- targets: ['${VM_HOST}:9100']
810
- job_name: 'cadvisor'
911
static_configs:
10-
- targets: ['192.168.122.130:9101']
12+
- targets: ['${VM_HOST}:9101']

tests/dbz-twin/rac/perf/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
# Override with: docker compose run swingbench -uc 8 -rt 01:00.00
4545
command:
4646
- "-cs"
47-
- "//192.168.122.130:1521/ORCLPDB"
47+
- "//${VM_HOST}:1521/ORCLPDB"
4848
- "-u"
4949
- "soe"
5050
- "-p"

tests/environments/rac/.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
DB_CONN=olr_test/olr_test@//192.168.122.130:1521/ORCLPDB
1+
# DB_CONN is set by the rac driver (tests/sql/scripts/drivers/rac.sh)
2+
# VM_HOST is auto-detected by vm-env.sh
23
PDB_NAME=ORCLPDB
34
INCLUDE_TAGS=rac

0 commit comments

Comments
 (0)