Skip to content

Commit

Permalink
Merge pull request wildfly#6147 from ehsavoie/WFCORE-6960
Browse files Browse the repository at this point in the history 
[WFCORE-6960]: Promote Simple config export for a server as an attachment from COMMUNITY to DEFAULT.
  • Loading branch information
@yersan
yersan authored Sep 19, 2024
2 parents 6a309c3 + f1f5ae6 commit 11f4c70
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 22 deletions.
3 changes: 1 addition & 2 deletions ...er/src/main/java/org/jboss/as/controller/operations/common/XmlFileMarshallingHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.UUID;

import org.jboss.as.controller.OperationContext;
import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
Expand All @@ -18,7 +19,6 @@
import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
import org.jboss.as.controller.descriptions.common.ControllerResolver;
import org.jboss.as.controller.persistence.ConfigurationPersister;
import org.jboss.as.version.Stability;
import org.jboss.dmr.ModelType;

/**
Expand All @@ -36,7 +36,6 @@ public class XmlFileMarshallingHandler extends AbstractXmlMarshallingHandler {
.setReplyParameters(new SimpleAttributeDefinitionBuilder(UUID, ModelType.STRING, false).build())
.setReadOnly()
.setRuntimeOnly()
.setStability(Stability.COMMUNITY)
.build();

public XmlFileMarshallingHandler(final ConfigurationPersister configPersister) {
Expand Down
1 change: 1 addition & 0 deletions ...ite/domain/src/test/java/org/jboss/as/test/integration/domain/suites/DomainTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
HostSuspendResumeTestCase.class,
SyncModelOperationTestCase.class,
ManagementReadXmlTestCase.class,
ManagementReadXmlAsFileTestCase.class,
HostReloadProxyTestCase.class,
AuditLogTestCase.class,
ReloadWithConfigTestCase.class,
Expand Down
81 changes: 61 additions & 20 deletions ...s/ManagementReadXmlCommunityTestCase.java → ...ites/ManagementReadXmlAsFileTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
* Copyright The WildFly Authors
* SPDX-License-Identifier: Apache-2.0
*/

package org.jboss.as.test.integration.domain.suites;


import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.HOST;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
Expand All @@ -25,47 +23,33 @@
import java.nio.file.Paths;
import java.util.Collections;


import org.apache.commons.io.IOUtils;
import org.jboss.as.controller.client.Operation;
import org.jboss.as.controller.client.OperationMessageHandler;
import org.jboss.as.controller.client.OperationResponse;
import org.jboss.as.controller.client.helpers.domain.DomainClient;
import org.jboss.as.version.Stability;
import org.jboss.as.test.integration.domain.management.util.WildFlyManagedConfiguration;
import org.jboss.as.test.integration.management.util.CLIWrapper;
import org.jboss.dmr.ModelNode;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.wildfly.test.stability.StabilityDomainSetupSnapshotRestoreTasks;

