diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2020-12-21 11:02:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-12-21 11:02:48 +0000 |
| commit | 63dcede0648aeed18c64d9947eb6fa02865e6c32 (patch) | |
| tree | 6a54d6cb4cda1dac28c717660fd59a1168a37c70 /mso-catalog-db | |
| parent | 5c84838a81d1723492a928a0b77ba9e431babf95 (diff) | |
| parent | 5d4f34c49eece70dc46633da5d978a5774ddc467 (diff) | |
Merge "software-version fix"
Diffstat (limited to 'mso-catalog-db')
| -rw-r--r-- | mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java | 14 | ||||
| -rw-r--r-- | mso-catalog-db/src/test/resources/schema.sql | 1 |
2 files changed, 14 insertions, 1 deletions
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 2e4623d25d..122a20fea9 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 @@ -88,6 +88,9 @@ public class PnfResourceCustomization implements Serializable { @Column(name = "CONTROLLER_ACTOR") private String controllerActor; + @Column(name = "DEFAULT_SOFTWARE_VERSION") + private String defaultSoftwareVersion; + @Override public String toString() { return new ToStringBuilder(this).append("modelCustomizationUUID", modelCustomizationUUID) @@ -95,7 +98,8 @@ public class PnfResourceCustomization implements Serializable { .append("nfFunction", nfFunction).append("nfType", nfType).append("nfRole", nfRole) .append("nfNamingCode", nfNamingCode).append("multiStageDesign", multiStageDesign) .append("pnfResources", pnfResources).append("blueprintName", blueprintName) - .append("blueprintVersion", blueprintVersion).append("controllerActor", controllerActor).toString(); + .append("blueprintVersion", blueprintVersion).append("controllerActor", controllerActor) + .append("defaultSoftwareVersion", defaultSoftwareVersion).toString(); } @Override @@ -234,4 +238,12 @@ public class PnfResourceCustomization implements Serializable { public void setControllerActor(String controllerActor) { this.controllerActor = controllerActor; } + + public String getDefaultSoftwareVersion() { + return defaultSoftwareVersion; + } + + public void setDefaultSoftwareVersion(String defaultSoftwareVersion) { + this.defaultSoftwareVersion = defaultSoftwareVersion; + } } diff --git a/mso-catalog-db/src/test/resources/schema.sql b/mso-catalog-db/src/test/resources/schema.sql index 68f272cca0..335c49ee8a 100644 --- a/mso-catalog-db/src/test/resources/schema.sql +++ b/mso-catalog-db/src/test/resources/schema.sql @@ -1204,6 +1204,7 @@ CREATE TABLE IF NOT EXISTS `pnf_resource_customization` ( `CDS_BLUEPRINT_VERSION` varchar(20) DEFAULT NULL, `SKIP_POST_INSTANTIATION_CONFIGURATION` boolean default true, `CONTROLLER_ACTOR` varchar(200) DEFAULT NULL, + `DEFAULT_SOFTWARE_VERSION` varchar(4000) DEFAULT NULL, PRIMARY KEY (`MODEL_CUSTOMIZATION_UUID`), KEY `fk_pnf_resource_customization__pnf_resource1_idx` (`PNF_RESOURCE_MODEL_UUID`), CONSTRAINT `fk_pnf_resource_customization__pnf_resource1` FOREIGN KEY (`PNF_RESOURCE_MODEL_UUID`) REFERENCES `pnf_resource` (`MODEL_UUID`) ON DELETE CASCADE ON UPDATE CASCADE |