diff options
Diffstat (limited to 'mso-catalog-db/src/main/java')
8 files changed, 20 insertions, 20 deletions
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java index 63ee35cd9c..c3617b62c7 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java @@ -76,8 +76,8 @@ public class CloudIdentity { @JsonProperty("admin_project_domain_name ") @BusinessKey - @Column(name = "ADMIN_PROJECT_DOMAIN_NAME") - private String adminProjectDomainName; + @Column(name = "ADMIN_PROJECT_DOMAIN_NAME", nullable = false) + private String adminProjectDomainName = "Default"; @JsonProperty("user_domain_name") @BusinessKey diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudSite.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudSite.java index 8e3f47552f..64c4b62b11 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudSite.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudSite.java @@ -127,7 +127,7 @@ public class CloudSite { @JsonProperty("support_fabric") @BusinessKey - @Column(name = "SUPPORT_FABRIC") + @Column(name = "SUPPORT_FABRIC", nullable = false) private Boolean supportFabric = true; @Transient diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResource.java index 65444d0819..f35008a519 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResource.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResource.java @@ -55,8 +55,8 @@ public class NetworkResource implements Serializable { @Column(name = "MODEL_UUID") private String modelUUID; - @Column(name = "ORCHESTRATION_MODE") - private String orchestrationMode = null; + @Column(name = "ORCHESTRATION_MODE", nullable = false) + private String orchestrationMode = "HEAT"; @Column(name = "DESCRIPTION") private String description = null; diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java index 122a20fea9..2dea0bb752 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java @@ -82,8 +82,8 @@ public class PnfResourceCustomization implements Serializable { @Column(name = "CDS_BLUEPRINT_VERSION") private String blueprintVersion; - @Column(name = "SKIP_POST_INSTANTIATION_CONFIGURATION") - private boolean skipPostInstConf; + @Column(name = "SKIP_POST_INSTANTIATION_CONFIGURATION", nullable = false) + private boolean skipPostInstConf = true; @Column(name = "CONTROLLER_ACTOR") private String controllerActor; diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java index 487b3c6ad9..3cca869663 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java @@ -159,8 +159,8 @@ public class Service implements Serializable { @Column(name = "CDS_BLUEPRINT_VERSION") private String blueprintVersion; - @Column(name = "SKIP_POST_INSTANTIATION_CONFIGURATION") - private Boolean skipPostInstConf; + @Column(name = "SKIP_POST_INSTANTIATION_CONFIGURATION", nullable = false) + private Boolean skipPostInstConf = true; @Column(name = "CONTROLLER_ACTOR") private String controllerActor; diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java index 5cacec7185..f745bb8609 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java @@ -64,14 +64,14 @@ public class VfModuleCustomization implements Serializable { @Column(name = "LABEL") private String label; - @Column(name = "MIN_INSTANCES") - private Integer minInstances; + @Column(name = "MIN_INSTANCES", nullable = false) + private Integer minInstances = 0; @Column(name = "MAX_INSTANCES") private Integer maxInstances; - @Column(name = "INITIAL_COUNT") - private Integer initialCount; + @Column(name = "INITIAL_COUNT", nullable = false) + private Integer initialCount = 0; @Column(name = "AVAILABILITY_ZONE_COUNT") private Integer availabilityZoneCount; @@ -100,8 +100,8 @@ public class VfModuleCustomization implements Serializable { @OneToMany(cascade = CascadeType.ALL, mappedBy = "vfModuleCustomization") private List<CvnfcCustomization> cvnfcCustomization; - @Column(name = "SKIP_POST_INSTANTIATION_CONFIGURATION") - private Boolean skipPostInstConf; + @Column(name = "SKIP_POST_INSTANTIATION_CONFIGURATION", nullable = false) + private Boolean skipPostInstConf = true; @Override public boolean equals(final Object other) { diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java index 1b1df2117e..740e51a269 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java @@ -117,14 +117,14 @@ public class VnfResourceCustomization implements Serializable { @Column(name = "CDS_BLUEPRINT_VERSION") private String blueprintVersion; - @Column(name = "SKIP_POST_INSTANTIATION_CONFIGURATION") + @Column(name = "SKIP_POST_INSTANTIATION_CONFIGURATION", nullable = false) private Boolean skipPostInstConf = true; @Column(name = "VNFCINSTANCEGROUP_ORDER") private String vnfcInstanceGroupOrder; - @Column(name = "NF_DATA_VALID") - private Boolean nfDataValid; + @Column(name = "NF_DATA_VALID", nullable = false) + private Boolean nfDataValid = false; @Column(name = "CONTROLLER_ACTOR") private String controllerActor; diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Workflow.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Workflow.java index 05e8ddc501..77dc95a309 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Workflow.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Workflow.java @@ -65,8 +65,8 @@ public class Workflow implements Serializable { @Column(name = "TIMEOUT_MINUTES") private Integer timeoutMinutes; - @Column(name = "ARTIFACT_CHECKSUM") - private String artifactChecksum; + @Column(name = "ARTIFACT_CHECKSUM", nullable = false) + private String artifactChecksum = "RECORD"; @Column(name = "CREATION_TIMESTAMP", updatable = false) @Temporal(TemporalType.TIMESTAMP) |