/**
* Test of various read-config-as-xml-file against the domain controller.
*
* @author Emmanuel Hugonnet (c) 2022 Red Hat, Inc.
*/
public class ManagementReadXmlCommunityTestCase extends ManagementReadXmlTestCase{
static StabilityDomainSetupSnapshotRestoreTasks tasks;
public class ManagementReadXmlAsFileTestCase extends ManagementReadXmlTestCase {

@BeforeClass
public static void setupDomain() throws Exception {
testSupport = DomainTestSuite.createSupport(ManagementReadXmlCommunityTestCase.class.getSimpleName());
tasks = new StabilityDomainSetupSnapshotRestoreTasks(Stability.COMMUNITY, testSupport);
tasks.setup();
ManagementReadXmlTestCase.setupDomain();
}

@AfterClass
public static void tearDownDomain() throws Exception {
if (tasks != null) {
tasks.tearDown();
}
ManagementReadXmlTestCase.tearDownDomain();
testSupport = DomainTestSuite.createSupport(ManagementReadXmlAsFileTestCase.class.getSimpleName());
}

@Test
public void testDomainReadConfigAsXmlFile() throws Exception {

DomainClient domainClient = domainPrimaryLifecycleUtil.getDomainClient();
ModelNode request = new ModelNode();
request.get(OP).set("read-config-as-xml-file");
Expand All @@ -81,6 +65,20 @@ public void testDomainReadConfigAsXmlFile() throws Exception {
Assert.assertEquals(expectedXml, xml);
}

@Test
public void testDomainReadConfigAsXmlFileWithCli() throws Exception {
WildFlyManagedConfiguration config = domainPrimaryLifecycleUtil.getConfiguration();
try (CLIWrapper cli = new CLIWrapper(config.getHostControllerManagementAddress(), config.getHostControllerManagementPort(), true)) {
Path result = new File("target", "result-domain-cli.xml").toPath();
cli.sendLine("attachment save --operation=:read-config-as-xml-file --file=" + result.toString());
String expectedXml = loadXMLConfigurationFile(Paths.get(domainPrimaryLifecycleUtil.getConfiguration().getDomainConfigFile()));
Path expected = new File("target", "expected-domain.xml").toPath();
Files.write(expected, Collections.singletonList(expectedXml));
Assert.assertEquals(expectedXml, Files.readString(result));
cli.quit();
}
}

@Test
public void testHostReadConfigAsXmlFile() throws Exception {

Expand Down Expand Up @@ -109,6 +107,29 @@ public void testHostReadConfigAsXmlFile() throws Exception {
Assert.assertEquals(expectedXml, xml);
}

@Test
public void testHostReadConfigAsXmlFileWithCli() throws Exception {
WildFlyManagedConfiguration config = domainPrimaryLifecycleUtil.getConfiguration();
try (CLIWrapper cli = new CLIWrapper(config.getHostControllerManagementAddress(), config.getHostControllerManagementPort(), true)) {
String expectedXml = loadXMLHostConfigurationFile(Paths.get(domainPrimaryLifecycleUtil.getConfiguration().getHostConfigFile()), "primary");
Path expected = new File("target", "expected-primary.xml").toPath();
Files.write(expected, Collections.singletonList(expectedXml));
Path result = new File("target", "result-primary-cli.xml").toPath();
cli.sendLine("attachment save --operation=/host=primary/:read-config-as-xml-file --file=" + result.toString());
Assert.assertEquals(expectedXml, Files.readString(result));
cli.quit();
}
try (CLIWrapper cli = new CLIWrapper(config.getHostControllerManagementAddress(), config.getHostControllerManagementPort(), true)) {
Path result = new File("target", "result-secondary-cli.xml").toPath();
cli.sendLine("attachment save --operation=/host=secondary/:read-config-as-xml-file --file=" + result.toString());
String expectedXml = loadXMLHostConfigurationFile(Paths.get(domainSecondaryLifecycleUtil.getConfiguration().getHostConfigFile()), "secondary");
Path expected = new File("target", "expected-secondary.xml").toPath();
Files.write(expected, Collections.singletonList(expectedXml));
Assert.assertEquals(expectedXml, Files.readString(result));
cli.quit();
}
}

@Test
public void testServerReadConfigAsXmlFile() throws Exception {

Expand Down Expand Up @@ -139,6 +160,26 @@ public void testServerReadConfigAsXmlFile() throws Exception {
Assert.assertEquals(expectedXml, xml);
}

@Test
public void testServerReadConfigAsXmlFileWithCli() throws Exception {
WildFlyManagedConfiguration config = domainPrimaryLifecycleUtil.getConfiguration();
try (CLIWrapper cli = new CLIWrapper(config.getHostControllerManagementAddress(), config.getHostControllerManagementPort(), true)) {
Path result = new File("target", "result-main-one-cli.xml").toPath();
cli.sendLine("attachment save --operation=/host=primary/server=main-one:read-config-as-xml-file --file=" + result.toString());
Path expected = new File("target").toPath().resolve("test-classes").resolve("expected-main-one.xml");
String expectedXml = readFileAsString(expected).replaceAll(System.lineSeparator(), "\n");
Files.write(new File("target", "expected-main-one.xml").toPath(), Collections.singletonList(expectedXml));
Assert.assertEquals(expectedXml, Files.readString(result));

result = new File("target", "result-main-three-cli.xml").toPath();
cli.sendLine("attachment save --operation=/host=secondary/server=main-three:read-config-as-xml-file --file=" + result.toString());
expected = new File("target").toPath().resolve("test-classes").resolve("expected-main-three.xml");
expectedXml = readFileAsString(expected).replaceAll(System.lineSeparator(), "\n");
Files.write(new File("target", "expected-main-one.xml").toPath(), Collections.singletonList(expectedXml));
Assert.assertEquals(expectedXml, Files.readString(result));
}
}

private static String validateOperationResponse(OperationResponse response) throws IOException {
Assert.assertEquals(1, response.getInputStreams().size());
Assert.assertEquals(SUCCESS, response.getResponseNode().require(OUTCOME).asString());
Expand Down

0 comments on commit 11f4c70

Please sign in to comment.