aboutsummaryrefslogtreecommitdiffstats
path: root/mso-catalog-db/src
diff options
context:
space:
mode:
Diffstat (limited to 'mso-catalog-db/src')
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java4
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudSite.java2
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResource.java4
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java4
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java4
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java12
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java6
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Workflow.java4
-rw-r--r--mso-catalog-db/src/test/resources/schema.sql8
9 files changed, 24 insertions, 24 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)
diff --git a/mso-catalog-db/src/test/resources/schema.sql b/mso-catalog-db/src/test/resources/schema.sql
index 335c49ee8a..86f56ca3a5 100644
--- a/mso-catalog-db/src/test/resources/schema.sql
+++ b/mso-catalog-db/src/test/resources/schema.sql
@@ -650,7 +650,7 @@ CREATE TABLE `network_resource` (
`TOSCA_NODE_TYPE` varchar(200) DEFAULT NULL,
`AIC_VERSION_MIN` varchar(20) NULL,
`AIC_VERSION_MAX` varchar(20) DEFAULT NULL,
- `ORCHESTRATION_MODE` varchar(20) DEFAULT 'HEAT',
+ `ORCHESTRATION_MODE` varchar(20) NOT NULL DEFAULT 'HEAT',
`CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
`RESOURCE_CATEGORY` varchar(200) DEFAULT NULL,
`RESOURCE_SUB_CATEGORY` varchar(200) DEFAULT NULL,
@@ -960,8 +960,8 @@ CREATE TABLE `vf_module_customization` (
`ID` int(13) NOT NULL AUTO_INCREMENT,
`MODEL_CUSTOMIZATION_UUID` varchar(200) NOT NULL,
`LABEL` varchar(200) DEFAULT NULL,
- `INITIAL_COUNT` int(11) DEFAULT '0',
- `MIN_INSTANCES` int(11) DEFAULT '0',
+ `INITIAL_COUNT` int(11) NOT NULL DEFAULT '0',
+ `MIN_INSTANCES` int(11) NOT NULL DEFAULT '0',
`MAX_INSTANCES` int(11) DEFAULT NULL,
`AVAILABILITY_ZONE_COUNT` int(11) DEFAULT NULL,
`HEAT_ENVIRONMENT_ARTIFACT_UUID` varchar(200) DEFAULT NULL,
@@ -1228,7 +1228,7 @@ CREATE TABLE IF NOT EXISTS `workflow` (
`RESOURCE_TARGET` varchar(200) NOT NULL,
`SOURCE` varchar(200) NOT NULL,
`TIMEOUT_MINUTES` int(11) DEFAULT NULL,
- `ARTIFACT_CHECKSUM` varchar(200) DEFAULT 'MANUAL RECORD',
+ `ARTIFACT_CHECKSUM` varchar(200) NOT NULL DEFAULT 'MANUAL RECORD',
`CREATION_TIMESTAMP` datetime NOT NULL DEFAULT current_timestamp(),
PRIMARY KEY (`ID`),
UNIQUE KEY `UK_workflow` (`ARTIFACT_UUID`,`NAME`,`VERSION`,`SOURCE`)