Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.7.x] RHBA-478 - WebSocket controller client method getContainers return Ki… #1416

Merged
merged 1 commit into from
Apr 6, 2018
Merged

[7.7.x] RHBA-478 - WebSocket controller client method getContainers return Ki… #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...ontroller-impl/src/main/java/org/kie/server/controller/impl/KieServerInstanceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,8 @@ public Void doOperation(KieServicesClient client,

public List<Container> getContainers(ServerInstanceKey serverInstanceKey) {

List<Container> containers = new ArrayList<org.kie.server.controller.api.model.runtime.Container>();
List<Container> containers = new ArrayList<>();
if (serverInstanceKey == null || serverInstanceKey.getUrl() == null) {

return containers;
}
try {
Expand All @@ -395,7 +394,7 @@ public List<Container> getContainers(ServerInstanceKey serverInstanceKey) {

Container container = new Container();
container.setContainerSpecId(containerResource.getContainerId());
container.setContainerName(containerResource.getContainerId());
container.setContainerName(containerResource.getContainerAlias());
container.setServerInstanceId(serverInstanceKey.getServerInstanceId());
container.setUrl(serverInstanceKey.getUrl() + CONTAINERS_URI_PART + containerResource.getContainerId());
container.setResolvedReleasedId(containerResource.getResolvedReleaseId() == null ? containerResource.getReleaseId() : containerResource.getResolvedReleaseId());
Expand Down Expand Up @@ -425,7 +424,6 @@ protected List<Container> callRemoteKieServerOperation(ServerTemplate serverTemp
List<Container> containers = new ArrayList<org.kie.server.controller.api.model.runtime.Container>();

if (serverTemplate.getServerInstanceKeys() == null || serverTemplate.getServerInstanceKeys().isEmpty() || containerSpec == null) {

return containers;
}

Expand Down
9 changes: 1 addition & 8 deletions ...org/kie/server/integrationtests/controller/ContainerConfigPropagationIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@

public class ContainerConfigPropagationIntegrationTest extends KieControllerManagementBaseTest {

private static ReleaseId releaseId = new ReleaseId("org.kie.server.testing", "stateless-session-kjar", "1.0.0");
private static ReleaseId releaseId101 = new ReleaseId("org.kie.server.testing", "stateless-session-kjar", "1.0.1");
private static ReleaseId releaseIdLatest = new ReleaseId("org.kie.server.testing", "stateless-session-kjar", "LATEST");

private static final String CONTAINER_ID = "kie-concurrent";
private static final String CONTAINER_NAME = "containerName";

private KieServerInfo kieServerInfo;

@BeforeClass
Expand Down Expand Up @@ -81,7 +74,7 @@ public void testPropagateProcessContainerConfig() throws Exception {
ProcessConfig processConfig = new ProcessConfig("PER_PROCESS_INSTANCE", "kieBase", "kieSession", "MERGE_COLLECTION");
containerConfigMap.put(Capability.PROCESS, processConfig);

ContainerSpec containerToDeploy = new ContainerSpec(CONTAINER_ID, CONTAINER_NAME, serverTemplate, releaseId, KieContainerStatus.STARTED, containerConfigMap);
ContainerSpec containerToDeploy = new ContainerSpec(CONTAINER_ID, CONTAINER_NAME, serverTemplate, RELEASE_ID, KieContainerStatus.STARTED, containerConfigMap);
controllerClient.saveContainerSpec(serverTemplate.getId(), containerToDeploy);

KieServerSynchronization.waitForKieServerSynchronization(client, 1);
Expand Down
46 changes: 46 additions & 0 deletions ...test/java/org/kie/server/integrationtests/controller/KieControllerManagementBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,33 @@
package org.kie.server.integrationtests.controller;

import java.io.IOException;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
import javax.ws.rs.core.Configuration;

import org.assertj.core.api.SoftAssertions;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
import org.junit.After;
import org.junit.Before;
import org.kie.server.api.model.KieContainerStatus;
import org.kie.server.api.model.ReleaseId;
import org.kie.server.controller.api.ModelFactory;
import org.kie.server.controller.api.model.spec.ContainerSpec;
import org.kie.server.controller.api.model.spec.ServerTemplate;
import org.kie.server.controller.client.KieServerControllerClient;
import org.kie.server.controller.client.KieServerControllerClientFactory;
import org.kie.server.integrationtests.config.TestConfig;
import org.kie.server.integrationtests.shared.basetests.RestOnlyBaseIntegrationTest;

public abstract class KieControllerManagementBaseTest extends RestOnlyBaseIntegrationTest {

protected static final ReleaseId RELEASE_ID = new ReleaseId("org.kie.server.testing", "stateless-session-kjar", "1.0.0");
protected static final ReleaseId RELEASE_ID_101 = new ReleaseId("org.kie.server.testing", "stateless-session-kjar", "1.0.1");
protected static final ReleaseId RELEASE_ID_LATEST = new ReleaseId("org.kie.server.testing", "stateless-session-kjar", "LATEST");

protected static final String CONTAINER_ID = "kie-concurrent";
protected static final String CONTAINER_NAME = "containerName";

protected KieServerControllerClient controllerClient;

@Before
Expand Down Expand Up @@ -76,4 +90,36 @@ public void closeControllerClient() {
}
}
}

protected ServerTemplate createServerTemplate(String id, String name) {
ServerTemplate serverTemplate = new ServerTemplate(id, name);

controllerClient.saveServerTemplate(serverTemplate);

return serverTemplate;
}

protected ServerTemplate createServerTemplate(String id, String name, String location) {
ServerTemplate serverTemplate = new ServerTemplate(id, name);

serverTemplate.addServerInstance(ModelFactory.newServerInstanceKey(serverTemplate.getId(), location));
controllerClient.saveServerTemplate(serverTemplate);

return serverTemplate;
}

protected ContainerSpec createContainerSpec(ServerTemplate serverTemplate, ReleaseId releaseId, KieContainerStatus status) {
ContainerSpec containerSpec = new ContainerSpec(CONTAINER_ID, CONTAINER_NAME, serverTemplate, releaseId, status, Collections.emptyMap());
controllerClient.saveContainerSpec(serverTemplate.getId(), containerSpec);
return containerSpec;
}

protected void checkContainer(ContainerSpec container, KieContainerStatus status) {
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(container).isNotNull();
softly.assertThat(container.getId()).isEqualTo(CONTAINER_ID);
softly.assertThat(container.getReleasedId()).isEqualTo(RELEASE_ID);
softly.assertThat(container.getStatus()).isEqualTo(status);
});
}
}