diff --git a/README.adoc b/README.adoc index c5af020..867ef6d 100644 --- a/README.adoc +++ b/README.adoc @@ -35,7 +35,7 @@ Following inputs may be used as `step.with` keys: | Name | Required | Default | Description | action | Yes | create | A valid action among: `create`, `delete`, `skip-testing`. | oci-service | | autonomous-transaction-processing-serverless-26ai | A valid Oracle Cloud Infrastructure service to be tested. -Valid OCI service are: `autonomous-transaction-processing-serverless-19c`, `autonomous-transaction-processing-serverless-26ai`, `base-database-service-19c`, `base-database-service-21c`, `base-database-service-23ai`, `base-database-service-26ai`, and `base-database-service-26ai-rac`. +Valid OCI service are: `autonomous-transaction-processing-serverless-19c`, `autonomous-transaction-processing-serverless-26ai`, `base-database-service-19c`, `base-database-service-21c`, `base-database-service-26ai`, and `base-database-service-26ai-rac`. | user | | | The database username to be used for database creation. If multiple users (up to 10) are required then enter a comma-separated list of usernames (no space). Limit usernames to 118 chars maximum. Accepted chars are: upper case letters, lower case letters, digits, colon, hyphen, underscore, and dot. | connection-string-format | | easy-connect | The resulting connection string format: `easy-connect` or `tns`. | prefix_list | | | A comma separated list of file(s) or folder(s) that if changed should not trigger any test (example: folder containing documentation). diff --git a/src/main/java/com/oracle/testpilot/Session.java b/src/main/java/com/oracle/testpilot/Session.java index 60c2816..49b0281 100644 --- a/src/main/java/com/oracle/testpilot/Session.java +++ b/src/main/java/com/oracle/testpilot/Session.java @@ -152,8 +152,8 @@ private void analyzeCommandLineParameters(final String[] args) { case "autonomous-transaction-processing-serverless-26ai": case "base-database-service-19c": case "base-database-service-21c": - case "base-database-service-23ai": case "base-database-service-26ai": + case "base-database-service-26ai-rac": break; default: @@ -162,7 +162,7 @@ private void analyzeCommandLineParameters(final String[] args) { } catch (IllegalArgumentException iae) { throw new TestPilotException(WRONG_OCI_SERVICE_PARAMETER, - new IllegalArgumentException("--oci-service must be either autonomous-transaction-processing-serverless-19c, autonomous-transaction-processing-serverless-26ai, base-database-service-19c, base-database-service-21c, base-database-service-26ai, or base-database-service-23ai")); + new IllegalArgumentException("--oci-service must be either autonomous-transaction-processing-serverless-19c, autonomous-transaction-processing-serverless-26ai, base-database-service-19c, base-database-service-21c, base-database-service-26ai, or base-database-service-26ai-rac")); } } else { @@ -240,12 +240,12 @@ private void displayUsage() { Action: --create: to provision the requested Oracle Cloud Infrastructure service to test Options: - --oci-service OCI service type (autonomous-transaction-processing-serverless, base-database-service-19c, base-database-service-21c, base-database-service-26ai) + --oci-service OCI service type (autonomous-transaction-processing-serverless, base-database-service-19c, base-database-service-21c, base-database-service-26ai, base-database-service-26airac) --user user name to be used (if several, then comma separated list without any space) --connection-string-format requested connection string format (easy-connect*, or tns) --delete: to de-provision the Oracle Cloud Infrastructure service Options: - --oci-service OCI service type (autonomous-transaction-processing-serverless, base-database-service-19c, base-database-service-21c, base-database-service-26ai) + --oci-service OCI service type (autonomous-transaction-processing-serverless, base-database-service-19c, base-database-service-21c, base-database-service-26ai, base-database-service-26airac) --user user name to be used (if several, then comma separated list without any space) --skip-testing Options: @@ -342,7 +342,6 @@ runID, jobID, type, buildUserList(users,true)) break; case TechnologyType.DB19C: case TechnologyType.DB21C: - case TechnologyType.DB23AI: case TechnologyType.DB26AI: { Database database = new JSON<>(Database.class).parse(jsonInformation); database = new JSON<>(Database.class).parse(database.getDatabase()); @@ -626,7 +625,6 @@ private String getInternalTechnologyType(final String technologyType) { case "autonomous-transaction-processing-serverless", "autonomous-transaction-processing-serverless-26ai" -> TechnologyType.AUTONOMOUS26AI; case "base-database-service-19c" -> TechnologyType.DB19C; case "base-database-service-21c" -> TechnologyType.DB21C; - case "base-database-service-23ai" -> TechnologyType.DB23AI; case "base-database-service-26ai" -> TechnologyType.DB26AI; case "base-database-service-26ai-rac" -> TechnologyType.DB26AIRAC; default -> throw new TestPilotException(CREATE_DATABASE_MISSING_DB_TYPE); diff --git a/src/main/java/com/oracle/testpilot/model/TechnologyType.java b/src/main/java/com/oracle/testpilot/model/TechnologyType.java index aa792b2..3e8fbb2 100644 --- a/src/main/java/com/oracle/testpilot/model/TechnologyType.java +++ b/src/main/java/com/oracle/testpilot/model/TechnologyType.java @@ -15,7 +15,6 @@ public class TechnologyType { public static final String AUTONOMOUS19C = "atps19c"; public static final String DB19C = "db19c"; public static final String DB21C = "db21c"; - public static final String DB23AI = "db23ai"; public static final String DB26AI = "db26ai"; public static final String DB26AIRAC = "db26airac"; }