create a new domain before discover

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -158,10 +158,10 @@ def update_machines_clusters_and_servers(self, delete_now=True):
  # can reference "other" servers
  self._topology_helper.create_placeholder_servers_in_cluster(self._topology)
 
- self._process_section(self._topology, folder_list, SERVER, location, delete_now)
-
  self._process_section(self._topology, folder_list, MIGRATABLE_TARGET, location, delete_now)
 
+ self._process_section(self._topology, folder_list, SERVER, location, delete_now)
+
  # targets may have been inadvertently assigned when clusters were added
  return jdbc_names
 

integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java

@@ -497,9 +497,18 @@ void test16CreateRestrictedJRFDomain(TestInfo testInfo) throws Exception {
  @Test
  void test17DiscoverDomainWithRequiredArgument(TestInfo testInfo) throws Exception {
  assumeTrue(new RestrictedJrfChecker(), "User specified skipping Restricted JRF tests");
+ String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
+ domainParentDir + FS + "restrictedJRFD1 -model_file " +
+ getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
+ " -domain_type RestrictedJRF";
+ try (PrintWriter out = getTestMethodWriter(testInfo)) {
+ CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
+ assertEquals(0, result.exitValue(), "Unexpected return code");
+
+ }
  try (PrintWriter out = getTestMethodWriter(testInfo)) {
  Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
- String cmd = discoverDomainScript
+ cmd = discoverDomainScript
  + " -oracle_home " + mwhome_12213
  + " -domain_home " + domainParentDir + FS + "restrictedJRFD1"
  + " -archive_file " + discoveredArchive
@@ -540,9 +549,17 @@ private void verifyFDiscoverDomainWithRequiredArgument(String expectedModelFile)
  @Test
  void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
  assumeTrue(new RestrictedJrfChecker(), "User specified skipping Restricted JRF tests");
+ String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
+ domainParentDir + FS + "restrictedJRFD1 -model_file " +
+ getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
+ " -domain_type RestrictedJRF";
+ try (PrintWriter out = getTestMethodWriter(testInfo)) {
+ CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
+ assertEquals(0, result.exitValue(), "Unexpected return code");
+ }
  Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
  Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.yaml");
- String cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
+ cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
  domainParentDir + FS + "restrictedJRFD1 -archive_file " + discoveredArchive +
  " -model_file " + discoveredModelFile;
  try (PrintWriter out = getTestMethodWriter(testInfo)) {
@@ -565,11 +582,20 @@ void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
  @Test
  void test19DiscoverDomainWithVariableFile(TestInfo testInfo) throws Exception {
  assumeTrue(new JrfChecker(), "User specified skipping JRF tests");
- Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
+ String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
+ domainParentDir + FS + "restrictedJRFD1 -model_file " +
+ getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
+ " -domain_type RestrictedJRF";
+ try (PrintWriter out = getTestMethodWriter(testInfo)) {
+ CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
+ assertEquals(0, result.exitValue(), "Unexpected return code");
+ }
+
+ Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
  Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.yaml");
  Path discoveredVariableFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.properties");
 
- String cmd = discoverDomainScript
+ cmd = discoverDomainScript
  + " -oracle_home " + mwhome_12213
  + " -domain_home " + domainParentDir + FS + "restrictedJRFD1"
  + " -archive_file " + discoveredArchive
@@ -603,8 +629,20 @@ private void verifyGDiscoverDomainWithVariableFile(String expectedModelFile) thr
  @Test
  void test20DiscoverDomainJRFDomainType(TestInfo testInfo) throws Exception {
  assumeTrue(new JrfChecker(), "User specified skipping JRF tests");
- assumeTrue(rcuDomainCreated, "test20DiscoverDomainJRFDomainType skipped because testDCreateJRFDomainRunRCU failed");
+ waitForDatabase();
+ try (PrintWriter out = getTestMethodWriter(testInfo)) {
+ Path source = Paths.get(getSampleModelFile("2"));
+ Path modelOut = getTestOutputPath(testInfo).resolve(SAMPLE_MODEL_FILE_PREFIX + "2.yaml");
+ // create wdt model file to use in create, after substitution of DB host/ip
+ replaceStringInFile(source, modelOut, "%DB_HOST%", getDBContainerIP());
 
+ String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
+ domainParentDir + FS + "jrfDomain1 -model_file " +
+ modelOut + " -archive_file " + getSampleArchiveFile() + " -domain_type JRF -run_rcu";
+
+ CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
+ assertEquals(0, result.exitValue(), "Unexpected return code");
+ }
  try (PrintWriter out = getTestMethodWriter(testInfo)) {
  Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
  Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredJRFD1.yaml");
@@ -944,12 +982,21 @@ void test30OnlineUpdateApp(TestInfo testInfo) throws Exception {
  @Tag("gate")
  @Test
  void test31DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
- assumeTrue(test30DomainCreated,
- "test31DiscoverDomainWithModelFile skipped because test30OnlineUpdateApp domain creation failed");
+ String domainDir = "domain2";
+ String cmd = createDomainScript
+ + " -oracle_home " + mwhome_12213
+ + " -domain_home " + domainParentDir + FS + domainDir
+ + " -model_file " + getSampleModelFile("-onlinebase")
+ + " -archive_file " + getSampleArchiveFile();
+
+ try (PrintWriter out = getTestMethodWriter(testInfo)) {
+ CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
+ assertEquals(0, result.exitValue(), "Unexpected return code");
+ }
  Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
  Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredModel.yaml");
  Path discoveredVariableFile = getTestOutputPath(testInfo).resolve("discoveredVariable.properties");
- String cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
+ cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
  domainParentDir + FS + "domain2 -archive_file " + discoveredArchive +
  " -model_file " + discoveredModelFile + " -variable_file " + discoveredVariableFile;
  try (PrintWriter out = getTestMethodWriter(testInfo)) {