// Find the index for base vf module and non-base vf module
AaiNqInventoryResponseItem baseItem = findVfModule(aaiResponseWrapper, true);
- AaiNqInventoryResponseItem vfModuleItem = findVfModule(aaiResponseWrapper, false);
+
+ SoModelInfo soModelInfo = prepareSoModelInfo(policy);
// Report the error if either base vf module or non-base vf module is not found
- if (baseItem == null || vfModuleItem == null) {
+ if (baseItem == null || soModelInfo == null) {
logger.error("Either base or non-base vf module is not found from AAI response.");
return null;
}
// Construct SO Request for a policy's recipe
if (RECIPE_VF_MODULE_CREATE.equals(policy.getRecipe())) {
return constructCreateRequest(aaiResponseWrapper, policy, tenantItem, vnfItem, vnfServiceItem,
- vfModuleItem);
+ soModelInfo);
} else if (RECIPE_VF_MODULE_DELETE.equals(policy.getRecipe())) {
- return constructDeleteRequest(tenantItem, vnfItem, vnfServiceItem, vfModuleItem);
+ return constructDeleteRequest(tenantItem, vnfItem, vnfServiceItem, soModelInfo, policy);
+ } else {
+ return null;
+ }
+ }
+
+ private SoModelInfo prepareSoModelInfo(Policy policy) {
+
+ SoModelInfo soModelInfo = new SoModelInfo();
+ if ((policy.getTarget() != null
+ && (policy.getTarget().getModelCustomizationId() != null))
+ && (policy.getTarget().getModelInvariantId() != null)
+ && (policy.getTarget().getModelName() != null)
+ && (policy.getTarget().getModelVersion() != null)
+ && (policy.getTarget().getModelVersionId() != null)) {
+
+ soModelInfo.setModelCustomizationId(policy.getTarget().getModelCustomizationId());
+ soModelInfo.setModelInvariantId(policy.getTarget().getModelInvariantId());
+ soModelInfo.setModelName(policy.getTarget().getModelName());
+ soModelInfo.setModelVersion(policy.getTarget().getModelVersion());
+ soModelInfo.setModelVersionId(policy.getTarget().getModelVersionId());
+
+ return soModelInfo;
} else {
return null;
}
private SoRequest constructCreateRequest(AaiNqResponseWrapper aaiResponseWrapper, Policy policy,
AaiNqInventoryResponseItem tenantItem, AaiNqInventoryResponseItem vnfItem,
AaiNqInventoryResponseItem vnfServiceItem,
- AaiNqInventoryResponseItem vfModuleItem) {
+ SoModelInfo vfModuleItem) {
SoRequest request = new SoRequest();
request.setOperationType(SoOperationType.SCALE_OUT);
//
// cloudConfiguration
request.getRequestDetails().setCloudConfiguration(constructCloudConfiguration(tenantItem));
// modelInfo
- request.getRequestDetails().setModelInfo(constructVfModuleModelInfo(vfModuleItem));
- request.getRequestDetails().getModelInfo().setModelVersionId(vfModuleItem.getVfModule().getModelVersionId());
+ request.getRequestDetails().setModelInfo(vfModuleItem);
// requestInfo
request.getRequestDetails().setRequestInfo(constructRequestInfo());
* @return SO delete vf-module request
*/
private SoRequest constructDeleteRequest(AaiNqInventoryResponseItem tenantItem, AaiNqInventoryResponseItem
- vnfItem, AaiNqInventoryResponseItem vnfServiceItem, AaiNqInventoryResponseItem vfModuleItem) {
+ vnfItem, AaiNqInventoryResponseItem vnfServiceItem, SoModelInfo vfModuleItem, Policy policy) {
SoRequest request = new SoRequest();
request.setOperationType(SoOperationType.DELETE_VF_MODULE);
request.setRequestDetails(new SoRequestDetails());
// cloudConfiguration
request.getRequestDetails().setCloudConfiguration(constructCloudConfiguration(tenantItem));
// modelInfo
- request.getRequestDetails().setModelInfo(constructVfModuleModelInfo(vfModuleItem));
+ request.getRequestDetails().setModelInfo(prepareSoModelInfo(policy));
// requestInfo
request.getRequestDetails().setRequestInfo(constructRequestInfo());
// Save the instance IDs for the VNF, service and vfModule to static fields
preserveInstanceIds(vnfItem.getGenericVnf().getVnfId(), vnfServiceItem.getServiceInstance()
- .getServiceInstanceId(), vfModuleItem.getVfModule().getVfModuleId());
+ .getServiceInstanceId(), null);
if (logger.isDebugEnabled()) {
logger.debug("Constructed SO request: {}", Serialization.gsonPretty.toJson(request));
return soRequestInfo;
}
- /**
- * Construct modelInfo of the vfModule for the SO requestDetails.
- *
- * @param vfModuleItem vf module item from A&AI named-query response
- * @return SO Model info for the vfModule
- */
- private SoModelInfo constructVfModuleModelInfo(AaiNqInventoryResponseItem vfModuleItem) {
- SoModelInfo soModelInfo = new SoModelInfo();
- soModelInfo.setModelType("vfModule");
- soModelInfo.setModelInvariantId(vfModuleItem.getVfModule().getModelInvariantId());
- soModelInfo.setModelCustomizationId(vfModuleItem.getVfModule().getModelCustomizationId());
-
- for (AaiNqExtraProperty prop : vfModuleItem.getExtraProperties().getExtraProperty()) {
- if (prop.getPropertyName().equals(MODEL_NAME_PROPERTY_KEY)) {
- soModelInfo.setModelName(prop.getPropertyValue());
- } else if (prop.getPropertyName().equals(MODEL_VERSION_PROPERTY_KEY)) {
- soModelInfo.setModelVersion(prop.getPropertyValue());
- }
- }
- return soModelInfo;
- }
-
/**
* Construct cloudConfiguration for the SO requestDetails.
*
import org.onap.policy.controlloop.ControlLoopOperation;
import org.onap.policy.controlloop.VirtualControlLoopEvent;
import org.onap.policy.controlloop.policy.Policy;
+import org.onap.policy.controlloop.policy.Target;
import org.onap.policy.so.SoOperationType;
import org.onap.policy.so.SoRequest;
import org.onap.policy.so.SoRequestParameters;
Policy policy = new Policy();
policy.setActor("Dorothy");
policy.setRecipe("GoToOz");
-
+
+ instantiateTarget(policy);
+
assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp));
policy.setActor("SO");
assertEquals("avalue", request.getRequestDetails().getRequestParameters().getUserParams().get(0).get("akey"));
assertEquals(1, request.getRequestDetails().getConfigurationParameters().size());
assertEquals("cvalue", request.getRequestDetails().getConfigurationParameters().get(0).get("ckey"));
-
+
// payload with config, but no request params
policy.setPayload(makePayload());
policy.getPayload().remove(SoActorServiceProvider.REQ_PARAM_NM);
assertNotNull(request);
assertNull(request.getRequestDetails().getRequestParameters());
assertNotNull(request.getRequestDetails().getConfigurationParameters());
-
+
// payload with request, but no config params
policy.setPayload(makePayload());
policy.getPayload().remove(SoActorServiceProvider.CONFIG_PARAM_NM);
assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy,
loadAaiResponse(onset, "aai/AaiNqResponse-NoBase.json")));
+ policy.setTarget(null);
+
// response has no non-base VF modules (other than the "dummy")
assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy,
loadAaiResponse(onset, "aai/AaiNqResponse-NoNonBase.json")));
+ instantiateTarget(policy);
policy.setRecipe(VF_MODULE_DELETE);
SoRequest deleteRequest = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
assertNotNull(deleteRequest);
assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp));
}
+ private void instantiateTarget(Policy policy) {
+
+ Target target = new Target();
+ target.setModelCustomizationId("3e2d67ad-3495-4732-82f6-b0b872791fff");
+ target.setModelInvariantId("90b793b5-b8ae-4c36-b10b-4b6372859d3a");
+ target.setModelName("SproutScalingVf..scaling_sprout..module-1");
+ target.setModelVersion("1");
+ target.setModelVersionId("2210154d-e61a-4d7f-8fb9-0face1aee3f8");
+
+ policy.setTarget(target);
+ }
+
@Test
public void testSendRequest() {
try {
+/*-
/*-
* ============LICENSE_START=======================================================
* policy-yaml
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Tech Mahindra
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
public class Target implements Serializable {
private static final long serialVersionUID = 2180988443264988319L;
-
+
private String resourceId;
private TargetType type;
+ private String modelInvariantId;
+ private String modelVersionId;
+ private String modelName;
+ private String modelVersion;
+ private String modelCustomizationId;
+
+ public String getModelInvariantId() {
+ return modelInvariantId;
+ }
+
+ public void setModelInvariantId(String modelInvariantId) {
+ this.modelInvariantId = modelInvariantId;
+ }
+
+ public String getModelVersionId() {
+ return modelVersionId;
+ }
+
+ public void setModelVersionId(String modelVersionId) {
+ this.modelVersionId = modelVersionId;
+ }
+
+ public String getModelName() {
+ return modelName;
+ }
+
+ public void setModelName(String modelName) {
+ this.modelName = modelName;
+ }
+
+ public String getModelVersion() {
+ return modelVersion;
+ }
+
+ public void setModelVersion(String modelVersion) {
+ this.modelVersion = modelVersion;
+ }
+
+ public String getModelCustomizationId() {
+ return modelCustomizationId;
+ }
+
+ public void setModelCustomizationId(String modelCustomizationId) {
+ this.modelCustomizationId = modelCustomizationId;
+ } //techm
+
public Target() {
//Does Nothing Empty Constructor
}
-
+
public Target(TargetType type) {
this.type = type;
}
-
+
public Target(String resourceId) {
this.resourceId = resourceId;
}
-
+
public Target(TargetType type, String resourceId) {
this.type = type;
this.resourceId = resourceId;
}
-
+
public Target(Target target) {
this.type = target.type;
this.resourceId = target.resourceId;
}
-
+
public String getResourceID() {
return resourceId;
}
public String toString() {
return "Target [type=" + type + ", resourceId=" + resourceId + "]";
}
-
+
@Override
public int hashCode() {
final int prime = 31;
result = prime * result + ((resourceId == null) ? 0 : resourceId.hashCode());
return result;
}
-
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
* ============LICENSE_START=======================================================
* policy-yaml
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019 Tech Mahindra
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
public enum TargetType {
VM("VM"),
PNF("PNF"),
- VFC("VFC"),
- VNF("VNF")
+ VFC("VFC"),
+ VNF("VNF"),
+ VFMODULE("VFModule")
;
-
+
private String target;
-
+
private TargetType(String targetType) {
this.target = targetType;
}
-
+
@Override
public String toString() {
return this.target;
Code Review / policy / models.git / commitdiff