import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
-
import java.io.Serializable;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
-
-import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
import org.json.JSONObject;
import org.onap.clamp.clds.util.JsonUtils;
import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.loop.template.MicroServiceModel;
+import org.onap.clamp.loop.template.PolicyModel;
import org.onap.clamp.policy.Policy;
import org.yaml.snakeyaml.Yaml;
@Entity
@Table(name = "micro_service_policies")
-@TypeDefs({ @TypeDef(name = "json", typeClass = StringJsonUserType.class) })
-public class MicroServicePolicy extends AuditEntity implements Serializable, Policy {
+@TypeDefs({@TypeDef(name = "json", typeClass = StringJsonUserType.class)})
+public class MicroServicePolicy extends Policy implements Serializable {
/**
* The serial version ID.
*/
@Column(nullable = false, name = "name", unique = true)
private String name;
- @Expose
- @Column(nullable = false, name = "policy_model_type")
- private String modelType;
-
@Expose
@Column(name = "context")
private String context;
@Column(name = "device_type_scope")
private String deviceTypeScope;
- @Expose
- @Type(type = "json")
- @Column(columnDefinition = "json", name = "properties")
- private JsonObject properties;
-
@Expose
@Column(name = "shared", nullable = false)
private Boolean shared;
- @Column(columnDefinition = "MEDIUMTEXT", name = "policy_tosca", nullable = false)
- private String policyTosca;
+ @ManyToMany(mappedBy = "microServicePolicies", fetch = FetchType.EAGER)
+ private Set<Loop> usedByLoops = new HashSet<>();
+
+ @Expose
+ @Column(name = "dcae_deployment_id")
+ private String dcaeDeploymentId;
@Expose
- @Type(type = "json")
- @Column(columnDefinition = "json", name = "json_representation", nullable = false)
- private JsonObject jsonRepresentation;
+ @Column(name = "dcae_deployment_status_url")
+ private String dcaeDeploymentStatusUrl;
- @ManyToMany(mappedBy = "microServicePolicies", fetch = FetchType.EAGER)
- private Set<Loop> usedByLoops = new HashSet<>();
+ @Expose
+ @Column(name = "dcae_blueprint_id")
+ private String dcaeBlueprintId;
@Expose
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "micro_service_model_id")
- private MicroServiceModel microServiceModel;
+ @JoinColumns({@JoinColumn(name = "policy_model_type", referencedColumnName = "policy_model_type"),
+ @JoinColumn(name = "policy_model_version", referencedColumnName = "version")})
+ private PolicyModel policyModel;
public MicroServicePolicy() {
// serialization
* using the ToscaYamlToJsonConvertor.
*
* @param name The name of the MicroService
- * @param modelType The model type of the MicroService
- * @param policyTosca The policy Tosca of the MicroService
+ * @param policyModel The policy model of the MicroService
* @param shared The flag indicate whether the MicroService is shared
* @param usedByLoops The list of loops that uses this MicroService
*/
- public MicroServicePolicy(String name, String modelType, String policyTosca, Boolean shared,
- Set<Loop> usedByLoops) {
+ public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared,
+ Set<Loop> usedByLoops) {
this.name = name;
- this.modelType = modelType;
- this.policyTosca = policyTosca;
+ this.policyModel = policyModel;
this.shared = shared;
- this.jsonRepresentation = JsonUtils.GSON_JPA_MODEL
- .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyTosca, modelType), JsonObject.class);
+ this.setJsonRepresentation(JsonUtils.GSON_JPA_MODEL
+ .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
+ policyModel.getPolicyModelType()), JsonObject.class));
this.usedByLoops = usedByLoops;
}
private JsonObject createJsonFromPolicyTosca() {
- Map<String, Object> map = new Yaml().load(this.getPolicyTosca());
+ Map<String, Object> map = new Yaml().load(this.getPolicyModel().getPolicyModelTosca());
JSONObject jsonObject = new JSONObject(map);
return new Gson().fromJson(jsonObject.toString(), JsonObject.class);
}
* the jsonRepresentation instead.
*
* @param name The name of the MicroService
- * @param modelType The model type of the MicroService
- * @param policyTosca The policy Tosca of the MicroService
+ * @param policyModel The policy model type of the MicroService
* @param shared The flag indicate whether the MicroService is
* shared
* @param jsonRepresentation The UI representation in json format
* @param usedByLoops The list of loops that uses this MicroService
*/
- public MicroServicePolicy(String name, String modelType, String policyTosca, Boolean shared,
- JsonObject jsonRepresentation, Set<Loop> usedByLoops) {
+ public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared,
+ JsonObject jsonRepresentation, Set<Loop> usedByLoops) {
this.name = name;
- this.modelType = modelType;
- this.policyTosca = policyTosca;
+ this.policyModel = policyModel;
this.shared = shared;
this.usedByLoops = usedByLoops;
- this.jsonRepresentation = jsonRepresentation;
+ this.setJsonRepresentation(jsonRepresentation);
}
@Override
return name;
}
- public String getModelType() {
- return modelType;
- }
-
- void setModelType(String modelType) {
- this.modelType = modelType;
- }
-
- public JsonObject getProperties() {
- return properties;
- }
-
- public void setProperties(JsonObject properties) {
- this.properties = properties;
+ /**
+ * name setter.
+ *
+ * @param name the name to set
+ */
+ @Override
+ public void setName(String name) {
+ this.name = name;
}
public Boolean getShared() {
this.shared = shared;
}
- public String getPolicyTosca() {
- return policyTosca;
- }
-
- void setPolicyTosca(String policyTosca) {
- this.policyTosca = policyTosca;
- }
-
- @Override
- public JsonObject getJsonRepresentation() {
- return jsonRepresentation;
- }
-
- void setJsonRepresentation(JsonObject jsonRepresentation) {
- this.jsonRepresentation = jsonRepresentation;
- }
-
public Set<Loop> getUsedByLoops() {
return usedByLoops;
}
this.deviceTypeScope = deviceTypeScope;
}
+ public PolicyModel getPolicyModel() {
+ return policyModel;
+ }
+
+ public void setPolicyModel(PolicyModel policyModel) {
+ this.policyModel = policyModel;
+ }
+
/**
- * microServiceModel getter.
- *
- * @return the microServiceModel
+ * dcaeDeploymentId getter.
+ *
+ * @return the dcaeDeploymentId
*/
- public MicroServiceModel getMicroServiceModel() {
- return microServiceModel;
+ public String getDcaeDeploymentId() {
+ return dcaeDeploymentId;
}
/**
- * microServiceModel setter.
- *
- * @param microServiceModel the microServiceModel to set
+ * dcaeDeploymentId setter.
+ *
+ * @param dcaeDeploymentId the dcaeDeploymentId to set
*/
- public void setMicroServiceModel(MicroServiceModel microServiceModel) {
- this.microServiceModel = microServiceModel;
+ public void setDcaeDeploymentId(String dcaeDeploymentId) {
+ this.dcaeDeploymentId = dcaeDeploymentId;
}
/**
- * name setter.
- *
- * @param name the name to set
+ * dcaeDeploymentStatusUrl getter.
+ *
+ * @return the dcaeDeploymentStatusUrl
*/
- public void setName(String name) {
- this.name = name;
+ public String getDcaeDeploymentStatusUrl() {
+ return dcaeDeploymentStatusUrl;
+ }
+
+ /**
+ * dcaeDeploymentStatusUrl setter.
+ *
+ * @param dcaeDeploymentStatusUrl the dcaeDeploymentStatusUrl to set
+ */
+ public void setDcaeDeploymentStatusUrl(String dcaeDeploymentStatusUrl) {
+ this.dcaeDeploymentStatusUrl = dcaeDeploymentStatusUrl;
+ }
+
+ /**
+ * dcaeBlueprintId getter.
+ *
+ * @return the dcaeBlueprintId
+ */
+ public String getDcaeBlueprintId() {
+ return dcaeBlueprintId;
+ }
+
+ /**
+ * dcaeBlueprintId setter.
+ *
+ * @param dcaeBlueprintId the dcaeBlueprintId to set
+ */
+ void setDcaeBlueprintId(String dcaeBlueprintId) {
+ this.dcaeBlueprintId = dcaeBlueprintId;
}
@Override
}
private String getMicroServicePropertyNameFromTosca(JsonObject object) {
- return object.getAsJsonObject("policy_types").getAsJsonObject(this.modelType).getAsJsonObject("properties")
+ return object.getAsJsonObject("policy_types").getAsJsonObject(this.getPolicyModel().getPolicyModelType())
+ .getAsJsonObject(
+ "properties")
.keySet().toArray(new String[1])[0];
}
JsonObject policyDetails = new JsonObject();
thisPolicy.add(this.getName(), policyDetails);
- policyDetails.addProperty("type", this.getModelType());
- policyDetails.addProperty("version", "1.0.0");
+ policyDetails.addProperty("type", this.getPolicyModel().getPolicyModelType());
+ policyDetails.addProperty("version", this.getPolicyModel().getVersion());
JsonObject policyMetadata = new JsonObject();
policyDetails.add("metadata", policyMetadata);
JsonObject policyProperties = new JsonObject();
policyDetails.add("properties", policyProperties);
- policyProperties.add(this.getMicroServicePropertyNameFromTosca(toscaJson), this.getProperties());
+ policyProperties.add(this.getMicroServicePropertyNameFromTosca(toscaJson), this.getConfigurationsJson());
String policyPayload = new GsonBuilder().setPrettyPrinting().create().toJson(policyPayloadResult);
logger.info("Micro service policy payload: " + policyPayload);
return policyPayload;
Code Review / clamp.git / blobdiff