import javax.ws.rs.client.Entity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
import org.onap.policy.aai.AaiConstants;
import org.onap.policy.aai.AaiCqResponse;
import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
/**
* A&AI Custom Query. Stores the {@link AaiCqResponse} in the context. In addition, if the
* context does not contain the "tenant" data for the vserver, then it will request that,
- * as well.
+ * as well. Note: this ignores the "target entity" in the parameters as this query always
+ * applies to the vserver, thus the target entity may be set to an empty string.
*/
public class AaiCustomQueryOperation extends HttpOperation<String> {
private static final Logger logger = LoggerFactory.getLogger(AaiCustomQueryOperation.class);
public static final String NAME = AaiCqResponse.OPERATION;
+ public static final String VSERVER_VSERVER_NAME = "vserver.vserver-name";
public static final String RESOURCE_LINK = "resource-link";
public static final String RESULT_DATA = "result-data";
private static final String PREFIX = "/aai/v16";
+ @Getter
+ private final String vserver;
+
/**
* Constructs the object.
*
*/
public AaiCustomQueryOperation(ControlLoopOperationParams params, HttpConfig config) {
super(params, config, String.class);
+
+ this.vserver = params.getContext().getEnrichment().get(VSERVER_VSERVER_NAME);
+ if (StringUtils.isBlank(this.vserver)) {
+ throw new IllegalArgumentException("missing " + VSERVER_VSERVER_NAME + " in enrichment data");
+ }
}
/**
*/
@Override
protected CompletableFuture<OperationOutcome> startPreprocessorAsync() {
- String vserver = params.getTargetEntity();
-
- ControlLoopOperationParams tenantParams = params.toBuilder().actor(AaiConstants.ACTOR_NAME)
- .operation(AaiGetOperation.TENANT).payload(null).retry(null).timeoutSec(null).build();
+ ControlLoopOperationParams tenantParams =
+ params.toBuilder().actor(AaiConstants.ACTOR_NAME).operation(AaiGetOperation.TENANT)
+ .targetEntity(vserver).payload(null).retry(null).timeoutSec(null).build();
return params.getContext().obtain(AaiGetOperation.getTenantKey(vserver), tenantParams);
}
* Constructs the custom query using the previously retrieved tenant data.
*/
private Map<String, String> makeRequest() {
- String vserver = params.getTargetEntity();
StandardCoderObject tenant = params.getContext().getProperty(AaiGetOperation.getTenantKey(vserver));
String resourceLink = tenant.getString(RESULT_DATA, 0, RESOURCE_LINK);
package org.onap.policy.controlloop.actor.aai;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
private static final StandardCoder coder = new StandardCoder();
private static final String MY_LINK = "my-link";
+ private static final String MY_VSERVER = "my-verserver-name";
@Captor
private ArgumentCaptor<Entity<Map<String, String>>> entityCaptor;
public void setUp() throws Exception {
super.setUpBasic();
+ params.getContext().getEnrichment().put(AaiCustomQueryOperation.VSERVER_VSERVER_NAME, MY_VSERVER);
+
MyTenantOperator tenantOperator = new MyTenantOperator();
when(service.getActor(AaiConstants.ACTOR_NAME)).thenReturn(tenantActor);
public void testAaiCustomQueryOperation() {
assertEquals(AaiConstants.ACTOR_NAME, oper.getActorName());
assertEquals(AaiCustomQueryOperation.NAME, oper.getName());
+ assertEquals(MY_VSERVER, oper.getVserver());
+
+ // verify that it works with an empty target entity
+ params = params.toBuilder().targetEntity("").build();
+ assertThatCode(() -> new AaiCustomQueryOperation(params, config)).doesNotThrowAnyException();
+
+ // try without enrichment data
+ params.getContext().getEnrichment().remove(AaiCustomQueryOperation.VSERVER_VSERVER_NAME);
+ assertThatIllegalArgumentException().isThrownBy(() -> new AaiCustomQueryOperation(params, config))
+ .withMessage("missing " + AaiCustomQueryOperation.VSERVER_VSERVER_NAME + " in enrichment data");
}
@Test
assertEquals(PolicyResult.SUCCESS, getResult(future2));
// tenant response should have been cached within the context
- assertNotNull(context.getProperty(AaiGetOperation.getTenantKey(TARGET_ENTITY)));
+ assertNotNull(context.getProperty(AaiGetOperation.getTenantKey(MY_VSERVER)));
// custom query response should have been cached within the context
AaiCqResponse cqData = context.getProperty(AaiCqResponse.CONTEXT_KEY);
assertEquals(PolicyResult.SUCCESS, getResult(future2));
// should not have replaced tenant response
- assertSame(data, context.getProperty(AaiGetOperation.getTenantKey(TARGET_ENTITY)));
+ assertSame(data, context.getProperty(AaiGetOperation.getTenantKey(MY_VSERVER)));
// custom query response should have been cached within the context
AaiCqResponse cqData = context.getProperty(AaiCqResponse.CONTEXT_KEY);
}
private void preloadTenantData(StandardCoderObject data) {
- context.setProperty(AaiGetOperation.getTenantKey(TARGET_ENTITY), data);
+ context.setProperty(AaiGetOperation.getTenantKey(MY_VSERVER), data);
}
private PolicyResult getResult(CompletableFuture<OperationOutcome> future2)